[java-opensaml] 01/02: JPAR-85 - Checkstyle, check final parameters

Tom Zeller tzeller at dragonacea.biz
Mon Aug 7 16:37:53 EDT 2017


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

tzeller 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=151e71900dc2a9bc7d05d6144167a76e900f08bd

commit 151e71900dc2a9bc7d05d6144167a76e900f08bd
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Aug 7 15:24:09 2017 -0500

    JPAR-85 - Checkstyle, check final parameters
---
 .../src/main/java/org/opensaml/core/Version.java   |  2 +-
 .../core/config/InitializationService.java         |  2 +-
 ...actFilesystemConfigurationPropertiesSource.java |  4 +-
 .../ClasspathConfigurationPropertiesSource.java    |  2 +-
 .../config/provider/MapBasedConfiguration.java     |  9 ++--
 .../opensaml/core/criterion/EntityIdCriterion.java |  2 +-
 .../core/criterion/SatisfyAnyCriterion.java        |  4 +-
 .../org/opensaml/core/xml/AbstractXMLObject.java   | 10 ++---
 .../main/java/org/opensaml/core/xml/Namespace.java |  2 +-
 .../org/opensaml/core/xml/NamespaceManager.java    |  2 +-
 .../java/org/opensaml/core/xml/SpaceBearing.java   |  2 +-
 .../xml/config/GlobalParserPoolInitializer.java    |  2 +-
 .../opensaml/core/xml/config/XMLConfigurator.java  |  8 ++--
 .../core/xml/config/XMLObjectProviderRegistry.java |  6 +--
 .../config/XMLObjectProviderRegistrySupport.java   |  6 +--
 .../xml/persist/FilesystemLoadSaveManager.java     | 20 ++++-----
 .../core/xml/persist/MapLoadSaveManager.java       | 12 +++---
 .../opensaml/core/xml/schema/XSBooleanValue.java   |  8 ++--
 .../core/xml/schema/impl/XSBase64BinaryImpl.java   |  2 +-
 .../core/xml/schema/impl/XSDateTimeImpl.java       |  6 +--
 .../core/xml/schema/impl/XSDateTimeMarshaller.java |  3 +-
 .../xml/schema/impl/XSDateTimeUnmarshaller.java    |  2 +-
 .../core/xml/schema/impl/XSIntegerImpl.java        |  4 +-
 .../core/xml/schema/impl/XSIntegerMarshaller.java  |  5 ++-
 .../xml/schema/impl/XSIntegerUnmarshaller.java     |  6 +--
 .../opensaml/core/xml/schema/impl/XSQNameImpl.java |  4 +-
 .../core/xml/schema/impl/XSQNameMarshaller.java    |  5 ++-
 .../core/xml/schema/impl/XSQNameUnmarshaller.java  |  8 ++--
 .../core/xml/schema/impl/XSStringImpl.java         |  4 +-
 .../core/xml/schema/impl/XSStringMarshaller.java   |  5 ++-
 .../core/xml/schema/impl/XSStringUnmarshaller.java |  6 +--
 .../opensaml/core/xml/schema/impl/XSURIImpl.java   |  4 +-
 .../core/xml/schema/impl/XSURIMarshaller.java      |  5 ++-
 .../core/xml/schema/impl/XSURIUnmarshaller.java    |  6 +--
 .../xml/util/AbstractSimpleSingletonFactory.java   |  4 +-
 .../core/xml/util/AbstractSingletonFactory.java    |  2 +-
 .../xml/util/AbstractWrappedSingletonFactory.java  | 12 +++---
 .../org/opensaml/core/xml/util/AttributeMap.java   | 42 +++++++++---------
 .../xml/util/IndexedXMLObjectChildrenList.java     |  6 +--
 .../core/xml/util/XMLAttributeSupport.java         | 16 +++----
 .../core/xml/util/XMLObjectChildrenList.java       |  8 ++--
 .../opensaml/core/xml/util/XMLObjectSource.java    |  2 +-
 .../opensaml/core/xml/util/XMLObjectSupport.java   | 50 +++++++++++-----------
 43 files changed, 163 insertions(+), 157 deletions(-)

diff --git a/opensaml-core/src/main/java/org/opensaml/core/Version.java b/opensaml-core/src/main/java/org/opensaml/core/Version.java
index 7077af5..f797757 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/Version.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/Version.java
@@ -34,7 +34,7 @@ public final class Version {
      * 
      * @param args command line arguments
      */
-    public static void main(String[] args) {
+    public static void main(final String[] args) {
         System.out.println(VERSION);
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/config/InitializationService.java b/opensaml-core/src/main/java/org/opensaml/core/config/InitializationService.java
index 8a730db..96fd6c3 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/config/InitializationService.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/config/InitializationService.java
@@ -54,7 +54,7 @@ public class InitializationService {
             log.debug("Initializing module initializer implementation: {}", initializer.getClass().getName());
             try {
                 initializer.init();
-            } catch (InitializationException e) {
+            } catch (final InitializationException e) {
                 log.error("Error initializing module", e);
                 throw e;
             }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java b/opensaml-core/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java
index d023dae..f28eb49 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java
@@ -64,10 +64,10 @@ public abstract class AbstractFilesystemConfigurationPropertiesSource implements
                         Properties props = new Properties();
                         props.load(is);
                         cachedProperties = props;
-                    } catch (FileNotFoundException e) {
+                    } catch (final FileNotFoundException e) {
                         log.warn("File not found attempting to load configuration properties '" 
                                 + fileName + "' from filesystem");
-                    } catch (IOException e) {
+                    } catch (final IOException e) {
                         log.warn("I/O problem attempting to load configuration properties '" 
                                 + fileName + "' from filesystem", e);
                     }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSource.java b/opensaml-core/src/main/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSource.java
index 74dc270..2e2352d 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSource.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSource.java
@@ -56,7 +56,7 @@ public class ClasspathConfigurationPropertiesSource implements ConfigurationProp
                         props.load(is);
                         cachedProperties = props;
                     }
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     log.warn("Problem attempting to load configuration properties '" 
                             + RESOURCE_NAME + "' from classpath", e);
                 }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java b/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java
index 66193bd..6c88ded 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java
@@ -46,7 +46,7 @@ public class MapBasedConfiguration implements Configuration {
      * 
      * @return the instance of the registered configuration interface, or null
      */
-    public <T extends Object> T get(Class<T> configClass, String partitionName) {
+    public <T extends Object> T get(final Class<T> configClass, final String partitionName) {
         final Map<String, Object> partition = getPartition(partitionName);
         return configClass.cast(partition.get(configClass.getName()));
     }
@@ -61,7 +61,8 @@ public class MapBasedConfiguration implements Configuration {
      * @param configuration the configuration implementation instance being registered
      * @param partitionName the partition name to use
      */
-    public <T extends Object, I extends T> void register(Class<T> configClass, I configuration, String partitionName) {
+    public <T extends Object, I extends T> void register(final Class<T> configClass, final I configuration,
+            final String partitionName) {
         Map<String, Object> partition = getPartition(partitionName);
         partition.put(configClass.getName(), configuration);
     }
@@ -76,7 +77,7 @@ public class MapBasedConfiguration implements Configuration {
      * 
      * @return the configuration implementation instance which was deregistered, or null
      */
-    public <T extends Object> T deregister(Class<T> configClass, String partitionName) {
+    public <T extends Object> T deregister(final Class<T> configClass, final String partitionName) {
         Map<String, Object> partition = getPartition(partitionName);
         synchronized (partition) {
             final T old = configClass.cast(partition.get(configClass.getName()));
@@ -92,7 +93,7 @@ public class MapBasedConfiguration implements Configuration {
      * 
      * @return the Map corresponding to the partition name.  A new empty Map will be created if necessary
      */
-    private synchronized Map<String, Object> getPartition(String partitionName) {
+    private synchronized Map<String, Object> getPartition(final String partitionName) {
         Map<String, Object> partition = storage.get(partitionName);
         if (partition == null) {
             partition = new ConcurrentHashMap<>();
diff --git a/opensaml-core/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java b/opensaml-core/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java
index 3e9073d..bf15720 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java
@@ -66,7 +66,7 @@ public final class EntityIdCriterion implements Criterion {
 
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/criterion/SatisfyAnyCriterion.java b/opensaml-core/src/main/java/org/opensaml/core/criterion/SatisfyAnyCriterion.java
index a122c5d..c3bfeb8 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/criterion/SatisfyAnyCriterion.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/criterion/SatisfyAnyCriterion.java
@@ -47,7 +47,7 @@ public class SatisfyAnyCriterion implements Criterion {
      *
      * @param value the satisfyAny flag value
      */
-    public SatisfyAnyCriterion(boolean value) {
+    public SatisfyAnyCriterion(final boolean value) {
         satisfyAny = value;
     }
 
@@ -66,7 +66,7 @@ public class SatisfyAnyCriterion implements Criterion {
     }
 
     /** {@inheritDoc} */
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (this == other) {
             return true;
         }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java b/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
index 2dcc78e..97dca88 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
@@ -167,7 +167,7 @@ public abstract class AbstractXMLObject implements XMLObject {
      * @param attributeName the attribute name
      * @param hasValue true to indicate that the attribute has a value, false to indicate it has no value
      */
-    protected void manageQualifiedAttributeNamespace(@Nonnull final QName attributeName, boolean hasValue) {
+    protected void manageQualifiedAttributeNamespace(@Nonnull final QName attributeName, final boolean hasValue) {
         if (hasValue) {
             getNamespaceManager().registerAttributeName(attributeName);
         } else {
@@ -274,7 +274,7 @@ public abstract class AbstractXMLObject implements XMLObject {
      * @return the value that should be assigned
      */
     @Nullable protected String prepareForAssignment(@Nullable final String oldValue, @Nullable final String newValue, 
-            boolean normalize) {
+            final boolean normalize) {
         String newString = newValue;
         if (normalize) {
             newString = StringSupport.trimOrNull(newString);
@@ -390,7 +390,7 @@ public abstract class AbstractXMLObject implements XMLObject {
     }
 
     /** {@inheritDoc} */
-    public void releaseChildrenDOM(boolean propagateRelease) {
+    public void releaseChildrenDOM(final boolean propagateRelease) {
         log.trace("Releasing cached DOM reprsentation for children of {} with propagation set to {}",
                 getElementQName(), propagateRelease);
         if (getOrderedChildren() != null) {
@@ -416,7 +416,7 @@ public abstract class AbstractXMLObject implements XMLObject {
     }
 
     /** {@inheritDoc} */
-    public void releaseParentDOM(boolean propagateRelease) {
+    public void releaseParentDOM(final boolean propagateRelease) {
         log.trace("Releasing cached DOM reprsentation for parent of {} with propagation set to {}", getElementQName(),
                 propagateRelease);
         XMLObject parentElement = getParent();
@@ -550,7 +550,7 @@ public abstract class AbstractXMLObject implements XMLObject {
     }
 
     /** {@inheritDoc} */
-    public void setNil(@Nullable XSBooleanValue newNil) {
+    public void setNil(@Nullable final XSBooleanValue newNil) {
         nil = prepareForAssignment(nil, newNil);
         manageQualifiedAttributeNamespace(XMLConstants.XSI_NIL_ATTRIB_NAME, nil != null);
     }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java b/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java
index 38d9e7c..942240a 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java
@@ -97,7 +97,7 @@ public class Namespace {
      * @return {@inheritDoc}
      */
     @Override
-    public boolean equals(Object obj) {    
+    public boolean equals(final Object obj) {
         if(obj == this){
             return true;
         }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java b/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java
index 0103bf0..70be243 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java
@@ -404,7 +404,7 @@ public class NamespaceManager {
      * @param namespaces list of Namespaces to merge
      * @return the a new set of merged Namespaces
      */
-    @Nonnull private Set<Namespace> mergeNamespaceCollections(Collection<Namespace> ... namespaces) {
+    @Nonnull private Set<Namespace> mergeNamespaceCollections(final Collection<Namespace> ... namespaces) {
         LazySet<Namespace> newNamespaces = new LazySet<>();
         
         for (Collection<Namespace> nsCollection : namespaces) {
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/SpaceBearing.java b/opensaml-core/src/main/java/org/opensaml/core/xml/SpaceBearing.java
index efa0430..f4075bc 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/SpaceBearing.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/SpaceBearing.java
@@ -54,7 +54,7 @@ public interface SpaceBearing {
          * @param value the value to parse
          * @return the corresponding XMLSpaceEnum
          */
-        public static XMLSpaceEnum parseValue(String value) {
+        public static XMLSpaceEnum parseValue(final String value) {
             return XMLSpaceEnum.valueOf(value.toUpperCase());
         }
         
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/config/GlobalParserPoolInitializer.java b/opensaml-core/src/main/java/org/opensaml/core/xml/config/GlobalParserPoolInitializer.java
index 8e3f67a..040ebb9 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/config/GlobalParserPoolInitializer.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/config/GlobalParserPoolInitializer.java
@@ -55,7 +55,7 @@ public class GlobalParserPoolInitializer implements Initializer {
         pp.setMaxPoolSize(50);
         try {
             pp.initialize();
-        } catch (ComponentInitializationException e) {
+        } catch (final ComponentInitializationException e) {
             throw new InitializationException("Error initializing parser pool", e);
         }
         
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java b/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java
index bff86cd..6eb140a 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java
@@ -220,7 +220,7 @@ public class XMLConfigurator {
      * 
      * @throws XMLConfigurationException thrown if the configuration elements are invalid
      */
-    protected void initializeObjectProviders(Element objectProviders) throws XMLConfigurationException {
+    protected void initializeObjectProviders(final Element objectProviders) throws XMLConfigurationException {
 
         final NodeList providerList = objectProviders.getElementsByTagNameNS(XMLTOOLING_CONFIG_NS, "ObjectProvider");
         for (int i = 0; i < providerList.getLength(); i++) {
@@ -266,7 +266,7 @@ public class XMLConfigurator {
      * 
      * @throws XMLConfigurationException thrown if there is a problem with a parsing or registering the ID attribute
      */
-    protected void initializeIDAttributes(Element idAttributesElement) throws XMLConfigurationException {
+    protected void initializeIDAttributes(final Element idAttributesElement) throws XMLConfigurationException {
         Element idAttributeElement;
         QName attributeQName;
 
@@ -294,7 +294,7 @@ public class XMLConfigurator {
      * 
      * @throws XMLConfigurationException thrown if the class can not be instantiated
      */
-    protected Object createClassInstance(Element configuration) throws XMLConfigurationException {
+    protected Object createClassInstance(final Element configuration) throws XMLConfigurationException {
         final String className = StringSupport.trimOrNull(configuration.getAttributeNS(null, "className"));
 
         if (className == null) {
@@ -326,7 +326,7 @@ public class XMLConfigurator {
      * 
      * @throws XMLConfigurationException thrown if the configuration is not schema-valid
      */
-    protected void validateConfiguration(Document configuration) throws XMLConfigurationException {
+    protected void validateConfiguration(final Document configuration) throws XMLConfigurationException {
         try {
             javax.xml.validation.Validator schemaValidator = configurationSchema.newValidator();
             schemaValidator.validate(new DOMSource(configuration));
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistry.java b/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistry.java
index a5d9ed3..9e75558 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistry.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistry.java
@@ -177,7 +177,7 @@ public class XMLObjectProviderRegistry {
      * 
      * @param attributeName the QName of the ID attribute to be registered
      */
-    public void registerIDAttribute(QName attributeName) {
+    public void registerIDAttribute(final QName attributeName) {
         if (!idAttributeNames.contains(attributeName)) {
             idAttributeNames.add(attributeName);
         }
@@ -188,7 +188,7 @@ public class XMLObjectProviderRegistry {
      * 
      * @param attributeName the QName of the ID attribute to be de-registered
      */
-    public void deregisterIDAttribute(QName attributeName) {
+    public void deregisterIDAttribute(final QName attributeName) {
         if (idAttributeNames.contains(attributeName)) {
             idAttributeNames.remove(attributeName);
         }
@@ -200,7 +200,7 @@ public class XMLObjectProviderRegistry {
      * @param attributeName the QName of the attribute to be checked for ID type.
      * @return true if attribute is registered as having an ID type.
      */
-    public boolean isIDAttribute(QName attributeName) {
+    public boolean isIDAttribute(final QName attributeName) {
         return idAttributeNames.contains(attributeName);
     }
     
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistrySupport.java b/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistrySupport.java
index ef33372..0da08b9 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistrySupport.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderRegistrySupport.java
@@ -131,7 +131,7 @@ public class XMLObjectProviderRegistrySupport {
      * 
      * @param attributeName the QName of the ID attribute to be registered
      */
-    public static void registerIDAttribute(QName attributeName) {
+    public static void registerIDAttribute(final QName attributeName) {
         ConfigurationService.get(XMLObjectProviderRegistry.class).registerIDAttribute(attributeName);
     }
 
@@ -140,7 +140,7 @@ public class XMLObjectProviderRegistrySupport {
      * 
      * @param attributeName the QName of the ID attribute to be de-registered
      */
-    public static void deregisterIDAttribute(QName attributeName) {
+    public static void deregisterIDAttribute(final QName attributeName) {
         ConfigurationService.get(XMLObjectProviderRegistry.class).deregisterIDAttribute(attributeName);
     }
 
@@ -150,7 +150,7 @@ public class XMLObjectProviderRegistrySupport {
      * @param attributeName the QName of the attribute to be checked for ID type.
      * @return true if attribute is registered as having an ID type.
      */
-    public static boolean isIDAttribute(QName attributeName) {
+    public static boolean isIDAttribute(final QName attributeName) {
         return ConfigurationService.get(XMLObjectProviderRegistry.class).isIDAttribute(attributeName);
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java
index 01a323e..82f3063 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java
@@ -155,12 +155,12 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
     }
 
     /** {@inheritDoc} */
-    public boolean exists(String key) throws IOException {
+    public boolean exists(final String key) throws IOException {
         return buildFile(key).exists();
     }
 
     /** {@inheritDoc} */
-    public T load(String key) throws IOException {
+    public T load(final String key) throws IOException {
         File file = buildFile(key);
         if (!file.exists()) {
             log.debug("Target file with key '{}' does not exist, path: {}", key, file.getAbsolutePath());
@@ -181,12 +181,12 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
     }
 
     /** {@inheritDoc} */
-    public void save(String key, T xmlObject) throws IOException {
+    public void save(final String key, final T xmlObject) throws IOException {
         save(key, xmlObject, false);
     }
 
     /** {@inheritDoc} */
-    public void save(String key, T xmlObject, boolean overwrite) throws IOException {
+    public void save(final String key, final T xmlObject, final boolean overwrite) throws IOException {
         if (!overwrite && exists(key)) {
             throw new IOException(
                     String.format("Target file already exists for key '%s' and overwrite not indicated", key));
@@ -204,7 +204,7 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
                         sources.size());
                 try {
                     XMLObjectSupport.marshallToOutputStream(xmlObject, fos);
-                } catch (MarshallingException e) {
+                } catch (final MarshallingException e) {
                     throw new IOException(String.format("Error saving target file: %s", file.getAbsolutePath()), e);
                 }
             } 
@@ -214,7 +214,7 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
     }
 
     /** {@inheritDoc} */
-    public boolean remove(String key) throws IOException {
+    public boolean remove(final String key) throws IOException {
         File file = buildFile(key);
         if (file.exists()) {
             boolean success = file.delete();
@@ -229,7 +229,7 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
     }
 
     /** {@inheritDoc} */
-    public boolean updateKey(String currentKey, String newKey) throws IOException {
+    public boolean updateKey(final String currentKey, final String newKey) throws IOException {
         File currentFile = buildFile(currentKey);
         if (!currentFile.exists()) {
             return false;
@@ -251,7 +251,7 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
      * @return the constructed File instance for the target file
      * @throws IOException if there is a fatal error constructing or evaluating the candidate target path
      */
-    protected File buildFile(String key) throws IOException {
+    protected File buildFile(final String key) throws IOException {
         File path = new File(baseDirectory, 
                 Constraint.isNotNull(StringSupport.trimOrNull(key), "Input key was null or empty"));
         if (path.exists() && !path.isFile()) {
@@ -268,7 +268,7 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
     public static class DefaultFileFilter implements FileFilter {
 
         /** {@inheritDoc} */
-        public boolean accept(File pathname) {
+        public boolean accept(final File pathname) {
             if (pathname == null) {
                 return false;
             }
@@ -374,7 +374,7 @@ public class FilesystemLoadSaveManager<T extends XMLObject> implements XMLObject
                     } else {
                         log.warn("Target file with key '{}' was removed since iterator creation, skipping", key);
                     }
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     log.warn("Error loading target file with key '{}'", key, e);
                 }
             }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/MapLoadSaveManager.java b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/MapLoadSaveManager.java
index 3774897..4bb2e20 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/persist/MapLoadSaveManager.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/persist/MapLoadSaveManager.java
@@ -71,22 +71,22 @@ public class MapLoadSaveManager<T extends XMLObject> implements XMLObjectLoadSav
     }
 
     /** {@inheritDoc} */
-    public boolean exists(String key) throws IOException {
+    public boolean exists(final String key) throws IOException {
         return backingMap.containsKey(key);
     }
 
     /** {@inheritDoc} */
-    public T load(String key) throws IOException {
+    public T load(final String key) throws IOException {
         return backingMap.get(key);
     }
 
     /** {@inheritDoc} */
-    public void save(String key, T xmlObject) throws IOException {
+    public void save(final String key, final T xmlObject) throws IOException {
         save(key, xmlObject, false);
     }
 
     /** {@inheritDoc} */
-    public void save(String key, T xmlObject, boolean overwrite) throws IOException {
+    public void save(final String key, final T xmlObject, final boolean overwrite) throws IOException {
         if (!overwrite && exists(key)) {
             throw new IOException(String.format("Value already exists for key '%s'", key));
         } else {
@@ -95,12 +95,12 @@ public class MapLoadSaveManager<T extends XMLObject> implements XMLObjectLoadSav
     }
 
     /** {@inheritDoc} */
-    public boolean remove(String key) throws IOException {
+    public boolean remove(final String key) throws IOException {
         return backingMap.remove(key) != null;
     }
 
     /** {@inheritDoc} */
-    public boolean updateKey(String currentKey, String newKey) throws IOException {
+    public boolean updateKey(final String currentKey, final String newKey) throws IOException {
         T value = load(currentKey);
         if (value != null) {
             save(newKey, value, false);
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java
index 577b5cb..70750e4 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java
@@ -47,7 +47,7 @@ public class XSBooleanValue {
      * @param newValue the value
      * @param numericRepresentation whether to use a numeric or lexical representation
      */
-    public XSBooleanValue(@Nullable final Boolean newValue, boolean numericRepresentation) {
+    public XSBooleanValue(@Nullable final Boolean newValue, final boolean numericRepresentation) {
         numeric = numericRepresentation;
         value = newValue;
     }
@@ -84,7 +84,7 @@ public class XSBooleanValue {
      * 
      * @param numericRepresentation whether to use the numeric or lexical representation
      */
-    public void setNumericRepresentation(boolean numericRepresentation) {
+    public void setNumericRepresentation(final boolean numericRepresentation) {
         numeric = numericRepresentation;
     }
     
@@ -115,7 +115,7 @@ public class XSBooleanValue {
     
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if(obj == this){
             return true;
         }
@@ -143,7 +143,7 @@ public class XSBooleanValue {
      * 
      * @return the textual representation
      */
-    public static String toString(Boolean value, boolean numericRepresentation) {
+    public static String toString(final Boolean value, final boolean numericRepresentation) {
         if (value == null) {
             return "false";
         }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryImpl.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryImpl.java
index 4f12950..8f3bd36 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryImpl.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryImpl.java
@@ -56,7 +56,7 @@ public class XSBase64BinaryImpl extends AbstractXMLObject implements XSBase64Bin
     /**
      * {@inheritDoc}
      */
-    public void setValue(@Nullable String newValue) {
+    public void setValue(@Nullable final String newValue) {
         value = prepareForAssignment(value, newValue);
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeImpl.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeImpl.java
index 056d57e..761a12b 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeImpl.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeImpl.java
@@ -49,7 +49,7 @@ public class XSDateTimeImpl extends AbstractXMLObject implements XSDateTime {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected XSDateTimeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected XSDateTimeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         formatter = ISODateTimeFormat.dateTime().withChronology(ISOChronology.getInstanceUTC());
     }
@@ -60,7 +60,7 @@ public class XSDateTimeImpl extends AbstractXMLObject implements XSDateTime {
     }
 
     /** {@inheritDoc} */
-    public void setValue(DateTime newValue) {
+    public void setValue(final DateTime newValue) {
         value = prepareForAssignment(value, newValue);
     }
 
@@ -75,7 +75,7 @@ public class XSDateTimeImpl extends AbstractXMLObject implements XSDateTime {
     }
 
     /** {@inheritDoc} */
-    public void setDateTimeFormatter(DateTimeFormatter newFormatter) {
+    public void setDateTimeFormatter(final DateTimeFormatter newFormatter) {
         formatter = Constraint.isNotNull(newFormatter, "The formatter cannot be null");
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java
index c19dccb..410e6d0 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeMarshaller.java
@@ -34,7 +34,8 @@ public class XSDateTimeMarshaller extends BaseXMLObjectMarshaller {
     public XSDateTimeMarshaller(){}
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         XSDateTime xsDateTime = (XSDateTime) xmlObject;
         
         ElementSupport.appendTextContent(domElement, xsDateTime.getDateTimeFormatter().print(xsDateTime.getValue()));
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java
index 6a9502b..8199659 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSDateTimeUnmarshaller.java
@@ -32,7 +32,7 @@ public class XSDateTimeUnmarshaller extends BaseXMLObjectUnmarshaller{
     public XSDateTimeUnmarshaller(){}
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         XSDateTime xsDateTime = (XSDateTime) xmlObject;
         
         xsDateTime.setValue(new DateTime(elementContent).withChronology(ISOChronology.getInstanceUTC()));
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerImpl.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerImpl.java
index 5f7214b..0434dcd 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerImpl.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerImpl.java
@@ -38,7 +38,7 @@ public class XSIntegerImpl extends AbstractXMLObject implements XSInteger {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected XSIntegerImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected XSIntegerImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -52,7 +52,7 @@ public class XSIntegerImpl extends AbstractXMLObject implements XSInteger {
     /**
      * {@inheritDoc}
      */
-    public void setValue(Integer newValue) {
+    public void setValue(final Integer newValue) {
         value = prepareForAssignment(value, newValue);
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerMarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerMarshaller.java
index f044a2f..7d80d20 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerMarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerMarshaller.java
@@ -31,12 +31,13 @@ import org.w3c.dom.Element;
 public class XSIntegerMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         XSInteger xsiInteger = (XSInteger) xmlObject;
 
         if (xsiInteger.getValue() != null) {
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerUnmarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerUnmarshaller.java
index 9d81254..bbe05ef 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerUnmarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSIntegerUnmarshaller.java
@@ -29,18 +29,18 @@ import org.w3c.dom.Attr;
 public class XSIntegerUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         // no children
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         XSInteger xsiInteger = (XSInteger) xmlObject;
 
         if (elementContent != null) {
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameImpl.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameImpl.java
index 856b2af..b30c57c 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameImpl.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameImpl.java
@@ -42,7 +42,7 @@ public class XSQNameImpl extends AbstractXMLObject implements XSQName {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected XSQNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected XSQNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -52,7 +52,7 @@ public class XSQNameImpl extends AbstractXMLObject implements XSQName {
     }
 
     /** {@inheritDoc} */
-    public void setValue(QName newValue) {
+    public void setValue(final QName newValue) {
         value = prepareElementContentForAssignment(value, newValue);
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameMarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameMarshaller.java
index 374a40d..ed2f725 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameMarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameMarshaller.java
@@ -32,12 +32,13 @@ import org.w3c.dom.Element;
 public class XSQNameMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no attributes to marshall
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         XSQName qname = (XSQName) xmlObject;
         ElementSupport.appendTextContent(domElement, QNameSupport.qnameToContentString(qname.getValue()));
     }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java
index 2c84d49..061fcc4 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java
@@ -34,23 +34,23 @@ import org.w3c.dom.Text;
 public class XSQNameUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         // no child elements
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         // handled by overriden unmarshallTextContent() directly, because we need access to the owning DOM element
     }
 
     /** {@inheritDoc} */
-    protected void unmarshallTextContent(XMLObject xmlObject, Text content) throws UnmarshallingException {
+    protected void unmarshallTextContent(final XMLObject xmlObject, final Text content) throws UnmarshallingException {
         String textContent = StringSupport.trimOrNull(content.getWholeText());
         if (textContent != null) {
             XSQName qname = (XSQName) xmlObject;
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringImpl.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringImpl.java
index 98e09d1..68c9cae 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringImpl.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringImpl.java
@@ -38,7 +38,7 @@ public class XSStringImpl extends AbstractXMLObject implements XSString {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected XSStringImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected XSStringImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -52,7 +52,7 @@ public class XSStringImpl extends AbstractXMLObject implements XSString {
     /**
      * {@inheritDoc}
      */
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         value = prepareForAssignment(value, newValue);
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringMarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringMarshaller.java
index 69b8d3a..a819db4 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringMarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringMarshaller.java
@@ -31,12 +31,13 @@ import org.w3c.dom.Element;
 public class XSStringMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         XSString xsiString = (XSString) xmlObject;
 
         ElementSupport.appendTextContent(domElement, xsiString.getValue());
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringUnmarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringUnmarshaller.java
index 3533a8a..ed27198 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringUnmarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSStringUnmarshaller.java
@@ -29,18 +29,18 @@ import org.w3c.dom.Attr;
 public class XSStringUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         // no children
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         XSString xsiString = (XSString) xmlObject;
 
         xsiString.setValue(elementContent);
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIImpl.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIImpl.java
index 26d2d69..9d00f64 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIImpl.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIImpl.java
@@ -40,7 +40,7 @@ public class XSURIImpl extends AbstractXMLObject implements XSURI {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected XSURIImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected XSURIImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class XSURIImpl extends AbstractXMLObject implements XSURI {
     }
 
     /** {@inheritDoc} */
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         value = prepareForAssignment(value, newValue);
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIMarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIMarshaller.java
index 06012d8..233f10a 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIMarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIMarshaller.java
@@ -31,12 +31,13 @@ import org.w3c.dom.Element;
 public class XSURIMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         XSURI uri = (XSURI) xmlObject;
 
         ElementSupport.appendTextContent(domElement, uri.getValue());
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIUnmarshaller.java b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIUnmarshaller.java
index 89d04dc..37a99aa 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIUnmarshaller.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSURIUnmarshaller.java
@@ -29,18 +29,18 @@ import org.w3c.dom.Attr;
 public class XSURIUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         // no child elements
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         XSURI uri = (XSURI) xmlObject;
         uri.setValue(elementContent);
     }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSimpleSingletonFactory.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSimpleSingletonFactory.java
index 96dd69b..f99998f 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSimpleSingletonFactory.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSimpleSingletonFactory.java
@@ -52,12 +52,12 @@ public abstract class AbstractSimpleSingletonFactory<Input, Output>
     }
     
     /** {@inheritDoc} */
-    protected synchronized Output get(Input input) {
+    protected synchronized Output get(final Input input) {
         return map.get(input);
     }
     
     /** {@inheritDoc} */
-    protected synchronized void put(Input input, Output output) {
+    protected synchronized void put(final Input input, final Output output) {
         map.put(input, output);
     }
     
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSingletonFactory.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSingletonFactory.java
index c00201b..3c9d434 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSingletonFactory.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractSingletonFactory.java
@@ -32,7 +32,7 @@ public abstract class AbstractSingletonFactory<Input, Output> implements Singlet
     private final Logger log = LoggerFactory.getLogger(AbstractSingletonFactory.class);
     
     /** {@inheritDoc} */
-    public synchronized Output getInstance(Input input) {
+    public synchronized Output getInstance(final Input input) {
         Output output = get(input);
         if (output != null) {
             log.trace("Input key mapped to a non-null value, returning output");
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractWrappedSingletonFactory.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractWrappedSingletonFactory.java
index 2734ef9..ab7a1cb 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractWrappedSingletonFactory.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AbstractWrappedSingletonFactory.java
@@ -102,7 +102,7 @@ public abstract class AbstractWrappedSingletonFactory<Input, Output>
      * @param requireExplicitRelease if true, callers must explicitly release
      *              output instances when garbage collection is desired.
      */
-    public AbstractWrappedSingletonFactory(boolean requireExplicitRelease) {
+    public AbstractWrappedSingletonFactory(final boolean requireExplicitRelease) {
         map = new WeakHashMap<>();
         explicitRelease = requireExplicitRelease;
         outputSet = new HashSet<>();
@@ -114,7 +114,7 @@ public abstract class AbstractWrappedSingletonFactory<Input, Output>
      * @param input the input class instance
      * @return an output class instance
      */
-    public synchronized Output getInstance(Input input) {
+    public synchronized Output getInstance(final Input input) {
         Output output = super.getInstance(input);
         
         if (explicitRelease && output != null) {
@@ -142,7 +142,7 @@ public abstract class AbstractWrappedSingletonFactory<Input, Output>
      * 
      * @param output the output instance to release
      */
-    public synchronized void release(Output output) {
+    public synchronized void release(final Output output) {
         outputSet.remove(output);
     }
     
@@ -160,7 +160,7 @@ public abstract class AbstractWrappedSingletonFactory<Input, Output>
      * 
      * @param output the ouput instance to register
      */
-    protected synchronized void register(Output output) {
+    protected synchronized void register(final Output output) {
         outputSet.add(output);
     }
     
@@ -178,7 +178,7 @@ public abstract class AbstractWrappedSingletonFactory<Input, Output>
      * for garbage collection.
      * </p>
      */
-    protected synchronized Output get(Input input) {
+    protected synchronized Output get(final Input input) {
         WeakReference<Output> outputRef = map.get(input);
         if (outputRef != null) {
             log.trace("Input key mapped to a non-null WeakReference");
@@ -200,7 +200,7 @@ public abstract class AbstractWrappedSingletonFactory<Input, Output>
      * The output instance will be automatically wrapped in a WeakReference.
      * </p>
      */
-    protected synchronized void put(Input input, Output output) {
+    protected synchronized void put(final Input input, final Output output) {
         map.put(input, new WeakReference<>(output));
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AttributeMap.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AttributeMap.java
index 22f3d30..db168bd 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/AttributeMap.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/AttributeMap.java
@@ -84,7 +84,7 @@ public class AttributeMap implements Map<QName, String> {
     }
 
     /** {@inheritDoc} */
-    public String put(QName attributeName, String value) {
+    public String put(final QName attributeName, final String value) {
         Constraint.isNotNull(attributeName, "Attribute name cannot be null");
         String oldValue = get(attributeName);
         if (!Objects.equals(value, oldValue)) {
@@ -117,7 +117,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param value the QName attribute value
      * @return the old attribute value, possibly null
      */
-    public QName put(QName attributeName, QName value) {
+    public QName put(final QName attributeName, final QName value) {
         Constraint.isNotNull(attributeName, "Attribute name cannot be null");
         String oldValueString = get(attributeName);
         
@@ -173,22 +173,22 @@ public class AttributeMap implements Map<QName, String> {
     }
 
     /** {@inheritDoc} */
-    public boolean containsKey(Object key) {
+    public boolean containsKey(final Object key) {
         return attributes.containsKey(key);
     }
 
     /** {@inheritDoc} */
-    public boolean containsValue(Object value) {
+    public boolean containsValue(final Object value) {
         return attributes.containsValue(value);
     }
 
     /** {@inheritDoc} */
-    public String get(Object key) {
+    public String get(final Object key) {
         return attributes.get(key);
     }
 
     /** {@inheritDoc} */
-    public String remove(Object key) {
+    public String remove(final Object key) {
         String removedValue = attributes.remove(key);
         if (removedValue != null) {
             releaseDOM();
@@ -204,7 +204,7 @@ public class AttributeMap implements Map<QName, String> {
     }
 
     /** {@inheritDoc} */
-    public void putAll(Map<? extends QName, ? extends String> t) {
+    public void putAll(final Map<? extends QName, ? extends String> t) {
         if (t != null && t.size() > 0) {
             for (Entry<? extends QName, ? extends String> entry : t.entrySet()) {
                 put(entry.getKey(), entry.getValue());
@@ -235,7 +235,7 @@ public class AttributeMap implements Map<QName, String> {
      * 
      * @param attributeName the QName of the ID attribute to be registered
      */
-    public void registerID(QName attributeName) {
+    public void registerID(final QName attributeName) {
         if (! idAttribNames.contains(attributeName)) {
             idAttribNames.add(attributeName);
         }
@@ -252,7 +252,7 @@ public class AttributeMap implements Map<QName, String> {
      * 
      * @param attributeName the QName of the ID attribute to be de-registered
      */
-    public void deregisterID(QName attributeName) {
+    public void deregisterID(final QName attributeName) {
         if (idAttribNames.contains(attributeName)) {
             idAttribNames.remove(attributeName);
         }
@@ -271,7 +271,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param attributeName the QName of the attribute to be checked for ID type.
      * @return true if attribute is registered as having an ID type.
      */
-    public boolean isIDAttribute(QName attributeName) {
+    public boolean isIDAttribute(final QName attributeName) {
         return idAttribNames.contains(attributeName);
     }
     
@@ -280,7 +280,7 @@ public class AttributeMap implements Map<QName, String> {
      * 
      * @param attributeName the name of the QName-valued attribute to be registered
      */
-    public void registerQNameAttribute(QName attributeName) {
+    public void registerQNameAttribute(final QName attributeName) {
         qnameAttribNames.add(attributeName);
     }
     
@@ -289,7 +289,7 @@ public class AttributeMap implements Map<QName, String> {
      * 
      * @param attributeName the name of the QName-valued attribute to be registered
      */
-    public void deregisterQNameAttribute(QName attributeName) {
+    public void deregisterQNameAttribute(final QName attributeName) {
         qnameAttribNames.remove(attributeName);
     }
     
@@ -299,7 +299,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param attributeName the QName of the attribute to be checked for QName type.
      * @return true if attribute is registered as having an QName type.
      */
-    public boolean isQNameAttribute(QName attributeName) {
+    public boolean isQNameAttribute(final QName attributeName) {
         return qnameAttribNames.contains(attributeName);
     }
     
@@ -321,7 +321,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param flag true if QName types should be inferred, false if not
      * 
      */
-    public void setInferQNameValues(boolean flag) {
+    public void setInferQNameValues(final boolean flag) {
         inferQNameValues = flag;
     }
     
@@ -340,7 +340,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param attributeName the attribute name
      * @param attributeValue the attribute value
      */
-    private void checkAndRegisterQNameValue(QName attributeName, String attributeValue) {
+    private void checkAndRegisterQNameValue(final QName attributeName, final String attributeValue) {
         if (attributeValue == null) {
             return;
         }
@@ -363,7 +363,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param attributeName the attribute name
      * @param attributeValue the attribute value
      */
-    private void registerQNameValue(QName attributeName, QName attributeValue) {
+    private void registerQNameValue(final QName attributeName, final QName attributeValue) {
         if (attributeValue == null) {
             return;
         }
@@ -381,7 +381,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param attributeName the attribute name
      * @param attributeValue the attribute value
      */
-    private void checkAndDeregisterQNameValue(QName attributeName, String attributeValue) {
+    private void checkAndDeregisterQNameValue(final QName attributeName, final String attributeValue) {
         if (attributeValue == null) {
             return;
         }
@@ -402,7 +402,7 @@ public class AttributeMap implements Map<QName, String> {
      * 
      * @param attributeName the attribute name whose QName attribute value should be deregistered
      */
-    private void deregisterQNameValue(QName attributeName) {
+    private void deregisterQNameValue(final QName attributeName) {
         String attributeID = NamespaceManager.generateAttributeID(attributeName);
         log.trace("Deregistering QName attribute with attibute ID '{}'", attributeID);
         attributeOwner.getNamespaceManager().deregisterAttributeValue(attributeID);
@@ -415,7 +415,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param attributeValue the attribute value
      * @return the QName if the attribute value is a QName type, otherwise null
      */
-    private QName checkQName(QName attributeName, String attributeValue) {
+    private QName checkQName(final QName attributeName, final String attributeValue) {
         log.trace("Checking whether attribute '{}' with value {} is a QName type", attributeName, attributeValue);
         
         if (attributeValue == null) {
@@ -461,7 +461,7 @@ public class AttributeMap implements Map<QName, String> {
      * 
      * @return the QName, or null if unable to resolve into a QName
      */
-    private QName resolveQName(String attributeValue, boolean isDefaultNSOK) {
+    private QName resolveQName(final String attributeValue, final boolean isDefaultNSOK) {
         if (attributeValue == null) {
             return null;
         }
@@ -511,7 +511,7 @@ public class AttributeMap implements Map<QName, String> {
      * @param attributeValue the QName to process
      * @return the attribute value string representation of the QName
      */
-    private String constructAttributeValue(QName attributeValue) {
+    private String constructAttributeValue(final QName attributeValue) {
         String trimmedLocalName = StringSupport.trimOrNull(attributeValue.getLocalPart());
 
         if (trimmedLocalName == null) {
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenList.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenList.java
index 7e44af2..c0b23ac 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenList.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenList.java
@@ -268,7 +268,7 @@ class ListView<ElementType extends XMLObject> extends AbstractList<ElementType>
 
     /** {@inheritDoc} */
     @Override
-    public void add(int newIndex, @Nullable final ElementType element) {
+    public void add(final int newIndex, @Nullable final ElementType element) {
         throw new UnsupportedOperationException();
     }
 
@@ -282,7 +282,7 @@ class ListView<ElementType extends XMLObject> extends AbstractList<ElementType>
 
     /** {@inheritDoc} */
     @Override
-    public boolean addAll(int i, @Nonnull final Collection<? extends ElementType> c) {
+    public boolean addAll(final int i, @Nonnull final Collection<? extends ElementType> c) {
         throw new UnsupportedOperationException();
     }
 
@@ -370,7 +370,7 @@ class ListView<ElementType extends XMLObject> extends AbstractList<ElementType>
 
     /** {@inheritDoc} */
     @Override
-    public ElementType set(int newIndex, @Nonnull final ElementType element) {
+    public ElementType set(final int newIndex, @Nonnull final ElementType element) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java
index b0470d3..5f3ccc2 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java
@@ -50,7 +50,7 @@ public final class XMLAttributeSupport {
      * @param xmlObject the XML object to which to add the attribute
      * @param id the Id value
      */
-    public static void addXMLId(XMLObject xmlObject, String id) {
+    public static void addXMLId(final XMLObject xmlObject, final String id) {
         if (xmlObject instanceof IdBearing) {
             ((IdBearing)xmlObject).setXMLId(id);
         } else if (xmlObject instanceof AttributeExtensibleXMLObject) {
@@ -68,7 +68,7 @@ public final class XMLAttributeSupport {
      * 
      * @return the value of the xml:id attribute, or null if not present
      */
-    public static String getXMLId(XMLObject xmlObject) {
+    public static String getXMLId(final XMLObject xmlObject) {
         String value = null;
         if (xmlObject instanceof IdBearing) {
             value = StringSupport.trimOrNull(((IdBearing)xmlObject).getXMLId());
@@ -90,7 +90,7 @@ public final class XMLAttributeSupport {
      * @param xmlObject the XML object to which to add the attribute
      * @param lang the lang value
      */
-    public static void addXMLLang(XMLObject xmlObject, String lang) {
+    public static void addXMLLang(final XMLObject xmlObject, final String lang) {
         if (xmlObject instanceof LangBearing) {
             ((LangBearing)xmlObject).setXMLLang(lang);
         } else if (xmlObject instanceof AttributeExtensibleXMLObject) {
@@ -108,7 +108,7 @@ public final class XMLAttributeSupport {
      * 
      * @return the value of the xml:lang attribute, or null if not present
      */
-    public static String getXMLLang(XMLObject xmlObject) {
+    public static String getXMLLang(final XMLObject xmlObject) {
         String value = null;
         if (xmlObject instanceof LangBearing) {
             value = StringSupport.trimOrNull(((LangBearing)xmlObject).getXMLLang());
@@ -130,7 +130,7 @@ public final class XMLAttributeSupport {
      * @param xmlObject the XML object to which to add the attribute
      * @param base the base value
      */
-    public static void addXMLBase(XMLObject xmlObject, String base) {
+    public static void addXMLBase(final XMLObject xmlObject, final String base) {
         if (xmlObject instanceof BaseBearing) {
             ((BaseBearing)xmlObject).setXMLBase(base);
         } else if (xmlObject instanceof AttributeExtensibleXMLObject) {
@@ -148,7 +148,7 @@ public final class XMLAttributeSupport {
      * 
      * @return the value of the xml:base attribute, or null if not present
      */
-    public static String getXMLBase(XMLObject xmlObject) {
+    public static String getXMLBase(final XMLObject xmlObject) {
         String value = null;
         if (xmlObject instanceof BaseBearing) {
             value = StringSupport.trimOrNull(((BaseBearing)xmlObject).getXMLBase());
@@ -170,7 +170,7 @@ public final class XMLAttributeSupport {
      * @param xmlObject the XML object to which to add the attribute
      * @param space the space value
      */
-    public static void addXMLSpace(XMLObject xmlObject, XMLSpaceEnum space) {
+    public static void addXMLSpace(final XMLObject xmlObject, final XMLSpaceEnum space) {
         if (xmlObject instanceof SpaceBearing) {
             ((SpaceBearing)xmlObject).setXMLSpace(space);
         } else if (xmlObject instanceof AttributeExtensibleXMLObject) {
@@ -188,7 +188,7 @@ public final class XMLAttributeSupport {
      * 
      * @return the value of the xml:space attribute, or null if not present
      */
-    public static XMLSpaceEnum getXMLSpace(XMLObject xmlObject) {
+    public static XMLSpaceEnum getXMLSpace(final XMLObject xmlObject) {
         XMLSpaceEnum valueEnum = null;
         if (xmlObject instanceof SpaceBearing) {
             valueEnum = ((SpaceBearing)xmlObject).getXMLSpace();
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectChildrenList.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectChildrenList.java
index b765e5f..bccb11d 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectChildrenList.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectChildrenList.java
@@ -100,7 +100,7 @@ public class XMLObjectChildrenList<ElementType extends XMLObject> extends Abstra
     }
 
     /** {@inheritDoc} */
-    @Nonnull public ElementType get(int index) {
+    @Nonnull public ElementType get(final int index) {
         return elements.get(index);
     }
 
@@ -116,7 +116,7 @@ public class XMLObjectChildrenList<ElementType extends XMLObject> extends Abstra
      * 
      * @return the replaced XMLObject
      */
-    @Nullable public ElementType set(int index, @Nullable final ElementType element) {
+    @Nullable public ElementType set(final int index, @Nullable final ElementType element) {
         if (element == null) {
             return null;
         }
@@ -148,7 +148,7 @@ public class XMLObjectChildrenList<ElementType extends XMLObject> extends Abstra
      * @param index index at which to add the given XMLObject
      * @param element element to be stored at the given index
      */
-    public void add(int index, @Nullable final ElementType element) {
+    public void add(final int index, @Nullable final ElementType element) {
         if (element == null || elements.contains(element)) {
             return;
         }
@@ -161,7 +161,7 @@ public class XMLObjectChildrenList<ElementType extends XMLObject> extends Abstra
     }
 
     /** {@inheritDoc} */
-    @Nonnull public ElementType remove(int index) {
+    @Nonnull public ElementType remove(final int index) {
         ElementType element = elements.remove(index);
 
         if (element != null) {
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSource.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSource.java
index 4c4751e..4203755 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSource.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSource.java
@@ -91,7 +91,7 @@ public class XMLObjectSource {
 
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == this) {
             return true;
         }
diff --git a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
index b00d0cd..cbb09b1 100644
--- a/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
+++ b/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
@@ -100,7 +100,7 @@ public final class XMLObjectSupport {
      * 
      * @param <T> the type of object being cloned
      */
-    public static <T extends XMLObject> T cloneXMLObject(T originalXMLObject)
+    public static <T extends XMLObject> T cloneXMLObject(final T originalXMLObject)
             throws MarshallingException, UnmarshallingException {
         return cloneXMLObject(originalXMLObject, CloneOutputOption.DropDOM);
     }
@@ -136,8 +136,8 @@ public final class XMLObjectSupport {
      * @deprecated use instead {@link #cloneXMLObject(XMLObject, CloneOutputOption)}.
      */
     @Deprecated
-    @Nullable public static <T extends XMLObject> T cloneXMLObject(@Nullable T originalXMLObject,
-            boolean rootInNewDocument) throws MarshallingException, UnmarshallingException {
+    @Nullable public static <T extends XMLObject> T cloneXMLObject(@Nullable final T originalXMLObject,
+            final boolean rootInNewDocument) throws MarshallingException, UnmarshallingException {
         if (rootInNewDocument) {
             return cloneXMLObject(originalXMLObject, CloneOutputOption.RootDOMInNewDocument);
         } else {
@@ -163,7 +163,7 @@ public final class XMLObjectSupport {
      * 
      * @param <T> the type of object being cloned
      */
-    @Nullable public static <T extends XMLObject> T cloneXMLObject(@Nullable T originalXMLObject,
+    @Nullable public static <T extends XMLObject> T cloneXMLObject(@Nullable final T originalXMLObject,
             @Nonnull final CloneOutputOption cloneOutputOption) throws MarshallingException, UnmarshallingException {
         
         if (originalXMLObject == null) {
@@ -186,7 +186,7 @@ public final class XMLObjectSupport {
                     // Note: importNode copies the node tree and does not modify the source document
                     clonedElement = (Element) newDocument.importNode(origElement, true);
                     newDocument.appendChild(clonedElement);
-                } catch (XMLParserException e) {
+                } catch (final XMLParserException e) {
                     throw new XMLRuntimeException("Error obtaining new Document from parser pool", e);
                 }
                 break;
@@ -221,7 +221,7 @@ public final class XMLObjectSupport {
      * @throws XMLParserException if there is a problem parsing the input data
      * @throws UnmarshallingException if there is a problem unmarshalling the parsed DOM
      */
-    public static XMLObject unmarshallFromInputStream(ParserPool parserPool, InputStream inputStream)
+    public static XMLObject unmarshallFromInputStream(final ParserPool parserPool, final InputStream inputStream)
             throws XMLParserException, UnmarshallingException {
         Logger log = getLogger();
         log.debug("Parsing InputStream into DOM document");
@@ -249,7 +249,7 @@ public final class XMLObjectSupport {
 
             log.debug("InputStream succesfully unmarshalled");
             return message;
-        } catch (RuntimeException e) {
+        } catch (final RuntimeException e) {
             throw new UnmarshallingException("Fatal error unmarshalling XMLObject", e);
         }
     }
@@ -263,7 +263,7 @@ public final class XMLObjectSupport {
      * @throws XMLParserException if there is a problem parsing the input data
      * @throws UnmarshallingException if there is a problem unmarshalling the parsed DOM
      */
-    public static XMLObject unmarshallFromReader(ParserPool parserPool, Reader reader)
+    public static XMLObject unmarshallFromReader(final ParserPool parserPool, final Reader reader)
             throws XMLParserException, UnmarshallingException {
         Logger log = getLogger();
         log.debug("Parsing Reader into DOM document");
@@ -292,7 +292,7 @@ public final class XMLObjectSupport {
 
             log.debug("Reader succesfully unmarshalled");
             return message;
-        } catch (RuntimeException e) {
+        } catch (final RuntimeException e) {
             throw new UnmarshallingException("Fatal error unmarshalling XMLObject", e);
         }
     }
@@ -339,7 +339,7 @@ public final class XMLObjectSupport {
      * @param outputStream the OutputStream to which to marshall
      * @throws MarshallingException if there is a problem marshalling the object
      */
-    public static void marshallToOutputStream(XMLObject xmlObject, OutputStream outputStream) 
+    public static void marshallToOutputStream(final XMLObject xmlObject, final OutputStream outputStream) 
             throws MarshallingException {
         Element element = marshall(xmlObject);
         SerializeSupport.writeNode(element, outputStream);
@@ -353,7 +353,7 @@ public final class XMLObjectSupport {
      * @param prefix the prefix to search
      * @return the namespace URI bound to the prefix, or none if not found
      */
-    public static String lookupNamespaceURI(XMLObject xmlObject, String prefix) {
+    public static String lookupNamespaceURI(final XMLObject xmlObject, final String prefix) {
         XMLObject current = xmlObject;
         
         while (current != null) {
@@ -376,7 +376,7 @@ public final class XMLObjectSupport {
      * @param namespaceURI the namespace URI to search
      * @return the prefix bound to the namespace URI, or none if not found
      */
-    public static String lookupNamespacePrefix(XMLObject xmlObject, String namespaceURI) {
+    public static String lookupNamespacePrefix(final XMLObject xmlObject, final String namespaceURI) {
         XMLObject current = xmlObject;
         
         while (current != null) {
@@ -410,8 +410,8 @@ public final class XMLObjectSupport {
      * @param isIDAttribute flag indicating whether the attribute being marshalled should be handled as an ID-typed
      *            attribute
      */
-    public static void marshallAttribute(QName attributeName, List<String> attributeValues, Element domElement,
-            boolean isIDAttribute) {
+    public static void marshallAttribute(final QName attributeName, final List<String> attributeValues,
+            final Element domElement, final boolean isIDAttribute) {
         marshallAttribute(attributeName, StringSupport.listToStringValue(attributeValues, " "), domElement,
                 isIDAttribute);
     }
@@ -426,8 +426,8 @@ public final class XMLObjectSupport {
      * @param isIDAttribute flag indicating whether the attribute being marshalled should be handled as an ID-typed
      *            attribute
      */
-    public static void marshallAttribute(QName attributeName, String attributeValue, Element domElement,
-            boolean isIDAttribute) {
+    public static void marshallAttribute(final QName attributeName, final String attributeValue,
+            final Element domElement, final boolean isIDAttribute) {
         Document document = domElement.getOwnerDocument();
         Attr attribute = AttributeSupport.constructAttribute(document, attributeName);
         attribute.setValue(attributeValue);
@@ -443,7 +443,7 @@ public final class XMLObjectSupport {
      * @param attributeMap the AttributeMap
      * @param domElement the target Element
      */
-    public static void marshallAttributeMap(AttributeMap attributeMap, Element domElement) {
+    public static void marshallAttributeMap(final AttributeMap attributeMap, final Element domElement) {
         Document document = domElement.getOwnerDocument();
         Attr attribute = null;
         for (Entry<QName, String> entry : attributeMap.entrySet()) {
@@ -463,7 +463,7 @@ public final class XMLObjectSupport {
      * @param attributeMap the target AttributeMap
      * @param attribute the target DOM Attr
      */
-    public static void unmarshallToAttributeMap(AttributeMap attributeMap, Attr attribute) {
+    public static void unmarshallToAttributeMap(final AttributeMap attributeMap, final Attr attribute) {
         QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
                 .getPrefix());
         attributeMap.put(attribQName, attribute.getValue());
@@ -479,7 +479,7 @@ public final class XMLObjectSupport {
      * @return an XMLObject
      * @throws XMLRuntimeException if the required builder can not be obtained
      */
-    public static XMLObject buildXMLObject(QName elementName) {
+    public static XMLObject buildXMLObject(final QName elementName) {
         XMLObjectBuilder<?> builder = getProviderRegistry().getBuilderFactory().getBuilderOrThrow(elementName);
         return builder.buildObject(elementName);
     }
@@ -492,7 +492,7 @@ public final class XMLObjectSupport {
      * @return an XMLObject
      * @throws XMLRuntimeException if the required builder can not be obtained
      */
-    public static XMLObject buildXMLObject(QName elementName, QName typeName) {
+    public static XMLObject buildXMLObject(final QName elementName, final QName typeName) {
         XMLObjectBuilder<?> builder = getProviderRegistry().getBuilderFactory().getBuilderOrThrow(elementName);
         return builder.buildObject(elementName, typeName);
     }
@@ -503,7 +503,7 @@ public final class XMLObjectSupport {
      * @param typeOrName the element name or type
      * @return an XMLObject builder, or null if no provider registered
      */
-    public static XMLObjectBuilder<?> getBuilder(QName typeOrName) {
+    public static XMLObjectBuilder<?> getBuilder(final QName typeOrName) {
         return getProviderRegistry().getBuilderFactory().getBuilder(typeOrName);
     }
     
@@ -513,7 +513,7 @@ public final class XMLObjectSupport {
      * @param typeOrName the element name or type
      * @return an XMLObject marshaller, or null if no provider registered
      */
-    public static Marshaller getMarshaller(QName typeOrName) {
+    public static Marshaller getMarshaller(final QName typeOrName) {
         return getProviderRegistry().getMarshallerFactory().getMarshaller(typeOrName);
     }
     
@@ -523,7 +523,7 @@ public final class XMLObjectSupport {
      * @param xmlObject the XMLObject to be marshalled
      * @return an XMLObject marshaller, or null if no provider registered
      */
-    public static Marshaller getMarshaller(XMLObject xmlObject) {
+    public static Marshaller getMarshaller(final XMLObject xmlObject) {
         return getProviderRegistry().getMarshallerFactory().getMarshaller(xmlObject);
     }
     
@@ -533,7 +533,7 @@ public final class XMLObjectSupport {
      * @param typeOrName the element name or type
      * @return an XMLObject unmarshaller, or null if no provider registered
      */
-    public static Unmarshaller getUnmarshaller(QName typeOrName) {
+    public static Unmarshaller getUnmarshaller(final QName typeOrName) {
         return getProviderRegistry().getUnmarshallerFactory().getUnmarshaller(typeOrName);
     }
     
@@ -543,7 +543,7 @@ public final class XMLObjectSupport {
      * @param element the DOM element
      * @return an XMLObject unmarshaller, or null if no provider registered
      */
-    public static Unmarshaller getUnmarshaller(Element element) {
+    public static Unmarshaller getUnmarshaller(final Element element) {
         return getProviderRegistry().getUnmarshallerFactory().getUnmarshaller(element);
     }
     

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


More information about the commits mailing list