http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java ---------------------------------------------------------------------- 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 cbe0f5d..97c9c89 100644 --- 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 @@ -150,6 +150,7 @@ public class JcrMetadataRepository } } + @Override public void updateProject( String repositoryId, ProjectMetadata project ) throws MetadataRepositoryException { @@ -171,6 +172,7 @@ public class JcrMetadataRepository } } + @Override public void updateArtifact( String repositoryId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifactMeta ) throws MetadataRepositoryException @@ -227,6 +229,7 @@ public class JcrMetadataRepository } } + @Override public void updateProjectVersion( String repositoryId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) throws MetadataRepositoryException @@ -357,6 +360,7 @@ public class JcrMetadataRepository } } + @Override public void updateNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { @@ -371,6 +375,7 @@ public class JcrMetadataRepository } } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { @@ -401,6 +406,7 @@ public class JcrMetadataRepository } + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { @@ -420,6 +426,7 @@ public class JcrMetadataRepository } } + @Override public List<String> getMetadataFacets( String repositoryId, String facetId ) throws MetadataRepositoryException { @@ -464,6 +471,7 @@ public class JcrMetadataRepository } } + @Override public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) throws MetadataRepositoryException { @@ -505,6 +513,7 @@ public class JcrMetadataRepository return metadataFacet; } + @Override public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) throws MetadataRepositoryException { @@ -529,6 +538,7 @@ public class JcrMetadataRepository } } + @Override public void removeNamespace( String repositoryId, String projectId ) throws MetadataRepositoryException { @@ -551,6 +561,7 @@ public class JcrMetadataRepository } } + @Override public void removeMetadataFacets( String repositoryId, String facetId ) throws MetadataRepositoryException { @@ -569,6 +580,7 @@ public class JcrMetadataRepository } } + @Override public void removeMetadataFacet( String repositoryId, String facetId, String name ) throws MetadataRepositoryException { @@ -595,6 +607,7 @@ public class JcrMetadataRepository } } + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime ) throws MetadataRepositoryException { @@ -638,6 +651,7 @@ public class JcrMetadataRepository return artifacts; } + @Override public Collection<String> getRepositories() throws MetadataRepositoryException { @@ -670,6 +684,7 @@ public class JcrMetadataRepository return repositories; } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum ) throws MetadataRepositoryException { @@ -698,6 +713,7 @@ public class JcrMetadataRepository } + @Override public void removeRepository( String repositoryId ) throws MetadataRepositoryException { @@ -716,6 +732,7 @@ public class JcrMetadataRepository } } + @Override public List<ArtifactMetadata> getArtifacts( String repositoryId ) throws MetadataRepositoryException { @@ -750,6 +767,7 @@ public class JcrMetadataRepository getRepositoryContentPath( repositoryId ) + "')"; } + @Override public ProjectMetadata getProject( String repositoryId, String namespace, String projectId ) throws MetadataResolutionException { @@ -776,6 +794,7 @@ public class JcrMetadataRepository return metadata; } + @Override public ProjectVersionMetadata getProjectVersion( String repositoryId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -954,6 +973,7 @@ public class JcrMetadataRepository return versionMetadata; } + @Override public Collection<String> getArtifactVersions( String repositoryId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -983,6 +1003,7 @@ public class JcrMetadataRepository return versions; } + @Override public Collection<ProjectVersionReference> getProjectReferences( String repositoryId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -1031,12 +1052,14 @@ public class JcrMetadataRepository return references; } + @Override public Collection<String> getRootNamespaces( String repositoryId ) throws MetadataResolutionException { return getNamespaces( repositoryId, null ); } + @Override public Collection<String> getNamespaces( String repositoryId, String baseNamespace ) throws MetadataResolutionException { @@ -1047,18 +1070,21 @@ public class JcrMetadataRepository return getNodeNames( path, NAMESPACE_NODE_TYPE ); } + @Override public Collection<String> getProjects( String repositoryId, String namespace ) throws MetadataResolutionException { return getNodeNames( getNamespacePath( repositoryId, namespace ), PROJECT_NODE_TYPE ); } + @Override public Collection<String> getProjectVersions( String repositoryId, String namespace, String projectId ) throws MetadataResolutionException { return getNodeNames( getProjectPath( repositoryId, namespace, projectId ), PROJECT_VERSION_NODE_TYPE ); } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { @@ -1102,6 +1128,7 @@ public class JcrMetadataRepository } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException { @@ -1128,6 +1155,7 @@ public class JcrMetadataRepository } } + @Override public void removeArtifact( String repositoryId, String namespace, String projectId, String projectVersion, String id ) throws MetadataRepositoryException @@ -1162,6 +1190,7 @@ public class JcrMetadataRepository } } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String projectVersion, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -1196,6 +1225,7 @@ public class JcrMetadataRepository } } + @Override public Collection<ArtifactMetadata> getArtifacts( String repositoryId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -1228,6 +1258,7 @@ public class JcrMetadataRepository return artifacts; } + @Override public void save() { try @@ -1240,6 +1271,7 @@ public class JcrMetadataRepository } } + @Override public void revert() { try @@ -1252,11 +1284,13 @@ public class JcrMetadataRepository } } + @Override public boolean canObtainAccess( Class<?> aClass ) { return aClass == Session.class; } + @Override public <T>T obtainAccess( Class<T> aClass ) throws MetadataRepositoryException { @@ -1276,6 +1310,7 @@ public class JcrMetadataRepository "Access using " + aClass + " is not supported on the JCR metadata storage" ); } + @Override public void close() throws MetadataRepositoryException {
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java index fcd7fed..8589ecb 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java @@ -63,6 +63,7 @@ public class JcrRepositorySessionFactory @Inject private RepositorySessionFactoryBean repositorySessionFactoryBean; + @Override public RepositorySession createSession() { try http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java index 12c106e..5efabdf 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java @@ -43,6 +43,7 @@ public class JcrMetadataRepositoryTest private ApplicationContext applicationContext; @Before + @Override public void setUp() throws Exception { @@ -80,6 +81,7 @@ public class JcrMetadataRepositoryTest @After + @Override public void tearDown() throws Exception { http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java b/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java index 76b79e2..5af0b91 100644 --- a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java +++ b/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java @@ -81,12 +81,14 @@ public class NPandayArtifactMappingProvider typeToExtensionMap.put( "exe", "exe" ); } + @Override public String mapClassifierAndExtensionToType( String classifier, String ext ) { // we don't need classifier return extensionToTypeMap.get( ext ); } + @Override public String mapTypeToExtension( String type ) { return typeToExtensionMap.get( type ); http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java index 181b0fa..6be3232 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java @@ -40,6 +40,7 @@ public class RepositoryProblemEventListener private Logger log = LoggerFactory.getLogger( RepositoryProblemEventListener.class ); // FIXME: move to session + @Override public void deleteArtifact( MetadataRepository metadataRepository, String repositoryId, String namespace, String project, String version, String id ) { @@ -55,6 +56,7 @@ public class RepositoryProblemEventListener } } + @Override public void addArtifact( RepositorySession session, String repoId, String namespace, String projectId, ProjectVersionMetadata metadata ) { @@ -74,6 +76,7 @@ public class RepositoryProblemEventListener } } + @Override public void addArtifactProblem( RepositorySession session, String repoId, String namespace, String projectId, String projectVersion, RepositoryStorageMetadataException exception ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java index 3262b3e..2f6417d 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java @@ -43,16 +43,19 @@ public class RepositoryProblemFacet private String problem; + @Override public String getFacetId() { return FACET_ID; } + @Override public String getName() { return createName( namespace, project, version, id ); } + @Override public Map<String, String> toProperties() { Map<String, String> map = new HashMap<>(); @@ -69,6 +72,7 @@ public class RepositoryProblemFacet return map; } + @Override public void fromProperties( Map<String, String> properties ) { repositoryId = properties.get( "repositoryId" ); http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java index 7531fa4..d14c156 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java @@ -30,11 +30,13 @@ import org.springframework.stereotype.Service; public class RepositoryProblemFacetFactory implements MetadataFacetFactory { + @Override public MetadataFacet createMetadataFacet() { return new RepositoryProblemFacet(); } + @Override public MetadataFacet createMetadataFacet( String repositoryId, String name ) { return new RepositoryProblemFacet(); http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java index 7d6fa86..dd12b7a 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java @@ -98,31 +98,37 @@ public class DuplicateArtifactsConsumer private RepositorySession repositorySession; + @Override public String getId() { return id; } + @Override public String getDescription() { return description; } + @Override public boolean isPermanent() { return false; } + @Override public List<String> getIncludes() { return includes; } + @Override public List<String> getExcludes() { return Collections.emptyList(); } + @Override public void beginScan( ManagedRepository repo, Date whenGathered ) throws ConsumerException { @@ -131,12 +137,14 @@ public class DuplicateArtifactsConsumer repositorySession = repositorySessionFactory.createSession(); } + @Override public void beginScan( ManagedRepository repo, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repo, whenGathered ); } + @Override public void processFile( String path ) throws ConsumerException { @@ -224,22 +232,26 @@ public class DuplicateArtifactsConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws ConsumerException { processFile( path ); } + @Override public void completeScan() { repositorySession.close(); } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isRepositoryScanning( propertyName ) ) @@ -248,6 +260,7 @@ public class DuplicateArtifactsConsumer } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing */ http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/MockitoFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/MockitoFactory.java b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/MockitoFactory.java index e298e90..14e5b1f 100644 --- a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/MockitoFactory.java +++ b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/MockitoFactory.java @@ -33,17 +33,20 @@ public class MockitoFactory this.type = type; } + @Override public Object getObject() throws Exception { return mock( type ); } + @Override public Class getObjectType() { return type; } + @Override public boolean isSingleton() { return true; http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java index 736b465..b05bea7 100644 --- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java +++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java @@ -59,12 +59,14 @@ public class DefaultRepositoryStatisticsManager private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" ); + @Override public boolean hasStatistics( MetadataRepository metadataRepository, String repositoryId ) throws MetadataRepositoryException { return metadataRepository.hasMetadataFacet( repositoryId, RepositoryStatistics.FACET_ID ); } + @Override public RepositoryStatistics getLastStatistics( MetadataRepository metadataRepository, String repositoryId ) throws MetadataRepositoryException { @@ -131,6 +133,7 @@ public class DefaultRepositoryStatisticsManager } } + @Override public void addStatisticsAfterScan( MetadataRepository metadataRepository, String repositoryId, Date startTime, Date endTime, long totalFiles, long newFiles ) throws MetadataRepositoryException @@ -262,12 +265,14 @@ public class DefaultRepositoryStatisticsManager } } + @Override public void deleteStatistics( MetadataRepository metadataRepository, String repositoryId ) throws MetadataRepositoryException { metadataRepository.removeMetadataFacets( repositoryId, RepositoryStatistics.FACET_ID ); } + @Override public List<RepositoryStatistics> getStatisticsInRange( MetadataRepository metadataRepository, String repositoryId, Date startTime, Date endTime ) throws MetadataRepositoryException http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java index eab3e82..71cee37 100644 --- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java +++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java @@ -151,11 +151,13 @@ public class RepositoryStatistics this.repositoryId = repositoryId; } + @Override public String getFacetId() { return FACET_ID; } + @Override public String getName() { return createNameFormat().format( scanStartTime ); @@ -168,6 +170,7 @@ public class RepositoryStatistics return fmt; } + @Override public Map<String, String> toProperties() { Map<String, String> properties = new HashMap<>(); @@ -187,6 +190,7 @@ public class RepositoryStatistics return properties; } + @Override public void fromProperties( Map<String, String> properties ) { scanEndTime = new Date( Long.parseLong( properties.get( "scanEndTime" ) ) ); http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java index 18bf920..1984646 100644 --- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java +++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java @@ -30,11 +30,13 @@ import org.springframework.stereotype.Service; public class RepositoryStatisticsFactory implements MetadataFacetFactory { + @Override public MetadataFacet createMetadataFacet() { return new RepositoryStatistics(); } + @Override public MetadataFacet createMetadataFacet( String repositoryId, String name ) { return new RepositoryStatistics(); http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java ---------------------------------------------------------------------- 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 ffc7921..892a461 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 http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java ---------------------------------------------------------------------- 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 b0ec1d8..642e523 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
