one move for all remaining override annotation

4 files changed, 37 insertions, 0 deletions

diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
index 216bc4758..61d393e8d 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
@@ -81,6 +81,7 @@ public class DefaultLegacyRepositoryConverter
         defaultLayout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
     }
 
+    @Override
     public void convertLegacyRepository( File legacyRepositoryDirectory, File repositoryDirectory,
                                          List<String> fileExclusionPatterns )
         throws RepositoryConversionException
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
index cdff8738c..b17a74a5b 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
@@ -88,6 +88,7 @@ public class LegacyConverterArtifactConsumer
         artifactFactory = plexusSisuBridge.lookup( ArtifactFactory.class );
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered )
         throws ConsumerException
     {
@@ -95,32 +96,38 @@ public class LegacyConverterArtifactConsumer
         this.managedRepository.setRepository( repository );
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repository, whenGathered );
     }
 
+    @Override
     public void completeScan()
     {
         // no op
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return excludes;
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return includes;
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -142,22 +149,26 @@ public class LegacyConverterArtifactConsumer
         }
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws Exception
     {
         processFile( path );
     }
 
+    @Override
     public String getDescription()
     {
         return "Legacy Artifact to Default Artifact Converter";
     }
 
+    @Override
     public String getId()
     {
         return "artifact-legacy-to-default-converter";
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
index 893b9df29..58ed74111 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
@@ -65,6 +65,7 @@ public class RepositoryConverterTest
     PlexusSisuBridge plexusSisuBridge;
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -95,6 +96,7 @@ public class RepositoryConverterTest
         //repositoryConverter = (LegacyRepositoryConverter) lookup( LegacyRepositoryConverter.ROLE, "default" );
     }
 
+    @Override
     protected void tearDown()
         throws Exception
     {
diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
index 93e6c33ac..c00189493 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
@@ -35,114 +35,133 @@ import java.util.List;
 public class MockArchivaAdministration
     implements ArchivaAdministration
 {
+    @Override
     public List<LegacyArtifactPath> getLegacyArtifactPaths()
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public List<FileType> getFileTypes()
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public FileType getFileType( String fileTypeId )
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public void addFileType( FileType fileType, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void removeFileType( String fileTypeId, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public List<String> getKnownContentConsumers()
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public List<String> getInvalidContentConsumers()
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public OrganisationInformation getOrganisationInformation()
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public void setOrganisationInformation( OrganisationInformation organisationInformation )
         throws RepositoryAdminException
     {
@@ -150,24 +169,28 @@ public class MockArchivaAdministration
 
     }
 
+    @Override
     public UiConfiguration getUiConfiguration()
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public void updateUiConfiguration( UiConfiguration uiConfiguration )
         throws RepositoryAdminException
     {
 
     }
 
+    @Override
     public NetworkConfiguration getNetworkConfiguration()
         throws RepositoryAdminException
     {
         return null;
     }
 
+    @Override
     public void setNetworkConfiguration( NetworkConfiguration networkConfiguration )
         throws RepositoryAdminException
     {