[java-oidc-common] branch main updated: Remove some erroneous annotations.
Scott Cantor
cantor.2 at osu.edu
Tue Aug 1 15:25:43 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor 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=4cf8539b33c889c66748b5c22086bcccd08cdb56
The following commit(s) were added to refs/heads/main by this push:
new 4cf8539 Remove some erroneous annotations.
4cf8539 is described below
commit 4cf8539b33c889c66748b5c22086bcccd08cdb56
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 1 11:25:40 2023 -0400
Remove some erroneous annotations.
---
.../oidc/jwa/algorithm/descriptors/EncryptionA128CBCHS256.java | 1 -
.../shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128GCM.java | 1 -
.../oidc/jwa/algorithm/descriptors/EncryptionA192CBCHS384.java | 1 -
.../shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192GCM.java | 1 -
.../oidc/jwa/algorithm/descriptors/EncryptionA256CBCHS512.java | 1 -
.../shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256GCM.java | 1 -
.../security/credential/impl/LocalJOSEObjectCredentialResolver.java | 2 +-
.../java/net/shibboleth/oidc/security/impl/JWETokenDecrypter.java | 4 ++--
.../shibboleth/oidc/metadata/AbstractEvaluableMetadataCriterion.java | 4 ++--
.../java/net/shibboleth/oidc/metadata/ClientInformationManager.java | 4 ++--
.../shibboleth/oidc/metadata/ProviderMetadataProviderContainer.java | 1 -
.../oidc/metadata/RelyingPartyClientInformationProvider.java | 1 -
.../net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java | 2 +-
.../oidc/metadata/cache/impl/BatchMetadataCacheBuilderSpec.java | 2 +-
.../shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java | 2 +-
.../profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java | 2 --
16 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128CBCHS256.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128CBCHS256.java
index 87beeb5..cfc7d7d 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128CBCHS256.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128CBCHS256.java
@@ -60,7 +60,6 @@ public final class EncryptionA128CBCHS256 implements BlockEncryptionAlgorithm {
/** {@inheritDoc} */
@Override
- @Nonnull
public int getKeyLength() {
return 256;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128GCM.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128GCM.java
index ba1b36a..44aeb3b 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128GCM.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA128GCM.java
@@ -54,7 +54,6 @@ public final class EncryptionA128GCM implements BlockEncryptionAlgorithm {
}
/** {@inheritDoc} */
- @Nonnull
public int getKeyLength() {
return 128;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192CBCHS384.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192CBCHS384.java
index 223634c..459273b 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192CBCHS384.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192CBCHS384.java
@@ -60,7 +60,6 @@ public final class EncryptionA192CBCHS384 implements BlockEncryptionAlgorithm {
/** {@inheritDoc} */
@Override
- @Nonnull
public int getKeyLength() {
return 384;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192GCM.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192GCM.java
index 7a6b0f7..954a527 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192GCM.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA192GCM.java
@@ -54,7 +54,6 @@ public final class EncryptionA192GCM implements BlockEncryptionAlgorithm {
}
/** {@inheritDoc} */
- @Nonnull
public int getKeyLength() {
return 192;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256CBCHS512.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256CBCHS512.java
index 515876b..33b0785 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256CBCHS512.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256CBCHS512.java
@@ -60,7 +60,6 @@ public final class EncryptionA256CBCHS512 implements BlockEncryptionAlgorithm {
/** {@inheritDoc} */
@Override
- @Nonnull
public int getKeyLength() {
return 512;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256GCM.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256GCM.java
index f406d9f..c2c7dc8 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256GCM.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/EncryptionA256GCM.java
@@ -54,7 +54,6 @@ public final class EncryptionA256GCM implements BlockEncryptionAlgorithm {
}
/** {@inheritDoc} */
- @Nonnull
public int getKeyLength() {
return 256;
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java
index c6df081..960d118 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java
@@ -114,7 +114,7 @@ public class LocalJOSEObjectCredentialResolver extends BasicJOSEObjectCredential
}
@Override
- @Nonnull protected void postProcess(@Nullable final CriteriaSet criteriaSet,
+ protected void postProcess(@Nullable final CriteriaSet criteriaSet,
@Nonnull final JOSEObject joseObject, @Nonnull final List<Credential> credentials)
throws ResolverException {
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWETokenDecrypter.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWETokenDecrypter.java
index 2911d31..f8c1d93 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWETokenDecrypter.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWETokenDecrypter.java
@@ -190,7 +190,7 @@ public class JWETokenDecrypter {
* @param criteriaSet the criteria set to add built criteria too
* @param encryptedObject the encrypted JWT from which to deduce decryption key 'alg' criteria
*/
- @Nullable private void buildKeyManagementAlgorithmCriteria(@Nonnull final CriteriaSet criteriaSet,
+ private void buildKeyManagementAlgorithmCriteria(@Nonnull final CriteriaSet criteriaSet,
@Nonnull final EncryptedJWT encryptedObject) {
final JWEAlgorithm alg = encryptedObject.getHeader().getAlgorithm();
@@ -227,7 +227,7 @@ public class JWETokenDecrypter {
* @param criteriaSet the criteria
* @param encryptedObject the encrypted JWT from which to deduce decryption key 'enc' criteria
*/
- @Nullable private void buildContentEncryptionKeyAlgorithmCriteria(
+ private void buildContentEncryptionKeyAlgorithmCriteria(
@Nonnull final CriteriaSet criteriaSet, @Nonnull final EncryptedJWT encryptedObject) {
final EncryptionMethod enc = encryptedObject.getHeader().getEncryptionMethod();
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 e4beb3d..75f0984 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
@@ -36,7 +36,7 @@ public abstract class AbstractEvaluableMetadataCriterion<T> implements Predicate
@Nonnull private final Class<T> objectType;
/** What should the default return type be if the wrong type is supplied.*/
- @Nonnull private final boolean defaultResultOnWrongType;
+ private final boolean defaultResultOnWrongType;
/**
*
@@ -46,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) {
+ 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");
}
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ClientInformationManager.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ClientInformationManager.java
index 2cad8d1..82a3e48 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ClientInformationManager.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ClientInformationManager.java
@@ -45,7 +45,7 @@ public interface ClientInformationManager {
* @deprecated
*/
@Deprecated(since="1.2.0", forRemoval=true)
- @Nonnull void storeClientInformation(@Nonnull final OIDCClientInformation clientInformation,
+ void storeClientInformation(@Nonnull final OIDCClientInformation clientInformation,
@Nullable final Instant expiration) throws ClientInformationManagerException;
/**
@@ -57,7 +57,7 @@ public interface ClientInformationManager {
*
* @throws ClientInformationManagerException If the client information cannot be stored.
*/
- @Nonnull default void storeClientInformation(@Nonnull final OIDCClientInformation clientInformation,
+ default void storeClientInformation(@Nonnull final OIDCClientInformation clientInformation,
@Nullable final Instant expiration, final boolean replace) throws ClientInformationManagerException {
storeClientInformation(clientInformation, expiration);
}
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ProviderMetadataProviderContainer.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ProviderMetadataProviderContainer.java
index 41757f1..b07741f 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ProviderMetadataProviderContainer.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/ProviderMetadataProviderContainer.java
@@ -65,7 +65,6 @@ public class ProviderMetadataProviderContainer extends AbstractServiceableCompon
*
* @param theResolver The {@link ProviderMetadataResolver} to embed.
*/
- @Nonnull
public void setEmbeddedResolver(@Nonnull final ProviderMetadataResolver theResolver) {
ifInitializedThrowUnmodifiabledComponentException();
resolver = Constraint.isNotNull(theResolver, "ProviderMetadataResolver cannot be null");
diff --git a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/RelyingPartyClientInformationProvider.java b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/RelyingPartyClientInformationProvider.java
index 7db6071..9b53735 100644
--- a/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/RelyingPartyClientInformationProvider.java
+++ b/oidc-common-metadata-api/src/main/java/net/shibboleth/oidc/metadata/RelyingPartyClientInformationProvider.java
@@ -76,7 +76,6 @@ public class RelyingPartyClientInformationProvider extends AbstractServiceableCo
*
* @param theResolver The {@link ClientInformationResolver} to embed.
*/
- @Nonnull
public void setEmbeddedResolver(@Nonnull final ClientInformationResolver theResolver) {
ifInitializedThrowUnmodifiabledComponentException();
resolver = Constraint.isNotNull(theResolver, "ClientInformationResolver cannot be null");
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 c6cf6b7..7fc3cee 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
@@ -108,7 +108,7 @@ public class BatchMetadataCache<IdentifierType, MetadataType>
* Is a match based on an identifier required? If not,
* all known metadata will be returned. Defaults to true - a match on identifier is required.
*/
- @Nonnull private boolean matchOnIdentifierRequired;
+ private boolean matchOnIdentifierRequired;
/** A lock to use when reading from and loading the cache.*/
@Nonnull private final ReadWriteLock readWriteLock;
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheBuilderSpec.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheBuilderSpec.java
index 62c2201..f53e8f4 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheBuilderSpec.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheBuilderSpec.java
@@ -65,7 +65,7 @@ public class BatchMetadataCacheBuilderSpec<IdentifierType, MetadataType>
* Is a match based on an identifier required? If not,
* all known metadata will be returned. Defaults to true - a match on identifier is required.
*/
- @Nonnull private boolean matchOnIdentifierRequired;
+ private boolean matchOnIdentifierRequired;
/** Determine the expiration time of the source batch loaded metadata.*/
@Nullable private Function<byte[], Instant> sourceMetadataExpiryStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
index 3558d30..2ba2105 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
@@ -235,7 +235,7 @@ public class PopulateJWTEncryptionParameters extends AbstractProfileAction {
*
* @param flag the flag to set
*/
- public void setEncryptionOptional(@Nonnull final boolean flag) {
+ public void setEncryptionOptional(final boolean flag) {
ifInitializedThrowUnmodifiabledComponentException();
encryptionOptionalPredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
index dc2caed..b16eca7 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
@@ -156,7 +156,6 @@ public class DefaultOAuth2TokenConfiguration extends AbstractOIDCSSOConfiguratio
}
@Override
- @Nonnull
public boolean isEnforceRefreshTokenRotation(
@Nullable final ProfileRequestContext profileRequestContext) {
return enforceRefreshTokenRotationPredicate.test(profileRequestContext);
@@ -186,7 +185,6 @@ public class DefaultOAuth2TokenConfiguration extends AbstractOIDCSSOConfiguratio
/** {@inheritDoc} */
@Override
- @Nonnull
public boolean isIssueIdTokenViaRefreshToken(
@Nullable final ProfileRequestContext profileRequestContext) {
return issueIdTokenViaRefreshTokenPredicate.test(profileRequestContext);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list