diff options
author | Eric Barboni <skygo@apache.org> | 2014-04-11 23:46:35 +0200 |
---|---|---|
committer | Eric Barboni <skygo@apache.org> | 2014-04-11 23:46:35 +0200 |
commit | 99117364be2b27ddb74fc6ffe3e052e0ad52d8dd (patch) | |
tree | 5aa6ee887b1cf3c1659f83b7c561a728c0ee4555 /archiva-modules/archiva-base/archiva-repository-admin | |
parent | d44d957734badacce74293846d11b3b736b9a478 (diff) | |
download | archiva-99117364be2b27ddb74fc6ffe3e052e0ad52d8dd.tar.gz archiva-99117364be2b27ddb74fc6ffe3e052e0ad52d8dd.zip |
one move for all remaining override annotation
Diffstat (limited to 'archiva-modules/archiva-base/archiva-repository-admin')
21 files changed, 130 insertions, 0 deletions
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 { |