You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/10 15:02:52 UTC
cxf-fediz git commit: Fixing last commit
Repository: cxf-fediz
Updated Branches:
refs/heads/master 08cd4fc68 -> 29bf8de22
Fixing last commit
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/29bf8de2
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/29bf8de2
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/29bf8de2
Branch: refs/heads/master
Commit: 29bf8de2253034c6e06e8a8a0dba2e75a56b0ad6
Parents: 08cd4fc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 10 14:43:10 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 10 14:43:10 2017 +0000
----------------------------------------------------------------------
.../main/java/org/apache/cxf/fediz/core/config/Protocol.java | 2 +-
.../idp/protocols/TrustedIdpFacebookProtocolHandler.java | 2 +-
.../service/idp/protocols/TrustedIdpOIDCProtocolHandler.java | 4 ++--
.../fediz/service/oidc/clients/ClientRegistrationService.java | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/29bf8de2/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
index 3eeaf54..993b011 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
@@ -181,7 +181,7 @@ public abstract class Protocol {
if (cbt.getType() == null || cbt.getType().equals(ArgumentType.STRING)) {
return cbt.getValue();
} else if (cbt.getType().equals(ArgumentType.CLASS)) {
- List<Object> handler = new ArrayList<Object>();
+ List<Object> handler = new ArrayList<>();
String[] cbtHandler = cbt.getValue().split(",");
for (String cbh : cbtHandler) {
try {
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/29bf8de2/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
index 36db3ae..83444e5 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
@@ -156,7 +156,7 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpOAuth2P
private ClientAccessToken getAccessTokenUsingCode(String tokenEndpoint, String code, String clientId,
String clientSecret, String redirectURI) {
// Here we need to get the AccessToken using the authorization code
- List<Object> providers = new ArrayList<Object>();
+ List<Object> providers = new ArrayList<>();
providers.add(new OAuthJSONProvider());
WebClient client =
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/29bf8de2/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
index b45c763..47a318d 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
@@ -125,7 +125,7 @@ public class TrustedIdpOIDCProtocolHandler extends AbstractTrustedIdpOAuth2Proto
}
// Here we need to get the IdToken using the authorization code
- List<Object> providers = new ArrayList<Object>();
+ List<Object> providers = new ArrayList<>();
providers.add(new OAuthJSONProvider());
WebClient client =
@@ -284,7 +284,7 @@ public class TrustedIdpOIDCProtocolHandler extends AbstractTrustedIdpOAuth2Proto
&& jwt.getJwsHeaders().containsHeader(JoseConstants.HEADER_KEY_ID)) {
String kid = (String)jwt.getJwsHeaders().getHeader(JoseConstants.HEADER_KEY_ID);
LOG.debug("Attemping to retrieve key id {} from uri {}", kid, jwksUri);
- List<Object> jsonKeyProviders = new ArrayList<Object>();
+ List<Object> jsonKeyProviders = new ArrayList<>();
jsonKeyProviders.add(new JsonWebKeysProvider());
WebClient client =
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/29bf8de2/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
index fb60d98..3bdf1b9 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
@@ -193,7 +193,7 @@ public class ClientRegistrationService {
if (dataProvider instanceof AuthorizationCodeDataProvider) {
Client c = getRegisteredClient(id);
UserSubject subject = new OidcUserSubject(getUserName());
- List<ServerAuthorizationCodeGrant> codeGrants = new ArrayList<ServerAuthorizationCodeGrant>(
+ List<ServerAuthorizationCodeGrant> codeGrants = new ArrayList<>(
((AuthorizationCodeDataProvider)dataProvider).getCodeGrants(c, subject));
Collections.sort(codeGrants, new CodeGrantComparator());
return new ClientCodeGrants(c, codeGrants);
@@ -363,7 +363,7 @@ public class ClientRegistrationService {
String userName = newClient.getResourceOwnerSubject().getLogin();
Set<String> names = clientNames.get(userName);
if (names == null) {
- names = new HashSet<String>();
+ names = new HashSet<>();
clientNames.put(userName, names);
} else if (names.contains(newClient.getApplicationName())) {
String newName = newClient.getApplicationName();
@@ -419,7 +419,7 @@ public class ClientRegistrationService {
getClientRegistrations(userName).add(c);
Set<String> names = clientNames.get(userName);
if (names == null) {
- names = new HashSet<String>();
+ names = new HashSet<>();
clientNames.put(userName, names);
}
names.add(c.getApplicationName());