[java-oidc-common] branch main updated: Null cleanup.

Scott Cantor cantor.2 at osu.edu
Thu Nov 9 19:20:59 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=2ac0ba3a0d100d6b8c6d6211d765c9b94ec94b1a

The following commit(s) were added to refs/heads/main by this push:
     new 2ac0ba3  Null cleanup.
2ac0ba3 is described below

commit 2ac0ba3a0d100d6b8c6d6211d765c9b94ec94b1a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 9 14:20:56 2023 -0500

    Null cleanup.
---
 .../oidc/saml/xmlobject/ClientSecret.java          |   9 +-
 .../saml/xmlobject/ClientSecretKeyReference.java   |   7 +-
 .../shibboleth/oidc/saml/xmlobject/Constants.java  |   6 +-
 .../oidc/saml/xmlobject/DefaultAcrValue.java       |   9 +-
 .../shibboleth/oidc/saml/xmlobject/JwksData.java   |   9 +-
 .../shibboleth/oidc/saml/xmlobject/JwksUri.java    |   9 +-
 .../saml/xmlobject/MetadataValueSAMLObject.java    |  16 ++-
 .../oidc/saml/xmlobject/OAuthRPExtensions.java     | 157 +++++++++++----------
 .../oidc/saml/xmlobject/PostLogoutRedirectUri.java |   9 +-
 .../shibboleth/oidc/saml/xmlobject/RequestUri.java |   9 +-
 10 files changed, 126 insertions(+), 114 deletions(-)

diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecret.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecret.java
index 9b449ca..53d8339 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecret.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecret.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -22,14 +23,14 @@ import javax.xml.namespace.QName;
 public interface ClientSecret extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecret";
+    @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecret";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
-}
+}
\ No newline at end of file
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecretKeyReference.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecretKeyReference.java
index b1ac2d2..7919a2e 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecretKeyReference.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/ClientSecretKeyReference.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -22,14 +23,14 @@ import javax.xml.namespace.QName;
 public interface ClientSecretKeyReference extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecretKeyReference";
+    @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecretKeyReference";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
 }
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/Constants.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/Constants.java
index e580d19..7430beb 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/Constants.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/Constants.java
@@ -26,13 +26,13 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public final class Constants {
 
     /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors prefi. */
-    public static final String SAML20MDOIDCMD_PREFIX = "oidcmd";
+    @Nonnull public static final String SAML20MDOIDCMD_PREFIX = "oidcmd";
 
     /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors XML namespace. */
-    public static final String SAML20MDOIDCMD_NS = "urn:mace:shibboleth:metadata:oidc:1.0";
+    @Nonnull public static final String SAML20MDOIDCMD_NS = "urn:mace:shibboleth:metadata:oidc:1.0";
 
     /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors. */
-    public static final String SAML20MDOIDCMD_SCHEMA_LOCATION =
+    @Nonnull public static final String SAML20MDOIDCMD_SCHEMA_LOCATION =
             SAMLConstants.SCHEMA_DIR + "saml-metadata-ext-oidcmd.xsd";
 
     /** OIDC base protocol URI. */
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/DefaultAcrValue.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/DefaultAcrValue.java
index 0bed0f3..2c09ce9 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/DefaultAcrValue.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/DefaultAcrValue.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -22,14 +23,14 @@ import javax.xml.namespace.QName;
 public interface DefaultAcrValue extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "default_acr_value";
+    @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "default_acr_value";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
-}
+}
\ No newline at end of file
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksData.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksData.java
index 3675055..0c8d934 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksData.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksData.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -22,14 +23,14 @@ import javax.xml.namespace.QName;
 public interface JwksData extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "JwksData";
+    @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "JwksData";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
-}
+}
\ No newline at end of file
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksUri.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksUri.java
index 8365892..74b4ec3 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksUri.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/JwksUri.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -22,14 +23,14 @@ import javax.xml.namespace.QName;
 public interface JwksUri extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "JwksUri";
+    @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "JwksUri";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
-}
+}
\ No newline at end of file
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/MetadataValueSAMLObject.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/MetadataValueSAMLObject.java
index 5189b88..c682feb 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/MetadataValueSAMLObject.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/MetadataValueSAMLObject.java
@@ -14,6 +14,9 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.opensaml.saml.common.SAMLObject;
 
 /**
@@ -22,25 +25,26 @@ import org.opensaml.saml.common.SAMLObject;
 public abstract interface MetadataValueSAMLObject extends SAMLObject {
 
     /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors prefi. */
-    public static final String SAML20MDOIDCMD_PREFIX = Constants.SAML20MDOIDCMD_PREFIX;
+    @Nonnull static final String SAML20MDOIDCMD_PREFIX = Constants.SAML20MDOIDCMD_PREFIX;
 
     /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors XML namespace. */
-    public static final String SAML20MDOIDCMD_NS = Constants.SAML20MDOIDCMD_NS;
+    @Nonnull static final String SAML20MDOIDCMD_NS = Constants.SAML20MDOIDCMD_NS;
 
     /** SAML 2.0 Metadata extension for OAuth/OIDC descriptors. */
-    public static final String SAML20MDOIDCMD_SCHEMA_LOCATION = Constants.SAML20MDOIDCMD_SCHEMA_LOCATION;
+    @Nonnull static final String SAML20MDOIDCMD_SCHEMA_LOCATION = Constants.SAML20MDOIDCMD_SCHEMA_LOCATION;
     
     /**
      * Get the value for this metadata object.
      * 
      * @return The value for this metadata object.
      */
-    public String getValue();
+    @Nullable String getValue();
     
     /**
      * Set the value for this metadata object.
      * 
      * @param newValue What to set.
      */
-    public void setValue(final String newValue);
-}
+    void setValue(@Nullable final String newValue);
+
+}
\ No newline at end of file
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/OAuthRPExtensions.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/OAuthRPExtensions.java
index c1b29c9..94df460 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/OAuthRPExtensions.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/OAuthRPExtensions.java
@@ -24,6 +24,7 @@ import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.ElementExtensibleXMLObject;
 import org.opensaml.saml.common.SAMLObject;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -32,94 +33,94 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface OAuthRPExtensions extends SAMLObject, AttributeExtensibleXMLObject, ElementExtensibleXMLObject {
     
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "OAuthRPExtensions";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "OAuthRPExtensions";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(MetadataValueSAMLObject.SAML20MDOIDCMD_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(MetadataValueSAMLObject.SAML20MDOIDCMD_NS, TYPE_LOCAL_NAME,
             MetadataValueSAMLObject.SAML20MDOIDCMD_PREFIX);
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String TOKEN_ENDPOINT_AUTH_METHOD_ATTRIB_NAME = "token_endpoint_auth_method";
+    @Nonnull @NotEmpty static final String TOKEN_ENDPOINT_AUTH_METHOD_ATTRIB_NAME = "token_endpoint_auth_method";
 
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String GRANT_TYPES_ATTRIB_NAME = "grant_types";
+    @Nonnull @NotEmpty static final String GRANT_TYPES_ATTRIB_NAME = "grant_types";
 
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String RESPONSE_TYPES_ATTRIB_NAME = "response_types";
+    @Nonnull @NotEmpty static final String RESPONSE_TYPES_ATTRIB_NAME = "response_types";
 
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String APPLICATION_TYPE_ATTRIB_NAME = "application_type";
+    @Nonnull @NotEmpty static final String APPLICATION_TYPE_ATTRIB_NAME = "application_type";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String CLIENT_URI_ATTRIB_NAME = "client_uri";
+    @Nonnull @NotEmpty static final String CLIENT_URI_ATTRIB_NAME = "client_uri";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String SCOPES_ATTRIB_NAME = "scopes";
+    @Nonnull @NotEmpty static final String SCOPES_ATTRIB_NAME = "scopes";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String SOFTWARE_ID_ATTRIB_NAME = "software_id";
+    @Nonnull @NotEmpty static final String SOFTWARE_ID_ATTRIB_NAME = "software_id";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String SOFTWARE_VERSION_ATTRIB_NAME = "software_version";
+    @Nonnull @NotEmpty static final String SOFTWARE_VERSION_ATTRIB_NAME = "software_version";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String SECTOR_IDENTIFIER_URI_ATTRIB_NAME = "sector_identifier_uri";
+    @Nonnull @NotEmpty static final String SECTOR_IDENTIFIER_URI_ATTRIB_NAME = "sector_identifier_uri";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String ID_TOKEN_SIGNED_RESPONSE_ALG_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String ID_TOKEN_SIGNED_RESPONSE_ALG_ATTRIB_NAME =
             "id_token_signed_response_alg";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String ID_TOKEN_ENCRYPTED_RESPONSE_ALG_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String ID_TOKEN_ENCRYPTED_RESPONSE_ALG_ATTRIB_NAME =
             "id_token_encrypted_response_alg";
 
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String ID_TOKEN_ENCRYPTED_RESPONSE_ENC_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String ID_TOKEN_ENCRYPTED_RESPONSE_ENC_ATTRIB_NAME =
             "id_token_encrypted_response_enc";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String USERINFO_SIGNED_RESPONSE_ALG_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String USERINFO_SIGNED_RESPONSE_ALG_ATTRIB_NAME =
             "userinfo_signed_response_alg";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String USERINFO_ENCRYPTED_RESPONSE_ALG_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String USERINFO_ENCRYPTED_RESPONSE_ALG_ATTRIB_NAME =
             "userinfo_encrypted_response_alg";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String USERINFO_ENCRYPTED_RESPONSE_ENC_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String USERINFO_ENCRYPTED_RESPONSE_ENC_ATTRIB_NAME =
             "userinfo_encrypted_response_enc";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String REQUEST_OBJECT_SIGNING_ALG_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String REQUEST_OBJECT_SIGNING_ALG_ATTRIB_NAME =
             "request_object_signing_alg";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String REQUEST_OBJECT_ENCRYPTION_ALG_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String REQUEST_OBJECT_ENCRYPTION_ALG_ATTRIB_NAME =
             "request_object_encryption_alg";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String REQUEST_OBJECT_ENCRYPTION_ENC_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String REQUEST_OBJECT_ENCRYPTION_ENC_ATTRIB_NAME =
             "request_object_encryption_enc";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String TOKEN_ENDPOINT_AUTH_SIGNING_ALG_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String TOKEN_ENDPOINT_AUTH_SIGNING_ALG_ATTRIB_NAME =
             "token_endpoint_auth_signing_alg";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String INITIATE_LOGIN_URI_ATTRIB_NAME = "initiate_login_uri";
+    @Nonnull @NotEmpty static final String INITIATE_LOGIN_URI_ATTRIB_NAME = "initiate_login_uri";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_MAX_AGE_ATTRIB_NAME = "default_max_age";
+    @Nonnull @NotEmpty static final String DEFAULT_MAX_AGE_ATTRIB_NAME = "default_max_age";
 
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String REQUIRE_AUTH_TIME_ATTRIB_NAME = "require_auth_time";
+    @Nonnull @NotEmpty static final String REQUIRE_AUTH_TIME_ATTRIB_NAME = "require_auth_time";
     
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String BACK_CHANNEL_LOGOUT_SESSION_REQUIRED_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String BACK_CHANNEL_LOGOUT_SESSION_REQUIRED_ATTRIB_NAME =
             "backchannel_logout_session_required";
 
     /** Attribute local name. */
-    @Nonnull @NotEmpty public static final String FRONT_CHANNEL_LOGOUT_SESSION_REQUIRED_ATTRIB_NAME =
+    @Nonnull @NotEmpty static final String FRONT_CHANNEL_LOGOUT_SESSION_REQUIRED_ATTRIB_NAME =
             "frontchannel_logout_session_required";
 
     /**
@@ -127,308 +128,308 @@ public interface OAuthRPExtensions extends SAMLObject, AttributeExtensibleXMLObj
      * 
      * @return token endpoint authentication method
      */
-    @Nullable public String getTokenEndpointAuthMethod();
+    @Nullable String getTokenEndpointAuthMethod();
     
     /**
      * Set the token endpoint authentication method.
      * 
      * @param method The token endpoint authentication method.
      */
-    public void setTokenEndpointAuthMethod(@Nullable final String method);
+    void setTokenEndpointAuthMethod(@Nullable final String method);
     
     /**
      * Get the whitespace-delimited list of response types.
      * 
      * @return list of response types
      */
-    @Nullable public String getResponseTypes();
+    @Nullable String getResponseTypes();
     
     /**
      * Set the whitespace-delimited list of response types.
      * 
      * @param types response types
      */
-    public void setResponseTypes(@Nullable final String types);
+    void setResponseTypes(@Nullable final String types);
     
     /**
      * Get the whitespace-delimited list of grant types.
      * 
      * @return list of grant types
      */
-    @Nullable public String getGrantTypes();
+    @Nullable String getGrantTypes();
     
     /**
      * Set the whitespace-delimited list of grant types.
      * 
      * @param types grant types
      */
-    public void setGrantTypes(@Nullable final String types);
+    void setGrantTypes(@Nullable final String types);
 
     /**
      * Get the application type.
      * 
      * @return The application type.
      */
-    @Nullable public String getApplicationType();
+    @Nullable String getApplicationType();
     
     /**
      * Set the application type.
      * 
      * @param type The application type.
      */
-    public void setApplicationType(@Nullable final String type);
+    void setApplicationType(@Nullable final String type);
 
     /**
      * Get the client URI.
      * 
      * @return The client URI
      */
-    @Nullable public String getClientUri();
+    @Nullable String getClientUri();
     
     /**
      * Set the client URI.
      * 
      * @param uri The client URI.
      */
-    public void setClientUri(@Nullable final String uri);
+    void setClientUri(@Nullable final String uri);
     
     /**
      * Get the whitespace-delimited list of scopes.
      * 
      * @return list of scopes
      */
-    @Nullable public String getScopes();
+    @Nullable String getScopes();
     
     /**
      * Set the whitespace-delimited list of scopes.
      * 
      * @param scopes the scopes
      */
-    public void setScopes(@Nullable final String scopes);
+    void setScopes(@Nullable final String scopes);
     
     /**
      * Get the software identifier.
      * 
      * @return software identifier
      */
-    @Nullable public String getSoftwareId();
+    @Nullable String getSoftwareId();
     
     /**
      * Set the software identifier.
      * 
      * @param id The software identifier.
      */
-    public void setSoftwareId(@Nullable final String id);
+    void setSoftwareId(@Nullable final String id);
     
     /**
      * Get the software version.
      * 
      * @return The software version.
      */
-    @Nullable public String getSoftwareVersion();
+    @Nullable String getSoftwareVersion();
     
     /**
      * Set the software version.
      * 
      * @param version The software version.
      */
-    public void setSoftwareVersion(@Nullable final String version);
+    void setSoftwareVersion(@Nullable final String version);
     
     /**
      * Get the sector identifier URI.
      * 
      * @return he sector identifier URI.
      */
-    @Nullable public String getSectorIdentifierUri();
+    @Nullable String getSectorIdentifierUri();
     
     /**
      * Set the sector identifier URI.
      * 
      * @param uri The sector identifier URI.
      */
-    public void setSectorIdentifierUri(@Nullable final String uri);
+    void setSectorIdentifierUri(@Nullable final String uri);
 
     /**
      * Get the JWS alg algorithm for ID token signature.
      * 
      * @return The JWS alg algorithm for ID token signature.
      */
-    @Nullable public String getIdTokenSignedResponseAlg();
+    @Nullable String getIdTokenSignedResponseAlg();
     
     /**
      * Set the JWS alg algorithm for ID token signature.
      * 
      * @param algorithm The JWS alg algorithm for ID token signature.
      */
-    public void setIdTokenSignedResponseAlg(@Nullable final String algorithm);
+    void setIdTokenSignedResponseAlg(@Nullable final String algorithm);
 
     /**
      * Get the JWE alg algorithm for ID token encryption.
      * 
      * @return The JWE alg algorithm for ID token encryption.
      */
-    @Nullable public String getIdTokenEncryptedResponseAlg();
+    @Nullable String getIdTokenEncryptedResponseAlg();
     
     /**
      * Set the JWE alg algorithm for ID token encryption.
      * 
      * @param algorithm The JWE alg algorithm for ID token encryption.
      */
-    public void setIdTokenEncryptedResponseAlg(@Nullable final String algorithm);
+    void setIdTokenEncryptedResponseAlg(@Nullable final String algorithm);
 
     /**
      * Get the JWE enc algorithm for ID token encryption.
      * 
      * @return The JWE enc algorithm for ID token encryption.
      */
-    @Nullable public String getIdTokenEncryptedResponseEnc();
+    @Nullable String getIdTokenEncryptedResponseEnc();
     
     /**
      * Set the JWE enc algorithm for ID token encryption.
      * 
      * @param algorithm The JWE enc algorithm for ID token encryption.
      */
-    public void setIdTokenEncryptedResponseEnc(@Nullable final String algorithm);
+    void setIdTokenEncryptedResponseEnc(@Nullable final String algorithm);
 
     /**
      * Get the JWS alg algorithm for UserInfo response signature.
      * 
      * @return The JWS alg algorithm for UserInfo response signature.
      */
-    @Nullable public String getUserInfoSignedResponseAlg();
+    @Nullable String getUserInfoSignedResponseAlg();
     
     /**
      * Set the JWS alg algorithm for UserInfo response signature.
      * 
      * @param algorithm The JWS alg algorithm for UserInfo response signature.
      */
-    public void setUserInfoSignedResponseAlg(@Nullable final String algorithm);
+    void setUserInfoSignedResponseAlg(@Nullable final String algorithm);
     
     /**
      * Get the JWE alg algorithm for UserInfo response encryption.
      * 
      * @return The JWE alg algorithm for UserInfo response encryption.
      */
-    @Nullable public String getUserInfoEncryptedResponseAlg();
+    @Nullable String getUserInfoEncryptedResponseAlg();
     
     /**
      * Set the JWE alg algorithm for UserInfo response encryption.
      * 
      * @param algorithm The JWE alg algorithm for UserInfo response encryption.
      */
-    public void setUserInfoEncryptedResponseAlg(@Nullable final String algorithm);
+    void setUserInfoEncryptedResponseAlg(@Nullable final String algorithm);
 
     /**
      * Get the JWE enc algorithm for UserInfo response encryption.
      * 
      * @return The JWE enc algorithm for UserInfo response encryption.
      */
-    @Nullable public String getUserInfoEncryptedResponseEnc();
+    @Nullable String getUserInfoEncryptedResponseEnc();
     
     /**
      * Set the JWE enc algorithm for UserInfo response encryption.
      * 
      * @param algorithm The JWE enc algorithm for UserInfo response encryption.
      */
-    public void setUserInfoEncryptedResponseEnc(@Nullable final String algorithm);
+    void setUserInfoEncryptedResponseEnc(@Nullable final String algorithm);
     
     /**
      * Get the JWS alg algorithm for request object signature.
      * 
      * @return The JWS alg algorithm for request object signature.
      */
-    @Nullable public String getRequestObjectSigningAlg();
+    @Nullable String getRequestObjectSigningAlg();
     
     /**
      * Set the JWS alg algorithm for request object signature.
      * 
      * @param algorithm The JWS alg algorithm for request object signature.
      */
-    public void setRequestObjectSigningAlg(@Nullable final String algorithm);
+    void setRequestObjectSigningAlg(@Nullable final String algorithm);
     
     /**
      * Get the JWE alg algorithm for request object encryption.
      * 
      * @return The JWE alg algorithm for request object encryption.
      */
-    @Nullable public String getRequestObjectEncryptionAlg();
+    @Nullable String getRequestObjectEncryptionAlg();
     
     /**
      * Set the JWE alg algorithm for request object encryption.
      * 
      * @param algorithm The JWE alg algorithm for request object encryption.
      */
-    public void setRequestObjectEncryptionAlg(@Nullable final String algorithm);
+    void setRequestObjectEncryptionAlg(@Nullable final String algorithm);
 
     /**
      * Get the JWE enc algorithm for request object encryption.
      * 
      * @return The JWE enc algorithm for request object encryption.
      */
-    @Nullable public String getRequestObjectEncryptionEnc();
+    @Nullable String getRequestObjectEncryptionEnc();
     
     /**
      * Set the JWE enc algorithm for request object encryption.
      * 
      * @param algorithm The JWE enc algorithm for request object encryption.
      */
-    public void setRequestObjectEncryptionEnc(@Nullable final String algorithm);
+    void setRequestObjectEncryptionEnc(@Nullable final String algorithm);
     
     /**
      * Get the JWS alg algorithm for token endpoint authentication signature.
      * 
      * @return The JWS alg algorithm for token endpoint authentication signature.
      */
-    @Nullable public String getTokenEndpointAuthSigningAlg();
+    @Nullable String getTokenEndpointAuthSigningAlg();
     
     /**
      * Set the JWS alg algorithm for token endpoint authentication signature.
      * 
      * @param algorithm The JWS alg algorithm for token endpoint authentication signature.
      */
-    public void setTokenEndpointAuthSigningAlg(@Nullable final String algorithm);
+    void setTokenEndpointAuthSigningAlg(@Nullable final String algorithm);
     
     /**
      * Get the URI for initiating login.
      * 
      * @return The URI for initiating login.
      */
-    @Nullable public String getInitiateLoginUri();
+    @Nullable String getInitiateLoginUri();
     
     /**
      * Set the URI for initiating login.
      * 
      * @param uri The URI for initiating login.
      */
-    public void setInitiateLoginUri(@Nullable final String uri);
+    void setInitiateLoginUri(@Nullable final String uri);
 
     /**
      * Get the value for default max age.
      * 
      * @return The value for default max age.
      */
-    public int getDefaultMaxAge();
+    int getDefaultMaxAge();
     
     /**
      * Set the value for default max age.
      * 
      * @param age The value for default max age.
      */
-    public void setDefaultMaxAge(final int age);
+    void setDefaultMaxAge(final int age);
     
     /**
      * Get the flag to require authentication time.
      * 
      * @return The flag to require authentication time.
      */
-    public boolean isRequireAuthTime();
+    boolean isRequireAuthTime();
 
     /**
      * Set the flag to require authentication time.
      * 
      * @param flag The flag to require authentication time.
      */
-    public void setRequireAuthTime(final boolean flag);
+    void setRequireAuthTime(final boolean flag);
 
     /**
      * Set the flag to require session id in back-channel logout request.
@@ -437,7 +438,7 @@ public interface OAuthRPExtensions extends SAMLObject, AttributeExtensibleXMLObj
      * 
      * @since 2.2.0
      */
-    public void setBackChannelLogoutSessionRequired(final boolean flag);
+    void setBackChannelLogoutSessionRequired(final boolean flag);
 
     /**
      * Get the flag to require session id in back-channel logout request.
@@ -446,7 +447,7 @@ public interface OAuthRPExtensions extends SAMLObject, AttributeExtensibleXMLObj
      * 
      * @since 2.2.0
      */
-    public boolean isBackChannelLogoutSessionRequired();
+    boolean isBackChannelLogoutSessionRequired();
 
     /**
      * Set the flag to require session id in front-channel logout request.
@@ -455,7 +456,7 @@ public interface OAuthRPExtensions extends SAMLObject, AttributeExtensibleXMLObj
      * 
      * @since 2.2.0
      */
-    public void setFrontChannelLogoutSessionRequired(final boolean flag);
+    void setFrontChannelLogoutSessionRequired(final boolean flag);
 
     /**
      * Get the flag to require session id in front-channel logout request.
@@ -464,27 +465,27 @@ public interface OAuthRPExtensions extends SAMLObject, AttributeExtensibleXMLObj
      * 
      * @since 2.2.0
      */
-    public boolean isFrontChannelLogoutSessionRequired();
+    boolean isFrontChannelLogoutSessionRequired();
 
     /**
      * Get the list of default ACR values.
      * 
      * @return The list of default ACR values.
      */
-    public List<DefaultAcrValue> getDefaultAcrValues();
+    @Nonnull @Live List<DefaultAcrValue> getDefaultAcrValues();
 
     /**
      * Get the list of request URIs.
      * 
      * @return The list of request URIs.
      */
-    public List<RequestUri> getRequestUris();
+    @Nonnull @Live List<RequestUri> getRequestUris();
     
     /**
      * Get the list of post logout redirection URIs.
      * 
      * @return The list of post logout redirection URIs.
      */
-    public List<PostLogoutRedirectUri> getPostLogoutRedirectUris();
+    @Nonnull @Live List<PostLogoutRedirectUri> getPostLogoutRedirectUris();
 
-}
+}
\ No newline at end of file
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/PostLogoutRedirectUri.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/PostLogoutRedirectUri.java
index db20279..eecd76c 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/PostLogoutRedirectUri.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/PostLogoutRedirectUri.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -22,14 +23,14 @@ import javax.xml.namespace.QName;
 public interface PostLogoutRedirectUri extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "post_logout_redirect_uri";
+    @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "post_logout_redirect_uri";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
-}
+}
\ No newline at end of file
diff --git a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/RequestUri.java b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/RequestUri.java
index 914980c..b5d99d2 100644
--- a/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/RequestUri.java
+++ b/oidc-common-saml-api/src/main/java/net/shibboleth/oidc/saml/xmlobject/RequestUri.java
@@ -14,6 +14,7 @@
 
 package net.shibboleth.oidc.saml.xmlobject;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -22,14 +23,14 @@ import javax.xml.namespace.QName;
 public interface RequestUri extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "request_uri";
+    @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "request_uri";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAML20MDOIDCMD_PREFIX);
 
-}
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list