Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 14:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ConcurrentHashMap in InMemoryReactiveClientRegistrationRepository

Browse Source 
Fixes gh-7299
This commit is contained in:
Rob Winch 2019-09-04 19:21:22 -05:00
parent bf78e43403
commit f8f1e9a3d4
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/InMemoryReactiveClientRegistrationRepository.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -15,15 +15,22 @@
*/ */
package org.springframework.security.oauth2.client.registration; package org.springframework.security.oauth2.client.registration;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.util.Assert;
/** /**
* A Reactive {@link ClientRegistrationRepository} that stores {@link ClientRegistration}(s) in-memory. * A Reactive {@link ClientRegistrationRepository} that stores {@link ClientRegistration}(s) in-memory.
* *
* @author Rob Winch * @author Rob Winch
* @author Ebert Toribio
* @since 5.1 * @since 5.1
* @see ClientRegistrationRepository * @see ClientRegistrationRepository
* @see ClientRegistration * @see ClientRegistration
@ -31,7 +38,7 @@ import reactor.core.publisher.Mono;
public final class InMemoryReactiveClientRegistrationRepository public final class InMemoryReactiveClientRegistrationRepository
implements ReactiveClientRegistrationRepository, Iterable<ClientRegistration> { implements ReactiveClientRegistrationRepository, Iterable<ClientRegistration> {
private final InMemoryClientRegistrationRepository delegate; private final Map<String, ClientRegistration> clientIdToClientRegistration;
/** /**
* Constructs an {@code InMemoryReactiveClientRegistrationRepository} using the provided parameters. * Constructs an {@code InMemoryReactiveClientRegistrationRepository} using the provided parameters.
@ -39,7 +46,12 @@ public final class InMemoryReactiveClientRegistrationRepository
* @param registrations the client registration(s) * @param registrations the client registration(s)
*/ */
public InMemoryReactiveClientRegistrationRepository(ClientRegistration... registrations) { public InMemoryReactiveClientRegistrationRepository(ClientRegistration... registrations) {
this.delegate = new InMemoryClientRegistrationRepository(registrations); this(toList(registrations));
}
private static List<ClientRegistration> toList(ClientRegistration... registrations) {
Assert.notEmpty(registrations, "registrations cannot be null or empty");
return Arrays.asList(registrations);
} }
/** /**
@ -48,12 +60,12 @@ public final class InMemoryReactiveClientRegistrationRepository
* @param registrations the client registration(s) * @param registrations the client registration(s)
*/ */
public InMemoryReactiveClientRegistrationRepository(List<ClientRegistration> registrations) { public InMemoryReactiveClientRegistrationRepository(List<ClientRegistration> registrations) {
this.delegate = new InMemoryClientRegistrationRepository(registrations); this.clientIdToClientRegistration = toUnmodifiableConcurrentMap(registrations);
} }
@Override @Override
public Mono<ClientRegistration> findByRegistrationId(String registrationId) { public Mono<ClientRegistration> findByRegistrationId(String registrationId) {
return Mono.justOrEmpty(this.delegate.findByRegistrationId(registrationId)); return Mono.justOrEmpty(this.clientIdToClientRegistration.get(registrationId));
} }
/** /**
@ -63,6 +75,20 @@ public final class InMemoryReactiveClientRegistrationRepository
*/ */
@Override @Override
public Iterator<ClientRegistration> iterator() { public Iterator<ClientRegistration> iterator() {
return delegate.iterator(); return this.clientIdToClientRegistration.values().iterator();
}
private static Map<String, ClientRegistration> toUnmodifiableConcurrentMap(List<ClientRegistration> registrations) {
Assert.notEmpty(registrations, "registrations cannot be null or empty");
ConcurrentHashMap<String, ClientRegistration> result = new ConcurrentHashMap<>();
for (ClientRegistration registration : registrations) {
Assert.notNull(registration, "no registration can be null");
if (result.containsKey(registration.getRegistrationId())) {
throw new IllegalStateException(String.format("Duplicate key %s",
registration.getRegistrationId()));
}
result.put(registration.getRegistrationId(), registration);
}
return Collections.unmodifiableMap(result);
} }
} }