[java-oidc-common] branch main updated: Sanitize NonnullElements in package.
Scott Cantor
cantor.2 at osu.edu
Wed Oct 18 19:26:24 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=cd8cb4bba56f7f4c62962e2f6de62692d39e3fbc
The following commit(s) were added to refs/heads/main by this push:
new cd8cb4b Sanitize NonnullElements in package.
cd8cb4b is described below
commit cd8cb4bba56f7f4c62962e2f6de62692d39e3fbc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 18 15:26:21 2023 -0400
Sanitize NonnullElements in package.
---
.../main/java/net/shibboleth/oidc/authn/context/package-info.java | 5 ++++-
.../oidc/jwa/algorithm/descriptors/EncryptionA128CBCHS256.java | 7 -------
.../oidc/jwa/algorithm/descriptors/EncryptionA192CBCHS384.java | 7 -------
.../oidc/jwa/algorithm/descriptors/EncryptionA256CBCHS512.java | 7 -------
.../oidc/jwa/algorithm/descriptors/KeyAgreementECDHES.java | 6 +++---
.../oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA128KW.java | 6 +++---
.../oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA192KW.java | 6 +++---
.../oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA256KW.java | 6 +++---
.../oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java | 1 -
.../oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128KW.java | 1 -
.../oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java | 1 -
.../oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192KW.java | 1 -
.../oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java | 1 -
.../oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256KW.java | 1 -
.../shibboleth/oidc/jwa/algorithm/descriptors/package-info.java | 5 ++++-
15 files changed, 20 insertions(+), 41 deletions(-)
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
index 1c58d36..5901329 100644
--- 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
@@ -13,4 +13,7 @@
*/
/** OIDC/Oauth2 authentication contexts. */
-package net.shibboleth.oidc.authn.context;
\ No newline at end of file
+ at NonnullElements
+package net.shibboleth.oidc.authn.context;
+
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
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 8f8ff79..5b5c5a2 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
@@ -28,48 +28,41 @@ import net.shibboleth.oidc.jwa.support.JCAConstantExtension;
public final class EncryptionA128CBCHS256 implements BlockEncryptionAlgorithm {
/** {@inheritDoc} */
- @Override
@Nonnull
public String getKey() {
return JCAConstants.KEY_ALGO_AES;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getURI() {
return EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public AlgorithmType getType() {
return AlgorithmType.BlockEncryption;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getJCAAlgorithmID() {
return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 256;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getCipherMode() {
return JCAConstants.CIPHER_MODE_CBC;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getPadding() {
return JCAConstantExtension.CIPHER_PADDING_PKCS5;
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 d66ee93..89f9341 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
@@ -28,48 +28,41 @@ import net.shibboleth.oidc.jwa.support.JCAConstantExtension;
public final class EncryptionA192CBCHS384 implements BlockEncryptionAlgorithm {
/** {@inheritDoc} */
- @Override
@Nonnull
public String getKey() {
return JCAConstants.KEY_ALGO_AES;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getURI() {
return EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public AlgorithmType getType() {
return AlgorithmType.BlockEncryption;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getJCAAlgorithmID() {
return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 384;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getCipherMode() {
return JCAConstants.CIPHER_MODE_CBC;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getPadding() {
return JCAConstantExtension.CIPHER_PADDING_PKCS5;
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 8ff6e83..5788542 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
@@ -28,48 +28,41 @@ import net.shibboleth.oidc.jwa.support.JCAConstantExtension;
public final class EncryptionA256CBCHS512 implements BlockEncryptionAlgorithm {
/** {@inheritDoc} */
- @Override
@Nonnull
public String getKey() {
return JCAConstants.KEY_ALGO_AES;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getURI() {
return EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public AlgorithmType getType() {
return AlgorithmType.BlockEncryption;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getJCAAlgorithmID() {
return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 512;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getCipherMode() {
return JCAConstants.CIPHER_MODE_CBC;
}
/** {@inheritDoc} */
- @Override
@Nonnull
public String getPadding() {
return JCAConstantExtension.CIPHER_PADDING_PKCS5;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHES.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHES.java
index b71cf5f..c74212a 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHES.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHES.java
@@ -25,20 +25,20 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
/** Algorithm descriptor for JWE key management algorithm: ECDH-ES. */
public class KeyAgreementECDHES implements KeyAgreementAlgorithm {
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getURI() {
return KeyManagementConstants.ALGO_ID_ALG_ECDH_ES;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
public AlgorithmType getType() {
return AlgorithmType.KeyAgreement;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getJCAAlgorithmID() {
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA128KW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA128KW.java
index e3b4eb3..43aa404 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA128KW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA128KW.java
@@ -29,20 +29,20 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
*/
public class KeyAgreementECDHESA128KW implements KeyAgreementAlgorithm {
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getURI() {
return KeyManagementConstants.ALGO_ID_ALG_ECDH_ES_AES_128_KW;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
public AlgorithmType getType() {
return AlgorithmType.KeyAgreement;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getJCAAlgorithmID() {
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA192KW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA192KW.java
index 8f6e0ff..bcf90ab 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA192KW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA192KW.java
@@ -29,20 +29,20 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
*/
public class KeyAgreementECDHESA192KW implements KeyAgreementAlgorithm {
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getURI() {
return KeyManagementConstants.ALGO_ID_ALG_ECDH_ES_AES_192_KW;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
public AlgorithmType getType() {
return AlgorithmType.KeyAgreement;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getJCAAlgorithmID() {
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA256KW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA256KW.java
index dad2f52..b797c3e 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA256KW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/KeyAgreementECDHESA256KW.java
@@ -29,20 +29,20 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
*/
public class KeyAgreementECDHESA256KW implements KeyAgreementAlgorithm {
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getURI() {
return KeyManagementConstants.ALGO_ID_ALG_ECDH_ES_AES_256_KW;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
public AlgorithmType getType() {
return AlgorithmType.KeyAgreement;
}
- @Override
+ /** {@inheritDoc} */
@Nonnull
@NotEmpty
public String getJCAAlgorithmID() {
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java
index fb4ea71..139911c 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java
@@ -55,7 +55,6 @@ public class SymmetricKeyWrapA128GCMKW implements SymmetricKeyWrapAlgorithm {
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 128;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128KW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128KW.java
index 364c7a7..d1c7bad 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128KW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA128KW.java
@@ -55,7 +55,6 @@ public class SymmetricKeyWrapA128KW implements SymmetricKeyWrapAlgorithm {
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 128;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java
index 7389a97..3ad18b6 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java
@@ -55,7 +55,6 @@ public class SymmetricKeyWrapA192GCMKW implements SymmetricKeyWrapAlgorithm {
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 192;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192KW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192KW.java
index 54e79da..619acde 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192KW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA192KW.java
@@ -55,7 +55,6 @@ public class SymmetricKeyWrapA192KW implements SymmetricKeyWrapAlgorithm {
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 192;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java
index 6a01b5f..5014abf 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java
@@ -55,7 +55,6 @@ public class SymmetricKeyWrapA256GCMKW implements SymmetricKeyWrapAlgorithm {
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 256;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256KW.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256KW.java
index 0d8f5ae..b1d13c5 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256KW.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/SymmetricKeyWrapA256KW.java
@@ -55,7 +55,6 @@ public class SymmetricKeyWrapA256KW implements SymmetricKeyWrapAlgorithm {
}
/** {@inheritDoc} */
- @Override
public int getKeyLength() {
return 256;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/package-info.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/package-info.java
index 9a41f6e..3b40920 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/package-info.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwa/algorithm/descriptors/package-info.java
@@ -13,4 +13,7 @@
*/
/** OIDC Signing/Encryption Algorithms. */
-package net.shibboleth.oidc.jwa.algorithm.descriptors;
\ No newline at end of file
+ at NonnullElements
+package net.shibboleth.oidc.jwa.algorithm.descriptors;
+
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list