[java-opensaml COMMIT] in /trunk/opensaml-core/src: main/java/org/opensaml/core/config/provider/MapBasedConfiguration...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 28 21:40:41 2016
New Revision: 4589

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4589&view=rev
Log:
OSJ-53 - Code cleanup pass over OpenSAML

https://issues.shibboleth.net/jira/browse/OSJ-53

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/FilteredMetricRegistry.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/ElementExtensibleXMLObject.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/AbstractXMLObjectTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/config/ConfigurationTest.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java?rev=4589&r1=4588&r2=4589&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java	(original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/config/provider/MapBasedConfiguration.java	Wed Dec 28 21:40:41 2016
@@ -47,8 +47,8 @@
      * @return the instance of the registered configuration interface, or null
      */
     public <T extends Object> T get(Class<T> configClass, String partitionName) {
-        Map<String, Object> partition = getPartition(partitionName);
-        return (T) partition.get(configClass.getName());
+        final Map<String, Object> partition = getPartition(partitionName);
+        return configClass.cast(partition.get(configClass.getName()));
     }
     
     /**
@@ -79,7 +79,7 @@
     public <T extends Object> T deregister(Class<T> configClass, String partitionName) {
         Map<String, Object> partition = getPartition(partitionName);
         synchronized (partition) {
-            T old = (T) partition.get(configClass.getName());
+            final T old = configClass.cast(partition.get(configClass.getName()));
             partition.remove(configClass.getName());
             return old;
         }

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/FilteredMetricRegistry.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/FilteredMetricRegistry.java?rev=4589&r1=4588&r2=4589&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/FilteredMetricRegistry.java	(original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/FilteredMetricRegistry.java	Wed Dec 28 21:40:41 2016
@@ -28,10 +28,8 @@
 import org.opensaml.core.metrics.impl.DisabledTimer;
 
 import com.codahale.metrics.Counter;
-import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
-import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.MetricSet;

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java?rev=4589&r1=4588&r2=4589&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java	(original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java	Wed Dec 28 21:40:41 2016
@@ -91,7 +91,7 @@
         if (map == null || map.isEmpty()) {
             levelMap = Collections.emptyMap();
         } else {
-            levelMap = new HashMap(map.size());
+            levelMap = new HashMap<>(map.size());
             for (final Map.Entry<String,Level> entry : map.entrySet()) {
                 final String trimmed = StringSupport.trimOrNull(entry.getKey());
                 if (trimmed != null && entry.getValue() != null) {

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/ElementExtensibleXMLObject.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/ElementExtensibleXMLObject.java?rev=4589&r1=4588&r2=4589&view=diff
==============================================================================

[... 217 lines stripped ...]