/*
 * Copyright 2012-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.springframework.security.oauth2.client.registration;

import org.springframework.util.Assert;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * A {@link ClientRegistrationRepository} that stores {@link ClientRegistration}(s) <i>in-memory</i>.
 *
 * @author Joe Grandja
 * @since 5.0
 * @see ClientRegistration
 */
public final class InMemoryClientRegistrationRepository implements ClientRegistrationRepository {
	private final ClientRegistrationIdentifierStrategy<String> identifierStrategy = new ClientAliasIdentifierStrategy();
	private final Map<String, ClientRegistration> registrations;

	public InMemoryClientRegistrationRepository(List<ClientRegistration> registrations) {
		Assert.notEmpty(registrations, "registrations cannot be empty");
		Map<String, ClientRegistration> registrationsMap = new HashMap<>();
		registrations.forEach(registration -> {
			String identifier = this.identifierStrategy.getIdentifier(registration);
			if (registrationsMap.containsKey(identifier)) {
				throw new IllegalArgumentException("ClientRegistration must be unique. Found duplicate identifier: " + identifier);
			}
			registrationsMap.put(identifier, registration);
		});
		this.registrations = Collections.unmodifiableMap(registrationsMap);
	}

	@Override
	public List<ClientRegistration> getRegistrationsByClientId(String clientId) {
		Assert.hasText(clientId, "clientId cannot be empty");
		return this.registrations.values().stream()
			.filter(registration -> registration.getClientId().equals(clientId))
			.collect(Collectors.toList());
	}

	@Override
	public ClientRegistration getRegistrationByClientAlias(String clientAlias) {
		Assert.hasText(clientAlias, "clientAlias cannot be empty");
		return this.registrations.values().stream()
			.filter(registration -> registration.getClientAlias().equals(clientAlias))
			.findFirst()
			.orElseGet(null);
	}

	@Override
	public List<ClientRegistration> getRegistrations() {
		return new ArrayList<>(this.registrations.values());
	}
}

@@ -2599,11 +2599,8 @@
 Else
-Get
 (nul

Fix NPE InMemoryClientRegistrationRepository