fix errors in implementation to pass tests

Author: kostya05983

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingOAuth2AuthorizedClientProvider.java

@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * An implementation of an {@link OAuth2AuthorizedClientProvider} that simply delegates

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/InMemoryClientRegistrationRepository.java

@@ -63,6 +63,10 @@ private static Map<String, ClientRegistration> createRegistrationsMap(List<Clien
 	private static Map<String, ClientRegistration> toUnmodifiableConcurrentMap(List<ClientRegistration> registrations) {
 		final ConcurrentHashMap<String, ClientRegistration> result = new ConcurrentHashMap<>();
 		for (ClientRegistration registration : registrations) {
+			if (result.containsKey(registration.getRegistrationId())) {
+					throw new IllegalStateException(String.format("Duplicate key %s",
+							registration.getRegistrationId()));
+			}
 			result.put(registration.getRegistrationId(), registration);
 		}
 		return Collections.unmodifiableMap(result);

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/converter/ObjectToListStringConverter.java

@@ -19,8 +19,12 @@
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 import org.springframework.util.ClassUtils;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.ArrayList;
 
 /**
  * @author Joe Grandja
@@ -60,7 +64,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		}
 		if (source instanceof Collection) {
 			final Collection<String> results = new ArrayList<>();
-			for (Object object : ((Collection<?>)source)) {
+			for (Object object : ((Collection<?>) source)) {
 				if (object != null) {
 					results.add(object.toString());
 				}

oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jose/jws/MacAlgorithm.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.security.oauth2.jose.jws;
 
-import java.util.stream.Stream;
 
 /**
  * An enumeration of the cryptographic algorithms defined by the JSON Web Algorithms (JWA) specification

oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java

@@ -161,7 +161,7 @@ public Map<String, Object> convert(Map<String, Object> claims) {
 
 	private Map<String, Object> removeClaims(Map<String, Object> claims) {
 		Map<String, Object> result = new HashMap<>();
-		for(Map.Entry<String, Object> entry: claims.entrySet()) {
+		for (Map.Entry<String, Object> entry: claims.entrySet()) {
 			if (entry.getValue() != null) {
 				result.put(entry.getKey(), entry.getValue());
 			}

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/OAuth2IntrospectionReactiveAuthenticationManager.java

@@ -17,8 +17,11 @@
 package org.springframework.security.oauth2.server.resource.authentication;
 
 import java.time.Instant;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ArrayList;
 
 import org.springframework.security.oauth2.core.OAuth2TokenAttributes;
 import reactor.core.publisher.Mono;

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationEntryPoint.java

@@ -116,7 +116,7 @@ private static String computeWWWAuthenticateHeaderValue(Map<String, String> para
 		if (!parameters.isEmpty()) {
 			wwwAuthenticate.append(" ");
 			int i = 0;
-			for(Map.Entry<String, String> entry : parameters.entrySet()) {
+			for (Map.Entry<String, String> entry : parameters.entrySet()) {
 				wwwAuthenticate.append(entry.getKey()).append("=\"").append(entry.getValue()).append("\"");
 						if (i != parameters.size() - 1) {
 							wwwAuthenticate.append(", ");

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/access/BearerTokenAccessDeniedHandler.java

@@ -94,7 +94,7 @@ private static String computeWWWAuthenticateHeaderValue(Map<String, String> para
 		if (!parameters.isEmpty()) {
 			wwwAuthenticate.append(" ");
 			int i = 0;
-			for(Map.Entry<String, String> entry : parameters.entrySet()) {
+			for (Map.Entry<String, String> entry : parameters.entrySet()) {
 				wwwAuthenticate.append(entry.getKey()).append("=\"").append(entry.getValue()).append("\"");
 				if (i != parameters.size() - 1) {
 					wwwAuthenticate.append(", ");

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandler.java

@@ -95,7 +95,7 @@ private static String computeWWWAuthenticateHeaderValue(Map<String, String> para
 		if (!parameters.isEmpty()) {
 			wwwAuthenticate.append(" ");
 			int i = 0;
-			for(Map.Entry<String, String> entry : parameters.entrySet()) {
+			for (Map.Entry<String, String> entry : parameters.entrySet()) {
 				wwwAuthenticate.append(entry.getKey()).append("=\"").append(entry.getValue()).append("\"");
 				if (i != parameters.size() - 1) {
 					wwwAuthenticate.append(", ");

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/BearerTokenServerAuthenticationEntryPoint.java

@@ -32,7 +32,6 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * An {@link AuthenticationEntryPoint} implementation used to commence authentication of protected resource requests
@@ -116,7 +115,7 @@ private static String computeWWWAuthenticateHeaderValue(Map<String, String> para
 		if (!parameters.isEmpty()) {
 			wwwAuthenticate.append(" ");
 			int i = 0;
-			for(Map.Entry<String, String> entry : parameters.entrySet()) {
+			for (Map.Entry<String, String> entry : parameters.entrySet()) {
 				wwwAuthenticate.append(entry.getKey()).append("=\"").append(entry.getValue()).append("\"");
 				if (i != parameters.size() - 1) {
 					wwwAuthenticate.append(", ");

web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java

@@ -21,9 +21,9 @@
 import org.springframework.util.Assert;
 import reactor.core.publisher.Mono;
 
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
  * Delegates to a collection of {@link ServerAuthenticationSuccessHandler} implementations.

web/src/main/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriter.java

@@ -15,9 +15,9 @@
  */
 package  org.springframework.security.web.server.header;
 
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
 
 import org.springframework.web.server.ServerWebExchange;
 
@@ -48,5 +48,4 @@ public Mono<Void> writeHttpHeaders(ServerWebExchange exchange) {
 		}
 		return Mono.when(results);
 	}
-
 }