github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updating guava to 14.0.1

pull/324/merge
Stephen Moore 2013-04-10 15:31:32 -04:00
parent 6dce0ef4c5
commit 23c318f6c2
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
View File

@ -19,7 +19,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate; 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.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.nimbusds.jose.JWSVerifier; import com.nimbusds.jose.JWSVerifier;
@ -39,7 +39,7 @@ import com.nimbusds.jose.jwk.RSAKey;
@Service @Service
public class JWKSetSigningAndValidationServiceCacheService { public class JWKSetSigningAndValidationServiceCacheService {
private Cache<String, JwtSigningAndValidationService> cache; private LoadingCache<String, JwtSigningAndValidationService> cache;
public JWKSetSigningAndValidationServiceCacheService() { public JWKSetSigningAndValidationServiceCacheService() {
this.cache = CacheBuilder.newBuilder() this.cache = CacheBuilder.newBuilder()

10
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
View File

@ -6,8 +6,6 @@ package org.mitre.oauth2.service.impl;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import javax.annotation.Nullable;
import org.mitre.oauth2.model.SystemScope; import org.mitre.oauth2.model.SystemScope;
import org.mitre.oauth2.repository.SystemScopeRepository; import org.mitre.oauth2.repository.SystemScopeRepository;
import org.mitre.oauth2.service.SystemScopeService; import org.mitre.oauth2.service.SystemScopeService;
@ -32,7 +30,7 @@ public class DefaultSystemScopeService implements SystemScopeService {
private Predicate<SystemScope> isDefault = new Predicate<SystemScope>() { private Predicate<SystemScope> isDefault = new Predicate<SystemScope>() {
@Override @Override
public boolean apply(@Nullable SystemScope input) { public boolean apply(SystemScope input) {
return (input != null && input.isDefaultScope()); return (input != null && input.isDefaultScope());
} }
}; };
@ -40,14 +38,14 @@ public class DefaultSystemScopeService implements SystemScopeService {
private Predicate<SystemScope> isDynReg = new Predicate<SystemScope>() { private Predicate<SystemScope> isDynReg = new Predicate<SystemScope>() {
@Override @Override
public boolean apply(@Nullable SystemScope input) { public boolean apply(SystemScope input) {
return (input != null && input.isAllowDynReg()); return (input != null && input.isAllowDynReg());
} }
}; };
private Function<String, SystemScope> stringToSystemScope = new Function<String, SystemScope>() { private Function<String, SystemScope> stringToSystemScope = new Function<String, SystemScope>() {
@Override @Override
public SystemScope apply(@Nullable String input) { public SystemScope apply(String input) {
if (input == null) { if (input == null) {
return null; return null;
} else { } else {
@ -65,7 +63,7 @@ public class DefaultSystemScopeService implements SystemScopeService {
private Function<SystemScope, String> systemScopeToString = new Function<SystemScope, String>() { private Function<SystemScope, String> systemScopeToString = new Function<SystemScope, String>() {
@Override @Override
public String apply(@Nullable SystemScope input) { public String apply(SystemScope input) {
if (input == null) { if (input == null) {
return null; return null;
} else { } else {

2
pom.xml
View File

@ -333,7 +333,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>10.0.1</version> <version>14.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>