[java-oidc-common] branch main updated: Lots of checkstyle fixes
Phil Smart
philip.smart at jisc.ac.uk
Fri Apr 1 16:58:04 UTC 2022
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=b781227d841395fccdc8c0fd22a00b01fe0b4429
The following commit(s) were added to refs/heads/main by this push:
new b781227 Lots of checkstyle fixes
b781227 is described below
commit b781227d841395fccdc8c0fd22a00b01fe0b4429
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Apr 1 17:57:57 2022 +0100
Lots of checkstyle fixes
---
.../impl/OIDCStringAttributeTranscoder.java | 14 +++---
.../oidc/authn/context/package-info.java | 19 ++++++++
.../oidc/jwk/support/RemoteJwkUtils.java | 2 -
.../oidc/jwt/claims/JWTClaimsValidation.java | 51 ----------------------
.../oidc/jwt/claims/JWTValidationException.java | 17 ++++++++
.../shibboleth/oidc/jwt/claims/package-info.java | 19 ++++++++
.../security/impl/JWTSignatureValidationUtil.java | 3 +-
.../AbstractEvaluableMetadataCriterion.java | 21 ++++++++-
.../oidc/metadata/BatchBackingStore.java | 13 +++---
.../oidc/metadata/DynamicBackingStore.java | 22 ++++++++++
.../oidc/metadata/OIDCMetadataResolver.java | 21 ++++++++-
.../oidc/metadata/cache/CacheLoadingContext.java | 13 +++---
.../oidc/metadata/cache/CacheLoadingException.java | 17 ++++++++
.../oidc/metadata/cache/ExpirationTimeContext.java | 17 ++++++++
.../oidc/metadata/cache/LoadingStrategy.java | 17 ++++++++
.../oidc/metadata/cache/MetadataCache.java | 13 +++---
.../metadata/cache/MetadataCacheException.java | 19 +++++++-
.../context/OIDCProviderMetadataContext.java | 17 ++++++++
.../oidc/metadata/context/package-info.java | 22 ++++++++++
.../oidc/metadata/criterion/IssuerIDCriterion.java | 30 ++++++++++---
.../criterion/ResourceLocationCriterion.java | 9 ++--
.../oidc/metadata/filter/FilterException.java | 17 ++++++++
.../oidc/metadata/filter/MetadataFilter.java | 27 +++++++++---
.../metadata/filter/MetadataFilterContext.java | 17 ++++++++
.../oidc/metadata/filter/MetadataSource.java | 21 ++++++++-
.../metadata/cache/impl/AbstractMetadataCache.java | 5 ++-
.../metadata/cache/impl/BatchMetadataCache.java | 2 +-
.../metadata/cache/impl/DynamicMetadataCache.java | 2 +-
.../cache/impl/FetchThroughMetadataCache.java | 7 +--
.../metadata/cache/impl/MetadataCacheBuilder.java | 2 +-
.../impl/ClientInformationNodeProcessor.java | 1 -
.../HTTPProviderConfigurationFetchingStrategy.java | 2 +-
.../StorageServiceClientInformationManager.java | 5 ++-
.../provider/ClientSecretReferenceProvider.java | 3 +-
.../policy/impl/DefaultMetadataPolicyEnforcer.java | 7 ++-
.../metadata/policy/impl/MetadataPolicyHelper.java | 3 +-
.../MetadataPolicyViaLocationFetchingStrategy.java | 12 ++---
.../shibboleth/oidc/common/OIDCCommonModule.java | 17 ++++++++
.../shibboleth/oidc/common/OIDCCommonPlugin.java | 17 ++++++++
.../OIDCDynamicRegistrationConfiguration.java | 3 +-
.../profile/config/OIDCUserInfoConfiguration.java | 5 ++-
.../navigate/AccessTokenTypeLookupFunction.java | 2 +-
...edRegistrationMetadataPolicyLookupFunction.java | 7 ++-
.../shibboleth/oidc/profile/core/OidcError.java | 2 +-
.../oidc/profile/decoding/package-info.java | 21 +++++++++
.../oidc/profile/encoder/OIDCMessageEncoder.java | 17 ++++++++
.../oidc/profile/encoder/package-info.java | 21 +++++++++
...th2ClientAuthenticableProfileConfiguration.java | 8 +++-
...AbstractOAuth2TokenValidatingConfiguration.java | 4 +-
.../config/OAuth2TokenAudienceConfiguration.java | 8 +++-
.../oauth2/config/OAuth2TokenConfiguration.java | 2 +-
.../impl/HTTPPostAuthnResponseDecoder.java | 5 ++-
.../impl/HTTPRedirectAuthnResponseDecoder.java | 5 ++-
.../oidc/profile/decoding/impl/package-info.java | 21 +++++++++
.../oidc/profile/logic/package-info.java | 21 +++++++++
.../impl/OAuthRPExtensionsMarshaller.java | 7 ++-
56 files changed, 564 insertions(+), 138 deletions(-)
diff --git a/oidc-common-attribute-impl/src/main/java/net/shibboleth/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoder.java b/oidc-common-attribute-impl/src/main/java/net/shibboleth/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoder.java
index cb0c8d2..be322df 100644
--- a/oidc-common-attribute-impl/src/main/java/net/shibboleth/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoder.java
+++ b/oidc-common-attribute-impl/src/main/java/net/shibboleth/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoder.java
@@ -86,7 +86,7 @@ public class OIDCStringAttributeTranscoder extends AbstractOIDCAttributeTranscod
@Nonnull private final Logger log = LoggerFactory.getLogger(OIDCStringAttributeTranscoder.class);
/** {@inheritDoc} */
-// Checkstyle: CyclomaticComplexity OFF
+ // Checkstyle: MethodLength|CyclomaticComplexity OFF
@Override
@Nullable protected Object encodeValues(@Nullable final ProfileRequestContext profileRequestContext,
@Nonnull final IdPAttribute attribute, @Nonnull final TranscodingRule rule)
@@ -162,7 +162,6 @@ public class OIDCStringAttributeTranscoder extends AbstractOIDCAttributeTranscod
return attributeString.length() != 0 ? attributeString.toString() : null;
}
-// Checkstyle: CyclomaticComplexity ON
/** {@inheritDoc} */
@Override
@@ -175,13 +174,16 @@ public class OIDCStringAttributeTranscoder extends AbstractOIDCAttributeTranscod
if (input instanceof String) {
return List.of(StringAttributeValue.valueOf((String)input));
- } else if (input instanceof Integer && rule.getOrDefault(PROP_NUMBER_AS_STRING, Boolean.class, false)) {
+ } else if (input instanceof Integer &&
+ rule.getOrDefault(PROP_NUMBER_AS_STRING, Boolean.class, false)) {
return List.of(StringAttributeValue.valueOf(Integer.toString((Integer)input)));
- } else if (input instanceof Double && rule.getOrDefault(PROP_NUMBER_AS_STRING, Boolean.class, false)) {
+ } else if (input instanceof Double &&
+ rule.getOrDefault(PROP_NUMBER_AS_STRING, Boolean.class, false)) {
return List.of(StringAttributeValue.valueOf(Double.toString((Double)input)));
- } else if (input instanceof Boolean && rule.getOrDefault(PROP_BOOLEAN_AS_STRING, Boolean.class, false)) {
+ } else if (input instanceof Boolean &&
+ rule.getOrDefault(PROP_BOOLEAN_AS_STRING, Boolean.class, false)) {
return List.of(StringAttributeValue.valueOf(Boolean.toString((Boolean)input)));
} else if (input instanceof JSONArray) {
@@ -212,7 +214,7 @@ public class OIDCStringAttributeTranscoder extends AbstractOIDCAttributeTranscod
}
}
-
+ // Checkstyle: MethodLength|CyclomaticComplexity ON
/**
* Parses string as JSONObject.
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/authn/context/package-info.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/authn/context/package-info.java
new file mode 100644
index 0000000..239bc8b
--- /dev/null
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/authn/context/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** OIDC/Oauth2 authentication contexts. */
+package net.shibboleth.oidc.authn.context;
\ No newline at end of file
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
index 1beec43..31a8e3d 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jose.jwk.JWKSet;
import com.nimbusds.jose.util.JSONObjectUtils;
-import net.minidev.json.JSONObject;
-
/**
* Generic utility methods related to remote JWK sets.
*/
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/JWTClaimsValidation.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/JWTClaimsValidation.java
deleted file mode 100644
index d13b5df..0000000
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/JWTClaimsValidation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package net.shibboleth.oidc.jwt.claims;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import com.nimbusds.jwt.JWTClaimsSet;
-
-/**
- * Validation engine for verifying claims in the JWT claims set.
- *
- * <p>Does not have to be directly responsible for validating claims, can delegate to
- * one or more {@link ClaimsValidator} implementations.</p>
- *
- * @deprecated
- */
- at Deprecated(since="1.2.0", forRemoval=true)
-public interface JWTClaimsValidation {
-
- /**
- * Validate the claims in the claims set. Can use supporting/runtime information contained
- * in the context tree.
- *
- * @param claims the JWT claims to validate.
- * @param context the supporting context.
- *
- * @throws JWTValidationException when validation is unsuccessful due to a failed attempt
- */
- void validate(@Nullable final JWTClaimsSet claims, @Nonnull final ProfileRequestContext context)
- throws JWTValidationException;
-
-}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/JWTValidationException.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/JWTValidationException.java
index 294532f..5adbf66 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/JWTValidationException.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/JWTValidationException.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.jwt.claims;
import javax.annotation.Nullable;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/package-info.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/package-info.java
new file mode 100644
index 0000000..9c1d383
--- /dev/null
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwt/claims/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** Validation functions for JWT claims. */
+package net.shibboleth.oidc.jwt.claims;
\ No newline at end of file
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtil.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtil.java
index 810fb6c..8514008 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtil.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtil.java
@@ -114,7 +114,7 @@ public final class JWTSignatureValidationUtil {
return validateSignatureEx(credentials, signedJwt, invalidJwtEventId);
}
-
+ // Checkstyle: CyclomaticComplexity OFF
/**
* Validates the signature of the given JWS against the given list of credentials. If the validation fails for
* any reason, including insufficient prequisities in the context, an event identifier is returned. Successful
@@ -166,6 +166,7 @@ public final class JWTSignatureValidationUtil {
log.warn("Unable to validate given JWT with any of the credentials");
return invalidJwtEventId;
}
+ // Checkstyle: CyclomaticComplexity ON
/**
* Initializes a {@link JWSVerifier} for the given algorithm, using the provided {@link Credential}.
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/AbstractEvaluableMetadataCriterion.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/AbstractEvaluableMetadataCriterion.java
index 632bbdd..b81415d 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/AbstractEvaluableMetadataCriterion.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/AbstractEvaluableMetadataCriterion.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata;
import java.util.function.Predicate;
@@ -29,7 +46,7 @@ public abstract class AbstractEvaluableMetadataCriterion<T> implements Predicate
* @param defaultResult what should be returned if the criterion is not appropriate for the given type.
*/
protected AbstractEvaluableMetadataCriterion(@Nonnull final Class<T> claz,
- @Nonnull final boolean defaultResult) {
+ @Nonnull final boolean defaultResult) {
objectType = Constraint.isNotNull(claz, "Object type cannot be null");
defaultResultOnWrongType = Constraint.isNotNull(defaultResult, "Default result on wrong type can not be null");
}
@@ -45,7 +62,7 @@ public abstract class AbstractEvaluableMetadataCriterion<T> implements Predicate
@Override
- public boolean test(T t) {
+ public boolean test(final T t) {
if (objectType.isInstance(t)) {
return doTest(t);
}
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/BatchBackingStore.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/BatchBackingStore.java
index 2b689d6..40bcc26 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/BatchBackingStore.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/BatchBackingStore.java
@@ -1,11 +1,10 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/DynamicBackingStore.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/DynamicBackingStore.java
index 9238756..4bee3ea 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/DynamicBackingStore.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/DynamicBackingStore.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata;
import java.util.Set;
@@ -10,6 +27,11 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+/** A dynamic version of a BackingStore.
+ *
+ * @param <I> the identifier type
+ * @param <T> the type of object stored, referenced by the key.
+ */
public interface DynamicBackingStore<I, T> extends BackingStore<I, T> {
/**
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/OIDCMetadataResolver.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/OIDCMetadataResolver.java
index 48ac035..05fa270 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/OIDCMetadataResolver.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/OIDCMetadataResolver.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata;
import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
@@ -6,8 +23,8 @@ import net.shibboleth.utilities.java.support.resolver.Resolver;
/**
- * Generic interface for OIDC Metadata resolvers which process specified criteria and produce some implementation-specific
- * result information.
+ * Generic interface for OIDC Metadata resolvers which process specified criteria and
+ * produce some implementation-specific result information.
*
* @param <T> the type of objects produced by this metadata resolver
*/
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingContext.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingContext.java
index f7cd2a9..c54ae1c 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingContext.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingContext.java
@@ -1,11 +1,10 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingException.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingException.java
index af14681..4c2beee 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingException.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/CacheLoadingException.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.cache;
import javax.annotation.Nullable;
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/ExpirationTimeContext.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/ExpirationTimeContext.java
index 98a392b..6e9dbf2 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/ExpirationTimeContext.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/ExpirationTimeContext.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.cache;
import java.time.Duration;
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/LoadingStrategy.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/LoadingStrategy.java
index a6afa69..bfa07b0 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/LoadingStrategy.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/LoadingStrategy.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.cache;
import javax.annotation.Nonnull;
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCache.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCache.java
index 582c7cc..ada4725 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCache.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCache.java
@@ -1,11 +1,10 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCacheException.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCacheException.java
index 83a2958..cab49dd 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCacheException.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/cache/MetadataCacheException.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.cache;
import javax.annotation.Nullable;
@@ -7,7 +24,7 @@ import javax.annotation.Nullable;
*/
public class MetadataCacheException extends Exception {
- /** SerialUID */
+ /** SerialUID. */
private static final long serialVersionUID = 4749191928630000314L;
/**
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/context/OIDCProviderMetadataContext.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/context/OIDCProviderMetadataContext.java
index 6483284..8470eb0 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/context/OIDCProviderMetadataContext.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/context/OIDCProviderMetadataContext.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.context;
import javax.annotation.Nullable;
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/context/package-info.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/context/package-info.java
new file mode 100644
index 0000000..561fe08
--- /dev/null
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/context/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *
+ * Metadata cache API contexts.
+ */
+package net.shibboleth.oidc.metadata.context;
\ No newline at end of file
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/IssuerIDCriterion.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/IssuerIDCriterion.java
index 67ace84..3769823 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/IssuerIDCriterion.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/IssuerIDCriterion.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.criterion;
import java.util.Objects;
@@ -55,14 +72,17 @@ public final class IssuerIDCriterion implements Criterion {
/** {@inheritDoc} */
@Override
- public boolean equals(Object obj) {
- if (this == obj)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
- IssuerIDCriterion other = (IssuerIDCriterion) obj;
+ }
+ final IssuerIDCriterion other = (IssuerIDCriterion) obj;
return id.equals(other.id);
}
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/ResourceLocationCriterion.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/ResourceLocationCriterion.java
index 3056417..af0026e 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/ResourceLocationCriterion.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/criterion/ResourceLocationCriterion.java
@@ -65,12 +65,15 @@ public class ResourceLocationCriterion implements Criterion {
/** {@inheritDoc} */
@Override
public boolean equals(final Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
final ResourceLocationCriterion other = (ResourceLocationCriterion) obj;
return location.equals(other.location);
}
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/FilterException.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/FilterException.java
index 6b0bcb7..d9d1487 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/FilterException.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/FilterException.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.filter;
import javax.annotation.Nullable;
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilter.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilter.java
index ba51212..825e068 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilter.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilter.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.filter;
import javax.annotation.Nonnull;
@@ -8,13 +25,13 @@ import javax.annotation.Nullable;
* A metadata filter is used to process a metadata document after it has been acquired from a metadata source.
*
* <p>
- * Some example SAML filters might remove everything but identity providers roles, decreasing the data a service provider
- * needs to work with, or a filter could be used to perform integrity checking on the retrieved metadata by verifying a
- * digital signature.
+ * Some example SAML filters might remove everything but identity providers roles, decreasing the
+ * data a service provider needs to work with, or a filter could be used to perform integrity checking
+ * on the retrieved metadata by verifying a digital signature.
* </p>
* <p>
- * Some example OIDC filters might throw a filter exception or return null if the metadata no longer supports, for example,
- * the ES-algorithms.
+ * Some example OIDC filters might throw a filter exception or return null if the metadata no longer
+ * supports, for example, the ES-algorithms.
* </p>
*
* <p>
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilterContext.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilterContext.java
index 1677f84..0e234f2 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilterContext.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataFilterContext.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.filter;
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataSource.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataSource.java
index 7a6f03d..6d32fd0 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataSource.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/filter/MetadataSource.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.metadata.filter;
import javax.annotation.Nullable;
@@ -5,8 +22,8 @@ import javax.annotation.Nullable;
import net.shibboleth.oidc.metadata.filter.MetadataFilterContext.Data;
/**
- * Data object for {@link MetadataFilterContext} intended to hold information about the source of the
- * metadata currently being processed.
+ * Data object for {@link MetadataFilterContext} intended to hold information about
+ * the source of the metadata currently being processed.
*/
public class MetadataSource implements Data {
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/AbstractMetadataCache.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/AbstractMetadataCache.java
index 7fe51c0..8a987d2 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/AbstractMetadataCache.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/AbstractMetadataCache.java
@@ -270,7 +270,7 @@ public abstract class AbstractMetadataCache<IdentifierType, MetadataType>
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
- metadataFilterStrategy = Constraint.isNotNull(strategy, "Metadata filter strategy can not be null");;
+ metadataFilterStrategy = Constraint.isNotNull(strategy, "Metadata filter strategy can not be null");
}
/**
@@ -360,7 +360,8 @@ public abstract class AbstractMetadataCache<IdentifierType, MetadataType>
}
}
if (!metadata.isEmpty()) {
- log.trace("{} Metadata cache has found '{}' entry(s) for '{}'", getLogPrefix(), metadata.size(), identifier);
+ log.trace("{} Metadata cache has found '{}' entry(s) for '{}'",
+ getLogPrefix(), metadata.size(), identifier);
}
return metadata;
}
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java
index 32161d5..1f5825e 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java
@@ -59,7 +59,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
* <p>Supports the following:</p>
* <ul>
* <li>Batch reloading of metadata from the source using the supplied loading strategy. The cache
- * is wiped and reloaded during each succesful refresh cycle.</li>
+ * is wiped and reloaded during each successful refresh cycle.</li>
* </ul>
*
* <p>The schedule for batch metadata reloads are based on:</p>
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCache.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCache.java
index 7e6b349..7ba223e 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCache.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCache.java
@@ -658,7 +658,7 @@ public class DynamicMetadataCache<IdentifierType, MetadataType>
}
/**
- * Purge metadata if {@link #isRemoveData(MetadataManagementData, Instant, Instant)} is true)
+ * Purge metadata if {@link #isRemoveData(MetadataManagementData, Instant, Instant)} is true.
*/
private void removeExpiredAndIdleMetadata() {
final Instant now = Instant.now();
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java
index a932265..dcfc99c 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java
@@ -115,14 +115,15 @@ public class FetchThroughMetadataCache <IdentifierType, MetadataType>
final IdentifierType extractedIdentifier = getIdentifierExtractionStrategy().apply(filteredMetadata);
if (extractedIdentifier == null) {
- log.warn("{} Metadata identifier could not be extracted, no further processing performed", getLogPrefix());
+ log.warn("{} Metadata identifier could not be extracted, no further processing performed",
+ getLogPrefix());
return Collections.emptyList();
}
// equality method of the identifier is required to be implemented correctly.
if (!Objects.equals(identifier, extractedIdentifier)) {
- log.warn("{} New metadata's identifer '{}' does not match expected identifier '{}', will not process",
- getLogPrefix(), extractedIdentifier, identifier);
+ log.warn("{} New metadata's identifer '{}' does not match expected identifier '{}', "
+ + "will not process", getLogPrefix(), extractedIdentifier, identifier);
return Collections.emptyList();
}
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilder.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilder.java
index 5d0179c..917e5c3 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilder.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilder.java
@@ -31,7 +31,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
* A builder that creates, initializes, and safely publishes the correct {@link MetadataCache metadata cache}
* based on the supplied {@link MetadataCacheBuilderSpec metadata cache builder specification}.
*/
-public class MetadataCacheBuilder {
+public final class MetadataCacheBuilder {
/** Private constructor.*/
private MetadataCacheBuilder() {
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessor.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessor.java
index 7708f80..6b09b0e 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessor.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessor.java
@@ -31,7 +31,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.schema.XSURI;
import org.opensaml.saml.criterion.RoleDescriptorCriterion;
import org.opensaml.saml.metadata.resolver.RoleDescriptorResolver;
import org.opensaml.saml.metadata.resolver.filter.FilterException;
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategy.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategy.java
index 406ff5d..3e7c4df 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategy.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategy.java
@@ -54,7 +54,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* A dynamic strategy for fetching OpenID Connect Provider Configuration Metadata from its well-known location
* (OpenID Connect Discovery 1.0, section 4).
*/
- at ThreadSafe //? is a singleton?
+ at ThreadSafe
public class HTTPProviderConfigurationFetchingStrategy
extends AbstractDynamicHTTPFetchingStrategy<OIDCProviderMetadata> {
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManager.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManager.java
index 8608b65..25831e8 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManager.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManager.java
@@ -43,8 +43,9 @@ public class StorageServiceClientInformationManager extends BaseStorageServiceCl
@Nonnull private final Logger log = LoggerFactory.getLogger(StorageServiceClientInformationResolver.class);
/** {@inheritDoc} */
+ @Override
public void storeClientInformation(@Nonnull final OIDCClientInformation clientInformation,
- @Nullable final Instant expiration, boolean replace) throws ClientInformationManagerException {
+ @Nullable final Instant expiration, final boolean replace) throws ClientInformationManagerException {
log.debug("Attempting to store client information (replace={})", replace ? "true" : "false");
final String clientId = clientInformation.getID().getValue();
@@ -67,6 +68,7 @@ public class StorageServiceClientInformationManager extends BaseStorageServiceCl
}
/** {@inheritDoc} */
+ @Override
@Deprecated
public void storeClientInformation(@Nonnull final OIDCClientInformation clientInformation,
@Nullable final Instant expiration) throws ClientInformationManagerException {
@@ -74,6 +76,7 @@ public class StorageServiceClientInformationManager extends BaseStorageServiceCl
}
/** {@inheritDoc} */
+ @Override
public void destroyClientInformation(final ClientID clientId) {
if (clientId == null) {
log.warn("The null clientId cannot be destroyed, nothing to do");
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
index 8f5af4f..850c618 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
@@ -63,7 +63,8 @@ public class ClientSecretReferenceProvider extends AbstractKeyInfoProvider {
*
* @param valueResolvers The list of resolvers for resolving the values for client secrets.
*/
- public ClientSecretReferenceProvider(@Nullable @NotEmpty final Collection<ClientSecretValueResolver> valueResolvers) {
+ public ClientSecretReferenceProvider(
+ @Nullable @NotEmpty final Collection<ClientSecretValueResolver> valueResolvers) {
if (valueResolvers != null) {
clientSecretValueResolvers = List.copyOf(valueResolvers);
} else {
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcer.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcer.java
index 4e8c1a0..999dda6 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcer.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcer.java
@@ -61,7 +61,9 @@ public class DefaultMetadataPolicyEnforcer implements BiFunction<Object,Metadata
@Nonnull private final Logger log = LoggerFactory.getLogger(DefaultMetadataPolicyEnforcer.class);
/** {@inheritDoc} */
- @Nonnull public Pair<Object, Boolean> apply(@Nullable final Object candidate, @Nullable final MetadataPolicy policy) {
+ @Override
+ @Nonnull public Pair<Object, Boolean> apply(@Nullable final Object candidate,
+ @Nullable final MetadataPolicy policy) {
if (policy == null) {
return new Pair<>(candidate, Boolean.TRUE);
}
@@ -127,6 +129,7 @@ public class DefaultMetadataPolicyEnforcer implements BiFunction<Object,Metadata
return add;
}
+ // Checkstyle: MethodLength|CyclomaticComplexity OFF
/**
* Runs the value check operators for the candidate.
*
@@ -181,7 +184,7 @@ public class DefaultMetadataPolicyEnforcer implements BiFunction<Object,Metadata
}
return validation;
}
-
+ // Checkstyle: MethodLength|CyclomaticComplexity ON
/**
* Verifies that the given candidate meets the regular expression.
*
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelper.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelper.java
index 56ae653..07bd800 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelper.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelper.java
@@ -67,6 +67,7 @@ public final class MetadataPolicyHelper {
: values.contains(candidate);
}
+ // Checkstyle: CyclomaticComplexity OFF
/**
* <p>Merges two metadata policies with the rules defined in the OIDC federation spec 5.1.3.1:</p>
* <ul>
@@ -150,7 +151,7 @@ public final class MetadataPolicyHelper {
.withRegexp(regexp)
.build();
}
-
+ // Checkstyle: CyclomaticComplexity ON
/**
* Merges two metadata policy values that can be either single valued or lists.
*
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyViaLocationFetchingStrategy.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyViaLocationFetchingStrategy.java
index 50e7e92..51feee9 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyViaLocationFetchingStrategy.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyViaLocationFetchingStrategy.java
@@ -53,6 +53,12 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
public class MetadataPolicyViaLocationFetchingStrategy
extends AbstractDynamicHTTPFetchingStrategy<Map<String, MetadataPolicy>>
implements Function<CriteriaSet, Map<String, MetadataPolicy>> {
+
+ /** Class logger. */
+ @Nonnull private final Logger log = LoggerFactory.getLogger(MetadataPolicyViaLocationFetchingStrategy.class);
+
+ /** The parsing strategy used for parsing metadata policies. */
+ @NonnullAfterInit private Function<byte[], List<Map<String, MetadataPolicy>>> parsingStrategy;
/**
* Constructor.
@@ -64,12 +70,6 @@ public class MetadataPolicyViaLocationFetchingStrategy
final ResponseHandler<Map<String, MetadataPolicy>> handler) {
super(client, handler);
}
-
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(MetadataPolicyViaLocationFetchingStrategy.class);
-
- /** The parsing strategy used for parsing metadata policies. */
- @NonnullAfterInit private Function<byte[], List<Map<String, MetadataPolicy>>> parsingStrategy;
/**
* Set the parsing strategy used for parsing metadata policies.
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java
index 8117fb6..bee1dde 100644
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java
+++ b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.common;
import java.io.IOException;
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
index 261be89..865ae5d 100644
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
+++ b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.common;
import java.io.IOException;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
index 120e6ae..ca81434 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
@@ -79,6 +79,7 @@ public class OIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwar
}
/** {@inheritDoc} */
+ @Override
@Nullable @NotEmpty public String getIssuer(@Nullable final ProfileRequestContext profileRequestContext) {
return issuerLookupStrategy.apply(profileRequestContext);
}
@@ -203,7 +204,7 @@ public class OIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwar
*
* @param policy metadata policy
*/
- public void setMetadataPolicy(@Nonnull Map<String,MetadataPolicy> policy) {
+ public void setMetadataPolicy(@Nonnull final Map<String,MetadataPolicy> policy) {
metadataPolicyLookupStrategy = FunctionSupport.constant(policy);
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
index 27b8f86..997be95 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
@@ -44,7 +44,8 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
* Profile configuration for the OpenID Connect core protocol userinfo endpoint.
*/
public class OIDCUserInfoConfiguration extends AbstractConditionalProfileConfiguration
- implements OIDCProfileConfiguration, OverriddenIssuerProfileConfiguration, AttributeResolvingProfileConfiguration {
+ implements OIDCProfileConfiguration, OverriddenIssuerProfileConfiguration,
+ AttributeResolvingProfileConfiguration {
/** OIDC base protocol URI. */
@Nonnull @NotEmpty public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
@@ -86,6 +87,7 @@ public class OIDCUserInfoConfiguration extends AbstractConditionalProfileConfigu
}
/** {@inheritDoc} */
+ @Override
@Nullable @NotEmpty public String getIssuer(@Nullable final ProfileRequestContext profileRequestContext) {
return issuerLookupStrategy.apply(profileRequestContext);
}
@@ -109,6 +111,7 @@ public class OIDCUserInfoConfiguration extends AbstractConditionalProfileConfigu
}
/** {@inheritDoc} */
+ @Override
public boolean isResolveAttributes(@Nullable final ProfileRequestContext profileRequestContext) {
return resolveAttributesPredicate.test(profileRequestContext);
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java
index b0a3517..1693732 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java
@@ -24,7 +24,6 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.AbstractOIDCSSOConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguration;
/**
@@ -38,6 +37,7 @@ import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguratio
public class AccessTokenTypeLookupFunction extends AbstractRelyingPartyLookupFunction<String> {
/** {@inheritDoc} */
+ @Override
@Nullable public String apply(@Nullable final ProfileRequestContext input) {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java
index 6508b2e..ed329a7 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java
@@ -42,7 +42,8 @@ public class ResolverBasedRegistrationMetadataPolicyLookupFunction
extends AbstractRelyingPartyLookupFunction<Map<String,MetadataPolicy>> {
/** Class logger. */
- @Nonnull private Logger log = LoggerFactory.getLogger(ResolverBasedRegistrationMetadataPolicyLookupFunction.class);
+ @Nonnull
+ private final Logger log = LoggerFactory.getLogger(ResolverBasedRegistrationMetadataPolicyLookupFunction.class);
/** The metadata policy resolver. */
@Nullable private MetadataPolicyResolver metadataPolicyResolver;
@@ -52,6 +53,7 @@ public class ResolverBasedRegistrationMetadataPolicyLookupFunction
/**
* Set the metadata policy resolver.
+ *
* @param resolver What to set.
*/
public void setMetadataPolicyResolver(@Nullable final MetadataPolicyResolver resolver) {
@@ -59,7 +61,8 @@ public class ResolverBasedRegistrationMetadataPolicyLookupFunction
}
/**
- * Set the lookup strategy for the criteria set used for the metadata policy resolver
+ * Set the lookup strategy for the criteria set used for the metadata policy resolver.
+ *
* @param strategy What to set.
*/
public void setCriteriaSetLookupStrategy(@Nullable final Function<ProfileRequestContext, CriteriaSet> strategy) {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/core/OidcError.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/core/OidcError.java
index 31f8cee..0e0bc00 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/core/OidcError.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/core/OidcError.java
@@ -26,7 +26,7 @@ import com.nimbusds.oauth2.sdk.http.HTTPResponse;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
- * Supplemental error objects for any missing values in the Nimbus library,
+ * Supplemental error objects for any missing values in the Nimbus library.
*/
public final class OidcError {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/decoding/package-info.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/decoding/package-info.java
new file mode 100644
index 0000000..590bd75
--- /dev/null
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/decoding/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * OIDC message decoder API.
+ */
+package net.shibboleth.oidc.profile.decoding;
\ No newline at end of file
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/encoder/OIDCMessageEncoder.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/encoder/OIDCMessageEncoder.java
index aa500f6..f758203 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/encoder/OIDCMessageEncoder.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/encoder/OIDCMessageEncoder.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.profile.encoder;
import java.util.function.Predicate;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/encoder/package-info.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/encoder/package-info.java
new file mode 100644
index 0000000..21d60eb
--- /dev/null
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/encoder/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * OIDC message encoder API.
+ */
+package net.shibboleth.oidc.profile.encoder;
\ No newline at end of file
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
index 933e751..86584f4 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
@@ -50,7 +50,8 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
* Base class for OAuth profile configurations that support OAuth-defined client authentication methods.
*/
public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
- extends AbstractConditionalProfileConfiguration implements OAuth2ProfileConfiguration, AuthenticationProfileConfiguration {
+ extends AbstractConditionalProfileConfiguration implements OAuth2ProfileConfiguration,
+ AuthenticationProfileConfiguration {
/** Enabled token endpoint authentication methods. */
@Nonnull private Function<ProfileRequestContext,Set<String>> tokenEndpointAuthMethodsLookupStrategy;
@@ -178,6 +179,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
}
/** {@inheritDoc} */
+ @Override
public boolean isForceAuthn(@Nullable final ProfileRequestContext profileRequestContext) {
return forceAuthnPredicate.test(profileRequestContext);
}
@@ -201,6 +203,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
}
/** {@inheritDoc} */
+ @Override
@Nullable public Integer getProxyCount(@Nullable final ProfileRequestContext profileRequestContext) {
final Integer count = proxyCountLookupStrategy.apply(profileRequestContext);
if (count != null) {
@@ -234,6 +237,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
}
/** {@inheritDoc} */
+ @Override
@Nonnull @NonnullElements @NotLive @Unmodifiable public Set<String> getAuthenticationFlows(
@Nullable final ProfileRequestContext profileRequestContext) {
final Set<String> flows = authenticationFlowsLookupStrategy.apply(profileRequestContext);
@@ -268,6 +272,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
}
/** {@inheritDoc} */
+ @Override
@Nonnull @NonnullElements @NotLive @Unmodifiable public List<String> getPostAuthenticationFlows(
@Nullable final ProfileRequestContext profileRequestContext) {
final Collection<String> flows = postAuthenticationFlowsLookupStrategy.apply(profileRequestContext);
@@ -302,6 +307,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
}
/** {@inheritDoc} */
+ @Override
@Nonnull @NonnullElements @NotLive @Unmodifiable public List<Principal> getDefaultAuthenticationMethods(
@Nullable final ProfileRequestContext profileRequestContext) {
final Collection<AuthenticationContextClassReferencePrincipal> methods =
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2TokenValidatingConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2TokenValidatingConfiguration.java
index 8d326b0..fae1ccb 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2TokenValidatingConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2TokenValidatingConfiguration.java
@@ -57,6 +57,7 @@ public class AbstractOAuth2TokenValidatingConfiguration extends AbstractOAuth2Cl
}
/** {@inheritDoc} */
+ @Override
@Nullable @NotEmpty public String getIssuer(@Nullable final ProfileRequestContext profileRequestContext) {
return issuerLookupStrategy.apply(profileRequestContext);
}
@@ -86,7 +87,8 @@ public class AbstractOAuth2TokenValidatingConfiguration extends AbstractOAuth2Cl
*
* @return the validator to use
*/
- @Nullable public ClaimsValidator getIssuedClaimsValidator(@Nullable final ProfileRequestContext profileRequestContext) {
+ @Nullable public ClaimsValidator getIssuedClaimsValidator(
+ @Nullable final ProfileRequestContext profileRequestContext) {
return issuedClaimsValidatorLookupStrategy.apply(profileRequestContext);
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
index f15a2cc..2090b9e 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
@@ -44,13 +44,15 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
* to the parties intended to process them, as distinct from the clients that use them.</p>
*/
public class OAuth2TokenAudienceConfiguration extends AbstractConditionalProfileConfiguration
- implements OAuth2ProfileConfiguration, OverriddenIssuerProfileConfiguration, AttributeResolvingProfileConfiguration {
+ implements OAuth2ProfileConfiguration, OverriddenIssuerProfileConfiguration,
+ AttributeResolvingProfileConfiguration {
/** OAuth2 Token Revocation URI. */
@Nonnull @NotEmpty public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc6749";
/** ID for this profile configuration. */
- @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oauth2/token/audience";
+ @Nonnull @NotEmpty
+ public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oauth2/token/audience";
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
@@ -90,6 +92,7 @@ public class OAuth2TokenAudienceConfiguration extends AbstractConditionalProfil
}
/** {@inheritDoc} */
+ @Override
@Nullable @NotEmpty public String getIssuer(@Nullable final ProfileRequestContext profileRequestContext) {
return issuerLookupStrategy.apply(profileRequestContext);
}
@@ -113,6 +116,7 @@ public class OAuth2TokenAudienceConfiguration extends AbstractConditionalProfil
}
/** {@inheritDoc} */
+ @Override
public boolean isResolveAttributes(@Nullable final ProfileRequestContext profileRequestContext) {
return resolveAttributesPredicate.test(profileRequestContext);
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
index 2375ef2..b013b9d 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
@@ -86,7 +86,7 @@ public class OAuth2TokenConfiguration extends AbstractOIDCSSOConfiguration {
}
/**
- * Set the enabled grant types
+ * Set the enabled grant types.
*
* @param types types to enable
*/
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPPostAuthnResponseDecoder.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPPostAuthnResponseDecoder.java
index 278b49d..51a1ab0 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPPostAuthnResponseDecoder.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPPostAuthnResponseDecoder.java
@@ -42,7 +42,8 @@ import net.shibboleth.oidc.profile.decoding.OIDCMessageDecoder;
*/
//TODO this is identical to the HTTPRedirectAuthnDecoder because it uses the Nimbus parser.
// do we leave as a placeholder for when we create our own decoders?
-public class HTTPPostAuthnResponseDecoder extends AbstractHttpServletRequestMessageDecoder implements OIDCMessageDecoder {
+public class HTTPPostAuthnResponseDecoder extends AbstractHttpServletRequestMessageDecoder
+ implements OIDCMessageDecoder {
/** Class logger. */
@Nonnull
@@ -64,7 +65,7 @@ public class HTTPPostAuthnResponseDecoder extends AbstractHttpServletRequestMess
final AuthenticationResponse inboundMessage =
AuthenticationResponseParser.parse(ServletUtils.createHTTPRequest(request));
messageContext.setMessage(inboundMessage);
- } catch (ParseException | IOException e) {
+ } catch (final ParseException | IOException e) {
log.error("Unable to parse incomming authentication response",e);
}
setMessageContext(messageContext);
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoder.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoder.java
index faa2a8c..24f68e4 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoder.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoder.java
@@ -42,7 +42,8 @@ import net.shibboleth.oidc.profile.decoding.OIDCMessageDecoder;
* when using a query response_mode.
*/
//TODO this is identical to the HTTPPostAuthnDecoder because it uses the Nimbus parser.
-public class HTTPRedirectAuthnResponseDecoder extends AbstractHttpServletRequestMessageDecoder implements OIDCMessageDecoder {
+public class HTTPRedirectAuthnResponseDecoder extends AbstractHttpServletRequestMessageDecoder
+ implements OIDCMessageDecoder {
/** Class logger. */
@Nonnull
@@ -64,7 +65,7 @@ public class HTTPRedirectAuthnResponseDecoder extends AbstractHttpServletRequest
final AuthenticationResponse inboundMessage =
AuthenticationResponseParser.parse(ServletUtils.createHTTPRequest(request));
messageContext.setMessage(inboundMessage);
- } catch (ParseException | IOException e) {
+ } catch (final ParseException | IOException e) {
log.error("Unable to parse incomming authentication response",e);
}
setMessageContext(messageContext);
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/package-info.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/package-info.java
new file mode 100644
index 0000000..a1f2a40
--- /dev/null
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/decoding/impl/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * OIDC message decoders.
+ */
+package net.shibboleth.oidc.profile.decoding.impl;
\ No newline at end of file
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/logic/package-info.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/logic/package-info.java
new file mode 100644
index 0000000..99e5516
--- /dev/null
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/logic/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * OIDC profile logic implementation classes.
+ */
+package net.shibboleth.oidc.profile.logic;
\ No newline at end of file
diff --git a/oidc-common-saml-impl/src/main/java/net/shibboleth/oidc/saml/xmlobject/impl/OAuthRPExtensionsMarshaller.java b/oidc-common-saml-impl/src/main/java/net/shibboleth/oidc/saml/xmlobject/impl/OAuthRPExtensionsMarshaller.java
index b121a54..58c1a3c 100644
--- a/oidc-common-saml-impl/src/main/java/net/shibboleth/oidc/saml/xmlobject/impl/OAuthRPExtensionsMarshaller.java
+++ b/oidc-common-saml-impl/src/main/java/net/shibboleth/oidc/saml/xmlobject/impl/OAuthRPExtensionsMarshaller.java
@@ -29,7 +29,9 @@ import net.shibboleth.oidc.saml.xmlobject.OAuthRPExtensions;
*/
public class OAuthRPExtensionsMarshaller extends AbstractSAMLObjectMarshaller {
+ // Checkstyle: MethodLength|CyclomaticComplexity OFF
/** {@inheritDoc} */
+ @Override
protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
throws MarshallingException {
final OAuthRPExtensions rpExtensions = (OAuthRPExtensions) samlElement;
@@ -145,4 +147,7 @@ public class OAuthRPExtensionsMarshaller extends AbstractSAMLObjectMarshaller {
}
marshallUnknownAttributes(rpExtensions, domElement);
- }}
+ }
+
+ // Checkstyle: MethodLength|CyclomaticComplexity ON
+}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list