[java-opensaml] branch master updated: Extra public qualifier cleanup.

Scott Cantor cantor.2 at osu.edu
Wed Mar 20 16:29:05 EDT 2019


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=f053a657240d6bbaa99cc66d79aca66ee5f3b52b

The following commit(s) were added to refs/heads/master by this push:
       new  f053a65   Extra public qualifier cleanup.
f053a65 is described below

commit f053a657240d6bbaa99cc66d79aca66ee5f3b52b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 20 16:29:01 2019 -0400

    Extra public qualifier cleanup.
---
 .../java/org/opensaml/core/xml/io/Marshaller.java     |  6 +++---
 .../java/org/opensaml/core/xml/io/Unmarshaller.java   |  2 +-
 .../ConditionalLoadXMLObjectLoadSaveManager.java      | 10 +++++-----
 .../core/xml/persist/XMLObjectLoadSaveManager.java    | 19 ++++++++-----------
 .../main/java/org/opensaml/core/xml/schema/XSAny.java | 10 ++++++----
 .../org/opensaml/core/xml/schema/XSBase64Binary.java  | 10 ++++++----
 .../java/org/opensaml/core/xml/schema/XSBoolean.java  | 10 ++++++----
 .../java/org/opensaml/core/xml/schema/XSDateTime.java |  8 ++++----
 .../java/org/opensaml/core/xml/schema/XSInteger.java  | 10 ++++++----
 .../java/org/opensaml/core/xml/schema/XSQName.java    | 10 ++++++----
 .../java/org/opensaml/core/xml/schema/XSString.java   | 10 ++++++----
 .../main/java/org/opensaml/core/xml/schema/XSURI.java | 10 ++++++----
 .../org/opensaml/core/xml/util/SingletonFactory.java  |  2 +-
 13 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/io/Marshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/io/Marshaller.java
index da0c622..538f755 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/io/Marshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/io/Marshaller.java
@@ -39,7 +39,7 @@ public interface Marshaller {
      * 
      * @throws MarshallingException thrown if there is a problem marshalling the given object
      */
-    @Nonnull public Element marshall(@Nonnull final XMLObject xmlObject) throws MarshallingException;
+    @Nonnull Element marshall(@Nonnull final XMLObject xmlObject) throws MarshallingException;
 
     /**
      * Marshall this element, and its children, into a W3C DOM element. If the document does not have a Document Element
@@ -52,7 +52,7 @@ public interface Marshaller {
      * 
      * @throws MarshallingException thrown if there is a problem marshalling the given object
      */
-    @Nonnull public Element marshall(@Nonnull final XMLObject xmlObject, @Nonnull final Document document)
+    @Nonnull Element marshall(@Nonnull final XMLObject xmlObject, @Nonnull final Document document)
             throws MarshallingException;
 
     /**
@@ -68,6 +68,6 @@ public interface Marshaller {
      * 
      * @throws MarshallingException thrown if the given XMLObject can not be marshalled.
      */
-    @Nonnull public Element marshall(@Nonnull final XMLObject xmlObject, @Nonnull final Element parentElement)
+    @Nonnull Element marshall(@Nonnull final XMLObject xmlObject, @Nonnull final Element parentElement)
             throws MarshallingException;
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/io/Unmarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/io/Unmarshaller.java
index df5a3b7..29550c8 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/io/Unmarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/io/Unmarshaller.java
@@ -36,5 +36,5 @@ public interface Unmarshaller {
      * 
      * @throws UnmarshallingException thrown if an error occurs unmarshalling the DOM element into the XMLObject
      */
-    @Nonnull public XMLObject unmarshall(@Nonnull final Element element) throws UnmarshallingException;
+    @Nonnull XMLObject unmarshall(@Nonnull final Element element) throws UnmarshallingException;
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/ConditionalLoadXMLObjectLoadSaveManager.java b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/ConditionalLoadXMLObjectLoadSaveManager.java
index 3e735ab..60ae963 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/ConditionalLoadXMLObjectLoadSaveManager.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/ConditionalLoadXMLObjectLoadSaveManager.java
@@ -40,7 +40,7 @@ public interface ConditionalLoadXMLObjectLoadSaveManager<T extends XMLObject> ex
      * 
      * @return true if data modify time check is enabled, false if not
      */
-    public boolean isLoadConditionally();
+    boolean isLoadConditionally();
     
     /**
      * Retrieve the cached modified time for the last load of the specified key.
@@ -54,7 +54,7 @@ public interface ConditionalLoadXMLObjectLoadSaveManager<T extends XMLObject> ex
      * @param key the target key
      * @return the current cached modified time, may be null
      */
-    @Nullable public Instant getLoadLastModified(@Nonnull final String key);
+    @Nullable Instant getLoadLastModified(@Nonnull final String key);
     
     /**
      * Clear the cached modified time for the last load of the specified key.
@@ -62,11 +62,11 @@ public interface ConditionalLoadXMLObjectLoadSaveManager<T extends XMLObject> ex
      * @param key the target key
      * @return the previously cached modified time, or null if did not exist
      */
-    @Nullable public Instant clearLoadLastModified(@Nonnull final String key);
+    @Nullable Instant clearLoadLastModified(@Nonnull final String key);
 
     /**
      * Clear the cached modified times for the last load for all keys.
      */
-    public void clearAllLoadLastModified();
+    void clearAllLoadLastModified();
 
-}
+}
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/XMLObjectLoadSaveManager.java b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/XMLObjectLoadSaveManager.java
index 0a2e588..8a7f9d7 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/XMLObjectLoadSaveManager.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/XMLObjectLoadSaveManager.java
@@ -50,8 +50,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      * 
      * @throws IOException if there is a fatal error obtaining the keys
      */
-    @Nonnull @NonnullElements @NotLive @Unmodifiable
-    public Set<String> listKeys() throws IOException;
+    @Nonnull @NonnullElements @NotLive @Unmodifiable Set<String> listKeys() throws IOException;
 
     /**
      * Return an iterable of all objects under management, along with their associated index key.
@@ -60,8 +59,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      * 
      * @throws IOException if there is a fatal error loading the managed objects
      */
-    @Nonnull @NonnullElements
-    public Iterable<Pair<String,T>> listAll() throws IOException;
+    @Nonnull @NonnullElements Iterable<Pair<String,T>> listAll() throws IOException;
 
     /**
      * Evaluate whether an object already exists indexed by the supplied key.
@@ -72,7 +70,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      * 
      * @throws IOException if there is a fatal error evaluating object existence
      */
-    public boolean exists(@Nonnull @NotEmpty final String key) throws IOException;
+    boolean exists(@Nonnull @NotEmpty final String key) throws IOException;
     
     /**
      * Load a particular object based on the supplied key.
@@ -83,8 +81,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      * 
      * @throws IOException if there is a fatal error loading the object
      */
-    @Nullable
-    public T load(@Nonnull @NotEmpty final String key) throws IOException;
+    @Nullable T load(@Nonnull @NotEmpty final String key) throws IOException;
     
     /**
      * Save a particular object, indexed by the supplied key.
@@ -101,7 +98,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      * @throws IOException if there is a fatal error saving the object, or if an object already exists
      *          indexed by the supplied key
      */
-    public void save(@Nonnull @NotEmpty final String key, @Nonnull final T xmlObject) throws IOException;
+    void save(@Nonnull @NotEmpty final String key, @Nonnull final T xmlObject) throws IOException;
     
     /**
      * Save a particular object, indexed by the supplied key.
@@ -113,7 +110,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      * @throws IOException if there is a fatal error saving the object, or if overwrite=false,
      *          if an object already exists indexed by the supplied key
      */
-    public void save(@Nonnull @NotEmpty final String key, @Nonnull final T xmlObject, boolean overwrite)
+    void save(@Nonnull @NotEmpty final String key, @Nonnull final T xmlObject, boolean overwrite)
             throws IOException;
     
     /**
@@ -125,7 +122,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      * 
      * @throws IOException if there was a fatal error removing the object
      */
-    public boolean remove(@Nonnull @NotEmpty final String key) throws IOException;
+    boolean remove(@Nonnull @NotEmpty final String key) throws IOException;
     
     /**
      * Update the key under which a particular object is stored.
@@ -138,7 +135,7 @@ public interface XMLObjectLoadSaveManager<T extends XMLObject> {
      *          
      * @throws IOException if there was a fatal error updating the key
      */
-    public boolean updateKey(@Nonnull @NotEmpty final String currentKey, @Nonnull @NotEmpty final String newKey)
+    boolean updateKey(@Nonnull @NotEmpty final String currentKey, @Nonnull @NotEmpty final String newKey)
             throws IOException;
     
 }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSAny.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSAny.java
index 82a56ab..de9d390 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSAny.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSAny.java
@@ -17,9 +17,11 @@
 
 package org.opensaml.core.xml.schema;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,22 +33,22 @@ import org.opensaml.core.xml.ElementExtensibleXMLObject;
 public interface XSAny extends ElementExtensibleXMLObject, AttributeExtensibleXMLObject {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "anyType"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "anyType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
+    @Nonnull static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
      * Gets the text content for the DOM Element.
      * 
      * @return the text content for the DOM Element, or null
      */
-    @Nullable public String getTextContent();
+    @Nullable String getTextContent();
 
     /**
      * Sets the text content for the DOM Element.
      * 
      * @param newContent the text content for the DOM Element
      */
-    public void setTextContent(@Nullable final String newContent);
+    void setTextContent(@Nullable final String newContent);
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBase64Binary.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBase64Binary.java
index 056c632..1b31cc7 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBase64Binary.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBase64Binary.java
@@ -17,9 +17,11 @@
 
 package org.opensaml.core.xml.schema;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.core.xml.XMLObject;
@@ -30,22 +32,22 @@ import org.opensaml.core.xml.XMLObject;
 public interface XSBase64Binary extends XMLObject {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "base64Binary"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "base64Binary"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
+    @Nonnull static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
      * Gets the base64-encoded binary value.
      * 
      * @return the string, or null
      */
-    @Nullable public String getValue();
+    @Nullable String getValue();
     
     /**
      * Sets the base64-encoded binary value.
      * 
      * @param newValue the string value
      */
-    public void setValue(@Nullable final String newValue);
+    void setValue(@Nullable final String newValue);
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBoolean.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBoolean.java
index 97b8e6f..b7b5e25 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBoolean.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBoolean.java
@@ -17,11 +17,13 @@
 
 package org.opensaml.core.xml.schema;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.XMLObject;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 /**
@@ -30,23 +32,23 @@ import net.shibboleth.utilities.java.support.xml.XMLConstants;
 public abstract interface XSBoolean extends XMLObject {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "boolean"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "boolean"; 
             
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
+    @Nonnull static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
      * Returns the XSBooleanValue value.
      * 
      * @return the {@link XSBooleanValue} value
      */
-    @Nullable public XSBooleanValue getValue();
+    @Nullable XSBooleanValue getValue();
 
     /**
      * Sets the XSBooleanValue value.
      * 
      * @param value The {@link XSBooleanValue} value
      */
-    public void setValue(@Nullable final XSBooleanValue value);
+    void setValue(@Nullable final XSBooleanValue value);
 
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSDateTime.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSDateTime.java
index 9f38206..cdc37e1 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSDateTime.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSDateTime.java
@@ -34,10 +34,10 @@ import org.opensaml.core.xml.XMLObject;
 public interface XSDateTime extends XMLObject {
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "dateTime"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "dateTime"; 
         
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
@@ -45,13 +45,13 @@ public interface XSDateTime extends XMLObject {
      * 
      * @return the dateTime value
      */
-    @Nullable public Instant getValue();
+    @Nullable Instant getValue();
     
     /**
      * Sets the dateTime value.
      * 
      * @param newValue the dateTime value
      */
-    public void setValue(@Nullable final Instant newValue);
+    void setValue(@Nullable final Instant newValue);
     
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSInteger.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSInteger.java
index 8054000..b57b5e4 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSInteger.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSInteger.java
@@ -17,9 +17,11 @@
 
 package org.opensaml.core.xml.schema;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.core.xml.XMLObject;
@@ -30,22 +32,22 @@ import org.opensaml.core.xml.XMLObject;
 public interface XSInteger extends XMLObject {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "integer"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "integer";
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
+    @Nonnull static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
      * Gets the integer.
      * 
      * @return the integer
      */
-    @Nullable public Integer getValue();
+    @Nullable Integer getValue();
     
     /**
      * Sets the integer.
      * 
      * @param newValue the integer value
      */
-    public void setValue(@Nullable final Integer newValue);
+    void setValue(@Nullable final Integer newValue);
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSQName.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSQName.java
index eb8e368..a0421e0 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSQName.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSQName.java
@@ -17,9 +17,11 @@
 
 package org.opensaml.core.xml.schema;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.core.xml.XMLObject;
@@ -30,22 +32,22 @@ import org.opensaml.core.xml.XMLObject;
 public interface XSQName extends XMLObject {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "QName"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "QName"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
+    @Nonnull static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
      * Gets the QName content of the element.
      * 
      * @return the QName content of the element
      */
-    @Nullable public QName getValue();
+    @Nullable QName getValue();
     
     /**
      * Sets the QName content of the element.
      * 
      * @param newValue the QName content of the element
      */
-    public void setValue(@Nullable final QName newValue);
+    void setValue(@Nullable final QName newValue);
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSString.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSString.java
index af5e089..657e2d1 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSString.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSString.java
@@ -17,9 +17,11 @@
 
 package org.opensaml.core.xml.schema;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.core.xml.XMLObject;
@@ -30,22 +32,22 @@ import org.opensaml.core.xml.XMLObject;
 public interface XSString extends XMLObject {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "string"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "string"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
+    @Nonnull static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
      * Gets the string.
      * 
      * @return the string
      */
-    @Nullable public String getValue();
+    @Nullable String getValue();
     
     /**
      * Sets the string.
      * 
      * @param newValue the string value
      */
-    public void setValue(@Nullable final String newValue);
+    void setValue(@Nullable final String newValue);
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSURI.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSURI.java
index 63088f3..b473990 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSURI.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSURI.java
@@ -17,9 +17,11 @@
 
 package org.opensaml.core.xml.schema;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.core.xml.XMLObject;
@@ -30,22 +32,22 @@ import org.opensaml.core.xml.XMLObject;
 public interface XSURI extends XMLObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "anyURI"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "anyURI"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
+    @Nonnull static final QName TYPE_NAME = new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
     
     /**
      * Gets the URI content of the element.
      * 
      * @return the URI content of the element
      */
-    @Nullable public String getValue();
+    @Nullable String getValue();
     
     /**
      * Sets the URI content of the element.
      * 
      * @param newValue the URI content of the element
      */
-    public void setValue(@Nullable final String newValue);
+    void setValue(@Nullable final String newValue);
 }
\ No newline at end of file
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/SingletonFactory.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/SingletonFactory.java
index a1e95fd..3e4314f 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/SingletonFactory.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/SingletonFactory.java
@@ -37,6 +37,6 @@ public interface SingletonFactory<Input, Output> {
      * @param input the input class instance
      * @return an output class instance
      */
-    public Output getInstance(Input input);
+    Output getInstance(Input input);
 
 }
\ 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