This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit b9dd7edf9eac052e4400fd37e12b3e123b8b9f55 Author: Martin Stockhammer <[email protected]> AuthorDate: Wed Jun 3 10:46:34 2020 +0200 Removing old API methods --- .../CleanupReleasedSnapshotsRepositoryPurge.java | 52 +++++++++------------- .../repository/BaseRepositoryContentLayout.java | 20 --------- .../mock/ManagedRepositoryContentMock.java | 13 ------ .../scanner/mock/ManagedRepositoryContentMock.java | 12 ----- .../mock/ManagedRepositoryContentMock.java | 12 ----- .../content/ManagedDefaultRepositoryContent.java | 35 --------------- .../ManagedDefaultRepositoryContentTest.java | 18 -------- 7 files changed, 21 insertions(+), 141 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java index 0697306..fe58824 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java @@ -34,6 +34,7 @@ import org.apache.archiva.repository.BaseRepositoryContentLayout; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.metadata.audit.RepositoryListener; +import org.apache.archiva.repository.content.ItemNotFoundException; import org.apache.archiva.repository.content.ItemSelector; import org.apache.archiva.repository.content.Project; import org.apache.archiva.repository.content.Version; @@ -108,7 +109,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge return; } - ItemSelector selector = ArchivaItemSelector.builder( ) + ItemSelector projectSelector = ArchivaItemSelector.builder( ) .withNamespace( artifactRef.getGroupId( ) ) .withProjectId( artifactRef.getArtifactId( ) ) .build(); @@ -124,7 +125,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge if ( repo.getActiveReleaseSchemes().contains( ReleaseScheme.RELEASE )) { BaseRepositoryContentLayout repoContent = repo.getContent().getLayout( BaseRepositoryContentLayout.class ); - Project proj = repoContent.getProject( selector ); + Project proj = repoContent.getProject( projectSelector ); for ( Version version : repoContent.getVersions( proj ) ) { if ( !VersionUtil.isSnapshot( version.getVersion() ) ) @@ -144,13 +145,21 @@ public class CleanupReleasedSnapshotsRepositoryPurge versionRef.setGroupId( artifactRef.getGroupId( ) ); versionRef.setArtifactId( artifactRef.getArtifactId( ) ); + ArchivaItemSelector.Builder versionSelectorBuilder = ArchivaItemSelector.builder( ) + .withNamespace( artifactRef.getGroupId( ) ) + .withProjectId( artifactRef.getArtifactId( ) ) + .withArtifactId( artifactRef.getArtifactId( ) ); + MetadataRepository metadataRepository = repositorySession.getRepository( ); if ( releasedVersions.contains( VersionUtil.getReleaseVersion( artifactRef.getVersion( ) ) ) ) { - versionRef.setVersion( artifactRef.getVersion( ) ); - layout.deleteVersion( versionRef ); - + ArchivaItemSelector selector = versionSelectorBuilder.withVersion( artifactRef.getVersion( ) ).build( ); + Version version = layout.getVersion( selector ); + if (version.exists()) + { + repository.deleteItem( version ); + } for ( RepositoryListener listener : listeners ) { listener.deleteArtifact( metadataRepository, repository.getId( ), artifactRef.getGroupId( ), @@ -172,10 +181,6 @@ public class CleanupReleasedSnapshotsRepositoryPurge { log.debug( "Not processing file that is not an artifact: {}", e.getMessage( ) ); } - catch ( ContentNotFoundException e ) - { - throw new RepositoryPurgeException( e.getMessage( ), e ); - } catch ( MetadataRepositoryException e ) { log.error( "Could not remove metadata during cleanup of released snapshots of {}", path, e ); @@ -184,6 +189,10 @@ public class CleanupReleasedSnapshotsRepositoryPurge { e.printStackTrace( ); } + catch ( ItemNotFoundException e ) + { + log.error( "Could not find item to delete {}",e.getMessage( ), e ); + } } @@ -211,15 +220,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge { // Ignore. (Just means we have no snapshot versions left to reference). } - catch ( RepositoryMetadataException e ) - { - // Ignore. - } - catch ( IOException e ) - { - // Ignore. - } - catch ( LayoutException e ) + catch ( RepositoryMetadataException | IOException | LayoutException e ) { // Ignore. } @@ -228,21 +229,10 @@ public class CleanupReleasedSnapshotsRepositoryPurge { metadataTools.updateMetadata( repository, projectRef ); } - catch ( ContentNotFoundException e ) + catch ( ContentNotFoundException | RepositoryMetadataException | IOException | LayoutException e ) { // Ignore. (Just means we have no snapshot versions left to reference). } - catch ( RepositoryMetadataException e ) - { - // Ignore. - } - catch ( IOException e ) - { - // Ignore. - } - catch ( LayoutException e ) - { - // Ignore. - } + } } diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java index bd1e293..2fc7aee 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java @@ -291,18 +291,6 @@ public interface BaseRepositoryContentLayout extends ManagedRepositoryContentLay /** - * Delete from the managed repository all files / directories associated with the - * provided version reference. - * - * @param reference the version reference to delete. - * @throws ContentNotFoundException - */ - void deleteVersion( VersionedReference reference ) - throws ContentNotFoundException, ContentAccessException; - - - - /** * delete a specified artifact from the repository * * @param artifactReference @@ -395,13 +383,5 @@ public interface BaseRepositoryContentLayout extends ManagedRepositoryContentLay */ StorageAsset toFile( VersionedReference reference ); - /** - * Given an {@link ArtifactReference}, return the file reference to the artifact. - * - * @param reference the artifact reference to use. - * @return the relative path to the artifact. - */ - StorageAsset toFile( ArtifactReference reference ); - } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java index ae32b0e..c10c6c3 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java @@ -150,13 +150,6 @@ public class ManagedRepositoryContentMock implements BaseRepositoryContentLayout @Override - public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException, ContentAccessException - { - - } - - - @Override public Version getVersion( ItemSelector versionCoordinates ) throws ContentAccessException, IllegalArgumentException { return null; @@ -393,12 +386,6 @@ public class ManagedRepositoryContentMock implements BaseRepositoryContentLayout } @Override - public StorageAsset toFile( ArtifactReference reference ) - { - return null; - } - - @Override public String toPath( ArtifactReference reference ) { return null; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java index 604c70b..d7d9ab4 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java @@ -308,12 +308,6 @@ public class ManagedRepositoryContentMock implements BaseRepositoryContentLayout } @Override - public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException, ContentAccessException - { - - } - - @Override public void deleteArtifact( ArtifactReference artifactReference ) throws ContentNotFoundException, ContentAccessException { @@ -585,12 +579,6 @@ public class ManagedRepositoryContentMock implements BaseRepositoryContentLayout } - @Override - public StorageAsset toFile( ArtifactReference reference ) - { - return getRepoRootAsset().resolve(refs.get(reference)); - } - private String formatAsDirectory( String directory ) { return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR ); diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java index 9706451..ae4a889 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java @@ -329,12 +329,6 @@ public class ManagedRepositoryContentMock implements BaseRepositoryContentLayout } @Override - public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException, ContentAccessException - { - - } - - @Override public void deleteArtifact( ArtifactReference artifactReference ) throws ContentNotFoundException, ContentAccessException { @@ -607,12 +601,6 @@ public class ManagedRepositoryContentMock implements BaseRepositoryContentLayout } - @Override - public StorageAsset toFile( ArtifactReference reference ) - { - return getRepoRootAsset().resolve( refs.get(reference)); - } - private String formatAsDirectory( String directory ) { return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR ); diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java index 032c531..3e195c2 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java @@ -1343,35 +1343,6 @@ public class ManagedDefaultRepositoryContent @Override - public void deleteVersion( VersionedReference ref ) throws ContentNotFoundException, ContentAccessException - { - final String path = toPath( ref ); - final Path deleteTarget = getRepoDir( ).resolve( path ); - if ( !Files.exists( deleteTarget ) ) - { - log.warn( "Version path for repository {} does not exist: {}", getId( ), deleteTarget ); - throw new ContentNotFoundException( "Version not found for repository " + getId( ) + ": " + path ); - } - if ( Files.isDirectory( deleteTarget ) ) - { - try - { - org.apache.archiva.common.utils.FileUtils.deleteDirectory( deleteTarget ); - } - catch ( IOException e ) - { - log.error( "Could not delete file path {}: {}", deleteTarget, e.getMessage( ), e ); - throw new ContentAccessException( "Error while trying to delete path " + path + " from repository " + getId( ) + ": " + e.getMessage( ), e ); - } - } - else - { - log.warn( "Version path for repository {} is not a directory {}", getId( ), deleteTarget ); - throw new ContentNotFoundException( "Version path for repository " + getId( ) + " is not directory: " + path ); - } - } - - @Override public void deleteProject( ProjectReference ref ) throws ContentNotFoundException, ContentAccessException { @@ -1690,12 +1661,6 @@ public class ManagedDefaultRepositoryContent @Override - public StorageAsset toFile( ArtifactReference reference ) - { - return repository.getAsset( toPath( reference ) ); - } - - @Override public StorageAsset toFile( VersionedReference reference ) { return repository.getAsset( toPath( reference ) ); diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java index e4728f2..746bbb8 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java @@ -522,24 +522,6 @@ public class ManagedDefaultRepositoryContentTest @Test - public void testDeleteVersion() throws IOException, org.apache.archiva.repository.ContentNotFoundException, org.apache.archiva.repository.ContentAccessException - { - Path deleteRepo = setupRepoCopy( "delete-repository", "delete-repository-2" ); - assertTrue( Files.exists( deleteRepo.resolve( "org/apache/maven/samplejar/1.0/samplejar-1.0-source.jar" ) ) ); - assertTrue( Files.exists( deleteRepo.resolve( "org/apache/maven/samplejar/1.0/samplejar-1.0.jar" ) ) ); - assertTrue( Files.exists( deleteRepo.resolve( "org/apache/maven/samplejar/1.0/samplejar-1.0.jar.md5" ) ) ); - assertTrue( Files.exists( deleteRepo.resolve( "org/apache/maven/samplejar/1.0/samplejar-1.0.jar.sha1" ) ) ); - assertTrue( Files.exists( deleteRepo.resolve( "org/apache/maven/samplejar/1.0/samplejar-1.0.pom" ) ) ); - - VersionedReference ref = new VersionedReference( ).groupId( "org.apache.maven" ).artifactId( "samplejar" ).version( "1.0" ); - - repoContent.deleteVersion( ref ); - - assertFalse( Files.exists( deleteRepo.resolve( "org/apache/maven/samplejar/1.0" ) ) ); - - } - - @Test public void testDeleteProject() throws IOException, org.apache.archiva.repository.ContentNotFoundException, org.apache.archiva.repository.ContentAccessException { Path deleteRepo = setupRepoCopy( "delete-repository", "delete-repository-2" );
