diff options
| author | Eric Barboni <skygo@apache.org> | 2014-04-11 23:46:35 +0200 |
|---|---|---|
| committer | Eric Barboni <skygo@apache.org> | 2014-04-11 23:46:35 +0200 |
| commit | 99117364be2b27ddb74fc6ffe3e052e0ad52d8dd (patch) | |
| tree | 5aa6ee887b1cf3c1659f83b7c561a728c0ee4555 /archiva-modules/plugins/stage-repository-merge | |
| parent | d44d957734badacce74293846d11b3b736b9a478 (diff) | |
| download | archiva-99117364be2b27ddb74fc6ffe3e052e0ad52d8dd.tar.gz archiva-99117364be2b27ddb74fc6ffe3e052e0ad52d8dd.zip | |
one move for all remaining override annotation
Diffstat (limited to 'archiva-modules/plugins/stage-repository-merge')
2 files changed, 10 insertions, 0 deletions
diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java index ffc7921e5..892a461ba 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java @@ -90,6 +90,7 @@ public class Maven2RepositoryMerger this.configuration = configuration; } + @Override public void merge( MetadataRepository metadataRepository, String sourceRepoId, String targetRepoId ) throws RepositoryMergerException { @@ -118,6 +119,7 @@ public class Maven2RepositoryMerger } // TODO when UI needs a subset to merge + @Override public void merge( MetadataRepository metadataRepository, String sourceRepoId, String targetRepoId, Filter<ArtifactMetadata> filter ) throws RepositoryMergerException @@ -368,6 +370,7 @@ public class Maven2RepositoryMerger return metadata; } + @Override public List<ArtifactMetadata> getConflictingArtifacts( MetadataRepository metadataRepository, String sourceRepo, String targetRepo ) throws RepositoryMergerException diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java index b0ec1d885..642e52371 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java +++ b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java @@ -29,37 +29,44 @@ public class StubConfiguration { private Configuration configuration; + @Override public Configuration getConfiguration() { return configuration; } + @Override public void save( Configuration configuration ) throws RegistryException, IndeterminateConfigurationException { this.configuration = configuration; } + @Override public boolean isDefaulted() { return false; } + @Override public void addListener( ConfigurationListener listener ) { throw new UnsupportedOperationException(); } + @Override public void removeListener( ConfigurationListener listener ) { throw new UnsupportedOperationException(); } + @Override public void addChangeListener( RegistryListener listener ) { throw new UnsupportedOperationException(); } + @Override public void reload() { // no op |