[java-opensaml] branch main updated: IDP-2069 Null handling
Rod Widdowson
rdw at steadingsoftware.com
Fri Mar 3 09:16:46 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=e482efbaee6a97ae15b73363b66a5ddef17e69a4
The following commit(s) were added to refs/heads/main by this push:
new e482efbae IDP-2069 Null handling
e482efbae is described below
commit e482efbaee6a97ae15b73363b66a5ddef17e69a4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 3 09:16:41 2023 +0000
IDP-2069 Null handling
https://shibboleth.atlassian.net/browse/IDP-2069
Garnish some static final fields with @Nonnull
---
.../main/java/org/opensaml/soap/soap11/ActorBearing.java | 7 ++++---
.../src/main/java/org/opensaml/soap/soap11/Body.java | 9 +++++----
.../src/main/java/org/opensaml/soap/soap11/Detail.java | 9 +++++----
.../org/opensaml/soap/soap11/EncodingStyleBearing.java | 5 +++--
.../src/main/java/org/opensaml/soap/soap11/Envelope.java | 9 +++++----
.../src/main/java/org/opensaml/soap/soap11/Fault.java | 15 ++++++++-------
.../main/java/org/opensaml/soap/soap11/FaultActor.java | 5 +++--
.../src/main/java/org/opensaml/soap/soap11/FaultCode.java | 13 +++++++------
.../main/java/org/opensaml/soap/soap11/FaultString.java | 5 +++--
.../src/main/java/org/opensaml/soap/soap11/Header.java | 9 +++++----
.../org/opensaml/soap/soap11/MustUnderstandBearing.java | 5 +++--
11 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/ActorBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/ActorBearing.java
index 19c1863de..697a5563b 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/ActorBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/ActorBearing.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
@@ -28,14 +29,14 @@ import org.opensaml.soap.util.SOAPConstants;
public interface ActorBearing {
/** The soap11:@actor attribute local name. */
- public static final String SOAP11_ACTOR_ATTR_LOCAL_NAME = "actor";
+ @Nonnull public static final String SOAP11_ACTOR_ATTR_LOCAL_NAME = "actor";
/** The soap11:@actor qualified attribute name. */
- public static final QName SOAP11_ACTOR_ATTR_NAME =
+ @Nonnull public static final QName SOAP11_ACTOR_ATTR_NAME =
new QName(SOAPConstants.SOAP11_NS, SOAP11_ACTOR_ATTR_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/** The specification-defined value 'http://schemas.xmlsoap.org/soap/actor/next'. */
- public static final String SOAP11_ACTOR_NEXT = "http://schemas.xmlsoap.org/soap/actor/next";
+ @Nonnull public static final String SOAP11_ACTOR_NEXT = "http://schemas.xmlsoap.org/soap/actor/next";
/**
* Get the attribute value.
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Body.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Body.java
index 3f81b3ee3..57ecce93c 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Body.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Body.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -30,16 +31,16 @@ import org.opensaml.soap.util.SOAPConstants;
public interface Body extends SOAPObject, ElementExtensibleXMLObject, AttributeExtensibleXMLObject {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Body";
+ @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Body";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
new QName(SOAPConstants.SOAP11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "Body";
+ @Nonnull public static final String TYPE_LOCAL_NAME = "Body";
/** QName of the XSI type. */
- public static final QName TYPE_NAME =
+ @Nonnull public static final QName TYPE_NAME =
new QName(SOAPConstants.SOAP11_NS, TYPE_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
}
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Detail.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Detail.java
index d3742cb7d..3edc66c1a 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Detail.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Detail.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -30,15 +31,15 @@ import org.opensaml.soap.util.SOAPConstants;
public interface Detail extends SOAPObject, ElementExtensibleXMLObject, AttributeExtensibleXMLObject {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "detail";
+ @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "detail";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
/** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "detail";
+ @Nonnull public static final String TYPE_LOCAL_NAME = "detail";
/** QName of the XSI type. */
- public static final QName TYPE_NAME =
+ @Nonnull public static final QName TYPE_NAME =
new QName(SOAPConstants.SOAP11_NS, TYPE_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
}
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/EncodingStyleBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/EncodingStyleBearing.java
index 6df1a8d7c..8350c338e 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/EncodingStyleBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/EncodingStyleBearing.java
@@ -19,6 +19,7 @@ package org.opensaml.soap.soap11;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
@@ -30,10 +31,10 @@ import org.opensaml.soap.util.SOAPConstants;
public interface EncodingStyleBearing {
/** The soap11:@encodingStyle attribute local name. */
- public static final String SOAP11_ENCODING_STYLE_ATTR_LOCAL_NAME = "encodingStyle";
+ @Nonnull public static final String SOAP11_ENCODING_STYLE_ATTR_LOCAL_NAME = "encodingStyle";
/** The soap11:@encodingStyle qualified attribute name. */
- public static final QName SOAP11_ENCODING_STYLE_ATTR_NAME =
+ @Nonnull public static final QName SOAP11_ENCODING_STYLE_ATTR_NAME =
new QName(SOAPConstants.SOAP11_NS, SOAP11_ENCODING_STYLE_ATTR_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Envelope.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Envelope.java
index 1cc81c90a..d0de18b97 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Envelope.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Envelope.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
@@ -31,17 +32,17 @@ import org.opensaml.soap.util.SOAPConstants;
public interface Envelope extends SOAPObject, ElementExtensibleXMLObject, AttributeExtensibleXMLObject {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Envelope";
+ @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Envelope";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
new QName(SOAPConstants.SOAP11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "Envelope";
+ @Nonnull public static final String TYPE_LOCAL_NAME = "Envelope";
/** QName of the XSI type. */
- public static final QName TYPE_NAME =
+ @Nonnull public static final QName TYPE_NAME =
new QName(SOAPConstants.SOAP11_NS, TYPE_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Fault.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Fault.java
index d41979276..94c76f600 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Fault.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Fault.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
@@ -29,17 +30,17 @@ import org.opensaml.soap.util.SOAPConstants;
public interface Fault extends SOAPObject {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Fault";
-
+ @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Fault";
+
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
new QName(SOAPConstants.SOAP11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
-
+
/** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "Fault";
-
+ @Nonnull public static final String TYPE_LOCAL_NAME = "Fault";
+
/** QName of the XSI type. */
- public static final QName TYPE_NAME =
+ @Nonnull public static final QName TYPE_NAME =
new QName(SOAPConstants.SOAP11_NS, TYPE_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultActor.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultActor.java
index 714b1aa8b..648a82919 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultActor.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultActor.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -28,8 +29,8 @@ import org.opensaml.soap.common.SOAPObject;
public interface FaultActor extends SOAPObject, XSURI {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "faultactor";
+ @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "faultactor";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
}
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultCode.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultCode.java
index 3556a3df5..a1456d484 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultCode.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultCode.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSQName;
@@ -29,22 +30,22 @@ import org.opensaml.soap.util.SOAPConstants;
public interface FaultCode extends SOAPObject, XSQName {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "faultcode";
+ @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "faultcode";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
/** FaultCode value <code>VersionMismatch</code>. */
- public static final QName VERSION_MISMATCH = new QName(SOAPConstants.SOAP11_NS, "VersionMismatch",
+ @Nonnull public static final QName VERSION_MISMATCH = new QName(SOAPConstants.SOAP11_NS, "VersionMismatch",
SOAPConstants.SOAP11_PREFIX);
/** FaultCode value <code>MustUnderstand</code>. */
- public static final QName MUST_UNDERSTAND = new QName(SOAPConstants.SOAP11_NS, "MustUnderstand",
+ @Nonnull public static final QName MUST_UNDERSTAND = new QName(SOAPConstants.SOAP11_NS, "MustUnderstand",
SOAPConstants.SOAP11_PREFIX);
/** FaultCode value <code>Server</code>. */
- public static final QName SERVER = new QName(SOAPConstants.SOAP11_NS, "Server", SOAPConstants.SOAP11_PREFIX);
+ @Nonnull public static final QName SERVER = new QName(SOAPConstants.SOAP11_NS, "Server", SOAPConstants.SOAP11_PREFIX);
/** FaultCode value <code>Client</code>. */
- public static final QName CLIENT = new QName(SOAPConstants.SOAP11_NS, "Client", SOAPConstants.SOAP11_PREFIX);
+ @Nonnull public static final QName CLIENT = new QName(SOAPConstants.SOAP11_NS, "Client", SOAPConstants.SOAP11_PREFIX);
}
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultString.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultString.java
index 50f411fb2..013213cd3 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultString.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/FaultString.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -28,8 +29,8 @@ import org.opensaml.soap.common.SOAPObject;
public interface FaultString extends SOAPObject, XSString {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "faultstring";
+ @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "faultstring";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(DEFAULT_ELEMENT_LOCAL_NAME);
}
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Header.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Header.java
index 2bd45a69a..cfeecb893 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Header.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/Header.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -30,16 +31,16 @@ import org.opensaml.soap.util.SOAPConstants;
public interface Header extends SOAPObject, ElementExtensibleXMLObject, AttributeExtensibleXMLObject {
/** Element local name. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Header";
+ @Nonnull static final String DEFAULT_ELEMENT_LOCAL_NAME = "Header";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME =
+ @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
new QName(SOAPConstants.SOAP11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "Header";
+ @Nonnull public static final String TYPE_LOCAL_NAME = "Header";
/** QName of the XSI type. */
- public static final QName TYPE_NAME =
+ @Nonnull public static final QName TYPE_NAME =
new QName(SOAPConstants.SOAP11_NS, TYPE_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
}
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/MustUnderstandBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/MustUnderstandBearing.java
index 970ca9b7b..92834ab7e 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/MustUnderstandBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap11/MustUnderstandBearing.java
@@ -17,6 +17,7 @@
package org.opensaml.soap.soap11;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
@@ -29,10 +30,10 @@ import org.opensaml.soap.util.SOAPConstants;
public interface MustUnderstandBearing {
/** The soap11:@mustUnderstand attribute local name. */
- public static final String SOAP11_MUST_UNDERSTAND_ATTR_LOCAL_NAME = "mustUnderstand";
+ @Nonnull public static final String SOAP11_MUST_UNDERSTAND_ATTR_LOCAL_NAME = "mustUnderstand";
/** The soap11:@mustUnderstand qualified attribute name. */
- public static final QName SOAP11_MUST_UNDERSTAND_ATTR_NAME =
+ @Nonnull public static final QName SOAP11_MUST_UNDERSTAND_ATTR_NAME =
new QName(SOAPConstants.SOAP11_NS, SOAP11_MUST_UNDERSTAND_ATTR_LOCAL_NAME, SOAPConstants.SOAP11_PREFIX);
/**
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list