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:54 UTC
[04/10] one move for all remaining override annotation
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java
index 56ab172..bcff976 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java
@@ -47,6 +47,7 @@ public class TreeDependencyNodeVisitor
}
+ @Override
public boolean visitEnter( DependencyNode dependencyNode )
{
TreeEntry entry =
@@ -67,6 +68,7 @@ public class TreeDependencyNodeVisitor
return true;
}
+ @Override
public boolean visitLeave( DependencyNode dependencyNode )
{
currentEntry = currentEntry.getParent();
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java
index eb67635..6e171ed 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java
@@ -32,6 +32,7 @@ public class ArtifactMetadataVersionComparator
{
public static ArtifactMetadataVersionComparator INSTANCE = new ArtifactMetadataVersionComparator();
+ @Override
public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
{
// sort by version (reverse), then ID
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java
index 0c5afeb..01ea559 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java
@@ -68,6 +68,7 @@ public class DefaultArtifactMappingProvider
typeToExtensionMap.put( "aspect", "jar" );
}
+ @Override
public String mapClassifierAndExtensionToType( String classifier, String ext )
{
if ( classifier == null )
@@ -81,6 +82,7 @@ public class DefaultArtifactMappingProvider
return classifierAndExtensionToTypeMap.get( classifier + ":" + ext );
}
+ @Override
public String mapTypeToExtension( String type )
{
return typeToExtensionMap.get( type );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
index e46b6eb..e0cf711 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
@@ -32,6 +32,7 @@ import org.apache.maven.model.plugin.LifecycleBindingsInjector;
public class DummyLifecycleBindingsInjector
implements LifecycleBindingsInjector
{
+ @Override
public void injectLifecycleBindings( Model model, ModelBuildingRequest modelBuildingRequest, ModelProblemCollector modelProblemCollector )
{
// left intentionally blank
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
index 890d570..763ba42 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
@@ -77,16 +77,19 @@ public class Maven2RepositoryPathTranslator
this.artifactMappingProviders = artifactMappingProviders;
}
+ @Override
public File toFile( File basedir, String namespace, String projectId, String projectVersion, String filename )
{
return new File( basedir, toPath( namespace, projectId, projectVersion, filename ) );
}
+ @Override
public File toFile( File basedir, String namespace, String projectId, String projectVersion )
{
return new File( basedir, toPath( namespace, projectId, projectVersion ) );
}
+ @Override
public String toPath( String namespace, String projectId, String projectVersion, String filename )
{
StringBuilder path = new StringBuilder();
@@ -123,6 +126,7 @@ public class Maven2RepositoryPathTranslator
return path.toString();
}
+ @Override
public String toPath( String namespace, String projectId )
{
StringBuilder path = new StringBuilder();
@@ -143,11 +147,13 @@ public class Maven2RepositoryPathTranslator
path.append( formatAsDirectory( namespace ) ).append( PATH_SEPARATOR );
}
+ @Override
public File toFile( File basedir, String namespace, String projectId )
{
return new File( basedir, toPath( namespace, projectId ) );
}
+ @Override
public File toFile( File basedir, String namespace )
{
return new File( basedir, toPath( namespace ) );
@@ -158,6 +164,7 @@ public class Maven2RepositoryPathTranslator
return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR );
}
+ @Override
public ArtifactMetadata getArtifactForPath( String repoId, String relativePath )
{
String[] parts = relativePath.replace( '\\', '/' ).split( "/" );
@@ -183,6 +190,7 @@ public class Maven2RepositoryPathTranslator
return getArtifactFromId( repoId, groupIdBuilder.toString(), artifactId, baseVersion, id );
}
+ @Override
public ArtifactMetadata getArtifactFromId( String repoId, String namespace, String projectId, String projectVersion,
String id )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
index a29241d..4f795eb 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
@@ -154,12 +154,14 @@ public class Maven2RepositoryStorage
}
+ @Override
public ProjectMetadata readProjectMetadata( String repoId, String namespace, String projectId )
{
// TODO: could natively implement the "shared model" concept from the browse action to avoid needing it there?
return null;
}
+ @Override
public ProjectVersionMetadata readProjectVersionMetadata( ReadMetadataRequest readMetadataRequest )
throws RepositoryStorageMetadataNotFoundException, RepositoryStorageMetadataInvalidException,
RepositoryStorageRuntimeException
@@ -498,6 +500,7 @@ public class Maven2RepositoryStorage
return ci;
}
+ @Override
public Collection<String> listRootNamespaces( String repoId, Filter<String> filter )
throws RepositoryStorageRuntimeException
{
@@ -537,6 +540,7 @@ public class Maven2RepositoryStorage
}
}
+ @Override
public Collection<String> listNamespaces( String repoId, String namespace, Filter<String> filter )
throws RepositoryStorageRuntimeException
{
@@ -559,6 +563,7 @@ public class Maven2RepositoryStorage
return namespaces;
}
+ @Override
public Collection<String> listProjects( String repoId, String namespace, Filter<String> filter )
throws RepositoryStorageRuntimeException
{
@@ -581,6 +586,7 @@ public class Maven2RepositoryStorage
return projects;
}
+ @Override
public Collection<String> listProjectVersions( String repoId, String namespace, String projectId,
Filter<String> filter )
throws RepositoryStorageRuntimeException
@@ -591,6 +597,7 @@ public class Maven2RepositoryStorage
return getSortedFiles( dir, filter );
}
+ @Override
public Collection<ArtifactMetadata> readArtifactsMetadata( ReadMetadataRequest readMetadataRequest )
throws RepositoryStorageRuntimeException
{
@@ -616,6 +623,7 @@ public class Maven2RepositoryStorage
return artifacts;
}
+ @Override
public ArtifactMetadata readArtifactMetadataFromPath( String repoId, String path )
throws RepositoryStorageRuntimeException
{
@@ -645,6 +653,7 @@ public class Maven2RepositoryStorage
* For such clients, archiva does server-side relocation by reading itself the <relocation> element in
* metadatas and serving the expected artifact.
*/
+ @Override
public void applyServerSideRelocation( ManagedRepositoryContent managedRepository, ArtifactReference artifact )
throws ProxyDownloadException
{
@@ -728,6 +737,7 @@ public class Maven2RepositoryStorage
}
+ @Override
public String getFilePath( String requestPath, ManagedRepository managedRepository )
{
// managedRepository can be null
@@ -774,6 +784,7 @@ public class Maven2RepositoryStorage
}
+ @Override
public String getFilePathWithVersion( final String requestPath, ManagedRepositoryContent managedRepositoryContent )
throws XMLException, RelocationException
{
@@ -966,6 +977,7 @@ public class Maven2RepositoryStorage
this.filter = filter;
}
+ @Override
public boolean accept( File dir, String name )
{
if ( !filter.accept( name ) )
@@ -994,6 +1006,7 @@ public class Maven2RepositoryStorage
this.filter = filter;
}
+ @Override
public boolean accept( File dir, String name )
{
// TODO compare to logic in maven-repository-layer
@@ -1041,6 +1054,7 @@ public class Maven2RepositoryStorage
this.projectVersion = projectVersion;
}
+ @Override
public boolean accept( File dir, String name )
{
if ( name.startsWith( artifactId + "-" ) && name.endsWith( ".pom" ) )
@@ -1066,6 +1080,7 @@ public class Maven2RepositoryStorage
this.pomFile = pomFile;
}
+ @Override
public boolean accept( File dir, String name )
{
return pomFile.equals( name );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java
index 747d65e..e0c57ba 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java
@@ -31,11 +31,13 @@ import org.springframework.stereotype.Service;
public class MavenArtifactFacetFactory
implements MetadataFacetFactory
{
+ @Override
public MetadataFacet createMetadataFacet()
{
return new MavenArtifactFacet();
}
+ @Override
public MetadataFacet createMetadataFacet( String repositoryId, String name )
{
throw new UnsupportedOperationException( "There is no valid name for artifact facets" );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java
index 9faa02f..190658a 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java
@@ -77,17 +77,20 @@ public class MavenProjectFacet
this.packaging = packaging;
}
+ @Override
public String getFacetId()
{
return FACET_ID;
}
+ @Override
public String getName()
{
// TODO: not needed, perhaps version metadata facet should be separate interface?
return null;
}
+ @Override
public Map<String, String> toProperties()
{
HashMap<String, String> properties = new HashMap<>();
@@ -103,6 +106,7 @@ public class MavenProjectFacet
return properties;
}
+ @Override
public void fromProperties( Map<String, String> properties )
{
groupId = properties.get( "groupId" );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
index 999f805..a7bd89a 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
@@ -30,11 +30,13 @@ import org.springframework.stereotype.Service;
public class MavenProjectFacetFactory
implements MetadataFacetFactory
{
+ @Override
public MetadataFacet createMetadataFacet()
{
return new MavenProjectFacet();
}
+ @Override
public MetadataFacet createMetadataFacet( String repositoryId, String name )
{
throw new UnsupportedOperationException( "There is no valid name for project version facets" );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
index 59c2a8c..a419bb9 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
@@ -102,6 +102,7 @@ public class RepositoryModelResolver
this.targetRepository = targetRepository;
}
+ @Override
public ModelSource resolveModel( String groupId, String artifactId, String version )
throws UnresolvableModelException
{
@@ -199,6 +200,7 @@ public class RepositoryModelResolver
return null;
}
+ @Override
public void addRepository( Repository repository )
throws InvalidRepositoryException
{
@@ -207,6 +209,7 @@ public class RepositoryModelResolver
// ID since they will rarely match
}
+ @Override
public ModelResolver newCopy()
{
return new RepositoryModelResolver( basedir, pathTranslator );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java
index 407a9db..dc580c8 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/LegacyPathParser.java
@@ -55,6 +55,7 @@ public class LegacyPathParser
*
* @see org.apache.archiva.repository.content.PathParser#toArtifactReference(String)
*/
+ @Override
public ArtifactReference toArtifactReference( String path )
throws LayoutException
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java
index a13d646..b6a06be 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/ManagedLegacyRepositoryContent.java
@@ -60,6 +60,7 @@ public class ManagedLegacyRepositoryContent
private ManagedRepository repository;
+ @Override
public void deleteVersion( VersionedReference reference )
throws ContentNotFoundException
{
@@ -129,6 +130,7 @@ public class ManagedLegacyRepositoryContent
}
}
+ @Override
public void deleteProject( String namespace, String projectId )
throws RepositoryException
{
@@ -152,11 +154,13 @@ public class ManagedLegacyRepositoryContent
}
}
+ @Override
public String getId()
{
return repository.getId();
}
+ @Override
public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference )
throws ContentNotFoundException
{
@@ -199,16 +203,19 @@ public class ManagedLegacyRepositoryContent
return foundArtifacts;
}
+ @Override
public String getRepoRoot()
{
return repository.getLocation();
}
+ @Override
public ManagedRepository getRepository()
{
return repository;
}
+ @Override
public Set<String> getVersions( ProjectReference reference )
throws ContentNotFoundException
{
@@ -249,6 +256,7 @@ public class ManagedLegacyRepositoryContent
return foundVersions;
}
+ @Override
public Set<String> getVersions( VersionedReference reference )
throws ContentNotFoundException
{
@@ -289,12 +297,14 @@ public class ManagedLegacyRepositoryContent
return foundVersions;
}
+ @Override
public boolean hasContent( ArtifactReference reference )
{
File artifactFile = toFile( reference );
return artifactFile.exists() && artifactFile.isFile();
}
+ @Override
public boolean hasContent( ProjectReference reference )
{
try
@@ -308,6 +318,7 @@ public class ManagedLegacyRepositoryContent
}
}
+ @Override
public boolean hasContent( VersionedReference reference )
{
try
@@ -321,6 +332,7 @@ public class ManagedLegacyRepositoryContent
}
}
+ @Override
public void setRepository( ManagedRepository repository )
{
this.repository = repository;
@@ -344,22 +356,26 @@ public class ManagedLegacyRepositoryContent
return super.toArtifactReference( path );
}
+ @Override
public File toFile( ArchivaArtifact reference )
{
return new File( repository.getLocation(), toPath( reference ) );
}
+ @Override
public File toFile( ArtifactReference reference )
{
return new File( repository.getLocation(), toPath( reference ) );
}
+ @Override
public String toMetadataPath( ProjectReference reference )
{
// No metadata present in legacy repository.
return null;
}
+ @Override
public String toMetadataPath( VersionedReference reference )
{
// No metadata present in legacy repository.
@@ -466,12 +482,14 @@ public class ManagedLegacyRepositoryContent
this.filetypes = fileTypes;
}
+ @Override
public void deleteArtifact( ArtifactReference artifactReference )
throws ContentNotFoundException
{
// TODO implements for legacy ??
}
+ @Override
public void deleteGroupId( String groupId )
throws ContentNotFoundException
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java
index 7a6cd54..7a7d3f3 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/legacy/RemoteLegacyRepositoryContent.java
@@ -42,21 +42,25 @@ public class RemoteLegacyRepositoryContent
{
private RemoteRepository repository;
+ @Override
public String getId()
{
return repository.getId();
}
+ @Override
public RemoteRepository getRepository()
{
return repository;
}
+ @Override
public RepositoryURL getURL()
{
return new RepositoryURL( repository.getUrl() );
}
+ @Override
public void setRepository( RemoteRepository repository )
{
this.repository = repository;
@@ -80,6 +84,7 @@ public class RemoteLegacyRepositoryContent
return super.toArtifactReference( path );
}
+ @Override
public RepositoryURL toURL( ArtifactReference reference )
{
String url = repository.getUrl() + toPath( reference );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
index c90eda9..c0bcaaf 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
@@ -55,6 +55,7 @@ public class DefaultPathParser
*
* @see org.apache.archiva.repository.content.PathParser#toArtifactReference(String)
*/
+ @Override
public ArtifactReference toArtifactReference( String path )
throws LayoutException
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
index e30a167..930855e 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
@@ -65,6 +65,7 @@ public class ManagedDefaultRepositoryContent
this.artifactMappingProviders = Collections.singletonList( new DefaultArtifactMappingProvider() );
}
+ @Override
public void deleteVersion( VersionedReference reference )
{
String path = toMetadataPath( reference );
@@ -77,6 +78,7 @@ public class ManagedDefaultRepositoryContent
}
}
+ @Override
public void deleteProject( String namespace, String projectId )
throws RepositoryException, ContentNotFoundException
{
@@ -107,6 +109,7 @@ public class ManagedDefaultRepositoryContent
}
+ @Override
public void deleteArtifact( ArtifactReference artifactReference )
{
String path = toPath( artifactReference );
@@ -132,6 +135,7 @@ public class ManagedDefaultRepositoryContent
}
}
+ @Override
public void deleteGroupId( String groupId )
throws ContentNotFoundException
{
@@ -153,11 +157,13 @@ public class ManagedDefaultRepositoryContent
}
}
+ @Override
public String getId()
{
return repository.getId();
}
+ @Override
public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference )
throws ContentNotFoundException
{
@@ -213,11 +219,13 @@ public class ManagedDefaultRepositoryContent
return foundArtifacts;
}
+ @Override
public String getRepoRoot()
{
return repository.getLocation();
}
+ @Override
public ManagedRepository getRepository()
{
return repository;
@@ -231,6 +239,7 @@ public class ManagedDefaultRepositoryContent
* @throws org.apache.archiva.repository.layout.LayoutException
* @throws org.apache.archiva.repository.layout.LayoutException
*/
+ @Override
public Set<String> getVersions( ProjectReference reference )
throws ContentNotFoundException, LayoutException
{
@@ -284,6 +293,7 @@ public class ManagedDefaultRepositoryContent
return foundVersions;
}
+ @Override
public Set<String> getVersions( VersionedReference reference )
throws ContentNotFoundException
{
@@ -347,12 +357,14 @@ public class ManagedDefaultRepositoryContent
return foundVersions;
}
+ @Override
public boolean hasContent( ArtifactReference reference )
{
File artifactFile = toFile( reference );
return artifactFile.exists() && artifactFile.isFile();
}
+ @Override
public boolean hasContent( ProjectReference reference )
{
try
@@ -370,6 +382,7 @@ public class ManagedDefaultRepositoryContent
}
}
+ @Override
public boolean hasContent( VersionedReference reference )
{
try
@@ -386,6 +399,7 @@ public class ManagedDefaultRepositoryContent
}
}
+ @Override
public void setRepository( ManagedRepository repository )
{
this.repository = repository;
@@ -409,11 +423,13 @@ public class ManagedDefaultRepositoryContent
return super.toArtifactReference( path );
}
+ @Override
public File toFile( ArtifactReference reference )
{
return new File( repository.getLocation(), toPath( reference ) );
}
+ @Override
public File toFile( ArchivaArtifact reference )
{
return new File( repository.getLocation(), toPath( reference ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java
index 9d0dfbe..9bf565b 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java
@@ -40,21 +40,25 @@ public class RemoteDefaultRepositoryContent
{
private RemoteRepository repository;
+ @Override
public String getId()
{
return repository.getId();
}
+ @Override
public RemoteRepository getRepository()
{
return repository;
}
+ @Override
public RepositoryURL getURL()
{
return new RepositoryURL( repository.getUrl() );
}
+ @Override
public void setRepository( RemoteRepository repository )
{
this.repository = repository;
@@ -78,6 +82,7 @@ public class RemoteDefaultRepositoryContent
return super.toArtifactReference( path );
}
+ @Override
public RepositoryURL toURL( ArtifactReference reference )
{
String url = repository.getUrl() + toPath( reference );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
index 85e63e5..f3c3c55 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
@@ -55,6 +55,7 @@ public class MockRepoAdmin
@Named (value = "archivaConfiguration#test")
private ArchivaConfiguration archivaConfiguration;
+ @Override
public List<RemoteRepository> getRemoteRepositories()
throws RepositoryAdminException
{
@@ -81,6 +82,7 @@ public class MockRepoAdmin
return remoteRepositories;
}
+ @Override
public RemoteRepository getRemoteRepository( String repositoryId )
throws RepositoryAdminException
{
@@ -94,48 +96,56 @@ public class MockRepoAdmin
return null;
}
+ @Override
public Boolean deleteRemoteRepository( String repositoryId, AuditInformation auditInformation )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Boolean addRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Boolean updateRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Map<String, RemoteRepository> getRemoteRepositoriesAsMap()
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public IndexingContext createIndexContext( RemoteRepository repository )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<ManagedRepository> getManagedRepositories()
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Map<String, ManagedRepository> getManagedRepositoriesAsMap()
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public ManagedRepository getManagedRepository( String repositoryId )
throws RepositoryAdminException
{
@@ -154,6 +164,7 @@ public class MockRepoAdmin
return null;
}
+ @Override
public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation,
boolean deleteContent )
throws RepositoryAdminException
@@ -161,6 +172,7 @@ public class MockRepoAdmin
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Boolean addManagedRepository( ManagedRepository managedRepository, boolean needStageRepo,
AuditInformation auditInformation )
throws RepositoryAdminException
@@ -168,6 +180,7 @@ public class MockRepoAdmin
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Boolean updateManagedRepository( ManagedRepository managedRepository, boolean needStageRepo,
AuditInformation auditInformation, boolean resetStats )
throws RepositoryAdminException
@@ -175,12 +188,14 @@ public class MockRepoAdmin
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public IndexingContext createIndexContext( ManagedRepository repository )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<ProxyConnector> getProxyConnectors()
throws RepositoryAdminException
{
@@ -195,30 +210,35 @@ public class MockRepoAdmin
return proxyConnectors;
}
+ @Override
public ProxyConnector getProxyConnector( String sourceRepoId, String targetRepoId )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Boolean addProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Boolean deleteProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Boolean updateProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation )
throws RepositoryAdminException
{
return null;
}
+ @Override
public Map<String, List<ProxyConnector>> getProxyConnectorAsMap()
throws RepositoryAdminException
{
@@ -245,30 +265,35 @@ public class MockRepoAdmin
return proxyConnectorMap;
}
+ @Override
public List<NetworkProxy> getNetworkProxies()
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public NetworkProxy getNetworkProxy( String networkProxyId )
throws RepositoryAdminException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void addNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation )
throws RepositoryAdminException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void updateNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation )
throws RepositoryAdminException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void deleteNetworkProxy( String networkProxyId, AuditInformation auditInformation )
throws RepositoryAdminException
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
index a583931..12ab3b9 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
@@ -29,37 +29,44 @@ public class TestConfiguration
{
private Configuration configuration;
+ @Override
public Configuration getConfiguration()
{
return configuration;
}
+ @Override
public void save( Configuration configuration )
throws RegistryException, IndeterminateConfigurationException
{
this.configuration = configuration;
}
+ @Override
public boolean isDefaulted()
{
return false;
}
+ @Override
public void addListener( ConfigurationListener listener )
{
// no op
}
+ @Override
public void removeListener( ConfigurationListener listener )
{
// no op
}
+ @Override
public void addChangeListener( RegistryListener listener )
{
// no op
}
+ @Override
public void reload()
{
// no op
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
index 31ea978..d05cad4 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
@@ -65,6 +65,7 @@ public class DependencyTreeBuilderTestMaven3
ArchivaConfiguration config;
@Before
+ @Override
public void setUp()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
index 9eb3839..e63cac1 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
@@ -39,89 +39,106 @@ public class TestMetadataRepository
{
private Map<String, MetadataFacet> facets = new HashMap<>();
+ @Override
public void updateProject( String repoId, ProjectMetadata project )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion,
ArtifactMetadata artifactMeta )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void updateProjectVersion( String repoId, String namespace, String projectId,
ProjectVersionMetadata versionMetadata )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void updateNamespace( String repoId, String namespace )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<String> getMetadataFacets( String repoId, String facetId )
{
return new ArrayList<>( facets.keySet() );
}
+ @Override
public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name )
{
return facets.get( name );
}
+ @Override
public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet )
{
facets.put( metadataFacet.getName(), metadataFacet );
}
+ @Override
public void removeMetadataFacets( String repositoryId, String facetId )
{
facets.clear();
}
+ @Override
public void removeMetadataFacet( String repoId, String facetId, String name )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<String> getRepositories()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void removeArtifact( String repositoryId, String namespace, String project, String version, String id )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void removeRepository( String repoId )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<ArtifactMetadata> getArtifacts( String repositoryId )
{
return null;
}
+ @Override
public ProjectMetadata getProject( String repoId, String namespace, String projectId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -129,6 +146,7 @@ public class TestMetadataRepository
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -136,6 +154,7 @@ public class TestMetadataRepository
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -143,30 +162,35 @@ public class TestMetadataRepository
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<String> getRootNamespaces( String repoId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<String> getNamespaces( String repoId, String namespace )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<String> getProjects( String repoId, String namespace )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<String> getProjectVersions( String repoId, String namespace, String projectId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -174,31 +198,37 @@ public class TestMetadataRepository
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void save()
{
//
}
+ @Override
public void close()
{
//
}
+ @Override
public void revert()
{
//
}
+ @Override
public boolean canObtainAccess( Class<?> aClass )
{
return false;
}
+ @Override
public <T>T obtainAccess( Class<T> aClass )
{
return null;
}
+ @Override
public void removeArtifact( String repositoryId, String namespace, String project, String version,
MetadataFacet metadataFacet )
throws MetadataRepositoryException
@@ -206,30 +236,35 @@ public class TestMetadataRepository
throw new UnsupportedOperationException();
}
+ @Override
public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion )
throws MetadataRepositoryException
{
throw new UnsupportedOperationException();
}
+ @Override
public void removeNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException
{
}
+ @Override
public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion )
throws MetadataRepositoryException
{
}
+ @Override
public void removeProject( String repositoryId, String namespace, String projectId )
throws MetadataRepositoryException
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean hasMetadataFacet( String repositoryId, String facetId )
throws MetadataRepositoryException
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
index 211cfa3..7020773 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
@@ -31,6 +31,7 @@ import java.util.Collection;
public class TestMetadataResolver
implements MetadataResolver
{
+ @Override
public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace,
String projectId, String projectVersion )
throws MetadataResolutionException
@@ -38,6 +39,7 @@ public class TestMetadataResolver
return null;
}
+ @Override
public Collection<ProjectVersionReference> resolveProjectReferences( RepositorySession session, String repoId,
String namespace, String projectId,
String projectVersion )
@@ -46,24 +48,28 @@ public class TestMetadataResolver
return null;
}
+ @Override
public Collection<String> resolveRootNamespaces( RepositorySession session, String repoId )
throws MetadataResolutionException
{
return null;
}
+ @Override
public Collection<String> resolveNamespaces( RepositorySession session, String repoId, String namespace )
throws MetadataResolutionException
{
return null;
}
+ @Override
public Collection<String> resolveProjects( RepositorySession session, String repoId, String namespace )
throws MetadataResolutionException
{
return null;
}
+ @Override
public Collection<String> resolveProjectVersions( RepositorySession session, String repoId, String namespace,
String projectId )
throws MetadataResolutionException
@@ -71,6 +77,7 @@ public class TestMetadataResolver
return null;
}
+ @Override
public Collection<ArtifactMetadata> resolveArtifacts( RepositorySession session, String repoId, String namespace,
String projectId, String projectVersion )
throws MetadataResolutionException
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
index 531b905..f0f10ec 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
@@ -28,6 +28,7 @@ public class TestRepositorySessionFactory
private MetadataResolver resolver = new TestMetadataResolver();
+ @Override
public RepositorySession createSession()
{
return new RepositorySession( metadataRepository, resolver );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
index c402511..0b921b0 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
@@ -150,6 +150,7 @@ public class ManagedDefaultRepositoryContentTest
}
@Test
+ @Override
public void testToPathOnNullArtifactReference()
{
try
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
index 5fff0d5..9cf7228 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
@@ -220,6 +220,7 @@ public class Maven2RepositoryMetadataResolverTest
List<ArtifactMetadata> artifacts = new ArrayList<>( springArtifacts );
Collections.sort( artifacts, new Comparator<ArtifactMetadata>()
{
+ @Override
public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
{
return o1.getId().compareTo( o2.getId() );
@@ -262,6 +263,7 @@ public class Maven2RepositoryMetadataResolverTest
List<ArtifactMetadata> artifacts = new ArrayList<>( testArtifacts );
Collections.sort( artifacts, new Comparator<ArtifactMetadata>()
{
+ @Override
public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
{
return o1.getId().compareTo( o2.getId() );
@@ -564,6 +566,7 @@ public class Maven2RepositoryMetadataResolverTest
assertEquals( 3, artifacts.size() );
Collections.sort( artifacts, new Comparator<ArtifactMetadata>()
{
+ @Override
public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
{
return o1.getId().compareTo( o2.getId() );
@@ -587,6 +590,7 @@ public class Maven2RepositoryMetadataResolverTest
assertEquals( 2, artifacts.size() );
Collections.sort( artifacts, new Comparator<ArtifactMetadata>()
{
+ @Override
public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
{
return o1.getId().compareTo( o2.getId() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
index 0d9540e..ec2d7b0 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
@@ -117,6 +117,7 @@ public class MavenRepositoryMetadataReaderTest
}
@Before
+ @Override
public void setUp()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java
index ff62616..4ef36d4 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java
@@ -40,6 +40,7 @@ import java.util.List;
public class MockWagon
implements Wagon
{
+ @Override
public void get( String s, File file )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
@@ -56,76 +57,89 @@ public class MockWagon
}
}
+ @Override
public boolean getIfNewer( String s, File file, long l )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
return false;
}
+ @Override
public void put( File file, String s )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
}
+ @Override
public void putDirectory( File file, String s )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
}
+ @Override
public boolean resourceExists( String s )
throws TransferFailedException, AuthorizationException
{
return false;
}
+ @Override
public List getFileList( String s )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
return null;
}
+ @Override
public boolean supportsDirectoryCopy()
{
return false;
}
+ @Override
public Repository getRepository()
{
return null;
}
+ @Override
public void connect( Repository repository )
throws ConnectionException, AuthenticationException
{
}
+ @Override
public void connect( Repository repository, ProxyInfo proxyInfo )
throws ConnectionException, AuthenticationException
{
}
+ @Override
public void connect( Repository repository, ProxyInfoProvider proxyInfoProvider )
throws ConnectionException, AuthenticationException
{
}
+ @Override
public void connect( Repository repository, AuthenticationInfo authenticationInfo )
throws ConnectionException, AuthenticationException
{
}
+ @Override
public void connect( Repository repository, AuthenticationInfo authenticationInfo, ProxyInfo proxyInfo )
throws ConnectionException, AuthenticationException
{
}
+ @Override
public void connect( Repository repository, AuthenticationInfo authenticationInfo,
ProxyInfoProvider proxyInfoProvider )
throws ConnectionException, AuthenticationException
@@ -133,73 +147,87 @@ public class MockWagon
}
+ @Override
public void openConnection()
throws ConnectionException, AuthenticationException
{
}
+ @Override
public void disconnect()
throws ConnectionException
{
}
+ @Override
public void setTimeout( int i )
{
}
+ @Override
public int getTimeout()
{
return 0;
}
+ @Override
public void setReadTimeout( int timeoutValue )
{
}
+ @Override
public int getReadTimeout()
{
return 0;
}
+ @Override
public void addSessionListener( SessionListener sessionListener )
{
}
+ @Override
public void removeSessionListener( SessionListener sessionListener )
{
}
+ @Override
public boolean hasSessionListener( SessionListener sessionListener )
{
return false;
}
+ @Override
public void addTransferListener( TransferListener transferListener )
{
}
+ @Override
public void removeTransferListener( TransferListener transferListener )
{
}
+ @Override
public boolean hasTransferListener( TransferListener transferListener )
{
return false;
}
+ @Override
public boolean isInteractive()
{
return false;
}
+ @Override
public void setInteractive( boolean b )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
old mode 100755
new mode 100644
index c953e95..09ef495
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
@@ -58,16 +58,19 @@ public class MockConfiguration
registryMock = registryControl.createMock( Registry.class );
}
+ @Override
public void addChangeListener( RegistryListener listener )
{
registryListeners.add( listener );
}
+ @Override
public Configuration getConfiguration()
{
return configuration;
}
+ @Override
public void save( Configuration configuration )
throws RegistryException
{
@@ -89,21 +92,25 @@ public class MockConfiguration
}
}
+ @Override
public void addListener( ConfigurationListener listener )
{
configListeners.add(listener);
}
+ @Override
public void removeListener( ConfigurationListener listener )
{
configListeners.remove( listener );
}
+ @Override
public boolean isDefaulted()
{
return false;
}
+ @Override
public void reload()
{
// no op
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
index 9d0db4b..da50c4f 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
@@ -444,11 +444,13 @@ public class DefaultCassandraArchivaManager
}
+ @Override
public void start()
{
}
@PreDestroy
+ @Override
public void shutdown()
{
}
@@ -467,51 +469,61 @@ public class DefaultCassandraArchivaManager
return keyspace;
}
+ @Override
public Cluster getCluster()
{
return cluster;
}
+ @Override
public String getRepositoryFamilyName()
{
return repositoryFamilyName;
}
+ @Override
public String getNamespaceFamilyName()
{
return namespaceFamilyName;
}
+ @Override
public String getProjectFamilyName()
{
return projectFamilyName;
}
+ @Override
public String getProjectVersionMetadataFamilyName()
{
return projectVersionMetadataFamilyName;
}
+ @Override
public String getArtifactMetadataFamilyName()
{
return artifactMetadataFamilyName;
}
+ @Override
public String getMetadataFacetFamilyName()
{
return metadataFacetFamilyName;
}
+ @Override
public String getMailingListFamilyName()
{
return mailingListFamilyName;
}
+ @Override
public String getLicenseFamilyName()
{
return licenseFamilyName;
}
+ @Override
public String getDependencyFamilyName()
{
return dependencyFamilyName;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
index 30d2049..57bd33d 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
@@ -53,6 +53,7 @@ public class CassandraMetadataRepositoryTest
CassandraMetadataRepository cmr;
@Before
+ @Override
public void setUp()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
index e12ca7a..d4b3c6f 100644
--- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
@@ -97,6 +97,7 @@ public class FileMetadataRepository
return new File( getBaseDirectory( repoId ), "content" );
}
+ @Override
public void updateProject( String repoId, ProjectMetadata project )
{
updateProject( repoId, project.getNamespace(), project.getId() );
@@ -122,6 +123,7 @@ public class FileMetadataRepository
}
}
+ @Override
public void updateProjectVersion( String repoId, String namespace, String projectId,
ProjectVersionMetadata versionMetadata )
{
@@ -283,6 +285,7 @@ public class FileMetadataRepository
}
}
+ @Override
public void updateNamespace( String repoId, String namespace )
{
try
@@ -300,6 +303,7 @@ public class FileMetadataRepository
}
}
+ @Override
public List<String> getMetadataFacets( String repoId, String facetId )
{
File directory = getMetadataDirectory( repoId, facetId );
@@ -308,6 +312,7 @@ public class FileMetadataRepository
return facets;
}
+ @Override
public boolean hasMetadataFacet( String repositoryId, String facetId )
throws MetadataRepositoryException
{
@@ -334,6 +339,7 @@ public class FileMetadataRepository
}
}
+ @Override
public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name )
{
Properties properties;
@@ -368,6 +374,7 @@ public class FileMetadataRepository
return metadataFacet;
}
+ @Override
public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet )
{
Properties properties = new Properties();
@@ -386,6 +393,7 @@ public class FileMetadataRepository
}
}
+ @Override
public void removeMetadataFacets( String repositoryId, String facetId )
{
File dir = getMetadataDirectory( repositoryId, facetId );
@@ -395,6 +403,7 @@ public class FileMetadataRepository
}
}
+ @Override
public void removeMetadataFacet( String repoId, String facetId, String name )
{
File dir = new File( getMetadataDirectory( repoId, facetId ), name );
@@ -404,6 +413,7 @@ public class FileMetadataRepository
}
}
+ @Override
public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime )
{
// TODO: this is quite slow - if we are to persist with this repository implementation we should build an index
@@ -444,6 +454,7 @@ public class FileMetadataRepository
}
}
+ @Override
public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId,
String projectVersion )
{
@@ -539,26 +550,31 @@ public class FileMetadataRepository
return artifacts.values();
}
+ @Override
public void save()
{
// it's all instantly persisted
}
+ @Override
public void close()
{
// nothing additional to close
}
+ @Override
public void revert()
{
log.warn( "Attempted to revert a session, but the file-based repository storage doesn't support it" );
}
+ @Override
public boolean canObtainAccess( Class<?> aClass )
{
return false;
}
+ @Override
public <T>T obtainAccess( Class<T> aClass )
{
throw new IllegalArgumentException(
@@ -578,6 +594,7 @@ public class FileMetadataRepository
}
}
+ @Override
public Collection<String> getRepositories()
{
List<String> repositories = new ArrayList<>();
@@ -588,6 +605,7 @@ public class FileMetadataRepository
return repositories;
}
+ @Override
public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum )
{
// TODO: this is quite slow - if we are to persist with this repository implementation we should build an index
@@ -603,6 +621,7 @@ public class FileMetadataRepository
return artifacts;
}
+ @Override
public void removeNamespace( String repositoryId, String project )
throws MetadataRepositoryException
{
@@ -621,6 +640,7 @@ public class FileMetadataRepository
}
}
+ @Override
public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion )
throws MetadataRepositoryException
{
@@ -663,6 +683,7 @@ public class FileMetadataRepository
}
+ @Override
public void removeArtifact( String repoId, String namespace, String project, String version, String id )
{
@@ -712,6 +733,7 @@ public class FileMetadataRepository
* @param metadataFacet will remove artifacts which have this {@link MetadataFacet} using equals
* @throws MetadataRepositoryException
*/
+ @Override
public void removeArtifact( String repositoryId, String namespace, String project, String projectVersion,
MetadataFacet metadataFacet )
throws MetadataRepositoryException
@@ -719,6 +741,7 @@ public class FileMetadataRepository
throw new UnsupportedOperationException( "not implemented" );
}
+ @Override
public void removeRepository( String repoId )
{
File dir = getDirectory( repoId );
@@ -779,6 +802,7 @@ public class FileMetadataRepository
}
}
+ @Override
public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion,
ArtifactMetadata artifact )
{
@@ -859,6 +883,7 @@ public class FileMetadataRepository
return properties;
}
+ @Override
public ProjectMetadata getProject( String repoId, String namespace, String projectId )
{
File directory = new File( getDirectory( repoId ), namespace + "/" + projectId );
@@ -878,6 +903,7 @@ public class FileMetadataRepository
return project;
}
+ @Override
public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
String projectVersion )
{
@@ -1050,6 +1076,7 @@ public class FileMetadataRepository
return versionMetadata;
}
+ @Override
public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId,
String projectVersion )
{
@@ -1069,6 +1096,7 @@ public class FileMetadataRepository
return versions;
}
+ @Override
public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId,
String projectVersion )
{
@@ -1091,11 +1119,13 @@ public class FileMetadataRepository
return references;
}
+ @Override
public Collection<String> getRootNamespaces( String repoId )
{
return getNamespaces( repoId, null );
}
+ @Override
public Collection<String> getNamespaces( String repoId, String baseNamespace )
{
List<String> allNamespaces = new ArrayList<>();
@@ -1132,6 +1162,7 @@ public class FileMetadataRepository
return new ArrayList<>( namespaces );
}
+ @Override
public Collection<String> getProjects( String repoId, String namespace )
{
List<String> projects = new ArrayList<>();
@@ -1150,6 +1181,7 @@ public class FileMetadataRepository
return projects;
}
+ @Override
public Collection<String> getProjectVersions( String repoId, String namespace, String projectId )
{
List<String> projectVersions = new ArrayList<>();
@@ -1168,6 +1200,7 @@ public class FileMetadataRepository
return projectVersions;
}
+ @Override
public void removeProject( String repositoryId, String namespace, String projectId )
throws MetadataRepositoryException
{
@@ -1185,6 +1218,7 @@ public class FileMetadataRepository
}
}
+ @Override
public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion )
throws MetadataRepositoryException
{
@@ -1220,6 +1254,7 @@ public class FileMetadataRepository
private static class ArtifactComparator
implements Comparator<ArtifactMetadata>
{
+ @Override
public int compare( ArtifactMetadata artifact1, ArtifactMetadata artifact2 )
{
if ( artifact1.getWhenGathered() == artifact2.getWhenGathered() )
@@ -1238,6 +1273,7 @@ public class FileMetadataRepository
}
}
+ @Override
public List<ArtifactMetadata> getArtifacts( String repoId )
{
List<ArtifactMetadata> artifacts = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
index 0f775a2..0d63f4e 100644
--- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
+++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
@@ -80,6 +80,7 @@ public class FileRepositorySessionFactory
}
+ @Override
public RepositorySession createSession()
{
MetadataRepository metadataRepository = new FileMetadataRepository( metadataFacetFactories, configuration );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
index 94ac46d..df97f2e 100644
--- a/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
@@ -38,6 +38,7 @@ public class FileMetadataRepositoryTest
{
@Before
+ @Override
public void setUp()
throws Exception
{