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

Changed predicates methods to use Collections2.filter rather than Sets.filter

pull/477/head
Amanda Anganes 2013-08-13 10:31:39 -04:00
parent f1357cceb4
commit e88c6c4943
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ import org.springframework.security.oauth2.provider.token.TokenEnhancer;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.PlainJWT; import com.nimbusds.jwt.PlainJWT;
@ -413,11 +414,11 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi
}; };
private Collection<OAuth2AccessTokenEntity> getExpiredAccessTokens() { private Collection<OAuth2AccessTokenEntity> getExpiredAccessTokens() {
return Sets.filter(Sets.newHashSet(tokenRepository.getAllAccessTokens()), isAccessTokenExpired); return Collections2.filter(tokenRepository.getAllAccessTokens(), isAccessTokenExpired);
} }
private Collection<OAuth2RefreshTokenEntity> getExpiredRefreshTokens() { private Collection<OAuth2RefreshTokenEntity> getExpiredRefreshTokens() {
return Sets.filter(Sets.newHashSet(tokenRepository.getAllRefreshTokens()), isRefreshTokenExpired); return Collections2.filter(tokenRepository.getAllRefreshTokens(), isRefreshTokenExpired);
} }
/* (non-Javadoc) /* (non-Javadoc)

4
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java
View File

@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Sets; import com.google.common.collect.Collections2;
/** /**
* Implementation of the ApprovedSiteService * Implementation of the ApprovedSiteService
@ -166,7 +166,7 @@ public class DefaultApprovedSiteService implements ApprovedSiteService {
}; };
private Collection<ApprovedSite> getExpired() { private Collection<ApprovedSite> getExpired() {
return Sets.filter(Sets.newHashSet(approvedSiteRepository.getAll()), isExpired); return Collections2.filter(approvedSiteRepository.getAll(), isExpired);
} }
} }