Switching to list as return values.

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
index 1275200c2802f308f1ee4841fecde0ebb2179f1f..662d2c26721375d1085faf43105f9bc376d4b82c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
@@ -26,7 +26,6 @@ import org.apache.archiva.metadata.repository.RepositorySession;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -74,7 +73,7 @@ public class TestMetadataRepository
     }
 
     @Override
-    public Collection<String> getProjectVersions( RepositorySession session, String repoId, String namespace, String projectId )
+    public List<String> getProjectVersions( RepositorySession session, String repoId, String namespace, String projectId )
     {
         return versions;
     }
@@ -99,8 +98,8 @@ public class TestMetadataRepository
 
 
     @Override
-    public Collection<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
-                                                      String projectVersion )
+    public List<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
+                                                String projectVersion )
     {
         return artifacts;
     }

diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/AbstractMetadataRepository.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/AbstractMetadataRepository.java
index db2fc83392601590aa63e1804cdf0c22b5b54408..5f54ef97361c64f6427e260ec7451f30fb0dd342 100644 (file)
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/AbstractMetadataRepository.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/AbstractMetadataRepository.java
@@ -204,44 +204,44 @@ public abstract class AbstractMetadataRepository
     }
 
     @Override
-    public Collection<String> getArtifactVersions( RepositorySession session, String repoId, String namespace, String projectId,
-                                                   String projectVersion )
+    public List<String> getArtifactVersions( RepositorySession session, String repoId, String namespace, String projectId,
+                                             String projectVersion )
         throws MetadataResolutionException
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Collection<ProjectVersionReference> getProjectReferences( RepositorySession session, String repoId, String namespace, String projectId,
-                                                                     String projectVersion )
+    public List<ProjectVersionReference> getProjectReferences( RepositorySession session, String repoId, String namespace, String projectId,
+                                                               String projectVersion )
         throws MetadataResolutionException
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Collection<String> getRootNamespaces( RepositorySession session, String repoId )
+    public List<String> getRootNamespaces( RepositorySession session, String repoId )
         throws MetadataResolutionException
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Collection<String> getChildNamespaces( RepositorySession session, String repoId, String namespace )
+    public List<String> getChildNamespaces( RepositorySession session, String repoId, String namespace )
         throws MetadataResolutionException
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Collection<String> getProjects( RepositorySession session, String repoId, String namespace )
+    public List<String> getProjects( RepositorySession session, String repoId, String namespace )
         throws MetadataResolutionException
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Collection<String> getProjectVersions( RepositorySession session, String repoId, String namespace, String projectId )
+    public List<String> getProjectVersions( RepositorySession session, String repoId, String namespace, String projectId )
         throws MetadataResolutionException
     {
         throw new UnsupportedOperationException();
@@ -294,8 +294,8 @@ public abstract class AbstractMetadataRepository
     }
 
     @Override
-    public Collection<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
-                                                      String projectVersion )
+    public List<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
+                                                String projectVersion )
         throws MetadataResolutionException
     {
         throw new UnsupportedOperationException();

diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
index 321ed2ef833d735fa10d43d13337570e73e9fb4d..c63420ac56afc2160fae103530c541b4d7b01ed4 100644 (file)
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
@@ -29,7 +29,6 @@ import org.apache.archiva.metadata.model.ProjectVersionReference;
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.time.ZonedDateTime;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -589,7 +588,7 @@ public interface MetadataRepository
      * @return A list of version strings, or a empty list if no versions are found, or this is not a snapshot version.
      * @throws MetadataResolutionException if the retrieval of the metadata failed.
      */
-    Collection<String> getArtifactVersions( RepositorySession session, String repoId, String namespace, String projectId, String projectVersion )
+    List<String> getArtifactVersions( RepositorySession session, String repoId, String namespace, String projectId, String projectVersion )
         throws MetadataResolutionException;
 
     /**
@@ -605,8 +604,8 @@ public interface MetadataRepository
      * @return a list of project references
      * @throws MetadataResolutionException if the version could not be found.
      */
-    Collection<ProjectVersionReference> getProjectReferences( RepositorySession session, String repoId, String namespace, String projectId,
-                                                              String projectVersion )
+    List<ProjectVersionReference> getProjectReferences( RepositorySession session, String repoId, String namespace, String projectId,
+                                                        String projectVersion )
         throws MetadataResolutionException;
 
     /**
@@ -617,7 +616,7 @@ public interface MetadataRepository
      * @return A list of namespace names, or empty list, if no namespace is stored for this repository.
      * @throws MetadataResolutionException If the retrieval failed.
      */
-    Collection<String> getRootNamespaces( RepositorySession session, String repoId )
+    List<String> getRootNamespaces( RepositorySession session, String repoId )
         throws MetadataResolutionException;
 
     /**
@@ -626,10 +625,10 @@ public interface MetadataRepository
      * @param session   The repository session.
      * @param repoId    The repository id.
      * @param namespace The parent namespace '.'-separated.
-     * @return {@link Collection} of child namespace names, or a empty list, if there are no children for the given parent namespace.
+     * @return {@link List} of child namespace names, or a empty list, if there are no children for the given parent namespace.
      * @throws MetadataResolutionException if the retrieval failed.
      */
-    Collection<String> getChildNamespaces( RepositorySession session, String repoId, String namespace )
+    List<String> getChildNamespaces( RepositorySession session, String repoId, String namespace )
         throws MetadataResolutionException;
 
     /**
@@ -641,7 +640,7 @@ public interface MetadataRepository
      * @return The list of project names or empty list if no project exists at the given namespace.
      * @throws MetadataResolutionException if the retrieval failed.
      */
-    Collection<String> getProjects( RepositorySession session, String repoId, String namespace )
+    List<String> getProjects( RepositorySession session, String repoId, String namespace )
         throws MetadataResolutionException;
 
     /**
@@ -654,7 +653,7 @@ public interface MetadataRepository
      * @return The list of versions or a empty list, if not version was found.
      * @throws MetadataResolutionException if the retrieval failed.
      */
-    Collection<String> getProjectVersions( RepositorySession session, String repoId, String namespace, String projectId )
+    List<String> getProjectVersions( RepositorySession session, String repoId, String namespace, String projectId )
         throws MetadataResolutionException;
 
     /**
@@ -682,8 +681,8 @@ public interface MetadataRepository
      * @return The list of artifact metadata objects, or a empty list, if no artifact exists for this version.
      * @throws MetadataResolutionException if the retrieval failed.
      */
-    Collection<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
-                                               String projectVersion )
+    List<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
+                                         String projectVersion )
         throws MetadataResolutionException;
 
     /**

diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
index f3a0fee9e439d1bd343ac46989e6287a736eed22..7a020efa88df871bdb510077f5fc4145a5bdc505 100644 (file)
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
@@ -459,7 +459,7 @@ public class CassandraMetadataRepository
 
     // FIXME this one need peformance improvement maybe a cache?
     @Override
-    public Collection<String> getRootNamespaces( RepositorySession session, final String repoId )
+    public List<String> getRootNamespaces( RepositorySession session, final String repoId )
         throws MetadataResolutionException
     {
 
@@ -477,12 +477,12 @@ public class CassandraMetadataRepository
             namespaces.add( StringUtils.substringBefore( getStringValue( row.getColumnSlice(), NAME.toString() ), "." ) );
         }
 
-        return namespaces;
+        return new ArrayList<>( namespaces );
     }
 
     // FIXME this one need peformance improvement maybe a cache?
     @Override
-    public Collection<String> getChildNamespaces( RepositorySession session, final String repoId, final String namespaceId )
+    public List<String> getChildNamespaces( RepositorySession session, final String repoId, final String namespaceId )
         throws MetadataResolutionException
     {
 
@@ -577,7 +577,7 @@ public class CassandraMetadataRepository
     }
 
     @Override
-    public Collection<String> getProjects( RepositorySession session, final String repoId, final String namespace )
+    public List<String> getProjects( RepositorySession session, final String repoId, final String namespace )
         throws MetadataResolutionException
     {
 
@@ -596,7 +596,7 @@ public class CassandraMetadataRepository
             projects.add( getStringValue( row.getColumnSlice(), PROJECT_ID.toString() ) );
         }
 
-        return projects;
+        return new ArrayList<>( projects );
     }
 
     @Override
@@ -642,7 +642,7 @@ public class CassandraMetadataRepository
     }
 
     @Override
-    public Collection<String> getProjectVersions( RepositorySession session, final String repoId, final String namespace, final String projectId )
+    public List<String> getProjectVersions( RepositorySession session, final String repoId, final String namespace, final String projectId )
         throws MetadataResolutionException
     {
 
@@ -669,7 +669,7 @@ public class CassandraMetadataRepository
             versions.add( getStringValue( orderedRows.getColumnSlice(), PROJECT_VERSION.toString() ) );
         }
 
-        return versions;
+        return new ArrayList<>( versions );
 
     }
 
@@ -1500,8 +1500,8 @@ public class CassandraMetadataRepository
     }
 
     @Override
-    public Collection<String> getArtifactVersions( RepositorySession session, final String repoId, final String namespace, final String projectId,
-                                                   final String projectVersion )
+    public List<String> getArtifactVersions( RepositorySession session, final String repoId, final String namespace, final String projectId,
+                                             final String projectVersion )
         throws MetadataResolutionException
     {
 
@@ -1522,11 +1522,11 @@ public class CassandraMetadataRepository
             versions.add( getStringValue( row.getColumnSlice(), VERSION.toString() ) );
         }
 
-        return versions;
+        return new ArrayList<>( versions );
 
     }
 
-    /**
+    /*
      * iterate over available facets to remove/add from the artifactMetadata
      *
      * @param facetedMetadata
@@ -2237,8 +2237,8 @@ public class CassandraMetadataRepository
 
 
     @Override
-    public Collection<ProjectVersionReference> getProjectReferences( RepositorySession session, String repoId, String namespace, String projectId,
-                                                                     String projectVersion )
+    public List<ProjectVersionReference> getProjectReferences( RepositorySession session, String repoId, String namespace, String projectId,
+                                                               String projectVersion )
         throws MetadataResolutionException
     {
         QueryResult<OrderedRows<String, String, String>> result = HFactory //
@@ -2317,8 +2317,8 @@ public class CassandraMetadataRepository
     }
 
     @Override
-    public Collection<ArtifactMetadata> getArtifacts( RepositorySession session, final String repoId, final String namespace,
-                                                      final String projectId, final String projectVersion )
+    public List<ArtifactMetadata> getArtifacts( RepositorySession session, final String repoId, final String namespace,
+                                                final String projectId, final String projectVersion )
         throws MetadataResolutionException
     {
 

diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
index e694ec915168da6075ab6a0b1b051eb11744dc0d..a5e63a27985c1e60759768bbb7a704e5ae91a8ff 100644 (file)
--- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
@@ -498,8 +498,8 @@ public class FileMetadataRepository
 
 
     @Override
-    public Collection<ArtifactMetadata> getArtifacts(RepositorySession session, String repoId, String namespace, String projectId,
-                                                     String projectVersion)
+    public List<ArtifactMetadata> getArtifacts( RepositorySession session, String repoId, String namespace, String projectId,
+                                                String projectVersion)
             throws MetadataResolutionException {
         try {
             Map<String, ArtifactMetadata> artifacts = new HashMap<>();
@@ -567,7 +567,7 @@ public class FileMetadataRepository
                     }
                 }
             }
-            return artifacts.values();
+            return new ArrayList<>(artifacts.values());
         } catch (IOException e) {
             throw new MetadataResolutionException(e.getMessage(), e);
         }
@@ -996,8 +996,8 @@ public class FileMetadataRepository
     }
 
     @Override
-    public Collection<String> getArtifactVersions(RepositorySession session, String repoId, String namespace, String projectId,
-                                                  String projectVersion)
+    public List<String> getArtifactVersions( RepositorySession session, String repoId, String namespace, String projectId,
+                                             String projectVersion)
             throws MetadataResolutionException {
         try {
             Path directory = getDirectory(repoId).resolve(namespace + "/" + projectId + "/" + projectVersion);
@@ -1011,15 +1011,15 @@ public class FileMetadataRepository
                     versions.add((String) entry.getValue());
                 }
             }
-            return versions;
+            return new ArrayList<>( versions );
         } catch (IOException e) {
             throw new MetadataResolutionException(e.getMessage(), e);
         }
     }
 
     @Override
-    public Collection<ProjectVersionReference> getProjectReferences(RepositorySession session, String repoId, String namespace, String projectId,
-                                                                    String projectVersion)
+    public List<ProjectVersionReference> getProjectReferences( RepositorySession session, String repoId, String namespace, String projectId,
+                                                               String projectVersion)
             throws MetadataResolutionException {
         try {
             Path directory = getDirectory(repoId).resolve(namespace + "/" + projectId + "/" + projectVersion);
@@ -1044,7 +1044,7 @@ public class FileMetadataRepository
     }
 
     @Override
-    public Collection<String> getRootNamespaces(RepositorySession session, String repoId)
+    public List<String> getRootNamespaces( RepositorySession session, String repoId)
             throws MetadataResolutionException {
         return this.getChildNamespaces(session, repoId, null);
     }
@@ -1076,7 +1076,7 @@ public class FileMetadataRepository
     }
 
     @Override
-    public Collection<String> getChildNamespaces( RepositorySession session, String repoId, String baseNamespace)
+    public List<String> getChildNamespaces( RepositorySession session, String repoId, String baseNamespace)
             throws MetadataResolutionException {
         try {
             List<String> allNamespaces;
@@ -1110,7 +1110,7 @@ public class FileMetadataRepository
     }
 
     @Override
-    public Collection<String> getProjects(RepositorySession session, String repoId, String namespace)
+    public List<String> getProjects( RepositorySession session, String repoId, String namespace)
             throws MetadataResolutionException {
         try {
             List<String> projects;
@@ -1132,7 +1132,7 @@ public class FileMetadataRepository
     }
 
     @Override
-    public Collection<String> getProjectVersions(RepositorySession session, String repoId, String namespace, String projectId)
+    public List<String> getProjectVersions( RepositorySession session, String repoId, String namespace, String projectId)
             throws MetadataResolutionException {
         try {
             List<String> projectVersions;

diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index 2efdf9681113868f32b6f59247249b8bfc0f3f2e..b11d5603f5c25ecb1a7d06b7618d039d6f647804 100644 (file)
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -1267,8 +1267,8 @@ public class JcrMetadataRepository
     }
 
     @Override
-    public Collection<String> getArtifactVersions( RepositorySession session, String repositoryId, String namespace, String projectId,
-                                                   String projectVersion )
+    public List<String> getArtifactVersions( RepositorySession session, String repositoryId, String namespace, String projectId,
+                                             String projectVersion )
         throws MetadataResolutionException
     {
         final Session jcrSession;
@@ -1302,12 +1302,12 @@ public class JcrMetadataRepository
             throw new MetadataResolutionException( e.getMessage(), e );
         }
 
-        return versions;
+        return new ArrayList<>( versions );
     }
 
     @Override
-    public Collection<ProjectVersionReference> getProjectReferences( RepositorySession session, String repositoryId, String namespace,
-                                                                     String projectId, String projectVersion )
+    public List<ProjectVersionReference> getProjectReferences( RepositorySession session, String repositoryId, String namespace,
+                                                               String projectId, String projectVersion )
         throws MetadataResolutionException
     {
         final Session jcrSession;
@@ -1364,14 +1364,14 @@ public class JcrMetadataRepository
     }
 
     @Override
-    public Collection<String> getRootNamespaces( RepositorySession session, String repositoryId )
+    public List<String> getRootNamespaces( RepositorySession session, String repositoryId )
         throws MetadataResolutionException
     {
         return this.getChildNamespaces(session , repositoryId, null );
     }
 
     @Override
-    public Collection<String> getChildNamespaces( RepositorySession session, String repositoryId, String baseNamespace )
+    public List<String> getChildNamespaces( RepositorySession session, String repositoryId, String baseNamespace )
         throws MetadataResolutionException
     {
         String path = baseNamespace != null
@@ -1389,7 +1389,7 @@ public class JcrMetadataRepository
     }
 
     @Override
-    public Collection<String> getProjects( RepositorySession session, String repositoryId, String namespace )
+    public List<String> getProjects( RepositorySession session, String repositoryId, String namespace )
         throws MetadataResolutionException
     {
         try
@@ -1403,7 +1403,7 @@ public class JcrMetadataRepository
     }
 
     @Override
-    public Collection<String> getProjectVersions( RepositorySession session, String repositoryId, String namespace, String projectId )
+    public List<String> getProjectVersions( RepositorySession session, String repositoryId, String namespace, String projectId )
         throws MetadataResolutionException
     {
         try
@@ -1561,8 +1561,8 @@ public class JcrMetadataRepository
     }
 
     @Override
-    public Collection<ArtifactMetadata> getArtifacts( RepositorySession session, String repositoryId, String namespace, String projectId,
-                                                      String projectVersion )
+    public List<ArtifactMetadata> getArtifacts( RepositorySession session, String repositoryId, String namespace, String projectId,
+                                                String projectVersion )
         throws MetadataResolutionException
     {
         final Session jcrSession;
@@ -1720,7 +1720,7 @@ public class JcrMetadataRepository
         return node.hasProperty( name ) ? node.getProperty( name ).getString() : null;
     }
 
-    private Collection<String> getNodeNames( Session jcrSession, String path, String nodeType )
+    private List<String> getNodeNames( Session jcrSession, String path, String nodeType )
         throws MetadataResolutionException
     {