Updating guava to 14.0.1
parent
6dce0ef4c5
commit
23c318f6c2
|
@ -19,7 +19,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
|
|||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import com.google.common.cache.Cache;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.nimbusds.jose.JWSVerifier;
|
||||
|
@ -39,7 +39,7 @@ import com.nimbusds.jose.jwk.RSAKey;
|
|||
@Service
|
||||
public class JWKSetSigningAndValidationServiceCacheService {
|
||||
|
||||
private Cache<String, JwtSigningAndValidationService> cache;
|
||||
private LoadingCache<String, JwtSigningAndValidationService> cache;
|
||||
|
||||
public JWKSetSigningAndValidationServiceCacheService() {
|
||||
this.cache = CacheBuilder.newBuilder()
|
||||
|
|
|
@ -6,8 +6,6 @@ package org.mitre.oauth2.service.impl;
|
|||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import org.mitre.oauth2.model.SystemScope;
|
||||
import org.mitre.oauth2.repository.SystemScopeRepository;
|
||||
import org.mitre.oauth2.service.SystemScopeService;
|
||||
|
@ -32,7 +30,7 @@ public class DefaultSystemScopeService implements SystemScopeService {
|
|||
|
||||
private Predicate<SystemScope> isDefault = new Predicate<SystemScope>() {
|
||||
@Override
|
||||
public boolean apply(@Nullable SystemScope input) {
|
||||
public boolean apply(SystemScope input) {
|
||||
return (input != null && input.isDefaultScope());
|
||||
}
|
||||
};
|
||||
|
@ -40,14 +38,14 @@ public class DefaultSystemScopeService implements SystemScopeService {
|
|||
|
||||
private Predicate<SystemScope> isDynReg = new Predicate<SystemScope>() {
|
||||
@Override
|
||||
public boolean apply(@Nullable SystemScope input) {
|
||||
public boolean apply(SystemScope input) {
|
||||
return (input != null && input.isAllowDynReg());
|
||||
}
|
||||
};
|
||||
|
||||
private Function<String, SystemScope> stringToSystemScope = new Function<String, SystemScope>() {
|
||||
@Override
|
||||
public SystemScope apply(@Nullable String input) {
|
||||
public SystemScope apply(String input) {
|
||||
if (input == null) {
|
||||
return null;
|
||||
} else {
|
||||
|
@ -65,7 +63,7 @@ public class DefaultSystemScopeService implements SystemScopeService {
|
|||
|
||||
private Function<SystemScope, String> systemScopeToString = new Function<SystemScope, String>() {
|
||||
@Override
|
||||
public String apply(@Nullable SystemScope input) {
|
||||
public String apply(SystemScope input) {
|
||||
if (input == null) {
|
||||
return null;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue