extract comparator to an external class

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/ShowArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/ShowArtifactAction.java
index c1563d7f81a4333249ef1248d636c67b2bfcdffd..9da515b53da25094f4fd7e7b64d389354eedc9f8 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/ShowArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/ShowArtifactAction.java
@@ -32,6 +32,7 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException;
 import org.apache.archiva.metadata.repository.MetadataResolutionException;
 import org.apache.archiva.metadata.repository.MetadataResolver;
 import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMetadataVersionComparator;
 import org.apache.archiva.reports.RepositoryProblemFacet;
 import org.apache.archiva.repository.RepositoryContentFactory;
 import org.apache.archiva.repository.RepositoryException;
@@ -39,7 +40,6 @@ import org.apache.archiva.repository.RepositoryNotFoundException;
 import org.apache.archiva.rest.api.model.ArtifactDownloadInfo;
 import org.apache.archiva.rest.services.utils.ArtifactDownloadInfoBuilder;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
@@ -47,7 +47,6 @@ import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -209,18 +208,7 @@ public class ShowArtifactAction
                         addIncompleteModelWarning( "Error resolving artifact metadata: " + e.getMessage() );
                         artifacts = Collections.emptyList();
                     }
-                    Collections.sort( artifacts, new Comparator<ArtifactMetadata>()
-                    {
-                        public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
-                        {
-                            // sort by version (reverse), then ID
-                            // TODO: move version sorting into repository handling (maven2 specific), and perhaps add a
-                            // way to get latest instead
-                            int result = new DefaultArtifactVersion( o2.getVersion() ).compareTo(
-                                new DefaultArtifactVersion( o1.getVersion() ) );
-                            return result != 0 ? result : o1.getId().compareTo( o2.getId() );
-                        }
-                    } );
+                    Collections.sort( artifacts, ArtifactMetadataVersionComparator.INSTANCE );
 
                     for ( ArtifactMetadata artifact : artifacts )
                     {

diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java
new file mode 100644 (file)
index 0000000..eb67635
--- /dev/null
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java
@@ -0,0 +1,42 @@
+package org.apache.archiva.metadata.repository.storage.maven2;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.metadata.model.ArtifactMetadata;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+
+import java.util.Comparator;
+
+/**
+ * @author Olivier Lamy
+ * @since 1.4-M3
+ */
+public class ArtifactMetadataVersionComparator
+    implements Comparator<ArtifactMetadata>
+{
+    public static ArtifactMetadataVersionComparator INSTANCE = new ArtifactMetadataVersionComparator();
+
+    public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
+    {
+        // sort by version (reverse), then ID
+        int result =
+            new DefaultArtifactVersion( o2.getVersion() ).compareTo( new DefaultArtifactVersion( o1.getVersion() ) );
+        return result != 0 ? result : o1.getId().compareTo( o2.getId() );
+    }
+}