[MRM-1436] better Map handling

Submitted by: Dave Brosius

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1040919 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index 1f22b1027daafa252229faeecfea3fb8ef187fc1..6821b2f95e089a6427f982d0d2027b2010db0782 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -315,9 +315,8 @@ public class DefaultArchivaConfiguration
             Map<String, java.util.List<ProxyConnectorConfiguration>> proxyConnectorMap = config
                 .getProxyConnectorAsMap();
 
-            for ( String key : proxyConnectorMap.keySet() )
+            for ( List<ProxyConnectorConfiguration> connectors : proxyConnectorMap.values() )
             {
-                List<ProxyConnectorConfiguration> connectors = proxyConnectorMap.get( key );
                 // Sort connectors by order field.
                 Collections.sort( connectors, ProxyConnectorConfigurationOrderComparator.getInstance() );
 

diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
index 9ea86474c106d40aeccdc809765c2435c1b8878a..53416912fc2b4ba5316ee2ce74f06d771272c484 100644 (file)
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
@@ -166,17 +166,17 @@ public class NexusRepositorySearch
         finally
         {
             Map<String, IndexingContext> indexingContexts = indexer.getIndexingContexts();
-            Set<String> keys = indexingContexts.keySet();
-            for( String key : keys )
+            
+            for ( Map.Entry<String, IndexingContext> entry : indexingContexts.entrySet() )
             {
                 try                
                 {   
-                    indexer.removeIndexingContext( indexingContexts.get( key ), false );
-                    log.debug( "Indexing context '" + key + "' removed from search." );
+                    indexer.removeIndexingContext( entry.getValue(), false );
+                    log.debug( "Indexing context '" + entry.getKey() + "' removed from search." );
                 }
                 catch ( IOException e )
                 {
-                    log.warn( "IOException occurred while removing indexing content '" + key  + "'." );
+                    log.warn( "IOException occurred while removing indexing content '" + entry.getKey()  + "'." );
                     continue;
                 }
             }            

diff --git a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java
index 3044e41234766707c31bbc0bdc0eb9d3cae56aed..4dd887085ab136a7ff38ec1d6d1b3e8167f5b6fa 100644 (file)
--- a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java
+++ b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java
@@ -48,10 +48,7 @@ public class GenericMetadataFacet
             additionalProperties = new TreeMap<String, String>();
         }
 
-        for ( String key : properties.keySet() )
-        {
-            additionalProperties.put( key, properties.get( key ) );
-        }
+        additionalProperties.putAll( properties );
     }
 
     public Map<String, String> toProperties()