diff options
255 files changed, 1918 insertions, 98 deletions
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java index 0742df402..f53789c0c 100644 --- a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java +++ b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java @@ -37,18 +37,21 @@ public abstract class AbstractProgressConsumer { private int count = 0; + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { this.count = 0; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void processFile( String path ) throws ConsumerException { @@ -60,17 +63,20 @@ public abstract class AbstractProgressConsumer } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws ConsumerException { processFile( path ); } + @Override public void completeScan() { System.out.println( "Final Count of Artifacts processed by " + getId() + ": " + count ); } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java index 7efde1622..6ac24d5ce 100644 --- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java +++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java @@ -67,26 +67,31 @@ public class ArtifactCountConsumer includes.add( "**/*.zip" ); } + @Override public String getDescription() { return description; } + @Override public String getId() { return id; } + @Override public boolean isPermanent() { return false; } + @Override public List<String> getExcludes() { return null; } + @Override public List<String> getIncludes() { return includes; diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java index c418dd1bc..310123693 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java @@ -38,6 +38,7 @@ public class LegacyRepositoryLayout return "legacy"; } + @Override public String pathOf( Artifact artifact ) { ArtifactHandler artifactHandler = artifact.getArtifactHandler(); @@ -61,6 +62,7 @@ public class LegacyRepositoryLayout return path.toString(); } + @Override public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository ) { return pathOfRepositoryMetadata( metadata, metadata.getLocalFilename( repository ) ); @@ -77,6 +79,7 @@ public class LegacyRepositoryLayout return path.toString(); } + @Override public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata ) { return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() ); diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java index 4e916779b..3635408df 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java @@ -104,6 +104,7 @@ public class LegacyToDefaultConverter artifactHandlerManager = plexusSisuBridge.lookup( ArtifactHandlerManager.class ); } + @Override public void convert( Artifact artifact, ArtifactRepository targetRepository ) throws ArtifactConversionException { @@ -677,11 +678,13 @@ public class LegacyToDefaultConverter warnings.put( artifact, messages ); } + @Override public void clearWarnings() { warnings.clear(); } + @Override public Map<Artifact, List<String>> getWarnings() { return warnings; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java index 21bcdd096..bea3eff64 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java @@ -162,6 +162,7 @@ public class DefaultArchivaConfiguration private static final String KEY = "org.apache.archiva"; + @Override public Configuration getConfiguration() { return loadConfiguration(); @@ -441,6 +442,7 @@ public class DefaultArchivaConfiguration } @SuppressWarnings ( "unchecked" ) + @Override public synchronized void save( Configuration configuration ) throws IndeterminateConfigurationException, RegistryException { @@ -627,6 +629,7 @@ public class DefaultArchivaConfiguration } } + @Override public void addListener( ConfigurationListener listener ) { if ( listener == null ) @@ -637,6 +640,7 @@ public class DefaultArchivaConfiguration listeners.add( listener ); } + @Override public void removeListener( ConfigurationListener listener ) { if ( listener == null ) @@ -647,6 +651,7 @@ public class DefaultArchivaConfiguration listeners.remove( listener ); } + @Override public void addChangeListener( RegistryListener listener ) { addRegistryChangeListener( listener ); @@ -760,6 +765,7 @@ public class DefaultArchivaConfiguration //save( configuration ); } + @Override public void reload() { this.configuration = null; @@ -774,11 +780,13 @@ public class DefaultArchivaConfiguration this.initialize(); } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { // nothing to do here } + @Override public synchronized void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { configuration = null; @@ -845,6 +853,7 @@ public class DefaultArchivaConfiguration return altConfigFilename; } + @Override public boolean isDefaulted() { return this.isConfigurationDefaulted; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java index f0ad020c7..96a551bcf 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java @@ -230,6 +230,7 @@ public class FileTypes } } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( propertyName.contains( "fileType" ) ) @@ -240,6 +241,7 @@ public class FileTypes } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* nothing to do */ diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java index e9ba6a57e..ce3d93a52 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java @@ -38,6 +38,7 @@ public class FiletypeSelectionPredicate this.filetypeId = id; } + @Override public boolean evaluate( Object object ) { boolean satisfies = false; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java index bf1637607..8d79937f1 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java @@ -35,6 +35,7 @@ public class FiletypeToMapClosure { private Map<String, FileType> map = new HashMap<>(); + @Override public void execute( Object input ) { if ( input instanceof FileType ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java index de5f1148d..d71e32316 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java @@ -31,6 +31,7 @@ import java.util.Comparator; public class NetworkProxyComparator implements Comparator<NetworkProxyConfiguration> { + @Override public int compare( NetworkProxyConfiguration o1, NetworkProxyConfiguration o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java index 822775a4b..f3bd35bd5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java @@ -38,6 +38,7 @@ public class NetworkProxySelectionPredicate this.proxyId = id; } + @Override public boolean evaluate( Object object ) { boolean satisfies = false; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java index 1fc9e7d4e..5643031eb 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java @@ -33,6 +33,7 @@ public class ProxyConnectorConfigurationOrderComparator private static ProxyConnectorConfigurationOrderComparator INSTANCE = new ProxyConnectorConfigurationOrderComparator(); + @Override public int compare( ProxyConnectorConfiguration o1, ProxyConnectorConfiguration o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java index eaa97fb9b..aec7c902f 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java @@ -41,6 +41,7 @@ public class ProxyConnectorSelectionPredicate this.targetId = targetId; } + @Override public boolean evaluate( Object object ) { boolean satisfies = false; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java index ddebce25f..9e2b64e22 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java @@ -31,6 +31,7 @@ import java.util.Comparator; public class RepositoryConfigurationComparator implements Comparator<AbstractRepositoryConfiguration> { + @Override public int compare( AbstractRepositoryConfiguration o1, AbstractRepositoryConfiguration o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java index f9b081f3d..03bb489b2 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java @@ -702,6 +702,7 @@ public class ArchivaConfigurationTest // etc. as it's done in other tests archivaConfiguration.addListener( new ConfigurationListener() { + @Override public void configurationEvent( ConfigurationEvent event ) { assertEquals( ConfigurationEvent.SAVED, event.getType() ); diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java index 576723147..639ff00c8 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java @@ -83,53 +83,63 @@ public class ArtifactMissingChecksumsConsumer initIncludes(); } + @Override public String getId() { return this.id; } + @Override public String getDescription() { return this.description; } + @Override public boolean isPermanent() { return false; } + @Override public void beginScan( ManagedRepository repo, Date whenGathered ) throws ConsumerException { this.repositoryDir = new File( repo.getLocation() ); } + @Override public void beginScan( ManagedRepository repo, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repo, whenGathered ); } + @Override public void completeScan() { /* do nothing */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public List<String> getExcludes() { return getDefaultArtifactExclusions(); } + @Override public List<String> getIncludes() { return includes; } + @Override public void processFile( String path ) throws ConsumerException { @@ -137,6 +147,7 @@ public class ArtifactMissingChecksumsConsumer createFixChecksum( path, new ChecksumAlgorithm[]{ ChecksumAlgorithm.MD5 } ); } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws ConsumerException { @@ -186,6 +197,7 @@ public class ArtifactMissingChecksumsConsumer } } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isRepositoryScanning( propertyName ) ) @@ -194,6 +206,7 @@ public class ArtifactMissingChecksumsConsumer } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing */ diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java index cc8b19d05..75654c6cb 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java @@ -75,53 +75,63 @@ public class AutoRemoveConsumer private List<String> includes = new ArrayList<>( 0 ); + @Override public String getId() { return this.id; } + @Override public String getDescription() { return this.description; } + @Override public boolean isPermanent() { return false; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { this.repositoryDir = new File( repository.getLocation() ); } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void completeScan() { /* do nothing */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public List<String> getExcludes() { return null; } + @Override public List<String> getIncludes() { return includes; } + @Override public void processFile( String path ) throws ConsumerException { @@ -133,12 +143,14 @@ public class AutoRemoveConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws ConsumerException { processFile( path ); } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isRepositoryScanning( propertyName ) ) @@ -147,6 +159,7 @@ public class AutoRemoveConsumer } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing */ diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java index 5ef93eb28..554d0287b 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java @@ -70,53 +70,63 @@ public class AutoRenameConsumer extensionRenameMap.put( ".plugin", ".jar" ); } + @Override public String getId() { return this.id; } + @Override public String getDescription() { return this.description; } + @Override public boolean isPermanent() { return false; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { this.repositoryDir = new File( repository.getLocation() ); } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void completeScan() { /* do nothing */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public List<String> getExcludes() { return null; } + @Override public List<String> getIncludes() { return includes; } + @Override public void processFile( String path ) throws ConsumerException { @@ -150,6 +160,7 @@ public class AutoRenameConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws ConsumerException { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java index 521a92299..e1b6009f2 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java @@ -113,11 +113,13 @@ public class MetadataUpdaterConsumer private long scanStartTimestamp = 0; + @Override public String getDescription() { return description; } + @Override public String getId() { return id; @@ -128,6 +130,7 @@ public class MetadataUpdaterConsumer this.includes = includes; } + @Override public void beginScan( ManagedRepository repoConfig, Date whenGathered ) throws ConsumerException { @@ -147,32 +150,38 @@ public class MetadataUpdaterConsumer } } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void completeScan() { /* do nothing here */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public List<String> getExcludes() { return getDefaultArtifactExclusions(); } + @Override public List<String> getIncludes() { return this.includes; } + @Override public void processFile( String path ) throws ConsumerException { @@ -192,6 +201,7 @@ public class MetadataUpdaterConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -291,11 +301,13 @@ public class MetadataUpdaterConsumer } } + @Override public boolean isPermanent() { return false; } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isRepositoryScanning( propertyName ) ) @@ -304,6 +316,7 @@ public class MetadataUpdaterConsumer } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing here */ diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java index 69e590c75..0a8f22ffc 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java @@ -90,53 +90,63 @@ public class ValidateChecksumConsumer private List<String> includes; + @Override public String getId() { return this.id; } + @Override public String getDescription() { return this.description; } + @Override public boolean isPermanent() { return false; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { this.repositoryDir = new File( repository.getLocation() ); } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void completeScan() { /* nothing to do */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public List<String> getExcludes() { return null; } + @Override public List<String> getIncludes() { return this.includes; } + @Override public void processFile( String path ) throws ConsumerException { @@ -163,6 +173,7 @@ public class ValidateChecksumConsumer } } + @Override public void processFile( String path, boolean executeOnEntireReDpo ) throws Exception { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java index 3d785ff74..f1f2c6216 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java @@ -41,6 +41,7 @@ public class ArtifactFilenameFilter this.filename = filename; } + @Override public boolean accept( File dir, String name ) { return ( name.startsWith( filename ) ); diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java index f81248297..a91cc5282 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java @@ -86,6 +86,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge this.repoContentFactory = repoContentFactory; } + @Override public void process( String path ) throws RepositoryPurgeException { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java index 5262bff28..da0591c85 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java @@ -63,6 +63,7 @@ public class DaysOldRepositoryPurge timestampParser.setTimeZone( DateUtils.UTC_TIME_ZONE ); } + @Override public void process( String path ) throws RepositoryPurgeException { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index 06f872f6a..5cc20c404 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -108,31 +108,37 @@ public class RepositoryPurgeConsumer private RepositorySession repositorySession; + @Override public String getId() { return this.id; } + @Override public String getDescription() { return this.description; } + @Override public boolean isPermanent() { return false; } + @Override public List<String> getExcludes() { return getDefaultArtifactExclusions(); } + @Override public List<String> getIncludes() { return this.includes; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { @@ -170,12 +176,14 @@ public class RepositoryPurgeConsumer deleteReleasedSnapshots = repository.isDeleteReleasedSnapshots(); } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void processFile( String path ) throws ConsumerException { @@ -194,22 +202,26 @@ public class RepositoryPurgeConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { 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 ) ) @@ -218,6 +230,7 @@ public class RepositoryPurgeConsumer } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing */ @@ -236,6 +249,7 @@ public class RepositoryPurgeConsumer initIncludes(); } + @Override public boolean isProcessUnmodified() { // we need to check all files for deletion, especially if not modified diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java index 85deca331..5cbcaa406 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java @@ -50,6 +50,7 @@ public class RetentionCountRepositoryPurge this.retentionCount = retentionCount; } + @Override public void process( String path ) throws RepositoryPurgeException { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java index 1426cab8f..3b2898dad 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java @@ -33,156 +33,186 @@ import java.util.List; public class TestMetadataRepository implements MetadataRepository { + @Override public ProjectMetadata getProject( String repoId, String namespace, String projectId ) { return null; } + @Override public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public Collection<String> getRootNamespaces( String repoId ) { return null; } + @Override public Collection<String> getNamespaces( String repoId, String namespace ) { return null; } + @Override public Collection<String> getProjects( String repoId, String namespace ) { return null; } + @Override public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) { return null; } + @Override public void updateProject( String repoId, ProjectMetadata project ) { } + @Override public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifactMeta ) { } + @Override public void updateProjectVersion( String repoId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) { } + @Override public void updateNamespace( String repoId, String namespace ) { } + @Override public List<String> getMetadataFacets( String repodId, String facetId ) { return Collections.emptyList(); } + @Override public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) { return null; } + @Override public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) { } + @Override public void removeMetadataFacets( String repositoryId, String facetId ) { } + @Override public void removeMetadataFacet( String repoId, String facetId, String name ) { } + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime ) { return null; } + @Override public Collection<String> getRepositories() { return null; } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum ) { return null; } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, String id ) { } + @Override public void removeRepository( String repoId ) { } + @Override public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public void save() { } + @Override public void close() { } + @Override public void revert() { } + @Override public boolean canObtainAccess( Class<?> aClass ) { return false; } + @Override public <T>T obtainAccess( Class<T> aClass ) { return null; } + @Override public List<ArtifactMetadata> getArtifacts( String repositoryId ) { return null; } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -190,30 +220,35 @@ public class TestMetadataRepository throw new UnsupportedOperationException(); } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public void removeNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException { } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java index 1ac5901ca..11bfe4037 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java @@ -28,6 +28,7 @@ public class TestRepositorySessionFactory private MetadataResolver resolver; + @Override public RepositorySession createSession() { return new RepositorySession( new TestMetadataRepository(), resolver ) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java index e5f8b90ab..487af9190 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java @@ -100,21 +100,25 @@ public class NexusIndexerConsumer this.managedRepositoryAdmin = managedRepositoryAdmin; } + @Override public String getDescription() { return "Indexes the repository to provide search and IDE integration features"; } + @Override public String getId() { return "index-content"; } + @Override public boolean isPermanent() { return false; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { @@ -132,6 +136,7 @@ public class NexusIndexerConsumer } } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -146,6 +151,7 @@ public class NexusIndexerConsumer } } + @Override public void processFile( String path ) throws ConsumerException { @@ -164,6 +170,7 @@ public class NexusIndexerConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -193,6 +200,7 @@ public class NexusIndexerConsumer } } + @Override public void completeScan() { IndexingContext context = this.indexingContext; @@ -221,6 +229,7 @@ public class NexusIndexerConsumer } } + @Override public void completeScan( boolean executeOnEntireRepo ) { if ( executeOnEntireRepo ) @@ -231,11 +240,13 @@ public class NexusIndexerConsumer // else, do nothing as the context will be closed when indexing task is executed if not a repo scan request! } + @Override public List<String> getExcludes() { return Collections.emptyList(); } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isRepositoryScanning( propertyName ) ) @@ -244,6 +255,7 @@ public class NexusIndexerConsumer } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing */ @@ -269,6 +281,7 @@ public class NexusIndexerConsumer initIncludes(); } + @Override public List<String> getIncludes() { return includes; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java index c09d04dea..5ce2781cd 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java @@ -60,6 +60,7 @@ public class NexusIndexerConsumerTest { Set<File> indexed = new HashSet<File>(); + @Override public void queueTask( ArtifactIndexingTask task ) throws TaskQueueException { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java index b343cc7d4..6c974c397 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java @@ -42,365 +42,429 @@ import java.util.Set; public class TestRBACManager implements RBACManager { + @Override public void initialize() { } + @Override public boolean isFinalImplementation() { return false; } + @Override public String getDescriptionKey() { return "archiva.redback.rbacmanager.test"; } + @Override public void addListener( RBACManagerListener listener ) { } + @Override public void removeListener( RBACManagerListener listener ) { } + @Override public Role createRole( String name ) { return null; } + @Override public boolean roleExists( String name ) { return false; } + @Override public boolean roleExists( Role role ) { return false; } + @Override public Role saveRole( Role role ) throws RbacObjectInvalidException, RbacManagerException { return null; } + @Override public void saveRoles( Collection<Role> roles ) throws RbacObjectInvalidException, RbacManagerException { } + @Override public Role getRole( String roleName ) throws RbacObjectNotFoundException, RbacManagerException { return null; } + @Override public Map<String, Role> getRoles( Collection<String> roleNames ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void addChildRole( Role role, Role childRole ) throws RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Map<String, Role> getChildRoles( Role role ) throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Map<String, Role> getParentRoles( Role role ) throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<Role> getAllRoles() throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Set<Role> getEffectiveRoles( Role role ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeRole( Role role ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeRole( String roleName ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Permission createPermission( String name ) throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Permission createPermission( String name, String operationName, String resourceIdentifier ) throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean permissionExists( String name ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean permissionExists( Permission permission ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Permission savePermission( Permission permission ) throws RbacObjectInvalidException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Permission getPermission( String permissionName ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<Permission> getAllPermissions() throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removePermission( Permission permission ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removePermission( String permissionName ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Operation createOperation( String name ) throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean operationExists( String name ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean operationExists( Operation operation ) { return false; } + @Override public Operation saveOperation( Operation operation ) throws RbacObjectInvalidException, RbacManagerException { return null; } + @Override public Operation getOperation( String operationName ) throws RbacObjectNotFoundException, RbacManagerException { return null; } + @Override public List<Operation> getAllOperations() throws RbacManagerException { return null; } + @Override public void removeOperation( Operation operation ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { } + @Override public void removeOperation( String operationName ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { } + @Override public Resource createResource( String identifier ) throws RbacManagerException { return null; } + @Override public boolean resourceExists( String identifier ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean resourceExists( Resource resource ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Resource saveResource( Resource resource ) throws RbacObjectInvalidException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Resource getResource( String resourceIdentifier ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<Resource> getAllResources() throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeResource( Resource resource ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeResource( String resourceIdentifier ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public UserAssignment createUserAssignment( String principal ) throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean userAssignmentExists( String principal ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean userAssignmentExists( UserAssignment assignment ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public UserAssignment saveUserAssignment( UserAssignment userAssignment ) throws RbacObjectInvalidException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public UserAssignment getUserAssignment( String principal ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<UserAssignment> getAllUserAssignments() throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<UserAssignment> getUserAssignmentsForRoles( Collection<String> roleNames ) throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeUserAssignment( UserAssignment userAssignment ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeUserAssignment( String principal ) throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<Role> getAssignedRoles( String principal ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<Role> getAssignedRoles( UserAssignment userAssignment ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<Role> getEffectivelyUnassignedRoles( String principal ) throws RbacManagerException, RbacObjectNotFoundException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<Role> getEffectivelyAssignedRoles( String principal ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<Role> getUnassignedRoles( String principal ) throws RbacManagerException, RbacObjectNotFoundException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Set<Permission> getAssignedPermissions( String principal ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Map<String, List<Permission>> getAssignedPermissionMap( String principal ) throws RbacObjectNotFoundException, RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<Role> getAllAssignableRoles() throws RbacManagerException, RbacObjectNotFoundException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Resource getGlobalResource() throws RbacManagerException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void eraseDatabase() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isReadOnly() { return false; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java index 145af7b02..8f3bb644f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java @@ -32,89 +32,104 @@ import java.net.URL; public class TestRoleManager implements RoleManager { + @Override public void loadRoleModel( URL resourceLocation ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void loadRoleModel( RedbackRoleModel model ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void createTemplatedRole( String templateId, String resource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeTemplatedRole( String templateId, String resource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateRole( String templateId, String oldResource, String newResource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void assignRole( String roleId, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void assignRoleByName( String roleName, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void assignTemplatedRole( String templateId, String resource, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void unassignRole( String roleId, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void unassignRoleByName( String roleName, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean roleExists( String roleId ) throws RoleManagerException { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean templatedRoleExists( String templateId, String resource ) throws RoleManagerException { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public RedbackRoleModel getModel() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void verifyTemplatedRole( String templateID, String resource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void initialize() { //To change body of implemented methods use File | Settings | File Templates. diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java index 39e5a944c..280a9dc17 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java @@ -94,31 +94,37 @@ public class ArchivaMetadataCreationConsumer private String repoId; + @Override public String getId() { return this.id; } + @Override public String getDescription() { return this.description; } + @Override public boolean isPermanent() { return true; } + @Override public List<String> getExcludes() { return getDefaultArtifactExclusions(); } + @Override public List<String> getIncludes() { return this.includes; } + @Override public void beginScan( ManagedRepository repo, Date whenGathered ) throws ConsumerException { @@ -126,12 +132,14 @@ public class ArchivaMetadataCreationConsumer this.whenGathered = whenGathered; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void processFile( String path ) throws ConsumerException { @@ -213,22 +221,26 @@ public class ArchivaMetadataCreationConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws ConsumerException { processFile( path ); } + @Override public void completeScan() { /* do nothing */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isRepositoryScanning( propertyName ) ) @@ -237,6 +249,7 @@ public class ArchivaMetadataCreationConsumer } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing */ 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 { diff --git a/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java b/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java index 4c4aaab7a..583d3b8af 100644 --- a/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java +++ b/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java @@ -268,6 +268,7 @@ public class DefaultFileLockManager } } + @Override public void clearLockFiles() { lockFiles.clear(); @@ -303,21 +304,25 @@ public class DefaultFileLockManager return ( parentDir != null && ( mkdirs( parentDir ) || parentDir.exists() ) && canonDir.mkdir() ); } + @Override public int getTimeout() { return timeout; } + @Override public void setTimeout( int timeout ) { this.timeout = timeout; } + @Override public boolean isSkipLocking() { return skipLocking; } + @Override public void setSkipLocking( boolean skipLocking ) { this.skipLocking = skipLocking; diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java index 0ea381b46..4bdae820e 100644 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java +++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java @@ -127,6 +127,7 @@ public class RepositoryURL } } + @Override public String toString() { return url; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java index 2c9b8477a..103c7a458 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java @@ -96,11 +96,13 @@ public abstract class AbstractUpdatePolicy protected abstract String getUpdateMode(); + @Override public List<String> getOptions() { return options; } + @Override public void applyPolicy( String policySetting, Properties request, File localFile ) throws PolicyViolationException, PolicyConfigurationException { diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java index 6976c45b5..62e76a4d6 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java @@ -63,6 +63,7 @@ public class CachedFailuresPolicy options.add( YES ); } + @Override public void applyPolicy( String policySetting, Properties request, File localFile ) throws PolicyViolationException, PolicyConfigurationException { @@ -95,21 +96,25 @@ public class CachedFailuresPolicy log.debug( "OK to fetch, check-failures detected no issues." ); } + @Override public String getDefaultOption() { return NO; } + @Override public String getId() { return "cache-failures"; } + @Override public String getName() { return "Cache failures"; } + @Override public List<String> getOptions() { return options; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java index 878079e5b..00e37a839 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java @@ -75,6 +75,7 @@ public class ChecksumPolicy options.add( IGNORE ); } + @Override public void applyPolicy( String policySetting, Properties request, File localFile ) throws PolicyViolationException, PolicyConfigurationException { @@ -148,21 +149,25 @@ public class ChecksumPolicy "Unable to process checksum policy of [" + policySetting + "], please file a bug report." ); } + @Override public String getDefaultOption() { return FIX; } + @Override public String getId() { return "checksum"; } + @Override public String getName() { return "Checksum"; } + @Override public List<String> getOptions() { return options; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java index 32ac4dffb..5813cd5ae 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java @@ -63,6 +63,7 @@ public class PropagateErrorsDownloadPolicy options.add( IGNORE ); } + @Override public boolean applyPolicy( String policySetting, Properties request, File localFile, Exception exception, Map<String, Exception> previousExceptions ) throws PolicyConfigurationException @@ -98,21 +99,25 @@ public class PropagateErrorsDownloadPolicy "Unable to process checksum policy of [" + policySetting + "], please file a bug report." ); } + @Override public String getDefaultOption() { return QUEUE; } + @Override public String getId() { return "propagate-errors"; } + @Override public String getName() { return "On remote error"; } + @Override public List<String> getOptions() { return options; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java index 6b5c95cb9..14732f1ec 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java @@ -53,6 +53,7 @@ public class PropagateErrorsOnUpdateDownloadPolicy options.add( NOT_PRESENT ); } + @Override public boolean applyPolicy( String policySetting, Properties request, File localFile, Exception exception, Map<String, Exception> previousExceptions ) throws PolicyConfigurationException @@ -81,21 +82,25 @@ public class PropagateErrorsOnUpdateDownloadPolicy "Unable to process checksum policy of [" + policySetting + "], please file a bug report." ); } + @Override public String getDefaultOption() { return NOT_PRESENT; } + @Override public String getId() { return "propagate-errors-on-update"; } + @Override public String getName() { return "Return error when"; } + @Override public List<String> getOptions() { return options; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java index 0018bdcf9..e757918dd 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java @@ -35,26 +35,31 @@ public class ReleasesPolicy /** * Defaults to {@link AbstractUpdatePolicy#HOURLY} */ + @Override public String getDefaultOption() { return AbstractUpdatePolicy.HOURLY; } + @Override protected boolean isSnapshotPolicy() { return false; } + @Override protected String getUpdateMode() { return "releases"; } + @Override public String getId() { return "releases"; } + @Override public String getName() { return "Releases"; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java index d1addb899..58f287ca3 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java @@ -35,26 +35,31 @@ public class SnapshotsPolicy /** * Defaults to {@link AbstractUpdatePolicy#HOURLY} */ + @Override public String getDefaultOption() { return AbstractUpdatePolicy.HOURLY; } + @Override protected boolean isSnapshotPolicy() { return true; } + @Override protected String getUpdateMode() { return "snapshots"; } + @Override public String getId() { return "snapshots"; } + @Override public String getName() { return "Snapshots"; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java index 4b671411c..052b549fe 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java @@ -41,11 +41,13 @@ public class DefaultUrlFailureCache this.urlCache = urlCache; } + @Override public void cacheFailure( String url ) { urlCache.register( url, new Date() ); } + @Override public boolean hasFailedBefore( String url ) { if ( urlCache.hasKey( url ) ) diff --git a/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java index 90c75983d..e8c20340a 100644 --- a/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java +++ b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java @@ -54,16 +54,19 @@ public class ProxyConnector // no op } + @Override public boolean isDisabled() { return disabled; } + @Override public void setDisabled( boolean disabled ) { this.disabled = disabled; } + @Override public List<String> getBlacklist() { return blacklist; @@ -74,6 +77,7 @@ public class ProxyConnector this.blacklist = blacklist; } + @Override public ManagedRepositoryContent getSourceRepository() { return sourceRepository; @@ -84,6 +88,7 @@ public class ProxyConnector this.sourceRepository = sourceRepository; } + @Override public RemoteRepositoryContent getTargetRepository() { return targetRepository; @@ -94,6 +99,7 @@ public class ProxyConnector this.targetRepository = targetRepository; } + @Override public List<String> getWhitelist() { return whitelist; diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java index d570ddeb7..322092f7c 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java @@ -32,36 +32,42 @@ public class DebugTransferListener { private Logger log = LoggerFactory.getLogger( getClass() ); + @Override public void transferInitiated( TransferEvent transferEvent ) { log.debug( "transferInitiated for resource {} on repository url {}", transferEvent.getResource().getName(), transferEvent.getWagon().getRepository().getUrl() ); } + @Override public void transferStarted( TransferEvent transferEvent ) { log.debug( "transferStarted for resource {} on repository url {}", transferEvent.getResource().getName(), transferEvent.getWagon().getRepository().getUrl() ); } + @Override public void transferProgress( TransferEvent transferEvent, byte[] bytes, int i ) { log.debug( "transferProgress for resource {} on repository url {}", transferEvent.getResource().getName(), transferEvent.getWagon().getRepository().getUrl() ); } + @Override public void transferCompleted( TransferEvent transferEvent ) { log.debug( "transferCompleted for resource {} on repository url {}", transferEvent.getResource().getName(), transferEvent.getWagon().getRepository().getUrl() ); } + @Override public void transferError( TransferEvent transferEvent ) { log.debug( "transferError for resource {} on repository url {}", transferEvent.getResource().getName(), transferEvent.getWagon().getRepository().getUrl(), transferEvent.getException() ); } + @Override public void debug( String s ) { log.debug( "wagon debug {}", s ); diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java index bb90fcabf..7438f4f12 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java @@ -105,6 +105,7 @@ public class AbstractRepository this.description = description; } + @Override public int hashCode() { int result = 17; @@ -112,6 +113,7 @@ public class AbstractRepository return result; } + @Override public boolean equals( Object other ) { if ( this == other ) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java index 4a86bca09..f0feb1402 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java @@ -77,6 +77,7 @@ public class PropertyEntry return sb.toString(); } + @Override public int compareTo( PropertyEntry o ) { if (o == null || o.getKey() == null) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java index 4f0c3c8c2..db152c9a7 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java @@ -182,6 +182,7 @@ public class RepositoryGroup return this; } + @Override public boolean equals( Object other ) { if ( this == other ) @@ -200,6 +201,7 @@ public class RepositoryGroup return result; } + @Override public int hashCode() { int result = 17; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java index 0c80eabd2..84f83618d 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java @@ -31,6 +31,7 @@ public class ProxyConnectorOrderComparator { private static ProxyConnectorOrderComparator INSTANCE = new ProxyConnectorOrderComparator(); + @Override public int compare( ProxyConnector o1, ProxyConnector o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java index 44cd0b0d4..4ae147a24 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java @@ -39,6 +39,7 @@ public class ProxyConnectorSelectionPredicate this.targetId = targetId; } + @Override public boolean evaluate( Object object ) { boolean satisfies = false; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java index 4e4f6491a..eb125922e 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java @@ -58,6 +58,7 @@ public class DefaultRepositoryCommonValidator * @param update in update mode if yes already exists won't be check * @throws RepositoryAdminException */ + @Override public void basicValidation( AbstractRepository abstractRepository, boolean update ) throws RepositoryAdminException { @@ -118,6 +119,7 @@ public class DefaultRepositoryCommonValidator * @param managedRepository * @since 1.4-M2 */ + @Override public void validateManagedRepository( ManagedRepository managedRepository ) throws RepositoryAdminException { @@ -155,6 +157,7 @@ public class DefaultRepositoryCommonValidator * @param directory * @return */ + @Override public String removeExpressions( String directory ) { String value = StringUtils.replace( directory, "${appserver.base}", diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java index b49a649db..f357bc2db 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java @@ -72,6 +72,7 @@ public class DefaultArchivaAdministration } + @Override public List<LegacyArtifactPath> getLegacyArtifactPaths() throws RepositoryAdminException { @@ -85,6 +86,7 @@ public class DefaultArchivaAdministration return legacyArtifactPaths; } + @Override public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -97,6 +99,7 @@ public class DefaultArchivaAdministration triggerAuditEvent( "", "", AuditEvent.ADD_LEGACY_PATH, auditInformation ); } + @Override public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -112,6 +115,7 @@ public class DefaultArchivaAdministration } + @Override public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -134,6 +138,7 @@ public class DefaultArchivaAdministration triggerAuditEvent( "", "", AuditEvent.ADD_PATTERN, auditInformation ); } + @Override public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -150,6 +155,7 @@ public class DefaultArchivaAdministration triggerAuditEvent( "", "", AuditEvent.REMOVE_PATTERN, auditInformation ); } + @Override public FileType getFileType( String fileTypeId ) throws RepositoryAdminException { @@ -162,6 +168,7 @@ public class DefaultArchivaAdministration return getModelMapper().map( fileType, FileType.class ); } + @Override public void addFileType( FileType fileType, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -177,6 +184,7 @@ public class DefaultArchivaAdministration saveConfiguration( configuration ); } + @Override public void removeFileType( String fileTypeId, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -187,6 +195,7 @@ public class DefaultArchivaAdministration saveConfiguration( configuration ); } + @Override public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -201,6 +210,7 @@ public class DefaultArchivaAdministration triggerAuditEvent( "", "", AuditEvent.ENABLE_REPO_CONSUMER, auditInformation ); } + @Override public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -210,6 +220,7 @@ public class DefaultArchivaAdministration triggerAuditEvent( "", "", AuditEvent.DISABLE_REPO_CONSUMER, auditInformation ); } + @Override public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -224,6 +235,7 @@ public class DefaultArchivaAdministration triggerAuditEvent( "", "", AuditEvent.ENABLE_REPO_CONSUMER, auditInformation ); } + @Override public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -233,6 +245,7 @@ public class DefaultArchivaAdministration triggerAuditEvent( "", "", AuditEvent.DISABLE_REPO_CONSUMER, auditInformation ); } + @Override public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -246,6 +259,7 @@ public class DefaultArchivaAdministration } } + @Override public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -259,6 +273,7 @@ public class DefaultArchivaAdministration } } + @Override public List<FileType> getFileTypes() throws RepositoryAdminException { @@ -276,6 +291,7 @@ public class DefaultArchivaAdministration return fileTypes; } + @Override public List<String> getKnownContentConsumers() throws RepositoryAdminException { @@ -283,6 +299,7 @@ public class DefaultArchivaAdministration getArchivaConfiguration().getConfiguration().getRepositoryScanning().getKnownContentConsumers() ); } + @Override public List<String> getInvalidContentConsumers() throws RepositoryAdminException { @@ -290,6 +307,7 @@ public class DefaultArchivaAdministration getArchivaConfiguration().getConfiguration().getRepositoryScanning().getInvalidContentConsumers() ); } + @Override public OrganisationInformation getOrganisationInformation() throws RepositoryAdminException { @@ -302,6 +320,7 @@ public class DefaultArchivaAdministration return getModelMapper().map( organisationInformation, OrganisationInformation.class ); } + @Override public void setOrganisationInformation( OrganisationInformation organisationInformation ) throws RepositoryAdminException { @@ -320,6 +339,7 @@ public class DefaultArchivaAdministration saveConfiguration( configuration ); } + @Override public UiConfiguration getUiConfiguration() throws RepositoryAdminException { @@ -336,6 +356,7 @@ public class DefaultArchivaAdministration return getModelMapper().map( userInterfaceOptions, UiConfiguration.class ); } + @Override public void updateUiConfiguration( UiConfiguration uiConfiguration ) throws RepositoryAdminException { @@ -355,6 +376,7 @@ public class DefaultArchivaAdministration } + @Override public NetworkConfiguration getNetworkConfiguration() throws RepositoryAdminException { @@ -368,6 +390,7 @@ public class DefaultArchivaAdministration return getModelMapper().map( networkConfiguration, NetworkConfiguration.class ); } + @Override public void setNetworkConfiguration( NetworkConfiguration networkConfiguration ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java index 666a8a178..57e924e25 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java @@ -35,6 +35,7 @@ public class FiletypeToMapClosure { private Map<String, FileType> map = new HashMap<>(); + @Override public void execute( Object input ) { if ( input instanceof FileType ) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java index 5be2e8fe4..af4fea009 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java @@ -105,6 +105,7 @@ public class DefaultRepositoryGroupAdmin return new File( groupsDirectory, repositoryGroupId ); } + @Override public List<RepositoryGroup> getRepositoriesGroups() throws RepositoryAdminException { @@ -123,6 +124,7 @@ public class DefaultRepositoryGroupAdmin return repositoriesGroups; } + @Override public RepositoryGroup getRepositoryGroup( String repositoryGroupId ) throws RepositoryAdminException { @@ -137,6 +139,7 @@ public class DefaultRepositoryGroupAdmin return null; } + @Override public Boolean addRepositoryGroup( RepositoryGroup repositoryGroup, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -157,6 +160,7 @@ public class DefaultRepositoryGroupAdmin return Boolean.TRUE; } + @Override public Boolean deleteRepositoryGroup( String repositoryGroupId, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -176,6 +180,7 @@ public class DefaultRepositoryGroupAdmin return Boolean.TRUE; } + @Override public Boolean updateRepositoryGroup( RepositoryGroup repositoryGroup, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -212,6 +217,7 @@ public class DefaultRepositoryGroupAdmin } + @Override public Boolean addRepositoryToGroup( String repositoryGroupId, String repositoryId, AuditInformation auditInformation ) throws RepositoryAdminException @@ -236,6 +242,7 @@ public class DefaultRepositoryGroupAdmin return Boolean.TRUE; } + @Override public Boolean deleteRepositoryFromGroup( String repositoryGroupId, String repositoryId, AuditInformation auditInformation ) throws RepositoryAdminException @@ -261,6 +268,7 @@ public class DefaultRepositoryGroupAdmin return Boolean.TRUE; } + @Override public Map<String, RepositoryGroup> getRepositoryGroupsAsMap() throws RepositoryAdminException { @@ -273,6 +281,7 @@ public class DefaultRepositoryGroupAdmin return map; } + @Override public Map<String, List<String>> getGroupToRepositoryMap() throws RepositoryAdminException { @@ -299,6 +308,7 @@ public class DefaultRepositoryGroupAdmin return map; } + @Override public Map<String, List<String>> getRepositoryToGroupMap() throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java index 891b83150..cfe4b624e 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java @@ -157,6 +157,7 @@ public class DefaultManagedRepositoryAdmin } } + @Override public List<ManagedRepository> getManagedRepositories() throws RepositoryAdminException { @@ -187,6 +188,7 @@ public class DefaultManagedRepositoryAdmin return managedRepos; } + @Override public Map<String, ManagedRepository> getManagedRepositoriesAsMap() throws RepositoryAdminException { @@ -199,6 +201,7 @@ public class DefaultManagedRepositoryAdmin return repositoriesMap; } + @Override public ManagedRepository getManagedRepository( String repositoryId ) throws RepositoryAdminException { @@ -213,6 +216,7 @@ public class DefaultManagedRepositoryAdmin return null; } + @Override public Boolean addManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, AuditInformation auditInformation ) throws RepositoryAdminException @@ -317,6 +321,7 @@ public class DefaultManagedRepositoryAdmin return repository; } + @Override public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation, boolean deleteContent ) throws RepositoryAdminException @@ -461,6 +466,7 @@ public class DefaultManagedRepositoryAdmin } + @Override public Boolean updateManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, AuditInformation auditInformation, boolean resetStats ) throws RepositoryAdminException @@ -590,6 +596,7 @@ public class DefaultManagedRepositoryAdmin } + @Override public IndexingContext createIndexContext( ManagedRepository repository ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java index 321c88b29..7b63551a3 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java @@ -43,6 +43,7 @@ public class DefaultNetworkProxyAdmin implements NetworkProxyAdmin { + @Override public List<NetworkProxy> getNetworkProxies() throws RepositoryAdminException { @@ -55,6 +56,7 @@ public class DefaultNetworkProxyAdmin return networkProxies; } + @Override public NetworkProxy getNetworkProxy( String networkProxyId ) throws RepositoryAdminException { @@ -69,6 +71,7 @@ public class DefaultNetworkProxyAdmin return null; } + @Override public void addNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -89,6 +92,7 @@ public class DefaultNetworkProxyAdmin saveConfiguration( configuration ); } + @Override public void updateNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -111,6 +115,7 @@ public class DefaultNetworkProxyAdmin saveConfiguration( configuration ); } + @Override public void deleteNetworkProxy( String networkProxyId, AuditInformation auditInformation ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java index 0d9914b0c..73450cbd5 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java @@ -58,6 +58,7 @@ public class DefaultProxyConnectorAdmin @Inject private RemoteRepositoryAdmin remoteRepositoryAdmin; + @Override public List<ProxyConnector> getProxyConnectors() throws RepositoryAdminException { @@ -72,6 +73,7 @@ public class DefaultProxyConnectorAdmin return proxyConnectors; } + @Override public ProxyConnector getProxyConnector( String sourceRepoId, String targetRepoId ) throws RepositoryAdminException { @@ -86,6 +88,7 @@ public class DefaultProxyConnectorAdmin return null; } + @Override public Boolean addProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -114,6 +117,7 @@ public class DefaultProxyConnectorAdmin } // FIXME take care of proxyConnectorRules ! + @Override public Boolean deleteProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -134,6 +138,7 @@ public class DefaultProxyConnectorAdmin } // FIXME care take of proxyConnectorRules ! + @Override public Boolean updateProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -163,6 +168,7 @@ public class DefaultProxyConnectorAdmin return Collections.emptyList(); } + @Override public Map<String, List<ProxyConnector>> getProxyConnectorAsMap() throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorOrderComparator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorOrderComparator.java index f3ffa2d59..b83a1c0f1 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorOrderComparator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorOrderComparator.java @@ -31,6 +31,7 @@ public class ProxyConnectorOrderComparator { private static ProxyConnectorOrderComparator INSTANCE = new ProxyConnectorOrderComparator(); + @Override public int compare( ProxyConnector o1, ProxyConnector o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java index 276808eba..041e66450 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java @@ -48,6 +48,7 @@ public class DefaultProxyConnectorRuleAdmin { private Logger log = LoggerFactory.getLogger( getClass() ); + @Override public List<ProxyConnectorRule> getProxyConnectorRules() throws RepositoryAdminException { @@ -92,6 +93,7 @@ public class DefaultProxyConnectorRuleAdmin return null; } + @Override public void addProxyConnectorRule( ProxyConnectorRule proxyConnectorRule, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -110,6 +112,7 @@ public class DefaultProxyConnectorRuleAdmin saveConfiguration( configuration ); } + @Override public void deleteProxyConnectorRule( ProxyConnectorRule proxyConnectorRule, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -143,6 +146,7 @@ public class DefaultProxyConnectorRuleAdmin } + @Override public void updateProxyConnectorRule( ProxyConnectorRule proxyConnectorRule, AuditInformation auditInformation ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java index bcf945ad4..28482f7c3 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java @@ -112,6 +112,7 @@ public class DefaultRemoteRepositoryAdmin } + @Override public List<RemoteRepository> getRemoteRepositories() throws RepositoryAdminException { @@ -141,6 +142,7 @@ public class DefaultRemoteRepositoryAdmin return remoteRepositories; } + @Override public RemoteRepository getRemoteRepository( String repositoryId ) throws RepositoryAdminException { @@ -154,6 +156,7 @@ public class DefaultRemoteRepositoryAdmin return null; } + @Override public Boolean addRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -179,6 +182,7 @@ public class DefaultRemoteRepositoryAdmin return Boolean.TRUE; } + @Override public Boolean deleteRemoteRepository( String repositoryId, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -213,6 +217,7 @@ public class DefaultRemoteRepositoryAdmin return Boolean.TRUE; } + @Override public Boolean updateRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation ) throws RepositoryAdminException { @@ -242,6 +247,7 @@ public class DefaultRemoteRepositoryAdmin return Boolean.TRUE; } + @Override public Map<String, RemoteRepository> getRemoteRepositoriesAsMap() throws RepositoryAdminException { @@ -255,6 +261,7 @@ public class DefaultRemoteRepositoryAdmin return map; } + @Override public IndexingContext createIndexContext( RemoteRepository remoteRepository ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java index be7004e68..718bfc169 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java @@ -118,12 +118,14 @@ public class DefaultArchivaRuntimeConfigurationAdmin } + @Override public ArchivaRuntimeConfiguration getArchivaRuntimeConfiguration() throws RepositoryAdminException { return build( archivaConfiguration.getConfiguration().getArchivaRuntimeConfiguration() ); } + @Override public void updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java index 356f00cdb..2ff43b3d0 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java @@ -78,6 +78,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin } @PostConstruct + @Override public void initialize() throws UserConfigurationException { @@ -285,11 +286,13 @@ public class DefaultRedbackRuntimeConfigurationAdmin } } + @Override public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration() { return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration() ); } + @Override public void updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws RepositoryAdminException { @@ -437,6 +440,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin // wrapper for UserConfiguration to intercept values (and store it not yet migrated) + @Override public String getString( String key ) { if ( UserConfigurationKeys.USER_MANAGER_IMPL.equals( key ) ) @@ -484,6 +488,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return value; } + @Override public String getString( String key, String defaultValue ) { if ( UserConfigurationKeys.LDAP_HOSTNAME.equals( key ) ) @@ -531,6 +536,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return value; } + @Override public int getInt( String key ) { RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration(); @@ -556,6 +562,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return value; } + @Override public int getInt( String key, int defaultValue ) { if ( UserConfigurationKeys.LDAP_PORT.equals( key ) ) @@ -586,6 +593,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return value; } + @Override public boolean getBoolean( String key ) { RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration(); @@ -626,6 +634,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return value; } + @Override public boolean getBoolean( String key, boolean defaultValue ) { if ( UserConfigurationKeys.LDAP_SSL.equals( key ) ) @@ -671,6 +680,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return value; } + @Override public List<String> getList( String key ) { List<String> value = userConfiguration.getList( key ); @@ -691,6 +701,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return value; } + @Override public String getConcatenatedList( String key, String defaultValue ) { if ( UserConfigurationKeys.LDAP_BASEDN.equals( key ) ) @@ -708,6 +719,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin return userConfiguration.getConcatenatedList( key, defaultValue ); } + @Override public Collection<String> getKeys() { Collection<String> keys = userConfiguration.getKeys(); diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java index 5e2d66d2e..973bbd71d 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java @@ -29,6 +29,7 @@ import java.util.Comparator; public class RepositoryComparator implements Comparator<AbstractRepository> { + @Override public int compare( AbstractRepository o1, AbstractRepository o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java index 37135a1f9..90cd99692 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java @@ -35,6 +35,7 @@ public class MockAuditListener private List<AuditEvent> auditEvents = new ArrayList<>(); + @Override public void auditEvent( AuditEvent event ) { auditEvents.add( event ); diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java index 133525f25..6e32329d4 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java @@ -30,22 +30,26 @@ import org.springframework.stereotype.Service; public class MockRepositoryArchivaTaskScheduler implements RepositoryArchivaTaskScheduler { + @Override public boolean isProcessingRepositoryTask( String repositoryId ) { return false; } + @Override public boolean isProcessingRepositoryTask( RepositoryTask task ) { return false; } + @Override public void queueTask( RepositoryTask task ) throws TaskQueueException { // no op } + @Override public boolean unQueueTask( RepositoryTask task ) throws TaskQueueException { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java index 199f0e288..69ffc47e9 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java @@ -42,6 +42,7 @@ import java.util.List; public class MockRepositorySessionFactory implements RepositorySessionFactory { + @Override public RepositorySession createSession() { return new RepositorySession( null, null ) @@ -64,18 +65,21 @@ public class MockRepositorySessionFactory return new MetadataRepository() { + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { return false; } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String projectVersion, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -83,12 +87,14 @@ public class MockRepositorySessionFactory throw new UnsupportedOperationException(); } + @Override public void updateProject( String repositoryId, ProjectMetadata project ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateArtifact( String repositoryId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifactMeta ) throws MetadataRepositoryException @@ -96,6 +102,7 @@ public class MockRepositorySessionFactory //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateProjectVersion( String repositoryId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) throws MetadataRepositoryException @@ -103,42 +110,49 @@ public class MockRepositorySessionFactory //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<String> getMetadataFacets( String repositoryId, String facetId ) throws MetadataRepositoryException { return Collections.emptyList(); } + @Override public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeMetadataFacets( String repositoryId, String facetId ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeMetadataFacet( String repositoryId, String facetId, String name ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repositoryId, Date startTime, Date endTime ) throws MetadataRepositoryException @@ -146,18 +160,21 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getRepositories() throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum ) throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, String id ) throws MetadataRepositoryException @@ -165,24 +182,28 @@ public class MockRepositorySessionFactory //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeRepository( String repositoryId ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifacts( String repositoryId ) throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public ProjectMetadata getProject( String repoId, String namespace, String projectId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -190,6 +211,7 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -197,6 +219,7 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) @@ -205,30 +228,35 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getRootNamespaces( String repoId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getNamespaces( String repoId, String namespace ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getProjects( String repoId, String namespace ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -236,37 +264,44 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void save() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void close() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void revert() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean canObtainAccess( Class<?> aClass ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public <T>T obtainAccess( Class<T> aClass ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException @@ -274,6 +309,7 @@ public class MockRepositorySessionFactory } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java index a9f4f9812..85ed80f5e 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java @@ -144,6 +144,7 @@ public class RepositoryContentFactory } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isManagedRepositories( propertyName ) || ConfigurationNames.isRemoteRepositories( @@ -153,6 +154,7 @@ public class RepositoryContentFactory } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* do nothing */ diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java index 43a7048d7..06038e960 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java @@ -121,6 +121,7 @@ public class MetadataTools lastUpdatedFormat.setTimeZone( DateUtils.UTC_TIME_ZONE ); } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isProxyConnector( propertyName ) ) @@ -129,6 +130,7 @@ public class MetadataTools } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* nothing to do */ diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java index d485bd8e3..a38ad47c0 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java @@ -53,6 +53,7 @@ public class DefaultRepositoryScanner private Set<RepositoryScannerInstance> inProgressScans = new LinkedHashSet<RepositoryScannerInstance>(); + @Override public RepositoryScanStatistics scan( ManagedRepository repository, long changesSince ) throws RepositoryScannerException { @@ -70,6 +71,7 @@ public class DefaultRepositoryScanner } } + @Override public RepositoryScanStatistics scan( ManagedRepository repository, List<KnownRepositoryContentConsumer> knownContentConsumers, List<InvalidRepositoryContentConsumer> invalidContentConsumers, @@ -155,6 +157,7 @@ public class DefaultRepositoryScanner return ids; } + @Override public Set<RepositoryScannerInstance> getInProgressScans() { return inProgressScans; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java index 5a5b4d71a..4ce22d2c4 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java @@ -68,6 +68,7 @@ public class RepositoryContentConsumers this.archivaAdministration = archivaAdministration; } + @Override public void setApplicationContext( ApplicationContext applicationContext ) throws BeansException { diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java index 371776ab0..65cb6603c 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java @@ -133,12 +133,14 @@ public class RepositoryScannerInstance return consumerCounts; } + @Override public void directoryWalkStarting( File basedir ) { log.info( "Walk Started: [{}] {}", this.repository.getId(), this.repository.getLocation() ); stats.triggerStart(); } + @Override public void directoryWalkStep( int percentage, File file ) { log.debug( "Walk Step: {}, {}", percentage, file ); @@ -167,6 +169,7 @@ public class RepositoryScannerInstance } } + @Override public void directoryWalkFinished() { TriggerScanCompletedClosure scanCompletedClosure = new TriggerScanCompletedClosure( repository, true ); @@ -183,6 +186,7 @@ public class RepositoryScannerInstance /** * Debug method from DirectoryWalker. */ + @Override public void debug( String message ) { log.debug( "Repository Scanner: {}", message ); diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java index 543a85eb5..69db9b786 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java @@ -45,6 +45,7 @@ public class ConsumerProcessFileClosure private Map<String,Long> consumerCounts; + @Override public void execute( Object input ) { if ( input instanceof RepositoryContentConsumer ) diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java index 5c1e66e4e..b83085411 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java @@ -61,6 +61,7 @@ public class TriggerBeginScanClosure this.executeOnEntireRepo = executeOnEntireRepo; } + @Override public void execute( Object input ) { if ( input instanceof RepositoryContentConsumer ) diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java index 775037825..3b7cf9d7f 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java @@ -48,6 +48,7 @@ public class TriggerScanCompletedClosure this.executeOnEntireRepo = executeOnEntireRepo; } + @Override public void execute( Object input ) { if ( input instanceof RepositoryContentConsumer ) diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java index 57041e32d..d3eadfdfa 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java @@ -52,126 +52,147 @@ public class ArchivaAdministrationStub this.archivaConfiguration = archivaConfiguration; } + @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 archivaConfiguration.getConfiguration().getRepositoryScanning().getKnownContentConsumers(); } + @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 archivaConfiguration.getConfiguration().getRepositoryScanning().getInvalidContentConsumers(); } + @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 { } + @Override public UiConfiguration getUiConfiguration() throws RepositoryAdminException { return null; } + @Override public void updateUiConfiguration( UiConfiguration uiConfiguration ) throws RepositoryAdminException { @@ -179,12 +200,14 @@ public class ArchivaAdministrationStub } + @Override public NetworkConfiguration getNetworkConfiguration() throws RepositoryAdminException { return null; } + @Override public void setNetworkConfiguration( NetworkConfiguration networkConfiguration ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java index f73496fab..717b8ba58 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java @@ -45,60 +45,71 @@ public class InvalidScanConsumer private int processCount = 0; + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { /* do nothing */ } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void completeScan() { /* do nothing */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public List<String> getExcludes() { return null; } + @Override public List<String> getIncludes() { return null; } + @Override public void processFile( String path ) throws ConsumerException { processCount++; } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws ConsumerException { processFile( path ); } + @Override public String getDescription() { return "Bad Content Scan Consumer (for testing)"; } + @Override public String getId() { return id; } + @Override public boolean isPermanent() { return false; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java index c75e6e5b3..77c7258ee 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java @@ -46,6 +46,7 @@ public class KnownScanConsumer private boolean processUnmodified = false; + @Override public List<String> getExcludes() { return null; @@ -57,50 +58,59 @@ public class KnownScanConsumer this.includes.addAll( Arrays.asList( includesArray ) ); } + @Override public List<String> getIncludes() { return includes; } + @Override public String getId() { return "test-scan-consumer"; } + @Override public String getDescription() { return "Scan Consumer (for testing)"; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { /* do nothing */ } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void processFile( String path ) throws ConsumerException { this.processCount++; } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { processFile( path ); } + @Override public void completeScan() { /* do nothing */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -116,11 +126,13 @@ public class KnownScanConsumer this.processCount = processCount; } + @Override public boolean isPermanent() { return false; } + @Override public boolean isProcessUnmodified() { return processUnmodified; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java index 568bdd7d1..a20d4688a 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java @@ -368,62 +368,74 @@ public class RepositoryContentConsumersTest this.invalidRepositoryContentConsumers = invalidRepositoryContentConsumers; } + @Override public String getApplicationName() { return "foo"; } + @Override public AutowireCapableBeanFactory getAutowireCapableBeanFactory( ) throws IllegalStateException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getDisplayName( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getId( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public ApplicationContext getParent( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public long getStartupDate( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean containsBeanDefinition( String beanName ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public int getBeanDefinitionCount( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String[] getBeanDefinitionNames( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String[] getBeanNamesForType( Class type ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String[] getBeanNamesForType( Class type, boolean includeNonSingletons, boolean allowEagerInit ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Map getBeansOfType( Class type ) throws BeansException { @@ -438,129 +450,152 @@ public class RepositoryContentConsumersTest throw new UnsupportedOperationException( "Should not have been called" ); } + @Override public Map getBeansOfType( Class type, boolean includeNonSingletons, boolean allowEagerInit ) throws BeansException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean containsBean( String name ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String[] getAliases( String name ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Object getBean( String name ) throws BeansException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Object getBean( String name, Class requiredType ) throws BeansException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Object getBean( String name, Object[] args ) throws BeansException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Class getType( String name ) throws NoSuchBeanDefinitionException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isPrototype( String name ) throws NoSuchBeanDefinitionException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isSingleton( String name ) throws NoSuchBeanDefinitionException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isTypeMatch( String name, Class targetType ) throws NoSuchBeanDefinitionException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean containsLocalBean( String name ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public BeanFactory getParentBeanFactory( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getMessage( String code, Object[] args, String defaultMessage, Locale locale ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getMessage( String code, Object[] args, Locale locale ) throws NoSuchMessageException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getMessage( MessageSourceResolvable resolvable, Locale locale ) throws NoSuchMessageException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public void publishEvent( ApplicationEvent event ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Resource[] getResources( String locationPattern ) throws IOException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public ClassLoader getClassLoader( ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Resource getResource( String location ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public <T> T getBean( Class<T> tClass ) throws BeansException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Map<String, Object> getBeansWithAnnotation( Class<? extends Annotation> aClass ) throws BeansException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public <A extends Annotation> A findAnnotationOnBean( String s, Class<A> aClass ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Environment getEnvironment() { return null; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java index fbaf2ec47..17138f732 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java @@ -41,60 +41,71 @@ public class SampleKnownConsumer */ private String id = "unset-id"; + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { /* nothing to do */ } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void completeScan() { /* nothing to do */ } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); } + @Override public List<String> getExcludes() { return null; } + @Override public List<String> getIncludes() { return null; } + @Override public void processFile( String path ) throws ConsumerException { /* nothing to do */ } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { processFile( path ); } + @Override public String getDescription() { return "Sample Known Consumer"; } + @Override public String getId() { return id; } + @Override public boolean isPermanent() { return false; diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java index 16c6a1523..316fd61c1 100644 --- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java +++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java @@ -51,6 +51,7 @@ public class CopyFileEvent this.destination = destination; } + @Override public void commit() throws IOException { @@ -100,6 +101,7 @@ public class CopyFileEvent return false; } + @Override public void rollback() throws IOException { diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java index 6e1510a38..956f9fe30 100644 --- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java +++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java @@ -50,6 +50,7 @@ public class CreateFileEvent this.destination = destination; } + @Override public void commit() throws IOException { @@ -67,6 +68,7 @@ public class CreateFileEvent createChecksums( destination, true ); } + @Override public void rollback() throws IOException { diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java index 4ee3b9e05..80a815588 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java +++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java @@ -35,6 +35,7 @@ public class ElementTextListClosure { private List<String> list = new ArrayList<>(); + @Override public void execute( Object input ) { if ( input instanceof Element ) diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java index 745555629..f65b4fc98 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java +++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java @@ -55,6 +55,7 @@ public class LatinEntityResolutionReader * @return The number of characters read, or -1 if the end of the stream has been reached * @throws IOException if an I/O error occurs. */ + @Override public int read( char[] destbuf, int offset, int length ) throws IOException { @@ -182,6 +183,7 @@ public class LatinEntityResolutionReader return ret.toString(); } + @Override public void close() throws IOException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java index 1f1e2c359..71fb58460 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java @@ -94,6 +94,7 @@ public class ArchivaIndexingTaskExecutor * @param task * @throws TaskExecutionException */ + @Override public void executeTask( Task task ) throws TaskExecutionException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java index 3d1156b4d..0029bc096 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java @@ -83,6 +83,7 @@ public class ArtifactIndexingTask this.executeOnEntireRepo = executeOnEntireRepo; } + @Override public long getMaxExecutionTime() { return 0; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java index 05f51d57a..42a6b72a6 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java @@ -149,12 +149,14 @@ public class DefaultDownloadRemoteIndexScheduler } } + @Override public void configurationEvent( ConfigurationEvent event ) { // TODO remove jobs and add again } + @Override public void scheduleDownloadRemote( String repositoryId, boolean now, boolean fullDownload ) throws DownloadRemoteIndexException { @@ -237,6 +239,7 @@ public class DefaultDownloadRemoteIndexScheduler this.taskScheduler = taskScheduler; } + @Override public List<String> getRunningRemoteDownloadIds() { return runningRemoteDownloadIds; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java index b8db00ae8..330df16a6 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java @@ -95,6 +95,7 @@ public class DownloadRemoteIndexTask this.remoteRepositoryAdmin = downloadRemoteIndexTaskRequest.getRemoteRepositoryAdmin(); } + @Override public void run() { @@ -255,6 +256,7 @@ public class DownloadRemoteIndexTask private int totalLength = 0; + @Override public void transferInitiated( TransferEvent transferEvent ) { startTime = System.currentTimeMillis(); @@ -262,6 +264,7 @@ public class DownloadRemoteIndexTask log.debug( "initiate transfer of {}", resourceName ); } + @Override public void transferStarted( TransferEvent transferEvent ) { this.totalLength = 0; @@ -269,12 +272,14 @@ public class DownloadRemoteIndexTask log.info( "start transfer of {}", transferEvent.getResource().getName() ); } + @Override public void transferProgress( TransferEvent transferEvent, byte[] buffer, int length ) { log.debug( "transfer of {} : {}/{}", transferEvent.getResource().getName(), buffer.length, length ); this.totalLength += length; } + @Override public void transferCompleted( TransferEvent transferEvent ) { resourceName = transferEvent.getResource().getName(); @@ -283,12 +288,14 @@ public class DownloadRemoteIndexTask this.totalLength / 1024, ( endTime - startTime ) / 1000 ); } + @Override public void transferError( TransferEvent transferEvent ) { log.info( "error of transfer file {}: {}", transferEvent.getResource().getName(), transferEvent.getException().getMessage(), transferEvent.getException() ); } + @Override public void debug( String message ) { log.debug( "transfer debug {}", message ); @@ -316,18 +323,21 @@ public class DownloadRemoteIndexTask this.remoteRepository = remoteRepository; } + @Override public void connect( String id, String url ) throws IOException { //no op } + @Override public void disconnect() throws IOException { // no op } + @Override public InputStream retrieve( String name ) throws IOException, FileNotFoundException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java index 908c42a2e..c53410aa0 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java @@ -47,6 +47,7 @@ public class IndexingArchivaTaskScheduler @Named(value = "taskQueue#indexing") private TaskQueue indexingQueue; + @Override public void queueTask( ArtifactIndexingTask task ) throws TaskQueueException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java index 6e92cc8bb..56f2dc696 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java @@ -80,6 +80,7 @@ public class ArchivaIndexingTaskExecutorTest ManagedRepositoryAdmin managedRepositoryAdmin; @Before + @Override public void setUp() throws Exception { @@ -101,6 +102,7 @@ public class ArchivaIndexingTaskExecutorTest } @After + @Override public void tearDown() throws Exception { @@ -279,6 +281,7 @@ public class ArchivaIndexingTaskExecutorTest indexerDirectory.listFiles( new FilenameFilter() { + @Override public boolean accept( File file, String s ) { if ( s.startsWith( "nexus-maven-repository-index" ) ) diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java index 5776681d5..6eedbc464 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java @@ -42,6 +42,7 @@ import java.util.List; public class MockRepositorySessionFactory implements RepositorySessionFactory { + @Override public RepositorySession createSession() { return new RepositorySession( null, null ) @@ -64,18 +65,21 @@ public class MockRepositorySessionFactory return new MetadataRepository() { + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { return false; } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String projectVersion, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -83,12 +87,14 @@ public class MockRepositorySessionFactory throw new UnsupportedOperationException(); } + @Override public void updateProject( String repositoryId, ProjectMetadata project ) throws MetadataRepositoryException { } + @Override public void updateArtifact( String repositoryId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifactMeta ) throws MetadataRepositoryException @@ -96,6 +102,7 @@ public class MockRepositorySessionFactory } + @Override public void updateProjectVersion( String repositoryId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) throws MetadataRepositoryException @@ -103,42 +110,49 @@ public class MockRepositorySessionFactory } + @Override public void updateNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { } + @Override public List<String> getMetadataFacets( String repositoryId, String facetId ) throws MetadataRepositoryException { return Collections.emptyList(); } + @Override public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) throws MetadataRepositoryException { } + @Override public void removeMetadataFacets( String repositoryId, String facetId ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeMetadataFacet( String repositoryId, String facetId, String name ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repositoryId, Date startTime, Date endTime ) throws MetadataRepositoryException @@ -146,18 +160,21 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getRepositories() throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum ) throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, String id ) throws MetadataRepositoryException @@ -165,24 +182,28 @@ public class MockRepositorySessionFactory //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeRepository( String repositoryId ) throws MetadataRepositoryException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifacts( String repositoryId ) throws MetadataRepositoryException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public ProjectMetadata getProject( String repoId, String namespace, String projectId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -190,6 +211,7 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -197,6 +219,7 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) @@ -205,30 +228,35 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getRootNamespaces( String repoId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getNamespaces( String repoId, String namespace ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getProjects( String repoId, String namespace ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -236,37 +264,44 @@ public class MockRepositorySessionFactory return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void save() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void close() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void revert() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean canObtainAccess( Class<?> aClass ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public <T>T obtainAccess( Class<T> aClass ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException @@ -274,6 +309,7 @@ public class MockRepositorySessionFactory } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java index 56c684a7e..d192187ff 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java @@ -33,6 +33,7 @@ public interface RepositoryArchivaTaskScheduler boolean isProcessingRepositoryTask( RepositoryTask task ); + @Override void queueTask( RepositoryTask task ) throws TaskQueueException; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java index 894f65bc6..e4a562075 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java @@ -60,6 +60,7 @@ public class RepositoryTask this.repositoryId = repositoryId; } + @Override public long getMaxExecutionTime() { return 0; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java index cb8fb21e0..f23d08b09 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java @@ -85,6 +85,7 @@ public class ArchivaRepositoryScanningTaskExecutor } @SuppressWarnings( "unchecked" ) + @Override public void executeTask( Task task ) throws TaskExecutionException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java index f9c650719..3012a40ec 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java @@ -173,6 +173,7 @@ public class DefaultRepositoryArchivaTaskScheduler } @SuppressWarnings( "unchecked" ) + @Override public boolean isProcessingRepositoryTask( String repositoryId ) { synchronized ( repositoryScanningQueue ) @@ -199,6 +200,7 @@ public class DefaultRepositoryArchivaTaskScheduler } } + @Override public boolean isProcessingRepositoryTask( RepositoryTask task ) { synchronized ( repositoryScanningQueue ) @@ -225,6 +227,7 @@ public class DefaultRepositoryArchivaTaskScheduler } } + @Override public void queueTask( RepositoryTask task ) throws TaskQueueException { @@ -242,6 +245,7 @@ public class DefaultRepositoryArchivaTaskScheduler } } + @Override public boolean unQueueTask( RepositoryTask task ) throws TaskQueueException { @@ -259,6 +263,7 @@ public class DefaultRepositoryArchivaTaskScheduler } } + @Override public void configurationEvent( ConfigurationEvent event ) { if ( event.getType() == ConfigurationEvent.SAVED ) diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java index 8bd2b9a54..92e5131db 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java @@ -39,6 +39,7 @@ public class RepositoryTaskJob * @param context * @throws org.quartz.JobExecutionException */ + @Override public void execute( JobExecutionContext context ) throws JobExecutionException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java index 90dd98b5d..def73a181 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java @@ -28,6 +28,7 @@ public class TestRepositorySessionFactory private MetadataResolver resolver; + @Override public RepositorySession createSession() { return new RepositorySession( repository, resolver ); diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java index 5e4a33104..1c659a28b 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java @@ -39,72 +39,84 @@ public class MockArchivaAdministration { private ArchivaConfiguration archivaConfiguration; + @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 { @@ -112,24 +124,28 @@ public class MockArchivaAdministration getArchivaConfiguration().getConfiguration().getRepositoryScanning().getKnownContentConsumers() ); } + @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 { @@ -137,18 +153,21 @@ public class MockArchivaAdministration getArchivaConfiguration().getConfiguration().getRepositoryScanning().getInvalidContentConsumers() ); } + @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 { @@ -165,24 +184,28 @@ public class MockArchivaAdministration this.archivaConfiguration = archivaConfiguration; } + @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 { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java index a8b02b29d..e70924d35 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java @@ -39,6 +39,7 @@ public class MockManagedRepositoryAdmin { private ArchivaConfiguration archivaConfiguration; + @Override public List<ManagedRepository> getManagedRepositories() throws RepositoryAdminException { @@ -63,12 +64,14 @@ public class MockManagedRepositoryAdmin return managedRepos; } + @Override public Map<String, ManagedRepository> getManagedRepositoriesAsMap() throws RepositoryAdminException { return null; } + @Override public ManagedRepository getManagedRepository( String repositoryId ) throws RepositoryAdminException { @@ -83,6 +86,7 @@ public class MockManagedRepositoryAdmin return null; } + @Override public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation, boolean deleteContent ) throws RepositoryAdminException @@ -90,6 +94,7 @@ public class MockManagedRepositoryAdmin return null; } + @Override public Boolean addManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, AuditInformation auditInformation ) throws RepositoryAdminException @@ -97,6 +102,7 @@ public class MockManagedRepositoryAdmin return null; } + @Override public Boolean updateManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, AuditInformation auditInformation, boolean resetStats ) throws RepositoryAdminException @@ -114,6 +120,7 @@ public class MockManagedRepositoryAdmin this.archivaConfiguration = archivaConfiguration; } + @Override public IndexingContext createIndexContext( ManagedRepository repository ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java index c29906d70..0a610c1bc 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java @@ -36,36 +36,42 @@ public class MockRemoteRepositoryAdmin { private ArchivaConfiguration archivaConfiguration; + @Override public List<RemoteRepository> getRemoteRepositories() throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public RemoteRepository getRemoteRepository( String repositoryId ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean deleteRemoteRepository( String repositoryId, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean addRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean updateRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Map<String, RemoteRepository> getRemoteRepositoriesAsMap() throws RepositoryAdminException { @@ -82,6 +88,7 @@ public class MockRemoteRepositoryAdmin this.archivaConfiguration = archivaConfiguration; } + @Override public IndexingContext createIndexContext( RemoteRepository repository ) throws RepositoryAdminException { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java index 1c0a8fb97..773c8c536 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java @@ -50,31 +50,37 @@ public class TestConsumer private ManagedRepositoryContent repository; + @Override public String getId() { return "test-consumer"; } + @Override public String getDescription() { return null; } + @Override public boolean isPermanent() { return false; } + @Override public List<String> getIncludes() { return Collections.singletonList( "**/**" ); } + @Override public List<String> getExcludes() { return null; } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { @@ -90,12 +96,14 @@ public class TestConsumer } } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repository, whenGathered ); } + @Override public void processFile( String path ) throws ConsumerException { @@ -112,16 +120,19 @@ public class TestConsumer } } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { processFile( path ); } + @Override public void completeScan() { } + @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java index a2ebf4532..d27e3506f 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java @@ -37,12 +37,14 @@ public class TestRepositoryStatisticsManager { private Map<String, List<RepositoryStatistics>> repoStats = new HashMap<>(); + @Override public boolean hasStatistics( MetadataRepository metadataRepository, String repositoryId ) throws MetadataRepositoryException { return !repoStats.isEmpty(); } + @Override public RepositoryStatistics getLastStatistics( MetadataRepository metadataRepository, String repositoryId ) { List<RepositoryStatistics> repositoryStatisticsList = getStatsList( repositoryId ); @@ -51,6 +53,7 @@ public class TestRepositoryStatisticsManager : null; } + @Override public void addStatisticsAfterScan( MetadataRepository metadataRepository, String repositoryId, Date startTime, Date endTime, long totalFiles, long newFiles ) { @@ -66,11 +69,13 @@ public class TestRepositoryStatisticsManager stats.add( repositoryStatistics ); } + @Override public void deleteStatistics( MetadataRepository metadataRepository, String repositoryId ) { repoStats.remove( repositoryId ); } + @Override public List<RepositoryStatistics> getStatisticsInRange( MetadataRepository metadataRepository, String repositoryId, Date startDate, Date endDate ) { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java index 4b7816dce..38c19adb0 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java @@ -75,6 +75,7 @@ public class BrowseResultEntry this.project = project; } + @Override public int compareTo( BrowseResultEntry browseGroupResultEntry ) { return this.name.compareTo( browseGroupResultEntry.name ); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java index 2f920d9d3..e92009077 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java @@ -120,6 +120,7 @@ public class CacheEntry this.inMemorySize = inMemorySize; } + @Override public int compareTo( Object o ) { return this.key.compareTo( ( (CacheEntry) o ).key ); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index 8534e0c96..6fb7d0bd0 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -332,6 +332,7 @@ public abstract class AbstractRestService private static class SearchResultHitMap extends PropertyMap<SearchResultHit, Artifact> { + @Override protected void configure() { skip().setId( null ); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java index 854da3e59..9edafe78e 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java @@ -63,6 +63,7 @@ public class DefaultArchivaAdministrationService @Inject private RepositoryContentConsumers repoConsumerUtil; + @Override public List<LegacyArtifactPath> getLegacyArtifactPaths() throws ArchivaRestServiceException { @@ -76,6 +77,7 @@ public class DefaultArchivaAdministrationService } } + @Override public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath ) throws ArchivaRestServiceException { @@ -107,6 +109,7 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean deleteLegacyArtifactPath( String path ) throws ArchivaRestServiceException { @@ -122,6 +125,7 @@ public class DefaultArchivaAdministrationService } + @Override public Boolean addFileTypePattern( String fileTypeId, String pattern ) throws ArchivaRestServiceException { @@ -136,6 +140,7 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean removeFileTypePattern( String fileTypeId, String pattern ) throws ArchivaRestServiceException { @@ -150,6 +155,7 @@ public class DefaultArchivaAdministrationService } } + @Override public FileType getFileType( String fileTypeId ) throws ArchivaRestServiceException { @@ -163,6 +169,7 @@ public class DefaultArchivaAdministrationService } } + @Override public void addFileType( FileType fileType ) throws ArchivaRestServiceException { @@ -176,6 +183,7 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean removeFileType( String fileTypeId ) throws ArchivaRestServiceException { @@ -190,6 +198,7 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean enabledKnownContentConsumer( String knownContentConsumer ) throws ArchivaRestServiceException { @@ -204,6 +213,7 @@ public class DefaultArchivaAdministrationService } } + @Override public void enabledKnownContentConsumers( List<String> knownContentConsumers ) throws ArchivaRestServiceException { @@ -217,6 +227,7 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean disabledKnownContentConsumer( String knownContentConsumer ) throws ArchivaRestServiceException { @@ -231,6 +242,7 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean enabledInvalidContentConsumer( String invalidContentConsumer ) throws ArchivaRestServiceException { @@ -245,6 +257,7 @@ public class DefaultArchivaAdministrationService } } + @Override public void enabledInvalidContentConsumers( List<String> invalidContentConsumers ) throws ArchivaRestServiceException { @@ -258,6 +271,7 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean disabledInvalidContentConsumer( String invalidContentConsumer ) throws ArchivaRestServiceException { @@ -272,6 +286,7 @@ public class DefaultArchivaAdministrationService } } + @Override public List<FileType> getFileTypes() throws ArchivaRestServiceException { @@ -290,6 +305,7 @@ public class DefaultArchivaAdministrationService } } + @Override public List<String> getKnownContentConsumers() throws ArchivaRestServiceException { @@ -303,6 +319,7 @@ public class DefaultArchivaAdministrationService } } + @Override public List<String> getInvalidContentConsumers() throws ArchivaRestServiceException { @@ -316,6 +333,7 @@ public class DefaultArchivaAdministrationService } } + @Override public OrganisationInformation getOrganisationInformation() throws ArchivaRestServiceException { @@ -329,6 +347,7 @@ public class DefaultArchivaAdministrationService } } + @Override public void setOrganisationInformation( OrganisationInformation organisationInformation ) throws ArchivaRestServiceException { @@ -342,12 +361,14 @@ public class DefaultArchivaAdministrationService } } + @Override public Boolean registrationDisabled() throws ArchivaRestServiceException { return getUiConfiguration().isDisableRegistration(); } + @Override public UiConfiguration getUiConfiguration() throws ArchivaRestServiceException { @@ -361,6 +382,7 @@ public class DefaultArchivaAdministrationService } } + @Override public void setUiConfiguration( UiConfiguration uiConfiguration ) throws ArchivaRestServiceException { @@ -378,6 +400,7 @@ public class DefaultArchivaAdministrationService } } + @Override public String getApplicationUrl() throws ArchivaRestServiceException { @@ -391,6 +414,7 @@ public class DefaultArchivaAdministrationService } } + @Override public NetworkConfiguration getNetworkConfiguration() throws ArchivaRestServiceException { @@ -404,6 +428,7 @@ public class DefaultArchivaAdministrationService } } + @Override public void setNetworkConfiguration( NetworkConfiguration networkConfiguration ) throws ArchivaRestServiceException { @@ -417,6 +442,7 @@ public class DefaultArchivaAdministrationService } } + @Override public List<AdminRepositoryConsumer> getKnownContentAdminRepositoryConsumers() throws ArchivaRestServiceException { @@ -435,6 +461,7 @@ public class DefaultArchivaAdministrationService } } + @Override public List<AdminRepositoryConsumer> getInvalidContentAdminRepositoryConsumers() throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java index c83feb2b3..461b824b6 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java @@ -52,6 +52,7 @@ public class DefaultArchivaRuntimeConfigurationService @Named( value = "fileLockManager#default" ) private FileLockManager fileLockManager; + @Override public ArchivaRuntimeConfiguration getArchivaRuntimeConfiguration() throws ArchivaRestServiceException { @@ -65,6 +66,7 @@ public class DefaultArchivaRuntimeConfigurationService } } + @Override public Boolean updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 507cfd50a..93e36284d 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -108,6 +108,7 @@ public class DefaultBrowseService @Named( value = "browse#versionMetadata" ) private Cache<String, ProjectVersionMetadata> versionMetadataCache; + @Override public BrowseResult getRootGroups( String repositoryId ) throws ArchivaRestServiceException { @@ -154,6 +155,7 @@ public class DefaultBrowseService return new BrowseResult( browseGroupResultEntries ); } + @Override public BrowseResult browseGroupId( String groupId, String repositoryId ) throws ArchivaRestServiceException { @@ -210,6 +212,7 @@ public class DefaultBrowseService } + @Override public VersionsList getVersionsList( String groupId, String artifactId, String repositoryId ) throws ArchivaRestServiceException { @@ -258,6 +261,7 @@ public class DefaultBrowseService } } + @Override public ProjectVersionMetadata getProjectMetadata( String groupId, String artifactId, String version, String repositoryId ) throws ArchivaRestServiceException @@ -302,6 +306,7 @@ public class DefaultBrowseService } + @Override public ProjectVersionMetadata getProjectVersionMetadata( String groupId, String artifactId, String repositoryId ) throws ArchivaRestServiceException { @@ -462,6 +467,7 @@ public class DefaultBrowseService } } + @Override public List<TreeEntry> getTreeEntries( String groupId, String artifactId, String version, String repositoryId ) throws ArchivaRestServiceException { @@ -481,6 +487,7 @@ public class DefaultBrowseService return Collections.emptyList(); } + @Override public List<ManagedRepository> getUserRepositories() throws ArchivaRestServiceException { @@ -495,6 +502,7 @@ public class DefaultBrowseService } } + @Override public List<Artifact> getDependees( String groupId, String artifactId, String version, String repositoryId ) throws ArchivaRestServiceException { @@ -532,6 +540,7 @@ public class DefaultBrowseService return artifacts; } + @Override public List<Entry> getMetadatas( String groupId, String artifactId, String version, String repositoryId ) throws ArchivaRestServiceException { @@ -558,6 +567,7 @@ public class DefaultBrowseService return entries; } + @Override public Boolean addMetadata( String groupId, String artifactId, String version, String key, String value, String repositoryId ) throws ArchivaRestServiceException @@ -612,6 +622,7 @@ public class DefaultBrowseService return Boolean.TRUE; } + @Override public Boolean deleteMetadata( String groupId, String artifactId, String version, String key, String repositoryId ) throws ArchivaRestServiceException { @@ -660,6 +671,7 @@ public class DefaultBrowseService return Boolean.TRUE; } + @Override public List<ArtifactContentEntry> getArtifactContentEntries( String groupId, String artifactId, String version, String classifier, String type, String path, String repositoryId ) @@ -704,6 +716,7 @@ public class DefaultBrowseService return Collections.emptyList(); } + @Override public List<Artifact> getArtifactDownloadInfos( String groupId, String artifactId, String version, String repositoryId ) throws ArchivaRestServiceException @@ -746,6 +759,7 @@ public class DefaultBrowseService return artifactDownloadInfos; } + @Override public ArtifactContent getArtifactContentText( String groupId, String artifactId, String version, String classifier, String type, String path, String repositoryId ) throws ArchivaRestServiceException @@ -809,6 +823,7 @@ public class DefaultBrowseService return new ArtifactContent(); } + @Override public Boolean artifactAvailable( String groupId, String artifactId, String version, String classifier, String repositoryId ) throws ArchivaRestServiceException @@ -907,12 +922,14 @@ public class DefaultBrowseService return false; } + @Override public Boolean artifactAvailable( String groupId, String artifactId, String version, String repositoryId ) throws ArchivaRestServiceException { return artifactAvailable( groupId, artifactId, version, null, repositoryId ); } + @Override public List<Artifact> getArtifacts( String repositoryId ) throws ArchivaRestServiceException { @@ -932,6 +949,7 @@ public class DefaultBrowseService } } + @Override public Boolean importMetadata( MetadataAddRequest metadataAddRequest, String repositoryId ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java index 4068f900e..795aaf169 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java @@ -69,6 +69,7 @@ public class DefaultCommonServices getAllI18nResources( "fr" ); } + @Override public String getI18nResources( String locale ) throws ArchivaRestServiceException { @@ -144,6 +145,7 @@ public class DefaultCommonServices } } + @Override public String getAllI18nResources( String locale ) throws ArchivaRestServiceException { @@ -197,6 +199,7 @@ public class DefaultCommonServices } + @Override public Boolean validateCronExpression( String cronExpression ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java index c5383bb28..9c10c9f09 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java @@ -57,6 +57,7 @@ public class DefaultManagedRepositoriesService @Inject private RepositoryStatisticsManager repositoryStatisticsManager; + @Override public List<ManagedRepository> getManagedRepositories() throws ArchivaRestServiceException { @@ -72,6 +73,7 @@ public class DefaultManagedRepositoriesService } } + @Override public ManagedRepository getManagedRepository( String repositoryId ) throws ArchivaRestServiceException { @@ -87,6 +89,7 @@ public class DefaultManagedRepositoriesService } + @Override public Boolean deleteManagedRepository( String repoId, boolean deleteContent ) throws ArchivaRestServiceException { @@ -102,6 +105,7 @@ public class DefaultManagedRepositoriesService } } + @Override public ManagedRepository addManagedRepository( ManagedRepository managedRepository ) throws ArchivaRestServiceException { @@ -124,6 +128,7 @@ public class DefaultManagedRepositoriesService } + @Override public Boolean updateManagedRepository( ManagedRepository managedRepository ) throws ArchivaRestServiceException { @@ -141,6 +146,7 @@ public class DefaultManagedRepositoriesService } } + @Override public Boolean fileLocationExists( String fileLocation ) throws ArchivaRestServiceException { @@ -148,6 +154,7 @@ public class DefaultManagedRepositoriesService return new File( location ).exists(); } + @Override public ArchivaRepositoryStatistics getManagedRepositoryStatistics( String repositoryId, String lang ) throws ArchivaRestServiceException { @@ -188,6 +195,7 @@ public class DefaultManagedRepositoriesService return null; } + @Override public String getPomSnippet( String repositoryId ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java index dc187afe9..a5c76b0b9 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java @@ -57,6 +57,7 @@ public class DefaultMergeRepositoriesService private Maven2RepositoryMerger repositoryMerger; + @Override public List<Artifact> getMergeConflictedArtifacts( String sourceRepositoryId, String targetRepositoryId ) throws ArchivaRestServiceException { @@ -79,6 +80,7 @@ public class DefaultMergeRepositoriesService } } + @Override public void mergeRepositories( String sourceRepositoryId, String targetRepositoryId, boolean skipConflicts ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java index a39e1b35a..6e3c0fec8 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java @@ -40,6 +40,7 @@ public class DefaultNetworkProxyService @Inject private NetworkProxyAdmin networkProxyAdmin; + @Override public List<NetworkProxy> getNetworkProxies() throws ArchivaRestServiceException { @@ -54,6 +55,7 @@ public class DefaultNetworkProxyService } } + @Override public NetworkProxy getNetworkProxy( String networkProxyId ) throws ArchivaRestServiceException { @@ -67,6 +69,7 @@ public class DefaultNetworkProxyService } } + @Override public void addNetworkProxy( NetworkProxy networkProxy ) throws ArchivaRestServiceException { @@ -84,6 +87,7 @@ public class DefaultNetworkProxyService } } + @Override public void updateNetworkProxy( NetworkProxy networkProxy ) throws ArchivaRestServiceException { @@ -101,6 +105,7 @@ public class DefaultNetworkProxyService } } + @Override public Boolean deleteNetworkProxy( String networkProxyId ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java index b9b0060ec..1d89c7e43 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java @@ -30,11 +30,13 @@ import org.springframework.stereotype.Service; public class DefaultPingService implements PingService { + @Override public String ping() { return "Yeah Baby It rocks!"; } + @Override public String pingWithAuthz() { return ping(); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorRuleService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorRuleService.java index 3b13bd8b9..c645c3f3b 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorRuleService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorRuleService.java @@ -41,6 +41,7 @@ public class DefaultProxyConnectorRuleService @Inject private ProxyConnectorRuleAdmin proxyConnectorRuleAdmin; + @Override public List<ProxyConnectorRule> getProxyConnectorRules() throws ArchivaRestServiceException { @@ -85,6 +86,7 @@ public class DefaultProxyConnectorRuleService } } + @Override public Boolean addProxyConnectorRule( ProxyConnectorRule proxyConnectorRule ) throws ArchivaRestServiceException { @@ -102,6 +104,7 @@ public class DefaultProxyConnectorRuleService } } + @Override public Boolean deleteProxyConnectorRule( ProxyConnectorRule proxyConnectorRule ) throws ArchivaRestServiceException { @@ -116,6 +119,7 @@ public class DefaultProxyConnectorRuleService } } + @Override public Boolean updateProxyConnectorRule( ProxyConnectorRule proxyConnectorRule ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java index fa1861c70..b9557c030 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java @@ -52,6 +52,7 @@ public class DefaultProxyConnectorService allPolicies = new ArrayList<>( getBeansOfType( applicationContext, Policy.class ).values() ); } + @Override public List<ProxyConnector> getProxyConnectors() throws ArchivaRestServiceException { @@ -66,6 +67,7 @@ public class DefaultProxyConnectorService } } + @Override public ProxyConnector getProxyConnector( String sourceRepoId, String targetRepoId ) throws ArchivaRestServiceException { @@ -79,6 +81,7 @@ public class DefaultProxyConnectorService } } + @Override public Boolean addProxyConnector( ProxyConnector proxyConnector ) throws ArchivaRestServiceException { @@ -96,6 +99,7 @@ public class DefaultProxyConnectorService } } + @Override public Boolean deleteProxyConnector( ProxyConnector proxyConnector ) throws ArchivaRestServiceException { @@ -113,6 +117,7 @@ public class DefaultProxyConnectorService } } + @Override public Boolean removeProxyConnector( String sourceRepoId, String targetRepoId ) throws ArchivaRestServiceException { @@ -126,6 +131,7 @@ public class DefaultProxyConnectorService return deleteProxyConnector( proxyConnector ); } + @Override public Boolean updateProxyConnector( ProxyConnector proxyConnector ) throws ArchivaRestServiceException { @@ -143,6 +149,7 @@ public class DefaultProxyConnectorService } } + @Override public List<PolicyInformation> getAllPolicyInformations() throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java index c47e1d3bb..209c405c8 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java @@ -91,6 +91,7 @@ public class DefaultRedbackRuntimeConfigurationService private LdapUserMapper ldapUserMapper; + @Override public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration() throws ArchivaRestServiceException { @@ -104,6 +105,7 @@ public class DefaultRedbackRuntimeConfigurationService } } + @Override public Boolean updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws ArchivaRestServiceException { @@ -189,6 +191,7 @@ public class DefaultRedbackRuntimeConfigurationService } } + @Override public List<UserManagerImplementationInformation> getUserManagerImplementationInformations() throws ArchivaRestServiceException { @@ -218,6 +221,7 @@ public class DefaultRedbackRuntimeConfigurationService return informations; } + @Override public List<RBACManagerImplementationInformation> getRbacManagerImplementationInformations() throws ArchivaRestServiceException { @@ -246,6 +250,7 @@ public class DefaultRedbackRuntimeConfigurationService return informations; } + @Override public RedbackImplementationsInformations getRedbackImplementationsInformations() throws ArchivaRestServiceException { @@ -253,6 +258,7 @@ public class DefaultRedbackRuntimeConfigurationService getRbacManagerImplementationInformations() ); } + @Override public Boolean checkLdapConnection() throws ArchivaRestServiceException { @@ -278,6 +284,7 @@ public class DefaultRedbackRuntimeConfigurationService return Boolean.TRUE; } + @Override public Boolean checkLdapConnection( LdapConfiguration ldapConfiguration ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java index fd6c1a7ca..92508bfb5 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java @@ -69,6 +69,7 @@ public class DefaultRemoteRepositoriesService @Inject private NetworkProxyAdmin networkProxyAdmin; + @Override public List<RemoteRepository> getRemoteRepositories() throws ArchivaRestServiceException { @@ -84,6 +85,7 @@ public class DefaultRemoteRepositoriesService } } + @Override public RemoteRepository getRemoteRepository( String repositoryId ) throws ArchivaRestServiceException { @@ -99,6 +101,7 @@ public class DefaultRemoteRepositoriesService return null; } + @Override public Boolean deleteRemoteRepository( String repositoryId ) throws ArchivaRestServiceException { @@ -113,6 +116,7 @@ public class DefaultRemoteRepositoriesService } } + @Override public Boolean addRemoteRepository( RemoteRepository remoteRepository ) throws ArchivaRestServiceException { @@ -127,6 +131,7 @@ public class DefaultRemoteRepositoriesService } } + @Override public Boolean updateRemoteRepository( RemoteRepository remoteRepository ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java index 08c7c1d13..37b5f9b1f 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java @@ -52,6 +52,7 @@ public class DefaultReportRepositoriesService @Inject private RepositoryStatisticsManager repositoryStatisticsManager; + @Override public List<RepositoryStatistics> getStatisticsReport( List<String> repositoriesId, int rowCount, Date startDate, Date endDate ) throws ArchivaRestServiceException @@ -124,6 +125,7 @@ public class DefaultReportRepositoriesService } } + @Override public List<RepositoryProblemFacet> getHealthReport( String repository, String groupId, int rowCount ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index c90589ce9..a623d82fe 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -159,16 +159,19 @@ public class DefaultRepositoriesService private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 }; + @Override public Boolean scanRepository( String repositoryId, boolean fullScan ) { return doScanRepository( repositoryId, fullScan ); } + @Override public Boolean alreadyScanning( String repositoryId ) { return repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId ); } + @Override public Boolean removeScanningTaskFromQueue( String repositoryId ) { RepositoryTask task = new RepositoryTask(); @@ -184,6 +187,7 @@ public class DefaultRepositoriesService } } + @Override public Boolean scanRepositoryNow( String repositoryId, boolean fullScan ) throws ArchivaRestServiceException { @@ -210,6 +214,7 @@ public class DefaultRepositoriesService } } + @Override public Boolean scheduleDownloadRemoteIndex( String repositoryId, boolean now, boolean fullDownload ) throws ArchivaRestServiceException { @@ -225,6 +230,7 @@ public class DefaultRepositoriesService return Boolean.TRUE; } + @Override public Boolean copyArtifact( ArtifactTransferRequest artifactTransferRequest ) throws ArchivaRestServiceException { @@ -610,6 +616,7 @@ public class DefaultRepositoriesService } } + @Override public Boolean removeProjectVersion( String repositoryId, String namespace, String projectId, String version ) throws ArchivaRestServiceException { @@ -715,6 +722,7 @@ public class DefaultRepositoriesService return Boolean.TRUE; } + @Override public Boolean deleteArtifact( Artifact artifact ) throws ArchivaRestServiceException { @@ -958,6 +966,7 @@ public class DefaultRepositoriesService return Boolean.TRUE; } + @Override public Boolean deleteGroupId( String groupId, String repositoryId ) throws ArchivaRestServiceException { @@ -1013,6 +1022,7 @@ public class DefaultRepositoriesService return true; } + @Override public Boolean deleteProject( String groupId, String projectId, String repositoryId ) throws ArchivaRestServiceException { @@ -1077,6 +1087,7 @@ public class DefaultRepositoriesService } + @Override public Boolean isAuthorizedToDeleteArtifacts( String repoId ) throws ArchivaRestServiceException { @@ -1094,6 +1105,7 @@ public class DefaultRepositoriesService } } + @Override public RepositoryScanStatistics scanRepositoryDirectoriesNow( String repositoryId ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java index 8269e763e..cbe4bfff7 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java @@ -42,6 +42,7 @@ public class DefaultRepositoryGroupService @Inject private RepositoryGroupAdmin repositoryGroupAdmin; + @Override public List<RepositoryGroup> getRepositoriesGroups() throws ArchivaRestServiceException { @@ -63,6 +64,7 @@ public class DefaultRepositoryGroupService } } + @Override public RepositoryGroup getRepositoryGroup( String repositoryGroupId ) throws ArchivaRestServiceException { @@ -76,6 +78,7 @@ public class DefaultRepositoryGroupService return null; } + @Override public Boolean addRepositoryGroup( RepositoryGroup repoGroup ) throws ArchivaRestServiceException { @@ -93,6 +96,7 @@ public class DefaultRepositoryGroupService } } + @Override public Boolean updateRepositoryGroup( RepositoryGroup repoGroup ) throws ArchivaRestServiceException { @@ -110,6 +114,7 @@ public class DefaultRepositoryGroupService } } + @Override public Boolean deleteRepositoryGroup( String repositoryGroupId ) throws ArchivaRestServiceException { @@ -123,6 +128,7 @@ public class DefaultRepositoryGroupService } } + @Override public Boolean addRepositoryToGroup( String repositoryGroupId, String repositoryId ) throws ArchivaRestServiceException { @@ -136,6 +142,7 @@ public class DefaultRepositoryGroupService } } + @Override public Boolean deleteRepositoryFromGroup( String repositoryGroupId, String repositoryId ) throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java index f17137365..a26fd7fdf 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java @@ -53,6 +53,7 @@ public class DefaultSearchService @Inject private RepositorySearch repositorySearch; + @Override public List<Artifact> quickSearch( String queryString ) throws ArchivaRestServiceException { @@ -77,6 +78,7 @@ public class DefaultSearchService } } + @Override public List<Artifact> quickSearchWithRepositories( SearchRequest searchRequest ) throws ArchivaRestServiceException { @@ -106,6 +108,7 @@ public class DefaultSearchService } } + @Override public List<Artifact> getArtifactVersions( String groupId, String artifactId, String packaging ) throws ArchivaRestServiceException { @@ -131,6 +134,7 @@ public class DefaultSearchService } } + @Override public List<Artifact> searchArtifacts( SearchRequest searchRequest ) throws ArchivaRestServiceException { @@ -159,6 +163,7 @@ public class DefaultSearchService } } + @Override public GroupIdList getAllGroupIds( List<String> selectedRepos ) throws ArchivaRestServiceException { @@ -192,6 +197,7 @@ public class DefaultSearchService return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public StringList getObservablesRepoIds() throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java index 62716ea9d..9f55c0294 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java @@ -77,6 +77,7 @@ public class DefaultSystemStatusService caches = getBeansOfType( applicationContext, Cache.class ); } + @Override public String getMemoryStatus() throws ArchivaRestServiceException { @@ -93,6 +94,7 @@ public class DefaultSystemStatusService return l / ( 1024 * 1024 ) + "M"; } + @Override public String getCurrentServerTime( String locale ) throws ArchivaRestServiceException { @@ -100,6 +102,7 @@ public class DefaultSystemStatusService return sdf.format( new Date() ); } + @Override public List<QueueEntry> getQueueEntries() throws ArchivaRestServiceException { @@ -121,6 +124,7 @@ public class DefaultSystemStatusService } } + @Override public List<CacheEntry> getCacheEntries() throws ArchivaRestServiceException { @@ -142,6 +146,7 @@ public class DefaultSystemStatusService return cacheEntries; } + @Override public Boolean clearCache( String cacheKey ) throws ArchivaRestServiceException { @@ -156,6 +161,7 @@ public class DefaultSystemStatusService return Boolean.TRUE; } + @Override public Boolean clearAllCaches() throws ArchivaRestServiceException { @@ -166,6 +172,7 @@ public class DefaultSystemStatusService return Boolean.TRUE; } + @Override public List<RepositoryScannerStatistics> getRepositoryScannerStatistics() throws ArchivaRestServiceException { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java index 04e4ced19..ef75fc734 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java @@ -35,6 +35,7 @@ import javax.ws.rs.ext.Provider; public class ArchivaRestServiceExceptionMapper implements ExceptionMapper<ArchivaRestServiceException> { + @Override public Response toResponse( ArchivaRestServiceException e ) { ArchivaRestError restError = new ArchivaRestError( e ); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java index 21d329f78..6a42c9518 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java @@ -43,6 +43,7 @@ public class AddAdminRepoConsumerClosure this.selectedIds = selectedIds; } + @Override public void execute( Object input ) { if ( input instanceof RepositoryContentConsumer ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java index 6cadd3da0..61daa4eeb 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java @@ -38,6 +38,7 @@ public class AdminRepositoryConsumerComparator return INSTANCE; } + @Override public int compare( AdminRepositoryConsumer o1, AdminRepositoryConsumer o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactContentEntryComparator.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactContentEntryComparator.java index 088520078..a58593d9c 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactContentEntryComparator.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactContentEntryComparator.java @@ -30,6 +30,7 @@ public class ArtifactContentEntryComparator { public static final ArtifactContentEntryComparator INSTANCE = new ArtifactContentEntryComparator(); + @Override public int compare( ArtifactContentEntry artifactContentEntry, ArtifactContentEntry artifactContentEntry1 ) { // include depth too in comparaison ? diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ConsumerScanningStatisticsComparator.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ConsumerScanningStatisticsComparator.java index 34b0e598e..b90923c8b 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ConsumerScanningStatisticsComparator.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ConsumerScanningStatisticsComparator.java @@ -30,6 +30,7 @@ public class ConsumerScanningStatisticsComparator { public static final ConsumerScanningStatisticsComparator INSTANCE = new ConsumerScanningStatisticsComparator(); + @Override public int compare( ConsumerScanningStatistics one, ConsumerScanningStatistics two ) { if ( one == two ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java index f0c44b51c..12070c3ac 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java @@ -543,6 +543,7 @@ public class RepositoriesServiceTest true, false ); } + @Override protected ManagedRepository getTestManagedRepository() { return getTestManagedRepository( "TEST", "test-repo" ); diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java index 776274ae7..019c9e16a 100644 --- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java +++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java @@ -68,6 +68,7 @@ public class NewArtifactsRssFeedProcessor * Process the newly discovered artifacts in the repository. Generate feeds for new artifacts in the repository and * new versions of artifact. */ + @Override public SyndFeed process( Map<String, String> reqParams, MetadataRepository metadataRepository ) throws FeedException { @@ -145,11 +146,13 @@ public class NewArtifactsRssFeedProcessor " during repository scan.", entries ); } + @Override public String getTitle() { return title; } + @Override public String getDescription() { return desc; diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java index eb315d296..c6b046696 100644 --- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java +++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java @@ -63,6 +63,7 @@ public class NewVersionsOfArtifactRssFeedProcessor /** * Process all versions of the artifact which had a rss feed request. */ + @Override public SyndFeed process( Map<String, String> reqParams, MetadataRepository metadataRepository ) throws FeedException { @@ -151,11 +152,13 @@ public class NewVersionsOfArtifactRssFeedProcessor entries ); } + @Override public String getTitle() { return title; } + @Override public String getDescription() { return desc; diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java index 40cab4f52..22524fc7d 100644 --- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java +++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java @@ -45,6 +45,7 @@ public class RssFeedGeneratorTest private RssFeedGenerator generator; @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java index 4ab49fc47..dee82c93e 100644 --- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java +++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java @@ -56,6 +56,7 @@ public class NewArtifactsRssFeedProcessorTest private MetadataRepositoryMock metadataRepository; @Before + @Override public void setUp() throws Exception { @@ -134,6 +135,7 @@ public class NewArtifactsRssFeedProcessorTest private List<ArtifactMetadata> artifactsByDateRange; + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date from, Date to ) { setRepoId( repoId ); @@ -142,6 +144,7 @@ public class NewArtifactsRssFeedProcessorTest return artifactsByDateRange; } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -149,149 +152,178 @@ public class NewArtifactsRssFeedProcessorTest throw new UnsupportedOperationException(); } + @Override public void addMetadataFacet( String arg0, MetadataFacet arg1 ) { throw new UnsupportedOperationException(); } + @Override public void removeArtifact( String arg0, String arg1, String arg2, String arg3, String arg4 ) { throw new UnsupportedOperationException(); } + @Override public void removeRepository( String arg0 ) { throw new UnsupportedOperationException(); } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String arg0, String arg1 ) { throw new UnsupportedOperationException(); } + @Override public MetadataFacet getMetadataFacet( String arg0, String arg1, String arg2 ) { throw new UnsupportedOperationException(); } + @Override public List<String> getMetadataFacets( String arg0, String arg1 ) { throw new UnsupportedOperationException(); } + @Override public Collection<String> getRepositories() { throw new UnsupportedOperationException(); } + @Override public void removeMetadataFacet( String arg0, String arg1, String arg2 ) { throw new UnsupportedOperationException(); } + @Override public void removeMetadataFacets( String arg0, String arg1 ) { throw new UnsupportedOperationException(); } + @Override public void updateArtifact( String arg0, String arg1, String arg2, String arg3, ArtifactMetadata arg4 ) { throw new UnsupportedOperationException(); } + @Override public void updateNamespace( String arg0, String arg1 ) { throw new UnsupportedOperationException(); } + @Override public void updateProject( String arg0, ProjectMetadata arg1 ) { throw new UnsupportedOperationException(); } + @Override public void updateProjectVersion( String arg0, String arg1, String arg2, ProjectVersionMetadata arg3 ) { throw new UnsupportedOperationException(); } + @Override public Collection<String> getArtifactVersions( String arg0, String arg1, String arg2, String arg3 ) { throw new UnsupportedOperationException(); } + @Override public Collection<ArtifactMetadata> getArtifacts( String arg0, String arg1, String arg2, String arg3 ) { throw new UnsupportedOperationException(); } + @Override public void save() { throw new UnsupportedOperationException(); } + @Override public void close() { throw new UnsupportedOperationException(); } + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { return false; } + @Override public void revert() { throw new UnsupportedOperationException(); } + @Override public boolean canObtainAccess( Class<?> aClass ) { return false; } + @Override public <T>T obtainAccess( Class<T> aClass ) { throw new UnsupportedOperationException(); } + @Override public Collection<String> getNamespaces( String arg0, String arg1 ) { throw new UnsupportedOperationException(); } + @Override public ProjectMetadata getProject( String arg0, String arg1, String arg2 ) { throw new UnsupportedOperationException(); } + @Override public Collection<ProjectVersionReference> getProjectReferences( String arg0, String arg1, String arg2, String arg3 ) { throw new UnsupportedOperationException(); } + @Override public ProjectVersionMetadata getProjectVersion( String arg0, String arg1, String arg2, String arg3 ) throws MetadataResolutionException { throw new UnsupportedOperationException(); } + @Override public Collection<String> getProjectVersions( String arg0, String arg1, String arg2 ) { throw new UnsupportedOperationException(); } + @Override public Collection<String> getProjects( String arg0, String arg1 ) { throw new UnsupportedOperationException(); } + @Override public Collection<String> getRootNamespaces( String arg0 ) { throw new UnsupportedOperationException(); } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { @@ -333,23 +365,27 @@ public class NewArtifactsRssFeedProcessorTest this.artifactsByDateRange = artifactsByDateRange; } + @Override public List<ArtifactMetadata> getArtifacts( String repositoryId ) { return artifactsByDateRange; } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { } + @Override public void removeNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException { diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java index 97228260c..2b71c0f5c 100644 --- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java +++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java @@ -58,6 +58,7 @@ public class NewVersionsOfArtifactRssFeedProcessorTest private MetadataRepository metadataRepository; @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java index 76222885c..be318ae93 100644 --- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java +++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java @@ -54,6 +54,7 @@ public class ArchivaServletAuthenticator @Inject private SecuritySystem securitySystem; + @Override public boolean isAuthenticated( HttpServletRequest request, AuthenticationResult result ) throws AuthenticationException, AccountLockedException, MustChangePasswordException { @@ -65,6 +66,7 @@ public class ArchivaServletAuthenticator return true; } + @Override public boolean isAuthorized( HttpServletRequest request, SecuritySession securitySession, String repositoryId, String permission ) throws AuthorizationException, UnauthorizedException @@ -88,6 +90,7 @@ public class ArchivaServletAuthenticator return true; } + @Override public boolean isAuthorized( String principal, String repoId, String permission ) throws UnauthorizedException { diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java index c39ca2753..e5597f762 100644 --- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java +++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java @@ -53,6 +53,7 @@ public class ArchivaStandardRolesCheck */ private boolean checked = false; + @Override public void validateEnvironment( List<String> violations ) { if ( !checked ) diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java index cb13c7e41..91ff5ea07 100644 --- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java +++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java @@ -60,6 +60,7 @@ public class DefaultUserRepositories private Logger log = LoggerFactory.getLogger( getClass() ); + @Override public List<String> getObservableRepositoryIds( String principal ) throws PrincipalNotFoundException, AccessDeniedException, ArchivaSecurityException { @@ -68,6 +69,7 @@ public class DefaultUserRepositories return getAccessibleRepositoryIds( principal, operation ); } + @Override public List<String> getManagableRepositoryIds( String principal ) throws PrincipalNotFoundException, AccessDeniedException, ArchivaSecurityException { @@ -90,6 +92,7 @@ public class DefaultUserRepositories return repoIds; } + @Override public List<ManagedRepository> getAccessibleRepositories( String principal ) throws ArchivaSecurityException, AccessDeniedException, PrincipalNotFoundException { @@ -167,6 +170,7 @@ public class DefaultUserRepositories return new DefaultSecuritySession( authn, user ); } + @Override public void createMissingRepositoryRoles( String repoId ) throws ArchivaSecurityException { @@ -189,6 +193,7 @@ public class DefaultUserRepositories } } + @Override public boolean isAuthorizedToUploadArtifacts( String principal, String repoId ) throws PrincipalNotFoundException, ArchivaSecurityException { @@ -206,6 +211,7 @@ public class DefaultUserRepositories } } + @Override public boolean isAuthorizedToDeleteArtifacts( String principal, String repoId ) throws ArchivaSecurityException { diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java index 3c63337ec..ce0218e97 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java @@ -51,6 +51,7 @@ public class ArchivaServletAuthenticatorTest private HttpServletRequest request; @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java index 585768f83..cef688739 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java @@ -38,6 +38,7 @@ public class DefaultUserRepositoriesTest @Before + @Override public void setUp() throws Exception { @@ -78,6 +79,7 @@ public class DefaultUserRepositoriesTest } @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java index ab414f5ca..73d7c9da8 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java @@ -49,11 +49,13 @@ import java.util.Collection; public class MockBeanServices implements RepositoryStorage, RepositoryListener, RepositoryArchivaTaskScheduler { + @Override public ProjectMetadata readProjectMetadata( String repoId, String namespace, String projectId ) { return null; } + @Override public ProjectVersionMetadata readProjectVersionMetadata( ReadMetadataRequest readMetadataRequest ) throws RepositoryStorageMetadataInvalidException, RepositoryStorageMetadataNotFoundException, RepositoryStorageRuntimeException @@ -61,24 +63,28 @@ public class MockBeanServices return null; } + @Override public Collection<String> listRootNamespaces( String repoId, Filter<String> filter ) throws RepositoryStorageRuntimeException { return null; } + @Override public Collection<String> listNamespaces( String repoId, String namespace, Filter<String> filter ) throws RepositoryStorageRuntimeException { return null; } + @Override public Collection<String> listProjects( String repoId, String namespace, Filter<String> filter ) throws RepositoryStorageRuntimeException { return null; } + @Override public Collection<String> listProjectVersions( String repoId, String namespace, String projectId, Filter<String> filter ) throws RepositoryStorageRuntimeException @@ -86,18 +92,21 @@ public class MockBeanServices return null; } + @Override public Collection<ArtifactMetadata> readArtifactsMetadata( ReadMetadataRequest readMetadataRequest ) throws RepositoryStorageRuntimeException { return null; } + @Override public ArtifactMetadata readArtifactMetadataFromPath( String repoId, String path ) throws RepositoryStorageRuntimeException { return null; } + @Override public void applyServerSideRelocation( ManagedRepositoryContent managedRepository, ArtifactReference artifact ) throws ProxyDownloadException { @@ -105,18 +114,21 @@ public class MockBeanServices } + @Override public void deleteArtifact( MetadataRepository metadataRepository, String repositoryId, String namespace, String project, String version, String id ) { } + @Override public void addArtifact( RepositorySession session, String repoId, String namespace, String projectId, ProjectVersionMetadata metadata ) { } + @Override public void addArtifactProblem( RepositorySession session, String repoId, String namespace, String projectId, String projectVersion, RepositoryStorageMetadataException exception ) { @@ -124,22 +136,26 @@ public class MockBeanServices } + @Override public boolean isProcessingRepositoryTask( String repositoryId ) { return false; } + @Override public boolean isProcessingRepositoryTask( RepositoryTask task ) { return false; } + @Override public void queueTask( RepositoryTask task ) throws TaskQueueException { } + @Override public boolean unQueueTask( RepositoryTask task ) throws TaskQueueException { diff --git a/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java b/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java index 47ca211ce..b7415874e 100644 --- a/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java +++ b/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java @@ -34,75 +34,89 @@ import java.util.List; public class MockInvalidRepositoryContentConsumer implements InvalidRepositoryContentConsumer { + @Override public String getId() { return "foo"; } + @Override public String getDescription() { return "the foo"; } + @Override public boolean isPermanent() { return false; } + @Override public void addConsumerMonitor( ConsumerMonitor monitor ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeConsumerMonitor( ConsumerMonitor monitor ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<String> getIncludes() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<String> getExcludes() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void beginScan( ManagedRepository repository, Date whenGathered ) throws ConsumerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void processFile( String path ) throws ConsumerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void completeScan() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void completeScan( boolean executeOnEntireRepo ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isProcessUnmodified() { return false; //To change body of implemented methods use File | Settings | File Templates. diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java index 1210f1386..2faac2aa1 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java @@ -50,6 +50,7 @@ public class DefaultDataValidatorService private RepositoryGroupAdmin repositoryGroupAdmin; + @Override public Boolean managedRepositoryIdNotExists( String id ) throws ArchivaRestServiceException { @@ -60,7 +61,8 @@ public class DefaultDataValidatorService catch ( RepositoryAdminException e ) { throw new ArchivaRestServiceException( e.getMessage(), e ); - } + @Override + } } public Boolean remoteRepositoryIdNotExists( String id ) @@ -72,7 +74,8 @@ public class DefaultDataValidatorService } catch ( RepositoryAdminException e ) { - throw new ArchivaRestServiceException( e.getMessage(), e ); + throw new ArchivaRestServiceException( e.getMessa @Override +ge(), e ); } } diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java index 936e1598f..4b97ab942 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java @@ -117,6 +117,7 @@ public class DefaultFileUploadService return attachment == null ? "" : IOUtils.toString( attachment.getDataHandler().getInputStream() ); } + @Override public FileMetadata post( MultipartBody multipartBody ) throws ArchivaRestServiceException { @@ -175,7 +176,8 @@ public class DefaultFileUploadService fileMetadatas = new CopyOnWriteArrayList<FileMetadata>(); httpServletRequest.getSession().setAttribute( FILES_SESSION_KEY, fileMetadatas ); } - return fileMetadatas; + return fileMeta @Override +datas; } public Boolean deleteFile( String fileName ) @@ -193,7 +195,8 @@ public class DefaultFileUploadService { return file.delete(); } - return Boolean.FALSE; + r @Override +eturn Boolean.FALSE; } public Boolean clearUploadedFiles() @@ -204,7 +207,8 @@ public class DefaultFileUploadService { deleteFile( new File( fileMetadata.getServerFileName() ).getPath() ); } - getSessionFileMetadatas().clear(); + getSessionFileMetadatas().cle @Override +ar(); return Boolean.TRUE; } @@ -214,7 +218,8 @@ public class DefaultFileUploadService List<FileMetadata> fileMetadatas = (List<FileMetadata>) httpServletRequest.getSession().getAttribute( FILES_SESSION_KEY ); - return fileMetadatas == null ? Collections.<FileMetadata>emptyList() : fileMetadatas; + return fileMetadatas == null ? Collec @Override +tions.<FileMetadata>emptyList() : fileMetadatas; } public Boolean save( String repositoryId, String groupId, String artifactId, String version, String packaging, @@ -260,7 +265,8 @@ public class DefaultFileUploadService // get from the session file with groupId/artifactId - Iterable<FileMetadata> filesToAdd = Iterables.filter( fileMetadatas, new Predicate<FileMetadata>() + Iterable<FileMetadata> filesToAdd = Ite @Override +rables.filter( fileMetadatas, new Predicate<FileMetadata>() { public boolean apply( FileMetadata fileMetadata ) { @@ -279,7 +285,8 @@ public class DefaultFileUploadService deleteFile( fileMetadata.getServerFileName() ); } - filesToAdd = Iterables.filter( fileMetadatas, new Predicate<FileMetadata>() + @Override + filesToAdd = Iterables.filter( fileMetadatas, new Predicate<FileMetadata>() { public boolean apply( FileMetadata fileMetadata ) { diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java index 37a320a2f..e2c3478ff 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java @@ -33,6 +33,7 @@ public class DefaultJavascriptLogger { private Logger logger = LoggerFactory.getLogger( getClass() ); + @Override public Boolean trace( JavascriptLog javascriptLog ) { Logger toUse = @@ -42,7 +43,8 @@ public class DefaultJavascriptLogger return Boolean.TRUE; } toUse.trace( javascriptLog.getMessage() ); - return Boolean.TRUE; + return Boolean @Override +.TRUE; } public Boolean debug( JavascriptLog javascriptLog ) @@ -56,7 +58,8 @@ public class DefaultJavascriptLogger } toUse.debug( javascriptLog.getMessage() ); - return Boolean.TRUE; + @Override +return Boolean.TRUE; } public Boolean info( JavascriptLog javascriptLog ) @@ -69,7 +72,8 @@ public class DefaultJavascriptLogger return Boolean.TRUE; } - toUse.info( javascriptLog.getMessage() ); + toUse.info( javascriptLog.getMessage @Override +() ); return Boolean.TRUE; } @@ -83,7 +87,8 @@ public class DefaultJavascriptLogger return Boolean.TRUE; } - toUse.warn( javascriptLog.getMessage() ); + toUse.warn( javascript @Override +Log.getMessage() ); return Boolean.TRUE; } diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java index 764241165..25945513c 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java @@ -62,6 +62,7 @@ public class DefaultRuntimeInfoService this.archivaRuntimeInfo = archivaRuntimeInfo; } + @Override public ApplicationRuntimeInfo getApplicationRuntimeInfo( String locale ) throws ArchivaRestServiceException { @@ -101,7 +102,8 @@ public class DefaultRuntimeInfoService { return req.getScheme() + "://" + req.getServerName() + ( req.getServerPort() == 80 ? "" - : ":" + req.getServerPort() ) + req.getContextPath(); + : ":" + req.getServerPort() ) + req.getContextP @Override +ath(); } public Boolean logMissingI18n( String key ) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java index ddbae53eb..3e639e006 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java @@ -93,6 +93,7 @@ public class RssFeedServlet */ private RepositorySessionFactory repositorySessionFactory; + @Override public void init( ServletConfig servletConfig ) throws ServletException { @@ -102,7 +103,8 @@ public class RssFeedServlet servletAuth = wac.getBean( ServletAuthenticator.class ); httpAuth = wac.getBean( "httpAuthenticator#basic", HttpAuthenticator.class ); // TODO: what if there are other types? - repositorySessionFactory = wac.getBean( "repositorySessionFactory", RepositorySessionFactory.class ); + repositorySessionFactory = wac.getBean( "repositorySessionFactory", RepositorySessionFactory.cl @Override +ass ); } public void doGet( HttpServletRequest req, HttpServletResponse res ) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java index 43607e9bf..cd15b1efa 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java @@ -46,6 +46,7 @@ public class ArchivaLdapConnectionFactory private LdapConnectionConfiguration ldapConnectionConfiguration; @PostConstruct + @Override public void initialize() { try diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java index d2aae47ba..6fed3800a 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java @@ -64,6 +64,7 @@ public class ArchivaConfigurableUsersManager private boolean useUsersCache; @PostConstruct + @Override public void initialize() { try @@ -92,7 +93,8 @@ public class ArchivaConfigurableUsersManager protected boolean useUsersCache() { - return this.useUsersCache; + return this.useUsers @Override +Cache; } public User addUser( User user ) @@ -105,6 +107,7 @@ public class ArchivaConfigurableUsersManager usersCache.put( user.getUsername(), user ); } + @Override return user; } @@ -115,7 +118,8 @@ public class ArchivaConfigurableUsersManager if ( useUsersCache() ) { - usersCache.put( user.getUsername(), user ); + usersCache.put( use @Override +r.getUsername(), user ); } } @@ -142,14 +146,16 @@ public class ArchivaConfigurableUsersManager } if ( lastException != null && allFailed ) { - throw new UserManagerException( lastException.getMessage(), lastException ); + throw new UserManagerException( lastException.getMessage(), @Override + lastException ); } return user; } public UserQuery createUserQuery() { - return userManagerPerId.values().iterator().next().createUserQuery(); + return u @Override +serManagerPerId.values().iterator().next().createUserQuery(); } @@ -176,7 +182,8 @@ public class ArchivaConfigurableUsersManager } if ( lastException != null && allFailed ) { - throw new UserManagerException( lastException.getMessage(), lastException ); + throw new @Override +UserManagerException( lastException.getMessage(), lastException ); } } @@ -235,7 +242,8 @@ public class ArchivaConfigurableUsersManager { throw (UserNotFoundException) lastException; } - throw new UserManagerException( lastException.getMessage(), lastException ); + throw new UserManagerException( @Override +lastException.getMessage(), lastException ); } } @@ -251,7 +259,8 @@ public class ArchivaConfigurableUsersManager @Override public User getGuestUser() - throws UserNotFoundException, UserManagerException + @Override + throws UserNotFoundException, UserManagerException { return findUser( GUEST_USERNAME ); } @@ -264,7 +273,8 @@ public class ArchivaConfigurableUsersManager for ( UserManager userManager : userManagerPerId.values() ) { List<User> found = userManager.findUsersByEmailKey( emailKey, orderAscending ); - if ( found != null ) + i @Override +f ( found != null ) { users.addAll( found ); } @@ -279,7 +289,8 @@ public class ArchivaConfigurableUsersManager for ( UserManager userManager : userManagerPerId.values() ) { - List<User> found = userManager.findUsersByFullNameKey( fullNameKey, orderAscending ); + List<User> found = userManager.findUsersByFullNameKey( fullNameKey, orderAscending ); @Override + if ( found != null ) { users.addAll( found ); @@ -295,7 +306,8 @@ public class ArchivaConfigurableUsersManager for ( UserManager userManager : userManagerPerId.values() ) { - List<User> found = userManager.findUsersByQuery( query ); + List<User> found = userManager.findUsersByQ @Override +uery( query ); if ( found != null ) { users.addAll( found ); @@ -311,8 +323,10 @@ public class ArchivaConfigurableUsersManager for ( UserManager userManager : userManagerPerId.values() ) { - List<User> found = userManager.findUsersByUsernameKey( usernameKey, orderAscending ); - if ( found != null ) + List<User> found = userManager.findUsersByUsernameKey( us @Override +ernameKey, orderAscending ); + if ( @Override +found != null ) { users.addAll( found ); } @@ -331,7 +345,8 @@ public class ArchivaConfigurableUsersManager List<User> users = new ArrayList<>(); for ( UserManager userManager : userManagerPerId.values() ) - { + @Override +{ List<User> found = userManager.getUsers(); if ( found != null ) { @@ -348,6 +363,7 @@ public class ArchivaConfigurableUsersManager for ( UserManager userManager : userManagerPerId.values() ) { + @Override List<User> found = userManager.getUsers( orderAscending ); if ( found != null ) { @@ -357,7 +373,8 @@ public class ArchivaConfigurableUsersManager return users; } - public boolean isReadOnly() + public boolean isReadOnly( @Override +) { boolean readOnly = false; @@ -372,7 +389,8 @@ public class ArchivaConfigurableUsersManager throws UserNotFoundException, UserManagerException { - UserManager userManager = userManagerPerId.get( user.getUserManagerId() ); + UserManager userManage @Override +r = userManagerPerId.get( user.getUserManagerId() ); user = userManager.updateUser( user ); @@ -421,7 +439,8 @@ public class ArchivaConfigurableUsersManager } } catch ( Exception e ) - { + @Override + { lastException = e; } } @@ -456,7 +475,8 @@ public class ArchivaConfigurableUsersManager lastException = e; } } - if ( lastException != null && allFailed ) + if ( las @Override +tException != null && allFailed ) { throw new UserManagerException( lastException.getMessage(), lastException ); } diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java index ab8719983..2ce58358b 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java @@ -52,6 +52,7 @@ public class ArchivaLdapRoleMapperConfiguration @Named( value = "redbackRuntimeConfigurationAdmin#default" ) private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin; + @Override public void addLdapMapping( String ldapGroup, List<String> roles ) throws MappingException { @@ -69,7 +70,8 @@ public class ArchivaLdapRoleMapperConfiguration catch ( RepositoryAdminException e ) { throw new MappingException( e.getMessage(), e ); - } + @Override + } } @@ -94,7 +96,8 @@ public class ArchivaLdapRoleMapperConfiguration } catch ( RepositoryAdminException e ) { - throw new MappingException( e.getMessage(), e ); + throw new MappingException( e.getMessa @Override +ge(), e ); } } @@ -112,7 +115,8 @@ public class ArchivaLdapRoleMapperConfiguration } catch ( RepositoryAdminException e ) { - throw new MappingException( e.getMessage(), e ); + throw new MappingExceptio @Override +n( e.getMessage(), e ); } } @@ -143,7 +147,8 @@ public class ArchivaLdapRoleMapperConfiguration } catch ( RepositoryAdminException e ) { - throw new MappingException( e.getMessage(), e ); + throw new @Override +MappingException( e.getMessage(), e ); } } diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java index 2b14fe227..8c1f4d790 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java @@ -89,6 +89,7 @@ public class ArchivaLockedAdminEnvironmentCheck * * @param violations */ + @Override public void validateEnvironment( List<String> violations ) { if ( !checked ) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java index 8ecc97c8e..607d2dab6 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java @@ -100,7 +100,7 @@ public class ArchivaRbacManager log.info( "use rbacManagerIds: '{}'", rbacManagerIds ); - this.rbacManagersPerId = new LinkedHashMap<String, RBACManager>( rbacManagerIds.size() ); + this.rbacManagersPerId = new LinkedHashMap<>( rbacManagerIds.size() ); for ( String id : rbacManagerIds ) { @@ -129,9 +129,11 @@ public class ArchivaRbacManager return this.rbacManagersPerId.values().iterator().next(); } + @Override public Role createRole( String name ) { - return getRbacManagerForWrite().createRole( name ); + return getRbacManagerForWrite().createRole( n @Override +ame ); } public Role saveRole( Role role ) @@ -158,6 +160,7 @@ public class ArchivaRbacManager { throw new RbacManagerException( lastException.getMessage(), lastException ); } + @Override return role; } @@ -183,7 +186,8 @@ public class ArchivaRbacManager } if ( lastException != null && allFailed ) { - throw new RbacManagerException( lastException.getMessage(), lastException ); + throw new RbacManagerException( lastException.getMes @Override +sage(), lastException ); } } @@ -217,7 +221,8 @@ public class ArchivaRbacManager log.debug( "cannot find role for name: ‘{}", roleName ); if ( lastException != null ) { - throw new RbacManagerException( lastException.getMessage(), lastException ); + throw new RbacManagerException( lastException.getMessage(), @Override + lastException ); } return null; } @@ -248,7 +253,8 @@ public class ArchivaRbacManager if ( lastException != null && allFailed ) { throw new RbacManagerException( lastException.getMessage(), lastException ); - } + @Override + } return new ArrayList<>( allRoles.values() ); } @@ -274,19 +280,22 @@ public class ArchivaRbacManager if ( lastException != null && allFailed ) { - throw new RbacManagerException( lastException.getMessage(), lastException ); + throw new @Override +RbacManagerException( lastException.getMessage(), lastException ); } } public Permission createPermission( String name ) - throws RbacManagerException + throws Rb @Override +acManagerException { return getRbacManagerForWrite().createPermission( name ); } public Permission createPermission( String name, String operationName, String resourceIdentifier ) throws RbacManagerException - { + @Override + { return getRbacManagerForWrite().createPermission( name, operationName, resourceIdentifier ); } @@ -313,7 +322,8 @@ public class ArchivaRbacManager if ( lastException != null && allFailed ) { - throw new RbacManagerException( lastException.getMessage(), lastException ); + @Override + throw new RbacManagerException( lastException.getMessage(), lastException ); } return permission; @@ -347,7 +357,8 @@ public class ArchivaRbacManager } } - if ( lastException != null ) + if ( lastException != null @Override + ) { throw new RbacManagerException( lastException.getMessage(), lastException ); } @@ -379,7 +390,8 @@ public class ArchivaRbacManager if ( lastException != null && allFailed ) { - throw new RbacManagerException( lastException.getMessage(), lastException ); + @Override + throw new RbacManagerException( lastException.getMessage(), lastException ); } return new ArrayList<>( allPermissions.values() ); } @@ -401,12 +413,14 @@ public class ArchivaRbacManager { lastException = e; } - } + } @Override + if ( lastException != null && allFailed ) { throw new RbacManagerException( lastException.getMessage(), lastException ); - } + @Override + } } public Operation createOperation( String name ) @@ -434,7 +448,8 @@ public class ArchivaRbacManager { lastException = e; } - } + @Override + } if ( lastException != null && allFailed ) { @@ -467,7 +482,8 @@ public class ArchivaRbacManager } catch ( Exception e ) { - lastException = e; + lastExce @Override +ption = e; } } @@ -501,6 +517,7 @@ public class ArchivaRbacManager } } + @Override if ( lastException != null && allFailed ) { throw new RbacManagerException( lastException.getMessage(), lastException ); @@ -522,14 +539,16 @@ public class ArchivaRbacManager allFailed = false; } catch ( Exception e ) - { + @Override + { lastException = e; } } if ( lastException != null && allFailed ) { - throw new RbacManagerException( lastException.getMessage(), lastException ); + throw new RbacMan @Override +agerException( lastException.getMessage(), lastException ); } } @@ -554,7 +573,8 @@ public class ArchivaRbacManager allFailed = false; } } - catch ( Exception e ) + catch ( Exception e ) @Override + { lastException = e; } @@ -589,7 +609,8 @@ public class ArchivaRbacManager return r; } } - catch ( Exception e ) + @Override + catch ( Exception e ) { lastException = e; } @@ -620,7 +641,8 @@ public class ArchivaRbacManager allFailed = false; } catch ( Exception e ) - { + @Override + { lastException = e; } } @@ -643,7 +665,8 @@ public class ArchivaRbacManager { rbacManager.removeResource( resource ); resourcesCache.remove( resource.getIdentifier() ); - allFailed = false; + @Override + allFailed = false; } catch ( Exception e ) { @@ -651,7 +674,8 @@ public class ArchivaRbacManager } } - if ( lastException != null && allFailed ) + if ( lastException != null @Override +&& allFailed ) { throw new RbacManagerException( lastException.getMessage(), lastException ); } @@ -676,7 +700,8 @@ public class ArchivaRbacManager { userAssignment = rbacManager.saveUserAssignment( userAssignment ); allFailed = false; - } + @Override + } } catch ( Exception e ) { @@ -768,7 +793,8 @@ public class ArchivaRbacManager { for ( RBACManager rbacManager : rbacManagersPerId.values() ) { - try + @Override + try { boolean exists = rbacManager.userAssignmentExists( assignment ); if ( exists ) @@ -808,7 +834,8 @@ public class ArchivaRbacManager } allUserAssignments.put( ua.getPrincipal(), ua ); } - allFailed = false; + allFai @Override +led = false; } catch ( Exception e ) { @@ -835,7 +862,8 @@ public class ArchivaRbacManager { List<UserAssignment> userAssignments = rbacManager.getUserAssignmentsForRoles( roleNames ); - allUserAssignments.addAll( userAssignments ); + allUserAssignments.addAll( @Override +userAssignments ); allFailed = false; } @@ -901,19 +929,22 @@ public class ArchivaRbacManager } catch ( Exception e ) { - lastException = e; + @Override + lastException = e; } } if ( lastException != null && allFailed ) { - throw new RbacManagerException( lastException.getMessage(), lastException ); + throw new RbacManagerException( lastException.getMe @Override +ssage(), lastException ); } return false; } @Override - public boolean roleExists( Role role ) + public b @Override +oolean roleExists( Role role ) throws RbacManagerException { return roleExists( role.getName() ); diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java index 4707c322e..4d9325305 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java @@ -34,7 +34,6 @@ import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; -import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,6 +91,7 @@ public class ArchivaUserManagerAuthenticator } + @Override public AuthenticationResult authenticate( AuthenticationDataSource ds ) throws AuthenticationException, AccountLockedException, MustChangePasswordException { @@ -214,11 +214,13 @@ public class ArchivaUserManagerAuthenticator return new AuthenticationResult( authenticationSuccess, username, resultException, authnResultErrors ); } + @Override public boolean supportsDataSource( AuthenticationDataSource source ) { return ( source instanceof PasswordBasedAuthenticationDataSource ); } + @Override public String getId() { return "ArchivaUserManagerAuthenticator"; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java index 8e00506fc..f82304243 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java @@ -57,6 +57,7 @@ public class ArchivaStartup private NexusIndexer nexusIndexer; + @Override public void contextInitialized( ServletContextEvent contextEvent ) { WebApplicationContext wac = @@ -95,6 +96,7 @@ public class ArchivaStartup } } + @Override public void contextDestroyed( ServletContextEvent contextEvent ) { WebApplicationContext applicationContext = diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java index bf942cb91..7a7c87df8 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java @@ -96,6 +96,7 @@ public class SecuritySynchronization return beans; } + @Override public void afterConfigurationChange( org.apache.archiva.redback.components.registry.Registry registry, String propertyName, Object propertyValue ) { @@ -105,7 +106,8 @@ public class SecuritySynchronization { syncRepoConfiguration( (String) propertyValue ); } - } + @Override + } } public void beforeConfigurationChange( org.apache.archiva.redback.components.registry.Registry registry, diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java index 2e35ba670..70ae9dd82 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java @@ -153,6 +153,7 @@ public abstract class AbstractDownloadTest @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java index 4775a88d5..14e5f1b4e 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java @@ -84,10 +84,12 @@ public class DownloadArtifactsTest System.setProperty( "appserver.base", previousAppServerBase ); } + @Override protected String getSpringConfigLocation() { return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml"; - } + } @Override + @Before public void startServer() @@ -122,7 +124,8 @@ public class DownloadArtifactsTest redirectServer.setHandler( contextRedirect ); redirectServer.start(); this.redirectPort = redirectServer.getConnectors()[0].getLocalPort(); - log.info( "redirect server port {}", redirectPort ); + log.info( "redirect server port {}", redirec @Override +tPort ); } diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java index 40f3ed8f8..6eec7f84d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java @@ -65,6 +65,7 @@ public class DownloadMergedIndexNonDefaultPathTest System.setProperty( "appserver.base", previousAppServerBase ); } + @Override protected String getSpringConfigLocation() { return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-merge-index-download.xml"; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java index 04c51fb8d..d338de5f3 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java @@ -70,6 +70,7 @@ public class DownloadMergedIndexTest System.setProperty( "appserver.base", previousAppServerBase ); } + @Override protected String getSpringConfigLocation() { return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-merge-index-download.xml"; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java index 9b969ede9..e53403e3d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java @@ -62,6 +62,7 @@ public class DownloadSnapshotTest System.setProperty( "appserver.base", previousAppServerBase ); } + @Override protected String getSpringConfigLocation() { return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml"; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java index 8f7c5fb62..1b15f06e0 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java @@ -58,6 +58,7 @@ public class RemoteRepositoryConnectivityCheckTest System.setProperty( "appserver.base", previousAppServerBase ); } + @Override protected String getSpringConfigLocation() { return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml"; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java index ae0750a97..485d4a718 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java @@ -34,11 +34,13 @@ public class UserRepositoriesStub { private List<String> repoIds = Collections.singletonList( "test-repo" ); + @Override public void createMissingRepositoryRoles( String repoId ) throws ArchivaSecurityException { } + @Override public List<String> getObservableRepositoryIds( String principal ) throws ArchivaSecurityException { @@ -50,17 +52,20 @@ public class UserRepositoriesStub this.repoIds = repoIds; } + @Override public boolean isAuthorizedToUploadArtifacts( String principal, String repoId ) throws ArchivaSecurityException { return true; } + @Override public boolean isAuthorizedToDeleteArtifacts( String principal, String repoId ) { return true; } + @Override public List<String> getManagableRepositoryIds( String principal ) throws ArchivaSecurityException { @@ -77,6 +82,7 @@ public class UserRepositoriesStub this.repoIds = repoIds; } + @Override public List<ManagedRepository> getAccessibleRepositories( String principal ) throws ArchivaSecurityException, AccessDeniedException, PrincipalNotFoundException { diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java index 8cccde1ba..d3b9bb1b1 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java @@ -32,89 +32,104 @@ import java.net.URL; public class RoleManagerStub implements RoleManager { + @Override public void loadRoleModel( URL resourceLocation ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void loadRoleModel( RedbackRoleModel model ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void createTemplatedRole( String templateId, String resource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeTemplatedRole( String templateId, String resource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateRole( String templateId, String oldResource, String newResource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void assignRole( String roleId, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void assignRoleByName( String roleName, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void assignTemplatedRole( String templateId, String resource, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void unassignRole( String roleId, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void unassignRoleByName( String roleName, String principal ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean roleExists( String roleId ) throws RoleManagerException { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean templatedRoleExists( String templateId, String resource ) throws RoleManagerException { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public RedbackRoleModel getModel() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void verifyTemplatedRole( String templateID, String resource ) throws RoleManagerException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void initialize() { //To change body of implemented methods use File | Settings | File Templates. diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java index ef42aad9f..964148370 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java @@ -89,6 +89,7 @@ public class RssFeedServletTest } @Before + @Override public void setUp() throws Exception { @@ -113,6 +114,7 @@ public class RssFeedServletTest } @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java index 20f624a3a..5a66698c3 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java @@ -63,6 +63,7 @@ public class SecuritySystemStub repoIds.add( "test-repo" ); } + @Override public SecuritySession authenticate( AuthenticationDataSource source ) throws AuthenticationException, UserNotFoundException, AccountLockedException { @@ -87,12 +88,14 @@ public class SecuritySystemStub return session; } + @Override public AuthorizationResult authorize( SecuritySession arg0, String arg1 ) throws AuthorizationException { return null; } + @Override public AuthorizationResult authorize( SecuritySession arg0, String arg1, String arg2 ) throws AuthorizationException { @@ -111,11 +114,13 @@ public class SecuritySystemStub return null; } + @Override public KeyManager getKeyManager() { return null; } + @Override public UserSecurityPolicy getPolicy() { return null; @@ -126,201 +131,241 @@ public class SecuritySystemStub return null; } + @Override public UserManager getUserManager() { return new UserManager() { + @Override public String getDescriptionKey() { return "French wine is better than Australian wine !"; } + @Override public boolean isFinalImplementation() { return false; } + @Override public void initialize() { // no op } + @Override public boolean isReadOnly() { return false; } + @Override public String getId() { return null; } + @Override public void addUserManagerListener( UserManagerListener listener ) { // no op } + @Override public void removeUserManagerListener( UserManagerListener listener ) { // no op } + @Override public User createUser( String username, String fullName, String emailAddress ) { return null; } + @Override public User createGuestUser() { return new User() { + @Override public String getUsername() { return "guest"; } + @Override public void setUsername( String name ) { } + @Override public String getFullName() { return null; } + @Override public void setFullName( String name ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getEmail() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setEmail( String address ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getPassword() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPassword( String rawPassword ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getEncodedPassword() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setEncodedPassword( String encodedPassword ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Date getLastPasswordChange() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setLastPasswordChange( Date passwordChangeDate ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<String> getPreviousEncodedPasswords() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPreviousEncodedPasswords( List<String> encodedPasswordList ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void addPreviousEncodedPassword( String encodedPassword ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isPermanent() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPermanent( boolean permanent ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isLocked() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setLocked( boolean locked ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isPasswordChangeRequired() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPasswordChangeRequired( boolean changeRequired ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isValidated() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setValidated( boolean valid ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public int getCountFailedLoginAttempts() { return 0; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setCountFailedLoginAttempts( int count ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Date getAccountCreationDate() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setAccountCreationDate( Date date ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Date getLastLoginDate() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setLastLoginDate( Date date ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getUserManagerId() { return "mock"; @@ -328,32 +373,38 @@ public class SecuritySystemStub }; } + @Override public UserQuery createUserQuery() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<User> getUsers() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<User> getUsers( boolean orderAscending ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public User addUser( User user ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public User updateUser( User user ) throws UserNotFoundException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public User findUser( String username ) throws UserNotFoundException { @@ -367,157 +418,188 @@ public class SecuritySystemStub return null; } + @Override public User getGuestUser() throws UserNotFoundException { return new User() { + @Override public String getUsername() { return "guest"; } + @Override public void setUsername( String name ) { } + @Override public String getFullName() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setFullName( String name ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getEmail() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setEmail( String address ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getPassword() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPassword( String rawPassword ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getEncodedPassword() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setEncodedPassword( String encodedPassword ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Date getLastPasswordChange() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setLastPasswordChange( Date passwordChangeDate ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<String> getPreviousEncodedPasswords() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPreviousEncodedPasswords( List<String> encodedPasswordList ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void addPreviousEncodedPassword( String encodedPassword ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isPermanent() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPermanent( boolean permanent ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isLocked() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setLocked( boolean locked ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isPasswordChangeRequired() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setPasswordChangeRequired( boolean changeRequired ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean isValidated() { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setValidated( boolean valid ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public int getCountFailedLoginAttempts() { return 0; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setCountFailedLoginAttempts( int count ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Date getAccountCreationDate() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setAccountCreationDate( Date date ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public Date getLastLoginDate() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void setLastLoginDate( Date date ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public String getUserManagerId() { return "mock"; @@ -525,47 +607,56 @@ public class SecuritySystemStub }; } + @Override public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<User> findUsersByEmailKey( String emailKey, boolean orderAscending ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<User> findUsersByQuery( UserQuery query ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public boolean userExists( String principal ) { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void deleteUser( String username ) throws UserNotFoundException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void addUserUnchecked( User user ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void eraseDatabase() { //To change body of implemented methods use File | Settings | File Templates. } + @Override public User updateUser( User user, boolean passwordChangeRequired ) throws UserNotFoundException { @@ -574,18 +665,21 @@ public class SecuritySystemStub }; } + @Override public boolean isAuthenticated( AuthenticationDataSource arg0 ) throws AuthenticationException, UserNotFoundException, AccountLockedException { return false; } + @Override public boolean isAuthorized( SecuritySession arg0, String arg1 ) throws AuthorizationException { return false; } + @Override public boolean isAuthorized( SecuritySession arg0, String arg1, String arg2 ) throws AuthorizationException { @@ -597,6 +691,7 @@ public class SecuritySystemStub return false; } + @Override public boolean userManagerReadOnly() { return true; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java index 940fa6e15..855f60056 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java @@ -74,97 +74,118 @@ public class TestMetadataRepository versions.add( projectVersion ); } + @Override public ProjectMetadata getProject( String repoId, String namespace, String projectId ) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationExcept @Override +ion(); } public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) { - throw new UnsupportedOperationException(); + throw new UnsupportedO @Override +perationException(); } public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) { - throw new UnsupportedOperationException(); + throw ne @Override +w UnsupportedOperationException(); } public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) { - throw new UnsupportedOperationException(); + @Override + throw new UnsupportedOperationException(); } - public Collection<String> getRootNamespaces( String repoId ) + public Collection<String> getRootNamespaces( String rep @Override +oId ) { throw new UnsupportedOperationException(); } - public Collection<String> getNamespaces( String repoId, String namespace ) + public Collection<String> getNamespaces( String repoId, @Override + String namespace ) { throw new UnsupportedOperationException(); } - public Collection<String> getProjects( String repoId, String namespace ) + public Collection<String> getProjects( @Override +String repoId, String namespace ) { throw new UnsupportedOperationException(); } - public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) + public Collection<String @Override +> getProjectVersions( String repoId, String namespace, String projectId ) { return versions; } - public void updateProject( String repoId, ProjectMetadata project ) + public @Override + void updateProject( String repoId, ProjectMetadata project ) { throw new UnsupportedOperationException(); } - public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion, + public void updateArtifact( String repoId, String namespace, String projectId, String proj @Override +ectVersion, ArtifactMetadata artifactMeta ) { throw new UnsupportedOperationException(); } - public void updateProjectVersion( String repoId, String namespace, String projectId, + public void updateProjectVersion( String repoId, String namespace, String @Override +projectId, ProjectVersionMetadata versionMetadata ) { - throw new UnsupportedOperationException(); + throw new Uns @Override +upportedOperationException(); } public void updateNamespace( String repoId, String namespace ) { - throw new UnsupportedOperationException(); + @Override + throw new UnsupportedOperationException(); } public List<String> getMetadataFacets( String repodId, String facetId ) { - return Collections.emptyList(); + r @Override +eturn Collections.emptyList(); } public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) - { + @Override + { throw new UnsupportedOperationException(); } - public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) + public void addMetadataFacet( String repositoryId, MetadataFa @Override +cet metadataFacet ) { throw new UnsupportedOperationException(); } public void removeMetadataFacets( String repositoryId, String facetId ) { - throw new UnsupportedOperationException(); + @Override + throw new UnsupportedOperationException(); } - public void removeMetadataFacet( String repoId, String facetId, String name ) + public void removeMetadataFacet( String repoId, String facetId, Strin @Override +g name ) { //To change body of implemented methods use File | Settings | File Templates. - } + @Override + } public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime ) + @Override { return artifacts; } @@ -174,35 +195,45 @@ public class TestMetadataRepository return Collections.singletonList( TEST_REPO ); } - public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum ) + public @Override + List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum ) { return null; } public void removeArtifact( String repositoryId, String namespace, String project, String version, String id ) { - throw new UnsupportedOperationException(); + throw new Unsu @Override +pportedOperationException(); } - public void removeArtifact( String repositoryId, String namespace, String project, String version, + public void removeArtifact( String repositoryId, String name @Override +space, String project, String version, MetadataFacet metadataFacet ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } - public void removeRepository( String repoId ) + @Override + public void remove @Override +Repository( String repo @Override +Id ) { throw new UnsupportedOperationException(); } - public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, - String projectVersion ) + pu @Override +blic Collection<ArtifactMetadata> getArtifacts( String repoId, String names @Override +pace, String projectId, + @Override + String projectVersion ) { return artifacts; } - public void save() + public void save() @Override + { } @@ -215,14 +246,16 @@ public class TestMetadataRepository throw new UnsupportedOperationException(); } - public boolean canObtainAccess( Class<?> aClass ) + public boolean canObtainAccess( Class @Override +<?> aClass ) { return false; } public <T>T obtainAccess( Class<T> aClass ) { - return null; + return @Override + null; } public List<ArtifactMetadata> getArtifacts( String repositoryId ) @@ -230,13 +263,15 @@ public class TestMetadataRepository return artifacts; } - public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) + public void removeArtifact( A @Override +rtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } - public void removeNamespace( String repositoryId, String namespace ) + public void remov @Override +eNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java index e5a06f569..b0edd246d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java @@ -49,12 +49,14 @@ public class TestMetadataResolver private Map<String, Collection<String>> versionsInProject = new HashMap<>(); + @Override public ProjectVersionMetadata resolveProjectVersion( RepositorySession repositorySession, String repoId, String namespace, String projectId, String projectVersion ) { return projectVersions.get( createMapKey( repoId, namespace, projectId, projectVersion ) ); } + @Override public Collection<ProjectVersionReference> resolveProjectReferences( RepositorySession repositorySession, String repoId, String namespace, String projectId, String projectVersion ) @@ -64,11 +66,13 @@ public class TestMetadataResolver return projectVersionReferences; } + @Override public Collection<String> resolveRootNamespaces( RepositorySession repositorySession, String repoId ) { return resolveNamespaces( repositorySession, repoId, null ); } + @Override public Collection<String> resolveNamespaces( RepositorySession repositorySession, String repoId, String baseNamespace ) { @@ -92,12 +96,14 @@ public class TestMetadataResolver return namespaces; } + @Override public Collection<String> resolveProjects( RepositorySession repositorySession, String repoId, String namespace ) { Collection<String> list = projectsInNamespace.get( namespace ); return list != null ? list : Collections.<String>emptyList(); } + @Override public Collection<String> resolveProjectVersions( RepositorySession repositorySession, String repoId, String namespace, String projectId ) { @@ -105,6 +111,7 @@ public class TestMetadataResolver return list != null ? list : Collections.<String>emptyList(); } + @Override public Collection<ArtifactMetadata> resolveArtifacts( RepositorySession repositorySession, String repoId, String namespace, String projectId, String projectVersion ) { diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java index ff159f47c..0e10a5254 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java @@ -36,6 +36,7 @@ public class TestRepositorySessionFactory this.repositorySession = repositorySession; } + @Override public RepositorySession createSession() { return repositorySession != null ? repositorySession : new RepositorySession( new TestMetadataRepository(), diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java index 47ae4bf6e..9d23b7733 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java @@ -29,6 +29,7 @@ import org.apache.archiva.webdav.util.RepositoryPathUtil; public class ArchivaDavLocatorFactory implements DavLocatorFactory { + @Override public DavResourceLocator createResourceLocator( String prefix, String href ) { // build prefix string and remove all prefixes from the given href. @@ -56,11 +57,13 @@ public class ArchivaDavLocatorFactory return new ArchivaDavResourceLocator( b.toString(), Text.unescape( href ), repository, this ); } + @Override public DavResourceLocator createResourceLocator( String prefix, String workspacePath, String resourcePath ) { return createResourceLocator( prefix, workspacePath, resourcePath, true ); } + @Override public DavResourceLocator createResourceLocator( String prefix, String workspacePath, String path, boolean isResourcePath ) { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java index f4061cb61..6961d2206 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java @@ -143,32 +143,38 @@ public class ArchivaDavResource this.principal = principal; } + @Override public String getComplianceClass() { return COMPLIANCE_CLASS; } + @Override public String getSupportedMethods() { return METHODS; } + @Override public boolean exists() { return localResource.exists(); } + @Override public boolean isCollection() { return localResource.isDirectory(); } + @Override public String getDisplayName() { String resPath = getResourcePath(); return ( resPath != null ) ? Text.getName( resPath ) : resPath; } + @Override public DavResourceLocator getLocator() { return locator; @@ -179,21 +185,25 @@ public class ArchivaDavResource return localResource; } + @Override public String getResourcePath() { return locator.getResourcePath(); } + @Override public String getHref() { return locator.getHref( isCollection() ); } + @Override public long getModificationTime() { return localResource.lastModified(); } + @Override public void spool( OutputContext outputContext ) throws IOException { @@ -237,26 +247,31 @@ public class ArchivaDavResource } } + @Override public DavPropertyName[] getPropertyNames() { return getProperties().getPropertyNames(); } + @Override public DavProperty getProperty( DavPropertyName name ) { return getProperties().get( name ); } + @Override public DavPropertySet getProperties() { return initProperties(); } + @Override public void setProperty( DavProperty property ) throws DavException { } + @Override public void removeProperty( DavPropertyName propertyName ) throws DavException { @@ -269,12 +284,14 @@ public class ArchivaDavResource } @SuppressWarnings ("unchecked") + @Override public MultiStatusResponse alterProperties( List changeList ) throws DavException { return null; } + @Override public DavResource getCollection() { DavResource parent = null; @@ -299,6 +316,7 @@ public class ArchivaDavResource return parent; } + @Override public void addMember( DavResource resource, InputContext inputContext ) throws DavException { @@ -359,6 +377,7 @@ public class ArchivaDavResource } } + @Override public DavResourceIterator getMembers() { List<DavResource> list = new ArrayList<>(); @@ -391,6 +410,7 @@ public class ArchivaDavResource return new DavResourceIteratorImpl( list ); } + @Override public void removeMember( DavResource member ) throws DavException { @@ -449,6 +469,7 @@ public class ArchivaDavResource } } + @Override public void move( DavResource destination ) throws DavException { @@ -483,6 +504,7 @@ public class ArchivaDavResource } } + @Override public void copy( DavResource destination, boolean shallow ) throws DavException { @@ -522,16 +544,19 @@ public class ArchivaDavResource } } + @Override public boolean isLockable( Type type, Scope scope ) { return Type.WRITE.equals( type ) && Scope.EXCLUSIVE.equals( scope ); } + @Override public boolean hasLock( Type type, Scope scope ) { return getLock( type, scope ) != null; } + @Override public ActiveLock getLock( Type type, Scope scope ) { ActiveLock lock = null; @@ -542,12 +567,14 @@ public class ArchivaDavResource return lock; } + @Override public ActiveLock[] getLocks() { ActiveLock writeLock = getLock( Type.WRITE, Scope.EXCLUSIVE ); return ( writeLock != null ) ? new ActiveLock[]{ writeLock } : new ActiveLock[0]; } + @Override public ActiveLock lock( LockInfo lockInfo ) throws DavException { @@ -563,6 +590,7 @@ public class ArchivaDavResource return lock; } + @Override public ActiveLock refreshLock( LockInfo lockInfo, String lockToken ) throws DavException { @@ -582,6 +610,7 @@ public class ArchivaDavResource return lock; } + @Override public void unlock( String lockToken ) throws DavException { @@ -600,16 +629,19 @@ public class ArchivaDavResource } } + @Override public void addLockManager( LockManager lockManager ) { this.lockManager = lockManager; } + @Override public DavResourceFactory getFactory() { return factory; } + @Override public DavSession getSession() { return session; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index 070d93687..b252fe302 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -209,6 +209,7 @@ public class ArchivaDavResourceFactory // no op } + @Override public DavResource createResource( final DavResourceLocator locator, final DavServletRequest request, final DavServletResponse response ) throws DavException @@ -718,6 +719,7 @@ public class ArchivaDavResourceFactory return resource; } + @Override public DavResource createResource( final DavResourceLocator locator, final DavSession davSession ) throws DavException { @@ -840,16 +842,19 @@ public class ArchivaDavResourceFactory } } + @Override public void addAuditListener( AuditListener listener ) { this.auditListeners.add( listener ); } + @Override public void clearAuditListeners() { this.auditListeners.clear(); } + @Override public void removeAuditListener( AuditListener listener ) { this.auditListeners.remove( listener ); diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java index 3c7d34573..c1be855cd 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java @@ -78,41 +78,49 @@ public class ArchivaDavResourceLocator this.resourcePath = path; } + @Override public String getRepositoryId() { return repositoryId; } + @Override public String getPrefix() { return prefix; } + @Override public String getResourcePath() { return resourcePath; } + @Override public String getWorkspacePath() { return ""; } + @Override public String getWorkspaceName() { return ""; } + @Override public boolean isSameWorkspace( DavResourceLocator locator ) { return isSameWorkspace( locator.getWorkspaceName() ); } + @Override public boolean isSameWorkspace( String workspaceName ) { return getWorkspaceName().equals( workspaceName ); } + @Override public String getHref( boolean isCollection ) { // avoid doubled trailing '/' for the root item @@ -120,16 +128,19 @@ public class ArchivaDavResourceLocator return href + suffix; } + @Override public boolean isRootLocation() { return "/".equals( resourcePath ); } + @Override public DavLocatorFactory getFactory() { return davLocatorFactory; } + @Override public String getRepositoryPath() { return getResourcePath(); @@ -140,6 +151,7 @@ public class ArchivaDavResourceLocator * * @return the hash code */ + @Override public int hashCode() { return href.hashCode(); @@ -152,6 +164,7 @@ public class ArchivaDavResourceLocator * @param obj the object to compare to * @return <code>true</code> if the 2 objects are equal; <code>false</code> otherwise */ + @Override public boolean equals( Object obj ) { if ( obj instanceof DavResourceLocator ) diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java index f0521e78c..ecab3d869 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java @@ -29,26 +29,31 @@ public class ArchivaDavSession { private final Set<String> lockTokens = new HashSet<String>(); + @Override public void addLockToken( String token ) { lockTokens.add( token ); } + @Override public String[] getLockTokens() { return lockTokens.toArray( new String[lockTokens.size()] ); } + @Override public void removeLockToken( String token ) { lockTokens.remove( token ); } + @Override public void removeReference( Object reference ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public void addReference( Object reference ) { throw new UnsupportedOperationException( "Not supported yet." ); diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java index 3735e4119..ac1554335 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java @@ -49,6 +49,7 @@ public class ArchivaDavSessionProvider this.httpAuth = httpAuth; } + @Override public boolean attachSession( WebdavRequest request ) throws DavException { @@ -95,6 +96,7 @@ public class ArchivaDavSessionProvider } } + @Override public void releaseSession( WebdavRequest request ) { request.setDavSession( null ); diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java index c84dc7b49..cb81e8561 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java @@ -84,6 +84,7 @@ public class ArchivaVirtualDavResource this.properties = new DavPropertySet(); } + @Override public void spool( OutputContext outputContext ) throws IOException { @@ -105,11 +106,13 @@ public class ArchivaVirtualDavResource } } + @Override public void addLockManager( LockManager arg0 ) { } + @Override public void addMember( DavResource arg0, InputContext arg1 ) throws DavException { @@ -117,6 +120,7 @@ public class ArchivaVirtualDavResource } @SuppressWarnings( "unchecked" ) + @Override public MultiStatusResponse alterProperties( List arg0 ) throws DavException { @@ -129,113 +133,134 @@ public class ArchivaVirtualDavResource return null; } + @Override public void copy( DavResource arg0, boolean arg1 ) throws DavException { } + @Override public boolean exists() { // localResources are already filtered (all files in the list are already existing) return true; } + @Override public ActiveLock getLock( Type arg0, Scope arg1 ) { return null; } + @Override public ActiveLock[] getLocks() { return null; } + @Override public DavResourceIterator getMembers() { return null; } + @Override public String getSupportedMethods() { return METHODS; } + @Override public long getModificationTime() { return 0; } + @Override public boolean hasLock( Type arg0, Scope arg1 ) { return false; } + @Override public boolean isCollection() { return true; } + @Override public boolean isLockable( Type arg0, Scope arg1 ) { return false; } + @Override public ActiveLock lock( LockInfo arg0 ) throws DavException { return null; } + @Override public void move( DavResource arg0 ) throws DavException { } + @Override public ActiveLock refreshLock( LockInfo arg0, String arg1 ) throws DavException { return null; } + @Override public void removeMember( DavResource arg0 ) throws DavException { } + @Override public void unlock( String arg0 ) throws DavException { } + @Override public String getComplianceClass() { return COMPLIANCE_CLASS; } + @Override public DavResourceLocator getLocator() { return locator; } + @Override public String getResourcePath() { return locator.getResourcePath(); } + @Override public String getHref() { return locator.getHref( isCollection() ); } + @Override public DavResourceFactory getFactory() { return factory; } + @Override public String getDisplayName() { String resPath = getResourcePath(); @@ -243,38 +268,45 @@ public class ArchivaVirtualDavResource return ( resPath != null ) ? Text.getName( resPath ) : resPath; } + @Override public DavSession getSession() { return null; } + @Override public DavPropertyName[] getPropertyNames() { return getProperties().getPropertyNames(); } + @Override public DavProperty getProperty( DavPropertyName name ) { initProperties(); return properties.get( name ); } + @Override public DavPropertySet getProperties() { initProperties(); return properties; } + @Override public void setProperty( DavProperty property ) throws DavException { } + @Override public void removeProperty( DavPropertyName propertyName ) throws DavException { } + @Override public DavResource getCollection() { DavResource parent = null; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java index 5e31dffcd..4b43a6037 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java @@ -76,6 +76,7 @@ public class RepositoryServlet private final Object reloadLock = new Object(); + @Override public void init( ServletConfig servletConfig ) throws ServletException { @@ -211,6 +212,7 @@ public class RepositoryServlet log.info( "initServers done in {} ms", (end - start) ); } + @Override public void configurationEvent( ConfigurationEvent event ) { if ( event.getType() == ConfigurationEvent.SAVED ) @@ -257,6 +259,7 @@ public class RepositoryServlet return configuration; } + @Override protected boolean isPreconditionValid( final WebdavRequest request, final DavResource davResource ) { // check for read or write access to the resource when resource-based permission is implemented @@ -264,36 +267,43 @@ public class RepositoryServlet return true; } + @Override public DavSessionProvider getDavSessionProvider() { return sessionProvider; } + @Override public void setDavSessionProvider( final DavSessionProvider davSessionProvider ) { this.sessionProvider = davSessionProvider; } + @Override public DavLocatorFactory getLocatorFactory() { return locatorFactory; } + @Override public void setLocatorFactory( final DavLocatorFactory davLocatorFactory ) { locatorFactory = davLocatorFactory; } + @Override public DavResourceFactory getResourceFactory() { return resourceFactory; } + @Override public void setResourceFactory( final DavResourceFactory davResourceFactory ) { resourceFactory = davResourceFactory; } + @Override public String getAuthenticateHeaderValue() { throw new UnsupportedOperationException(); diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java index 450044876..8571821d6 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java @@ -47,6 +47,7 @@ public class TemporaryGroupIndexSessionCleaner public static final String TEMPORARY_INDEX_SESSION_KEY = TemporaryGroupIndexSessionCleaner.class.getName(); + @Override public void sessionCreated( HttpSessionEvent httpSessionEvent ) { // ensure the map is here to avoid NPE @@ -64,6 +65,7 @@ public class TemporaryGroupIndexSessionCleaner } } + @Override public void sessionDestroyed( HttpSessionEvent httpSessionEvent ) { Map<String, TemporaryGroupIndex> tempFilesPerKey = diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java index 8fe7a6c29..fc30e0d51 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java @@ -34,156 +34,186 @@ import java.util.List; public class TestMetadataRepository implements MetadataRepository { + @Override public ProjectMetadata getProject( String repoId, String namespace, String projectId ) { return null; } + @Override public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public Collection<String> getRootNamespaces( String repoId ) { return null; } + @Override public Collection<String> getNamespaces( String repoId, String namespace ) { return null; } + @Override public Collection<String> getProjects( String repoId, String namespace ) { return null; } + @Override public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) { return null; } + @Override public void updateProject( String repoId, ProjectMetadata project ) { } + @Override public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifactMeta ) { } + @Override public void updateProjectVersion( String repoId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) { } + @Override public void updateNamespace( String repoId, String namespace ) { } + @Override public List<String> getMetadataFacets( String repodId, String facetId ) { return Collections.emptyList(); } + @Override public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) { return null; } + @Override public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) { } + @Override public void removeMetadataFacets( String repositoryId, String facetId ) { } + @Override public void removeMetadataFacet( String repoId, String facetId, String name ) { } + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime ) { return null; } + @Override public Collection<String> getRepositories() { return null; } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum ) { return null; } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, String id ) { } + @Override public void removeRepository( String repoId ) { } + @Override public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) { return null; } + @Override public void save() { } + @Override public void close() { } + @Override public void revert() { } + @Override public boolean canObtainAccess( Class<?> aClass ) { return false; } + @Override public <T>T obtainAccess( Class<T> aClass ) { return null; } + @Override public List<ArtifactMetadata> getArtifacts( String repositoryId ) { return null; } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -191,30 +221,35 @@ public class TestMetadataRepository throw new UnsupportedOperationException(); } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public void removeNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException { } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java index 93a4e5ce5..03be76a86 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java @@ -27,6 +27,7 @@ public class TestRepositorySessionFactory { private MetadataResolver resolver; + @Override public RepositorySession createSession() { return new RepositorySession( new TestMetadataRepository(), resolver ); diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java index 0734e2cd3..b58cee62e 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java @@ -35,6 +35,7 @@ public class TestAuditListener private List<AuditEvent> events = new ArrayList<>(); + @Override public void auditEvent( AuditEvent event ) { events.add( event ); diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java index a80a1b85c..58ce852a3 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java @@ -243,6 +243,7 @@ public abstract class AbstractRepositoryServletProxiedMetadataTestCase // } @Before + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java index 9fea3a979..311a83f34 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java @@ -111,6 +111,7 @@ public abstract class AbstractRepositoryServletTestCase } @Before + @Override public void setUp() throws Exception { @@ -569,6 +570,7 @@ public abstract class AbstractRepositoryServletTestCase { MockHttpServletResponse response = new MockHttpServletResponse() { + @Override public String getContentAsString() throws UnsupportedEncodingException { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java index 5290a9f1a..ddd0c087c 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java @@ -121,6 +121,7 @@ public class ArchivaDavResourceFactoryTest @Before + @Override public void setUp() throws Exception { @@ -206,6 +207,7 @@ public class ArchivaDavResourceFactoryTest } @After + @Override public void tearDown() throws Exception { @@ -617,6 +619,7 @@ public class ArchivaDavResourceFactoryTest super( applicationContext, plexusSisuBridge, archivaConfiguration ); } + @Override protected boolean isAuthorized( DavServletRequest request, String repositoryId ) throws DavException { @@ -631,6 +634,7 @@ public class ArchivaDavResourceFactoryTest } } + @Override protected String getActivePrincipal( DavServletRequest request ) { return "guest"; @@ -640,6 +644,7 @@ public class ArchivaDavResourceFactoryTest class OverridingRepositoryProxyConnectors extends DefaultRepositoryProxyConnectors { + @Override public File fetchMetatadaFromProxies( ManagedRepositoryContent repository, String logicalPath ) { File target = new File( repository.getRepoRoot(), logicalPath ); diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java index 52d4c3731..b657c082b 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java @@ -105,215 +105,256 @@ public class ArchivaDavSessionProviderTest implements HttpServletRequest { + @Override public boolean authenticate( HttpServletResponse httpServletResponse ) throws IOException, ServletException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public void login( String s, String s1 ) throws ServletException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public void logout() throws ServletException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Collection<Part> getParts() throws IOException, ServletException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Part getPart( String s ) throws IOException, ServletException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public ServletContext getServletContext() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public AsyncContext startAsync() throws IllegalStateException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public AsyncContext startAsync( ServletRequest servletRequest, ServletResponse servletResponse ) throws IllegalStateException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isAsyncStarted() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isAsyncSupported() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public AsyncContext getAsyncContext() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public DispatcherType getDispatcherType() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Object getAttribute( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Enumeration getAttributeNames() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getCharacterEncoding() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public int getContentLength() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getContentType() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public ServletInputStream getInputStream() throws IOException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getLocalAddr() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getLocalName() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public int getLocalPort() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Locale getLocale() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Enumeration getLocales() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getParameter( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Map getParameterMap() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Enumeration getParameterNames() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String[] getParameterValues( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getProtocol() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public BufferedReader getReader() throws IOException { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getRealPath( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getRemoteAddr() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getRemoteHost() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public int getRemotePort() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public RequestDispatcher getRequestDispatcher( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getScheme() { return ""; } + @Override public String getServerName() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public int getServerPort() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isSecure() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public void removeAttribute( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public void setAttribute( String arg0, Object arg1 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public void setCharacterEncoding( String arg0 ) throws UnsupportedEncodingException { @@ -321,126 +362,151 @@ public class ArchivaDavSessionProviderTest } + @Override public String getAuthType() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getContextPath() { return "/"; } + @Override public Cookie[] getCookies() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public long getDateHeader( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getHeader( String arg0 ) { return ""; } + @Override public Enumeration getHeaderNames() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Enumeration getHeaders( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public int getIntHeader( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getMethod() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getPathInfo() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getPathTranslated() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getQueryString() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getRemoteUser() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getRequestURI() { return "/"; } + @Override public StringBuffer getRequestURL() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getRequestedSessionId() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public String getServletPath() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public HttpSession getSession( boolean arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public HttpSession getSession() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public Principal getUserPrincipal() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isRequestedSessionIdFromCookie() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isRequestedSessionIdFromURL() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isRequestedSessionIdFromUrl() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isRequestedSessionIdValid() { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public boolean isUserInRole( String arg0 ) { throw new UnsupportedOperationException( "Not supported yet." ); @@ -450,12 +516,14 @@ public class ArchivaDavSessionProviderTest private class ServletAuthenticatorMock implements ServletAuthenticator { + @Override public boolean isAuthenticated( HttpServletRequest arg0, AuthenticationResult arg1 ) throws AuthenticationException, AccountLockedException, MustChangePasswordException { return true; } + @Override public boolean isAuthorized( HttpServletRequest request, SecuritySession securitySession, String repositoryId, String permission ) throws AuthorizationException, UnauthorizedException @@ -463,6 +531,7 @@ public class ArchivaDavSessionProviderTest return true; } + @Override public boolean isAuthorized( String principal, String repoId, String permission ) throws UnauthorizedException { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java index 7eefdd65e..a8587718b 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java @@ -60,6 +60,7 @@ public class BypassSecuritySystem bypassUserManager = new MemoryUserManager(); } + @Override public SecuritySession authenticate( AuthenticationDataSource source ) throws AuthenticationException, UserNotFoundException, AccountLockedException { @@ -67,48 +68,57 @@ public class BypassSecuritySystem return new DefaultSecuritySession( result ); } + @Override public AuthorizationResult authorize( SecuritySession session, String permission ) throws AuthorizationException { return new AuthorizationResult( true, session.getUser(), null ); } + @Override public AuthorizationResult authorize( SecuritySession session, String permission, String resource ) throws AuthorizationException { return new AuthorizationResult( true, session.getUser(), null ); } + @Override public String getAuthenticatorId() { return "bypass-authenticator"; } + @Override public String getAuthorizerId() { return "bypass-authorizer"; } + @Override public KeyManager getKeyManager() { return bypassKeyManager; } + @Override public UserSecurityPolicy getPolicy() { return bypassPolicy; } + @Override public String getUserManagementId() { return "bypass-managementid"; } + @Override public UserManager getUserManager() { return bypassUserManager; } + @Override public boolean isAuthenticated( AuthenticationDataSource source ) throws AuthenticationException, UserNotFoundException, AccountLockedException { @@ -116,6 +126,7 @@ public class BypassSecuritySystem return true; } + @Override public boolean isAuthorized( SecuritySession session, String permission ) throws AuthorizationException { @@ -123,6 +134,7 @@ public class BypassSecuritySystem return true; } + @Override public boolean isAuthorized( SecuritySession session, String permission, String resource ) throws AuthorizationException { @@ -130,6 +142,7 @@ public class BypassSecuritySystem return true; } + @Override public boolean userManagerReadOnly() { return true; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java index f0d6deb9f..e8e8b63a8 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java @@ -99,6 +99,7 @@ public class DavResourceTest } @After + @Override public void tearDown() throws Exception { @@ -316,6 +317,7 @@ public class DavResourceTest private class RootContextDavResourceFactory implements DavResourceFactory { + @Override public DavResource createResource( DavResourceLocator locator, DavServletRequest request, DavServletResponse response ) throws DavException @@ -323,6 +325,7 @@ public class DavResourceTest throw new UnsupportedOperationException( "Not supported yet." ); } + @Override public DavResource createResource( DavResourceLocator locator, DavSession session ) throws DavException { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java index 121b4e170..e183c0753 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java @@ -41,6 +41,7 @@ public class RepositoryServletNoProxyTest { @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java index d099d1e17..9b0654b7c 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java @@ -40,6 +40,7 @@ public class RepositoryServletProxiedMetadataLocalOnlyTest } @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java index 8d2e67d33..dd5da4535 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java @@ -41,6 +41,7 @@ public class RepositoryServletProxiedMetadataRemoteOnlyTest } @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java index 500727c9b..af3204016 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java @@ -53,6 +53,7 @@ public class RepositoryServletProxiedPassthroughTest } @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java index 9267086da..72d1328c7 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java @@ -41,6 +41,7 @@ public class RepositoryServletProxiedSnapshotPolicyTest { @Before + @Override public void setUp() throws Exception { @@ -50,6 +51,7 @@ public class RepositoryServletProxiedSnapshotPolicyTest } @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java index 7e7a78396..0c3219de9 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java @@ -48,6 +48,7 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest } @After + @Override public void tearDown() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java index 507d7bebd..e040e000a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java @@ -107,6 +107,7 @@ public class RepositoryServletSecurityTest ApplicationContext applicationContext; @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java index 57037fd5f..079828fbe 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java @@ -65,6 +65,7 @@ public class MavenIndexerCleaner } + @Override public void contextInitialized( ServletContextEvent servletContextEvent ) { try @@ -82,6 +83,7 @@ public class MavenIndexerCleaner } } + @Override public void contextDestroyed( ServletContextEvent servletContextEvent ) { try 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" ); diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java index 9e98e30e9..b0da64d65 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java @@ -236,11 +236,13 @@ public class AuditEvent this.timestamp = timestamp; } + @Override public String getFacetId() { return FACET_ID; } + @Override public String getName() { // use the hashCode here to make it unique if multiple events occur at a certain timestamp. None of the other @@ -257,6 +259,7 @@ public class AuditEvent return fmt; } + @Override public Map<String, String> toProperties() { Map<String, String> properties = new HashMap<>(); @@ -276,6 +279,7 @@ public class AuditEvent return properties; } + @Override public void fromProperties( Map<String, String> properties ) { this.action = properties.get( "action" ); diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java index a1589c070..f25ef8ec9 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java @@ -30,11 +30,13 @@ import org.springframework.stereotype.Service; public class AuditEventFactory implements MetadataFacetFactory { + @Override public MetadataFacet createMetadataFacet() { throw new UnsupportedOperationException( "Must construct an audit event with a name" ); } + @Override public MetadataFacet createMetadataFacet( String repositoryId, String name ) { return new AuditEvent( name, repositoryId ); diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java index 62af11d33..eeb99b5d7 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java @@ -43,6 +43,7 @@ public class AuditLog * Creates a log message in the following format ... * "{repository_id} {user_id} {remote_ip} \"{resource}\" \"{action}\"" */ + @Override public void auditEvent( AuditEvent event ) { StringBuilder msg = new StringBuilder(); diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java index 07adab737..ca93bbe43 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java @@ -48,6 +48,7 @@ public class DefaultAuditManager private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" ); + @Override public List<AuditEvent> getMostRecentAuditEvents( MetadataRepository metadataRepository, List<String> repositoryIds ) throws MetadataRepositoryException @@ -76,6 +77,7 @@ public class DefaultAuditManager return events; } + @Override public void addAuditEvent( MetadataRepository repository, AuditEvent event ) throws MetadataRepositoryException { @@ -86,12 +88,14 @@ public class DefaultAuditManager } } + @Override public void deleteAuditEvents( MetadataRepository metadataRepository, String repositoryId ) throws MetadataRepositoryException { metadataRepository.removeMetadataFacets( repositoryId, AuditEvent.FACET_ID ); } + @Override public List<AuditEvent> getAuditEventsInRange( MetadataRepository metadataRepository, Collection<String> repositoryIds, Date startTime, Date endTime ) throws MetadataRepositoryException @@ -99,6 +103,7 @@ public class DefaultAuditManager return getAuditEventsInRange( metadataRepository, repositoryIds, null, startTime, endTime ); } + @Override public List<AuditEvent> getAuditEventsInRange( MetadataRepository metadataRepository, Collection<String> repositoryIds, String resource, Date startTime, Date endTime ) @@ -135,6 +140,7 @@ public class DefaultAuditManager } Collections.sort( results, new Comparator<AuditEvent>() { + @Override public int compare( AuditEvent o1, AuditEvent o2 ) { return o2.getTimestamp().compareTo( o1.getTimestamp() ); @@ -163,6 +169,7 @@ public class DefaultAuditManager this.name = name; } + @Override public int compareTo( AuditRecord other ) { // reverse ordering diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java index 49bd8839c..3ad104fe5 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java @@ -50,6 +50,7 @@ public class MetadataAuditListener @Inject private RepositorySessionFactory repositorySessionFactory; + @Override public void auditEvent( AuditEvent event ) { // for now we only log upload events, some of the others are quite noisy diff --git a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java index 4dd887085..1a839e811 100644 --- a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java +++ b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacet.java @@ -31,16 +31,19 @@ public class GenericMetadataFacet public static final String FACET_ID = "org.apache.archiva.metadata.generic"; + @Override public String getFacetId() { return FACET_ID; } + @Override public String getName() { return ""; } + @Override public void fromProperties( Map<String, String> properties ) { if ( additionalProperties == null ) @@ -51,6 +54,7 @@ public class GenericMetadataFacet additionalProperties.putAll( properties ); } + @Override public Map<String, String> toProperties() { Map<String, String> properties = new TreeMap<String, String>(); diff --git a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java index c2f2aa70c..8d4dfb67a 100644 --- a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java +++ b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java @@ -30,11 +30,13 @@ public class GenericMetadataFacetFactory implements MetadataFacetFactory { + @Override public MetadataFacet createMetadataFacet() { return new GenericMetadataFacet(); } + @Override public MetadataFacet createMetadataFacet( String repositoryId, String name ) { throw new UnsupportedOperationException( "There is no valid name for project version facets" ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java index 02193ece8..bc08156c6 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java @@ -44,6 +44,7 @@ public class ArchivaRepositoryConnectorFactory // no op but empty constructor needed by aether } + @Override public RepositoryConnector newInstance( RepositorySystemSession session, RemoteRepository repository ) throws NoRepositoryConnectorException { @@ -61,18 +62,21 @@ public class ArchivaRepositoryConnectorFactory private Logger log = LoggerFactory.getLogger( getClass() ); + @Override public void get( Collection<? extends ArtifactDownload> artifactDownloads, Collection<? extends MetadataDownload> metadataDownloads ) { log.debug( "get" ); } + @Override public void put( Collection<? extends ArtifactUpload> artifactUploads, Collection<? extends MetadataUpload> metadataUploads ) { log.debug( "put" ); } + @Override public void close() { log.debug( "close" ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java index e1749a955..53e801b52 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java @@ -124,6 +124,7 @@ public class Maven3DependencyTreeBuilder builder = defaultModelBuilderFactory.newInstance(); } + @Override public void buildDependencyTree( List<String> repositoryIds, String groupId, String artifactId, String version, DependencyVisitor dependencyVisitor ) throws DependencyTreeBuilderException @@ -192,6 +193,7 @@ public class Maven3DependencyTreeBuilder } + @Override public List<TreeEntry> buildDependencyTree( List<String> repositoryIds, String groupId, String artifactId, String version ) throws DependencyTreeBuilderException diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java index 56ab172d3..bcff976b4 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java @@ -47,6 +47,7 @@ public class TreeDependencyNodeVisitor } + @Override public boolean visitEnter( DependencyNode dependencyNode ) { TreeEntry entry = @@ -67,6 +68,7 @@ public class TreeDependencyNodeVisitor return true; } + @Override public boolean visitLeave( DependencyNode dependencyNode ) { currentEntry = currentEntry.getParent(); 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 index eb67635cc..6e171edf9 100644 --- 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 @@ -32,6 +32,7 @@ public class ArtifactMetadataVersionComparator { public static ArtifactMetadataVersionComparator INSTANCE = new ArtifactMetadataVersionComparator(); + @Override public int compare( ArtifactMetadata o1, ArtifactMetadata o2 ) { // sort by version (reverse), then ID diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java index 0c5afebc4..01ea55970 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java @@ -68,6 +68,7 @@ public class DefaultArtifactMappingProvider typeToExtensionMap.put( "aspect", "jar" ); } + @Override public String mapClassifierAndExtensionToType( String classifier, String ext ) { if ( classifier == null ) @@ -81,6 +82,7 @@ public class DefaultArtifactMappingProvider return classifierAndExtensionToTypeMap.get( classifier + ":" + ext ); } + @Override public String mapTypeToExtension( String type ) { return typeToExtensionMap.get( type ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java index e46b6ebfa..e0cf7118a 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java @@ -32,6 +32,7 @@ import org.apache.maven.model.plugin.LifecycleBindingsInjector; public class DummyLifecycleBindingsInjector implements LifecycleBindingsInjector { + @Override public void injectLifecycleBindings( Model model, ModelBuildingRequest modelBuildingRequest, ModelProblemCollector modelProblemCollector ) { // left intentionally blank diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java index 890d57046..763ba42c2 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java @@ -77,16 +77,19 @@ public class Maven2RepositoryPathTranslator this.artifactMappingProviders = artifactMappingProviders; } + @Override public File toFile( File basedir, String namespace, String projectId, String projectVersion, String filename ) { return new File( basedir, toPath( namespace, projectId, projectVersion, filename ) ); } + @Override public File toFile( File basedir, String namespace, String projectId, String projectVersion ) { return new File( basedir, toPath( namespace, projectId, projectVersion ) ); } + @Override public String toPath( String namespace, String projectId, String projectVersion, String filename ) { StringBuilder path = new StringBuilder(); @@ -123,6 +126,7 @@ public class Maven2RepositoryPathTranslator return path.toString(); } + @Override public String toPath( String namespace, String projectId ) { StringBuilder path = new StringBuilder(); @@ -143,11 +147,13 @@ public class Maven2RepositoryPathTranslator path.append( formatAsDirectory( namespace ) ).append( PATH_SEPARATOR ); } + @Override public File toFile( File basedir, String namespace, String projectId ) { return new File( basedir, toPath( namespace, projectId ) ); } + @Override public File toFile( File basedir, String namespace ) { return new File( basedir, toPath( namespace ) ); @@ -158,6 +164,7 @@ public class Maven2RepositoryPathTranslator return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR ); } + @Override public ArtifactMetadata getArtifactForPath( String repoId, String relativePath ) { String[] parts = relativePath.replace( '\\', '/' ).split( "/" ); @@ -183,6 +190,7 @@ public class Maven2RepositoryPathTranslator return getArtifactFromId( repoId, groupIdBuilder.toString(), artifactId, baseVersion, id ); } + @Override public ArtifactMetadata getArtifactFromId( String repoId, String namespace, String projectId, String projectVersion, String id ) { diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index a29241dee..4f795ebcc 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -154,12 +154,14 @@ public class Maven2RepositoryStorage } + @Override public ProjectMetadata readProjectMetadata( String repoId, String namespace, String projectId ) { // TODO: could natively implement the "shared model" concept from the browse action to avoid needing it there? return null; } + @Override public ProjectVersionMetadata readProjectVersionMetadata( ReadMetadataRequest readMetadataRequest ) throws RepositoryStorageMetadataNotFoundException, RepositoryStorageMetadataInvalidException, RepositoryStorageRuntimeException @@ -498,6 +500,7 @@ public class Maven2RepositoryStorage return ci; } + @Override public Collection<String> listRootNamespaces( String repoId, Filter<String> filter ) throws RepositoryStorageRuntimeException { @@ -537,6 +540,7 @@ public class Maven2RepositoryStorage } } + @Override public Collection<String> listNamespaces( String repoId, String namespace, Filter<String> filter ) throws RepositoryStorageRuntimeException { @@ -559,6 +563,7 @@ public class Maven2RepositoryStorage return namespaces; } + @Override public Collection<String> listProjects( String repoId, String namespace, Filter<String> filter ) throws RepositoryStorageRuntimeException { @@ -581,6 +586,7 @@ public class Maven2RepositoryStorage return projects; } + @Override public Collection<String> listProjectVersions( String repoId, String namespace, String projectId, Filter<String> filter ) throws RepositoryStorageRuntimeException @@ -591,6 +597,7 @@ public class Maven2RepositoryStorage return getSortedFiles( dir, filter ); } + @Override public Collection<ArtifactMetadata> readArtifactsMetadata( ReadMetadataRequest readMetadataRequest ) throws RepositoryStorageRuntimeException { @@ -616,6 +623,7 @@ public class Maven2RepositoryStorage return artifacts; } + @Override public ArtifactMetadata readArtifactMetadataFromPath( String repoId, String path ) throws RepositoryStorageRuntimeException { @@ -645,6 +653,7 @@ public class Maven2RepositoryStorage * For such clients, archiva does server-side relocation by reading itself the <relocation> element in * metadatas and serving the expected artifact. */ + @Override public void applyServerSideRelocation( ManagedRepositoryContent managedRepository, ArtifactReference artifact ) throws ProxyDownloadException { @@ -728,6 +737,7 @@ public class Maven2RepositoryStorage } + @Override public String getFilePath( String requestPath, ManagedRepository managedRepository ) { // managedRepository can be null @@ -774,6 +784,7 @@ public class Maven2RepositoryStorage } + @Override public String getFilePathWithVersion( final String requestPath, ManagedRepositoryContent managedRepositoryContent ) throws XMLException, RelocationException { @@ -966,6 +977,7 @@ public class Maven2RepositoryStorage this.filter = filter; } + @Override public boolean accept( File dir, String name ) { if ( !filter.accept( name ) ) @@ -994,6 +1006,7 @@ public class Maven2RepositoryStorage this.filter = filter; } + @Override public boolean accept( File dir, String name ) { // TODO compare to logic in maven-repository-layer @@ -1041,6 +1054,7 @@ public class Maven2RepositoryStorage this.projectVersion = projectVersion; } + @Override public boolean accept( File dir, String name ) { if ( name.startsWith( artifactId + "-" ) && name.endsWith( ".pom" ) ) @@ -1066,6 +1080,7 @@ public class Maven2RepositoryStorage this.pomFile = pomFile; } + @Override public boolean accept( File dir, String name ) { return pomFile.equals( name ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java index 747d65ef2..e0c57ba76 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java @@ -31,11 +31,13 @@ import org.springframework.stereotype.Service; public class MavenArtifactFacetFactory implements MetadataFacetFactory { + @Override public MetadataFacet createMetadataFacet() { return new MavenArtifactFacet(); } + @Override public MetadataFacet createMetadataFacet( String repositoryId, String name ) { throw new UnsupportedOperationException( "There is no valid name for artifact facets" ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java index 9faa02fa0..190658a8d 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java @@ -77,17 +77,20 @@ public class MavenProjectFacet this.packaging = packaging; } + @Override public String getFacetId() { return FACET_ID; } + @Override public String getName() { // TODO: not needed, perhaps version metadata facet should be separate interface? return null; } + @Override public Map<String, String> toProperties() { HashMap<String, String> properties = new HashMap<>(); @@ -103,6 +106,7 @@ public class MavenProjectFacet return properties; } + @Override public void fromProperties( Map<String, String> properties ) { groupId = properties.get( "groupId" ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java index 999f805ff..a7bd89a29 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java @@ -30,11 +30,13 @@ import org.springframework.stereotype.Service; public class MavenProjectFacetFactory implements MetadataFacetFactory { + @Override public MetadataFacet createMetadataFacet() { return new MavenProjectFacet(); } + @Override public MetadataFacet createMetadataFacet( String repositoryId, String name ) { throw new UnsupportedOperationException( "There is no valid name for project version facets" ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java index 59c2a8cd4..a419bb91f 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java @@ -102,6 +102,7 @@ public class RepositoryModelResolver this.targetRepository = targetRepository; } + @Override public ModelSource resolveModel( String groupId, String artifactId, String version ) throws UnresolvableModelException { @@ -199,6 +200,7 @@ public class RepositoryModelResolver return null; } + @Override public void addRepository( Repository repository ) throws InvalidRepositoryException { @@ -207,6 +209,7 @@ public class RepositoryModelResolver // ID since they will rarely match } + @Override public ModelResolver newCopy() { return new RepositoryModelResolver( basedir, pathTranslator ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java index 407a9db8d..dc580c8dd 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java @@ -55,6 +55,7 @@ public class LegacyPathParser * * @see org.apache.archiva.repository.content.PathParser#toArtifactReference(String) */ + @Override public ArtifactReference toArtifactReference( String path ) throws LayoutException { diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java index a13d646d4..b6a06be95 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java @@ -60,6 +60,7 @@ public class ManagedLegacyRepositoryContent private ManagedRepository repository; + @Override public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException { @@ -129,6 +130,7 @@ public class ManagedLegacyRepositoryContent } } + @Override public void deleteProject( String namespace, String projectId ) throws RepositoryException { @@ -152,11 +154,13 @@ public class ManagedLegacyRepositoryContent } } + @Override public String getId() { return repository.getId(); } + @Override public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException { @@ -199,16 +203,19 @@ public class ManagedLegacyRepositoryContent return foundArtifacts; } + @Override public String getRepoRoot() { return repository.getLocation(); } + @Override public ManagedRepository getRepository() { return repository; } + @Override public Set<String> getVersions( ProjectReference reference ) throws ContentNotFoundException { @@ -249,6 +256,7 @@ public class ManagedLegacyRepositoryContent return foundVersions; } + @Override public Set<String> getVersions( VersionedReference reference ) throws ContentNotFoundException { @@ -289,12 +297,14 @@ public class ManagedLegacyRepositoryContent return foundVersions; } + @Override public boolean hasContent( ArtifactReference reference ) { File artifactFile = toFile( reference ); return artifactFile.exists() && artifactFile.isFile(); } + @Override public boolean hasContent( ProjectReference reference ) { try @@ -308,6 +318,7 @@ public class ManagedLegacyRepositoryContent } } + @Override public boolean hasContent( VersionedReference reference ) { try @@ -321,6 +332,7 @@ public class ManagedLegacyRepositoryContent } } + @Override public void setRepository( ManagedRepository repository ) { this.repository = repository; @@ -344,22 +356,26 @@ public class ManagedLegacyRepositoryContent return super.toArtifactReference( path ); } + @Override public File toFile( ArchivaArtifact reference ) { return new File( repository.getLocation(), toPath( reference ) ); } + @Override public File toFile( ArtifactReference reference ) { return new File( repository.getLocation(), toPath( reference ) ); } + @Override public String toMetadataPath( ProjectReference reference ) { // No metadata present in legacy repository. return null; } + @Override public String toMetadataPath( VersionedReference reference ) { // No metadata present in legacy repository. @@ -466,12 +482,14 @@ public class ManagedLegacyRepositoryContent this.filetypes = fileTypes; } + @Override public void deleteArtifact( ArtifactReference artifactReference ) throws ContentNotFoundException { // TODO implements for legacy ?? } + @Override public void deleteGroupId( String groupId ) throws ContentNotFoundException { diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java index 7a6cd5472..7a7d3f3eb 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java @@ -42,21 +42,25 @@ public class RemoteLegacyRepositoryContent { private RemoteRepository repository; + @Override public String getId() { return repository.getId(); } + @Override public RemoteRepository getRepository() { return repository; } + @Override public RepositoryURL getURL() { return new RepositoryURL( repository.getUrl() ); } + @Override public void setRepository( RemoteRepository repository ) { this.repository = repository; @@ -80,6 +84,7 @@ public class RemoteLegacyRepositoryContent return super.toArtifactReference( path ); } + @Override public RepositoryURL toURL( ArtifactReference reference ) { String url = repository.getUrl() + toPath( reference ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java index c90eda9da..c0bcaaf54 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java @@ -55,6 +55,7 @@ public class DefaultPathParser * * @see org.apache.archiva.repository.content.PathParser#toArtifactReference(String) */ + @Override public ArtifactReference toArtifactReference( String path ) throws LayoutException { diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java index e30a16712..930855ea0 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java @@ -65,6 +65,7 @@ public class ManagedDefaultRepositoryContent this.artifactMappingProviders = Collections.singletonList( new DefaultArtifactMappingProvider() ); } + @Override public void deleteVersion( VersionedReference reference ) { String path = toMetadataPath( reference ); @@ -77,6 +78,7 @@ public class ManagedDefaultRepositoryContent } } + @Override public void deleteProject( String namespace, String projectId ) throws RepositoryException, ContentNotFoundException { @@ -107,6 +109,7 @@ public class ManagedDefaultRepositoryContent } + @Override public void deleteArtifact( ArtifactReference artifactReference ) { String path = toPath( artifactReference ); @@ -132,6 +135,7 @@ public class ManagedDefaultRepositoryContent } } + @Override public void deleteGroupId( String groupId ) throws ContentNotFoundException { @@ -153,11 +157,13 @@ public class ManagedDefaultRepositoryContent } } + @Override public String getId() { return repository.getId(); } + @Override public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException { @@ -213,11 +219,13 @@ public class ManagedDefaultRepositoryContent return foundArtifacts; } + @Override public String getRepoRoot() { return repository.getLocation(); } + @Override public ManagedRepository getRepository() { return repository; @@ -231,6 +239,7 @@ public class ManagedDefaultRepositoryContent * @throws org.apache.archiva.repository.layout.LayoutException * @throws org.apache.archiva.repository.layout.LayoutException */ + @Override public Set<String> getVersions( ProjectReference reference ) throws ContentNotFoundException, LayoutException { @@ -284,6 +293,7 @@ public class ManagedDefaultRepositoryContent return foundVersions; } + @Override public Set<String> getVersions( VersionedReference reference ) throws ContentNotFoundException { @@ -347,12 +357,14 @@ public class ManagedDefaultRepositoryContent return foundVersions; } + @Override public boolean hasContent( ArtifactReference reference ) { File artifactFile = toFile( reference ); return artifactFile.exists() && artifactFile.isFile(); } + @Override public boolean hasContent( ProjectReference reference ) { try @@ -370,6 +382,7 @@ public class ManagedDefaultRepositoryContent } } + @Override public boolean hasContent( VersionedReference reference ) { try @@ -386,6 +399,7 @@ public class ManagedDefaultRepositoryContent } } + @Override public void setRepository( ManagedRepository repository ) { this.repository = repository; @@ -409,11 +423,13 @@ public class ManagedDefaultRepositoryContent return super.toArtifactReference( path ); } + @Override public File toFile( ArtifactReference reference ) { return new File( repository.getLocation(), toPath( reference ) ); } + @Override public File toFile( ArchivaArtifact reference ) { return new File( repository.getLocation(), toPath( reference ) ); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java index 9d0dfbe13..9bf565b72 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java @@ -40,21 +40,25 @@ public class RemoteDefaultRepositoryContent { private RemoteRepository repository; + @Override public String getId() { return repository.getId(); } + @Override public RemoteRepository getRepository() { return repository; } + @Override public RepositoryURL getURL() { return new RepositoryURL( repository.getUrl() ); } + @Override public void setRepository( RemoteRepository repository ) { this.repository = repository; @@ -78,6 +82,7 @@ public class RemoteDefaultRepositoryContent return super.toArtifactReference( path ); } + @Override public RepositoryURL toURL( ArtifactReference reference ) { String url = repository.getUrl() + toPath( reference ); diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java index 85e63e59a..f3c3c55fc 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java @@ -55,6 +55,7 @@ public class MockRepoAdmin @Named (value = "archivaConfiguration#test") private ArchivaConfiguration archivaConfiguration; + @Override public List<RemoteRepository> getRemoteRepositories() throws RepositoryAdminException { @@ -81,6 +82,7 @@ public class MockRepoAdmin return remoteRepositories; } + @Override public RemoteRepository getRemoteRepository( String repositoryId ) throws RepositoryAdminException { @@ -94,48 +96,56 @@ public class MockRepoAdmin return null; } + @Override public Boolean deleteRemoteRepository( String repositoryId, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean addRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean updateRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Map<String, RemoteRepository> getRemoteRepositoriesAsMap() throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public IndexingContext createIndexContext( RemoteRepository repository ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ManagedRepository> getManagedRepositories() throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Map<String, ManagedRepository> getManagedRepositoriesAsMap() throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public ManagedRepository getManagedRepository( String repositoryId ) throws RepositoryAdminException { @@ -154,6 +164,7 @@ public class MockRepoAdmin return null; } + @Override public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation, boolean deleteContent ) throws RepositoryAdminException @@ -161,6 +172,7 @@ public class MockRepoAdmin return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean addManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, AuditInformation auditInformation ) throws RepositoryAdminException @@ -168,6 +180,7 @@ public class MockRepoAdmin return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean updateManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, AuditInformation auditInformation, boolean resetStats ) throws RepositoryAdminException @@ -175,12 +188,14 @@ public class MockRepoAdmin return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public IndexingContext createIndexContext( ManagedRepository repository ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ProxyConnector> getProxyConnectors() throws RepositoryAdminException { @@ -195,30 +210,35 @@ public class MockRepoAdmin return proxyConnectors; } + @Override public ProxyConnector getProxyConnector( String sourceRepoId, String targetRepoId ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean addProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean deleteProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Boolean updateProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation ) throws RepositoryAdminException { return null; } + @Override public Map<String, List<ProxyConnector>> getProxyConnectorAsMap() throws RepositoryAdminException { @@ -245,30 +265,35 @@ public class MockRepoAdmin return proxyConnectorMap; } + @Override public List<NetworkProxy> getNetworkProxies() throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public NetworkProxy getNetworkProxy( String networkProxyId ) throws RepositoryAdminException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void addNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation ) throws RepositoryAdminException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation ) throws RepositoryAdminException { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void deleteNetworkProxy( String networkProxyId, AuditInformation auditInformation ) throws RepositoryAdminException { diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java index a58393169..12ab3b99c 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java @@ -29,37 +29,44 @@ public class TestConfiguration { 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 ) { // no op } + @Override public void removeListener( ConfigurationListener listener ) { // no op } + @Override public void addChangeListener( RegistryListener listener ) { // no op } + @Override public void reload() { // no op diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java index 31ea9789f..d05cad441 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java @@ -65,6 +65,7 @@ public class DependencyTreeBuilderTestMaven3 ArchivaConfiguration config; @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java index 9eb38392f..e63cac19e 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java @@ -39,89 +39,106 @@ public class TestMetadataRepository { private Map<String, MetadataFacet> facets = new HashMap<>(); + @Override public void updateProject( String repoId, ProjectMetadata project ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifactMeta ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateProjectVersion( String repoId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void updateNamespace( String repoId, String namespace ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<String> getMetadataFacets( String repoId, String facetId ) { return new ArrayList<>( facets.keySet() ); } + @Override public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) { return facets.get( name ); } + @Override public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) { facets.put( metadataFacet.getName(), metadataFacet ); } + @Override public void removeMetadataFacets( String repositoryId, String facetId ) { facets.clear(); } + @Override public void removeMetadataFacet( String repoId, String facetId, String name ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getRepositories() { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum ) { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, String id ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public void removeRepository( String repoId ) { //To change body of implemented methods use File | Settings | File Templates. } + @Override public List<ArtifactMetadata> getArtifacts( String repositoryId ) { return null; } + @Override public ProjectMetadata getProject( String repoId, String namespace, String projectId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -129,6 +146,7 @@ public class TestMetadataRepository return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -136,6 +154,7 @@ public class TestMetadataRepository return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -143,30 +162,35 @@ public class TestMetadataRepository return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getRootNamespaces( String repoId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getNamespaces( String repoId, String namespace ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getProjects( String repoId, String namespace ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) throws MetadataResolutionException { return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -174,31 +198,37 @@ public class TestMetadataRepository return null; //To change body of implemented methods use File | Settings | File Templates. } + @Override public void save() { // } + @Override public void close() { // } + @Override public void revert() { // } + @Override public boolean canObtainAccess( Class<?> aClass ) { return false; } + @Override public <T>T obtainAccess( Class<T> aClass ) { return null; } + @Override public void removeArtifact( String repositoryId, String namespace, String project, String version, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -206,30 +236,35 @@ public class TestMetadataRepository throw new UnsupportedOperationException(); } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public void removeNamespace( String repositoryId, String namespace ) throws MetadataRepositoryException { } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException { } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { throw new UnsupportedOperationException(); } + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java index 211cfa305..702077325 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java @@ -31,6 +31,7 @@ import java.util.Collection; public class TestMetadataResolver implements MetadataResolver { + @Override public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException @@ -38,6 +39,7 @@ public class TestMetadataResolver return null; } + @Override public Collection<ProjectVersionReference> resolveProjectReferences( RepositorySession session, String repoId, String namespace, String projectId, String projectVersion ) @@ -46,24 +48,28 @@ public class TestMetadataResolver return null; } + @Override public Collection<String> resolveRootNamespaces( RepositorySession session, String repoId ) throws MetadataResolutionException { return null; } + @Override public Collection<String> resolveNamespaces( RepositorySession session, String repoId, String namespace ) throws MetadataResolutionException { return null; } + @Override public Collection<String> resolveProjects( RepositorySession session, String repoId, String namespace ) throws MetadataResolutionException { return null; } + @Override public Collection<String> resolveProjectVersions( RepositorySession session, String repoId, String namespace, String projectId ) throws MetadataResolutionException @@ -71,6 +77,7 @@ public class TestMetadataResolver return null; } + @Override public Collection<ArtifactMetadata> resolveArtifacts( RepositorySession session, String repoId, String namespace, String projectId, String projectVersion ) throws MetadataResolutionException diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java index 531b90534..f0f10ec77 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java @@ -28,6 +28,7 @@ public class TestRepositorySessionFactory private MetadataResolver resolver = new TestMetadataResolver(); + @Override public RepositorySession createSession() { return new RepositorySession( metadataRepository, resolver ); diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java index c4025116d..0b921b0d7 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java @@ -150,6 +150,7 @@ public class ManagedDefaultRepositoryContentTest } @Test + @Override public void testToPathOnNullArtifactReference() { try diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java index 5fff0d532..9cf722813 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java @@ -220,6 +220,7 @@ public class Maven2RepositoryMetadataResolverTest List<ArtifactMetadata> artifacts = new ArrayList<>( springArtifacts ); Collections.sort( artifacts, new Comparator<ArtifactMetadata>() { + @Override public int compare( ArtifactMetadata o1, ArtifactMetadata o2 ) { return o1.getId().compareTo( o2.getId() ); @@ -262,6 +263,7 @@ public class Maven2RepositoryMetadataResolverTest List<ArtifactMetadata> artifacts = new ArrayList<>( testArtifacts ); Collections.sort( artifacts, new Comparator<ArtifactMetadata>() { + @Override public int compare( ArtifactMetadata o1, ArtifactMetadata o2 ) { return o1.getId().compareTo( o2.getId() ); @@ -564,6 +566,7 @@ public class Maven2RepositoryMetadataResolverTest assertEquals( 3, artifacts.size() ); Collections.sort( artifacts, new Comparator<ArtifactMetadata>() { + @Override public int compare( ArtifactMetadata o1, ArtifactMetadata o2 ) { return o1.getId().compareTo( o2.getId() ); @@ -587,6 +590,7 @@ public class Maven2RepositoryMetadataResolverTest assertEquals( 2, artifacts.size() ); Collections.sort( artifacts, new Comparator<ArtifactMetadata>() { + @Override public int compare( ArtifactMetadata o1, ArtifactMetadata o2 ) { return o1.getId().compareTo( o2.getId() ); diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java index 0d9540ec8..ec2d7b00c 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java @@ -117,6 +117,7 @@ public class MavenRepositoryMetadataReaderTest } @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java index ff626167a..4ef36d4af 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java @@ -40,6 +40,7 @@ import java.util.List; public class MockWagon implements Wagon { + @Override public void get( String s, File file ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { @@ -56,76 +57,89 @@ public class MockWagon } } + @Override public boolean getIfNewer( String s, File file, long l ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { return false; } + @Override public void put( File file, String s ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { } + @Override public void putDirectory( File file, String s ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { } + @Override public boolean resourceExists( String s ) throws TransferFailedException, AuthorizationException { return false; } + @Override public List getFileList( String s ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { return null; } + @Override public boolean supportsDirectoryCopy() { return false; } + @Override public Repository getRepository() { return null; } + @Override public void connect( Repository repository ) throws ConnectionException, AuthenticationException { } + @Override public void connect( Repository repository, ProxyInfo proxyInfo ) throws ConnectionException, AuthenticationException { } + @Override public void connect( Repository repository, ProxyInfoProvider proxyInfoProvider ) throws ConnectionException, AuthenticationException { } + @Override public void connect( Repository repository, AuthenticationInfo authenticationInfo ) throws ConnectionException, AuthenticationException { } + @Override public void connect( Repository repository, AuthenticationInfo authenticationInfo, ProxyInfo proxyInfo ) throws ConnectionException, AuthenticationException { } + @Override public void connect( Repository repository, AuthenticationInfo authenticationInfo, ProxyInfoProvider proxyInfoProvider ) throws ConnectionException, AuthenticationException @@ -133,73 +147,87 @@ public class MockWagon } + @Override public void openConnection() throws ConnectionException, AuthenticationException { } + @Override public void disconnect() throws ConnectionException { } + @Override public void setTimeout( int i ) { } + @Override public int getTimeout() { return 0; } + @Override public void setReadTimeout( int timeoutValue ) { } + @Override public int getReadTimeout() { return 0; } + @Override public void addSessionListener( SessionListener sessionListener ) { } + @Override public void removeSessionListener( SessionListener sessionListener ) { } + @Override public boolean hasSessionListener( SessionListener sessionListener ) { return false; } + @Override public void addTransferListener( TransferListener transferListener ) { } + @Override public void removeTransferListener( TransferListener transferListener ) { } + @Override public boolean hasTransferListener( TransferListener transferListener ) { return false; } + @Override public boolean isInteractive() { return false; } + @Override public void setInteractive( boolean b ) { diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java index c953e9512..09ef4959f 100755..100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java @@ -58,16 +58,19 @@ public class MockConfiguration registryMock = registryControl.createMock( Registry.class ); } + @Override public void addChangeListener( RegistryListener listener ) { registryListeners.add( listener ); } + @Override public Configuration getConfiguration() { return configuration; } + @Override public void save( Configuration configuration ) throws RegistryException { @@ -89,21 +92,25 @@ public class MockConfiguration } } + @Override public void addListener( ConfigurationListener listener ) { configListeners.add(listener); } + @Override public void removeListener( ConfigurationListener listener ) { configListeners.remove( listener ); } + @Override public boolean isDefaulted() { return false; } + @Override public void reload() { // no op diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java index 9d0db4b1b..da50c4f1f 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java +++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java @@ -444,11 +444,13 @@ public class DefaultCassandraArchivaManager } + @Override public void start() { } @PreDestroy + @Override public void shutdown() { } @@ -467,51 +469,61 @@ public class DefaultCassandraArchivaManager return keyspace; } + @Override public Cluster getCluster() { return cluster; } + @Override public String getRepositoryFamilyName() { return repositoryFamilyName; } + @Override public String getNamespaceFamilyName() { return namespaceFamilyName; } + @Override public String getProjectFamilyName() { return projectFamilyName; } + @Override public String getProjectVersionMetadataFamilyName() { return projectVersionMetadataFamilyName; } + @Override public String getArtifactMetadataFamilyName() { return artifactMetadataFamilyName; } + @Override public String getMetadataFacetFamilyName() { return metadataFacetFamilyName; } + @Override public String getMailingListFamilyName() { return mailingListFamilyName; } + @Override public String getLicenseFamilyName() { return licenseFamilyName; } + @Override public String getDependencyFamilyName() { return dependencyFamilyName; diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java index 30d2049fd..57bd33d5f 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java +++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java @@ -53,6 +53,7 @@ public class CassandraMetadataRepositoryTest CassandraMetadataRepository cmr; @Before + @Override public void setUp() throws Exception { diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java index e12ca7a27..d4b3c6fed 100644 --- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java @@ -97,6 +97,7 @@ public class FileMetadataRepository return new File( getBaseDirectory( repoId ), "content" ); } + @Override public void updateProject( String repoId, ProjectMetadata project ) { updateProject( repoId, project.getNamespace(), project.getId() ); @@ -122,6 +123,7 @@ public class FileMetadataRepository } } + @Override public void updateProjectVersion( String repoId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) { @@ -283,6 +285,7 @@ public class FileMetadataRepository } } + @Override public void updateNamespace( String repoId, String namespace ) { try @@ -300,6 +303,7 @@ public class FileMetadataRepository } } + @Override public List<String> getMetadataFacets( String repoId, String facetId ) { File directory = getMetadataDirectory( repoId, facetId ); @@ -308,6 +312,7 @@ public class FileMetadataRepository return facets; } + @Override public boolean hasMetadataFacet( String repositoryId, String facetId ) throws MetadataRepositoryException { @@ -334,6 +339,7 @@ public class FileMetadataRepository } } + @Override public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) { Properties properties; @@ -368,6 +374,7 @@ public class FileMetadataRepository return metadataFacet; } + @Override public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) { Properties properties = new Properties(); @@ -386,6 +393,7 @@ public class FileMetadataRepository } } + @Override public void removeMetadataFacets( String repositoryId, String facetId ) { File dir = getMetadataDirectory( repositoryId, facetId ); @@ -395,6 +403,7 @@ public class FileMetadataRepository } } + @Override public void removeMetadataFacet( String repoId, String facetId, String name ) { File dir = new File( getMetadataDirectory( repoId, facetId ), name ); @@ -404,6 +413,7 @@ public class FileMetadataRepository } } + @Override public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime ) { // TODO: this is quite slow - if we are to persist with this repository implementation we should build an index @@ -444,6 +454,7 @@ public class FileMetadataRepository } } + @Override public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) { @@ -539,26 +550,31 @@ public class FileMetadataRepository return artifacts.values(); } + @Override public void save() { // it's all instantly persisted } + @Override public void close() { // nothing additional to close } + @Override public void revert() { log.warn( "Attempted to revert a session, but the file-based repository storage doesn't support it" ); } + @Override public boolean canObtainAccess( Class<?> aClass ) { return false; } + @Override public <T>T obtainAccess( Class<T> aClass ) { throw new IllegalArgumentException( @@ -578,6 +594,7 @@ public class FileMetadataRepository } } + @Override public Collection<String> getRepositories() { List<String> repositories = new ArrayList<>(); @@ -588,6 +605,7 @@ public class FileMetadataRepository return repositories; } + @Override public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum ) { // TODO: this is quite slow - if we are to persist with this repository implementation we should build an index @@ -603,6 +621,7 @@ public class FileMetadataRepository return artifacts; } + @Override public void removeNamespace( String repositoryId, String project ) throws MetadataRepositoryException { @@ -621,6 +640,7 @@ public class FileMetadataRepository } } + @Override public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion ) throws MetadataRepositoryException { @@ -663,6 +683,7 @@ public class FileMetadataRepository } + @Override public void removeArtifact( String repoId, String namespace, String project, String version, String id ) { @@ -712,6 +733,7 @@ public class FileMetadataRepository * @param metadataFacet will remove artifacts which have this {@link MetadataFacet} using equals * @throws MetadataRepositoryException */ + @Override public void removeArtifact( String repositoryId, String namespace, String project, String projectVersion, MetadataFacet metadataFacet ) throws MetadataRepositoryException @@ -719,6 +741,7 @@ public class FileMetadataRepository throw new UnsupportedOperationException( "not implemented" ); } + @Override public void removeRepository( String repoId ) { File dir = getDirectory( repoId ); @@ -779,6 +802,7 @@ public class FileMetadataRepository } } + @Override public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifact ) { @@ -859,6 +883,7 @@ public class FileMetadataRepository return properties; } + @Override public ProjectMetadata getProject( String repoId, String namespace, String projectId ) { File directory = new File( getDirectory( repoId ), namespace + "/" + projectId ); @@ -878,6 +903,7 @@ public class FileMetadataRepository return project; } + @Override public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) { @@ -1050,6 +1076,7 @@ public class FileMetadataRepository return versionMetadata; } + @Override public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) { @@ -1069,6 +1096,7 @@ public class FileMetadataRepository return versions; } + @Override public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) { @@ -1091,11 +1119,13 @@ public class FileMetadataRepository return references; } + @Override public Collection<String> getRootNamespaces( String repoId ) { return getNamespaces( repoId, null ); } + @Override public Collection<String> getNamespaces( String repoId, String baseNamespace ) { List<String> allNamespaces = new ArrayList<>(); @@ -1132,6 +1162,7 @@ public class FileMetadataRepository return new ArrayList<>( namespaces ); } + @Override public Collection<String> getProjects( String repoId, String namespace ) { List<String> projects = new ArrayList<>(); @@ -1150,6 +1181,7 @@ public class FileMetadataRepository return projects; } + @Override public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) { List<String> projectVersions = new ArrayList<>(); @@ -1168,6 +1200,7 @@ public class FileMetadataRepository return projectVersions; } + @Override public void removeProject( String repositoryId, String namespace, String projectId ) throws MetadataRepositoryException { @@ -1185,6 +1218,7 @@ public class FileMetadataRepository } } + @Override public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) throws MetadataRepositoryException { @@ -1220,6 +1254,7 @@ public class FileMetadataRepository private static class ArtifactComparator implements Comparator<ArtifactMetadata> { + @Override public int compare( ArtifactMetadata artifact1, ArtifactMetadata artifact2 ) { if ( artifact1.getWhenGathered() == artifact2.getWhenGathered() ) @@ -1238,6 +1273,7 @@ public class FileMetadataRepository } } + @Override public List<ArtifactMetadata> getArtifacts( String repoId ) { List<ArtifactMetadata> artifacts = new ArrayList<>(); diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java index 0f775a2c6..0d63f4ee9 100644 --- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java @@ -80,6 +80,7 @@ public class FileRepositorySessionFactory } + @Override public RepositorySession createSession() { MetadataRepository metadataRepository = new FileMetadataRepository( metadataFacetFactories, configuration ); diff --git a/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java index 94ac46d7c..df97f2e8c 100644 --- a/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java +++ b/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java @@ -38,6 +38,7 @@ public class FileMetadataRepositoryTest { @Before + @Override public void setUp() throws Exception { 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 cbe0f5d26..97c9c89bd 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 { 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 fcd7fed21..8589ecbdd 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 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 12c106ef5..5efabdfad 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 { 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 76b79e282..5af0b9159 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 ); 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 181b0fa96..6be32322c 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 ) { 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 3262b3ec6..2f6417da0 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" ); 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 7531fa403..d14c1563a 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(); 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 7d6fa86ce..dd12b7a62 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 */ 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 e298e905b..14e5b1f0a 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; 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 736b46501..b05bea767 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 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 eab3e8200..71cee371e 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" ) ) ); 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 18bf920cb..198464688 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(); 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 |