You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2014/04/11 23:53:59 UTC
[09/10] one move for all remaining override annotation
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
----------------------------------------------------------------------
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 39e5a94..280a9dc 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 */
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
----------------------------------------------------------------------
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 216bc47..61d393e 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
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
----------------------------------------------------------------------
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 cdff873..b17a74a 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
----------------------------------------------------------------------
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 893b9df..58ed741 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
----------------------------------------------------------------------
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 93e6c33..c001894 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
----------------------------------------------------------------------
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 4c4aaab..583d3b8 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java
----------------------------------------------------------------------
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 0ea381b..4bdae82 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
----------------------------------------------------------------------
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 2c9b847..103c7a4 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
----------------------------------------------------------------------
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 6976c45..62e76a4 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
----------------------------------------------------------------------
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 878079e..00e37a8 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
----------------------------------------------------------------------
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 32ac4df..5813cd5 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
----------------------------------------------------------------------
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 6b5c95c..14732f1 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java
----------------------------------------------------------------------
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 0018bdc..e757918 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";
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java
----------------------------------------------------------------------
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 d1addb8..58f287c 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";
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
----------------------------------------------------------------------
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 4b67141..052b549 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 ) )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
----------------------------------------------------------------------
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 90c7598..e8c2034 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
----------------------------------------------------------------------
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 d570dde..322092f 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 );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
----------------------------------------------------------------------
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 bb90fca..7438f4f 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 )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
----------------------------------------------------------------------
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 4a86bca..f0feb14 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)
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
----------------------------------------------------------------------
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 4f0c3c8..db152c9 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java
----------------------------------------------------------------------
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 0c80eab..84f8361 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 )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java
----------------------------------------------------------------------
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 44cd0b0..4ae147a 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;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
----------------------------------------------------------------------
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 4e4f649..eb12592 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}",
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
----------------------------------------------------------------------
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 b49a649..f357bc2 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java
----------------------------------------------------------------------
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 666a8a1..57e924e 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 )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
----------------------------------------------------------------------
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 5be2e8f..af4fea0 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
----------------------------------------------------------------------
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 891b831..cfe4b62 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
----------------------------------------------------------------------
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 321c88b..7b63551 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
----------------------------------------------------------------------
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 0d9914b..73450cb 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorOrderComparator.java
----------------------------------------------------------------------
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 f3ffa2d..b83a1c0 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 )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
----------------------------------------------------------------------
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 276808e..041e664 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
----------------------------------------------------------------------
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 bcf945a..28482f7 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
----------------------------------------------------------------------
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 be7004e..718bfc1 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
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
----------------------------------------------------------------------
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 356f00c..2ff43b3 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();
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java
----------------------------------------------------------------------
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 5e2d66d..973bbd7 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 )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
----------------------------------------------------------------------
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 37135a1..90cd996 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 );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java
----------------------------------------------------------------------
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 133525f..6e32329 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
{