one move for all remaining override annotation

7 files changed, 29 insertions, 0 deletions

diff --git a/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java b/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java
index 7c4a9383b..56580f38f 100644
--- a/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java
+++ b/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java
@@ -78,17 +78,20 @@ public class MavenArtifactFacet
         this.buildNumber = buildNumber;
     }
 
+    @Override
     public String getFacetId()
     {
         return FACET_ID;
     }
 
+    @Override
     public String getName()
     {
         // TODO: not needed, perhaps artifact/version metadata facet should be separate interface?
         return null;
     }
 
+    @Override
     public Map<String, String> toProperties()
     {
         Map<String, String> properties = new HashMap<>();
@@ -108,6 +111,7 @@ public class MavenArtifactFacet
         return properties;
     }
 
+    @Override
     public void fromProperties( Map<String, String> properties )
     {
         type = properties.get( "type" );
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index 06b4bb532..a8d67f1ae 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -87,6 +87,7 @@ public class DefaultMetadataResolver
     @Named( value = "cache#namespaces" )
     private Cache<String, Collection<String>> namespacesCache;
 
+    @Override
     public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace,
                                                          String projectId, String projectVersion )
         throws MetadataResolutionException
@@ -165,6 +166,7 @@ public class DefaultMetadataResolver
         return metadata;
     }
 
+    @Override
     public Collection<ProjectVersionReference> resolveProjectReferences( RepositorySession session, String repoId,
                                                                          String namespace, String projectId,
                                                                          String projectVersion )
@@ -176,6 +178,7 @@ public class DefaultMetadataResolver
         return metadataRepository.getProjectReferences( repoId, namespace, projectId, projectVersion );
     }
 
+    @Override
     public Collection<String> resolveRootNamespaces( RepositorySession session, String repoId )
         throws MetadataResolutionException
     {
@@ -227,6 +230,7 @@ public class DefaultMetadataResolver
         }
     }
 
+    @Override
     public Collection<String> resolveNamespaces( RepositorySession session, String repoId, String namespace )
         throws MetadataResolutionException
     {
@@ -276,6 +280,7 @@ public class DefaultMetadataResolver
         }
     }
 
+    @Override
     public Collection<String> resolveProjects( RepositorySession session, String repoId, String namespace )
         throws MetadataResolutionException
     {
@@ -330,6 +335,7 @@ public class DefaultMetadataResolver
         }
     }
 
+    @Override
     public Collection<String> resolveProjectVersions( RepositorySession session, String repoId, String namespace,
                                                       String projectId )
         throws MetadataResolutionException
@@ -398,6 +404,7 @@ public class DefaultMetadataResolver
         }
     }
 
+    @Override
     public Collection<ArtifactMetadata> resolveArtifacts( RepositorySession session, String repoId, String namespace,
                                                           String projectId, String projectVersion )
         throws MetadataResolutionException
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
index 4f9b1828a..5aeb5090e 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
@@ -86,6 +86,7 @@ public class RepositorySession
      * exception occurs.
      * <b>can throw RuntimeException</b>
      */
+    @Override
     public void close()
     {
         try
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java
index f3f571f2f..1759a19be 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java
@@ -22,6 +22,7 @@ package org.apache.archiva.metadata.repository.filter;
 public class AllFilter<T>
     implements Filter<T>
 {
+    @Override
     public boolean accept( T value )
     {
         return true;
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java
index d97c4ed99..ab872e0c8 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java
@@ -31,6 +31,7 @@ public class ExcludesFilter<T>
         this.excludes = excludes;
     }
 
+    @Override
     public boolean accept( T value )
     {
         return !excludes.contains( value );
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java
index d50ebba9b..4969a64e0 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java
@@ -31,6 +31,7 @@ public class IncludesFilter<T>
         this.includes = includes;
     }
 
+    @Override
     public boolean accept( T value )
     {
         return includes.contains( value );
diff --git a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
index 21e404862..221eae279 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
@@ -97,11 +97,13 @@ public abstract class AbstractMetadataRepositoryTest
         Map<String, MetadataFacetFactory> factories = new HashMap<>();
         factories.put( TEST_FACET_ID, new MetadataFacetFactory()
         {
+            @Override
             public MetadataFacet createMetadataFacet()
             {
                 return new TestMetadataFacet( TEST_METADATA_VALUE );
             }
 
+            @Override
             public MetadataFacet createMetadataFacet( String repositoryId, String name )
             {
                 return new TestMetadataFacet( TEST_METADATA_VALUE );
@@ -111,11 +113,13 @@ public abstract class AbstractMetadataRepositoryTest
         // add to ensure we don't accidentally create an empty facet ID.
         factories.put( "", new MetadataFacetFactory()
         {
+            @Override
             public MetadataFacet createMetadataFacet()
             {
                 return new TestMetadataFacet( "", TEST_VALUE );
             }
 
+            @Override
             public MetadataFacet createMetadataFacet( String repositoryId, String name )
             {
                 return new TestMetadataFacet( "", TEST_VALUE );
@@ -815,6 +819,7 @@ public abstract class AbstractMetadataRepositoryTest
         ArrayList<ArtifactMetadata> actual = new ArrayList<>( artifacts );
         Collections.sort( actual, new Comparator<ArtifactMetadata>()
         {
+            @Override
             public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
             {
                 return o1.getId().compareTo( o2.getId() );
@@ -1457,6 +1462,7 @@ public abstract class AbstractMetadataRepositoryTest
     private static class ArtifactMetadataComparator
         implements Comparator<ArtifactMetadata>
     {
+        @Override
         public final int compare( ArtifactMetadata a, ArtifactMetadata b )
         {
             return a.getProject().compareTo( b.getProject() );
@@ -1480,6 +1486,7 @@ public abstract class AbstractMetadataRepositoryTest
             this.date = date;
         }
 
+        @Override
         public String getName()
         {
             return createNameFormat().format( date );
@@ -1492,16 +1499,19 @@ public abstract class AbstractMetadataRepositoryTest
             return fmt;
         }
 
+        @Override
         public String getFacetId()
         {
             return KindOfRepositoryStatistics.class.getName();
         }
 
+        @Override
         public Map<String, String> toProperties()
         {
             return Collections.emptyMap();
         }
 
+        @Override
         public void fromProperties( Map<String, String> properties )
         {
             // no op
@@ -1535,16 +1545,19 @@ public abstract class AbstractMetadataRepositoryTest
             this.additionalProps = additionalProps;
         }
 
+        @Override
         public String getFacetId()
         {
             return testFacetId;
         }
 
+        @Override
         public String getName()
         {
             return TEST_NAME;
         }
 
+        @Override
         public Map<String, String> toProperties()
         {
             if ( value != null )
@@ -1571,6 +1584,7 @@ public abstract class AbstractMetadataRepositoryTest
             }
         }
 
+        @Override
         public void fromProperties( Map<String, String> properties )
         {
             String value = properties.get( "foo" );