You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2022/02/13 09:27:57 UTC
[archiva] 01/02: Updating mapper for managed repo
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 99bd81ac000598105529473a53f62a5b53d885a5
Author: Martin Schreier <ma...@apache.org>
AuthorDate: Thu Jan 13 21:00:33 2022 +0100
Updating mapper for managed repo
---
.../api/v2/model/map/MavenRepositoryMapper.java | 65 ++++--
.../v2/model/map/MavenRepositoryMapperTest.java | 231 +++++++++++++++++++++
2 files changed, 279 insertions(+), 17 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapper.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapper.java
index d9f00fc..1e4ed68 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapper.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapper.java
@@ -22,6 +22,7 @@ import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ReleaseScheme;
import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.repository.features.ArtifactCleanupFeature;
+import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.repository.features.StagingRepositoryFeature;
import org.apache.archiva.rest.api.v2.model.MavenManagedRepository;
import org.springframework.stereotype.Service;
@@ -48,24 +49,32 @@ public class MavenRepositoryMapper extends RestServiceMapper<MavenManagedReposit
@Override
public void update( MavenManagedRepository source, ManagedRepositoryConfiguration target )
{
- target.setId( source.getId() );
- target.setName( source.getName() );
- target.setDescription( source.getDescription( ) );
+ if (source.getId()!=null)
+ target.setId( source.getId() );
+ if (source.getName()!=null)
+ target.setName( source.getName() );
+ if (source.getDescription()!=null)
+ target.setDescription( source.getDescription( ) );
target.setType( TYPE );
target.setBlockRedeployments( source.isBlocksRedeployments() );
target.setDeleteReleasedSnapshots( source.isDeleteSnapshotsOfRelease() );
- target.setIndexDir( source.getIndexPath() );
- target.setLayout( source.getLayout() );
- target.setLocation( source.getLocation() );
- target.setPackedIndexDir( source.getPackedIndexPath() );
- target.setRefreshCronExpression( source.getSchedulingDefinition() );
- target.setReleases( source.getReleaseSchemes( ).contains( ReleaseScheme.RELEASE ) );
+ if (source.getIndexPath()!=null)
+ target.setIndexDir( source.getIndexPath() );
+ if (source.getLayout()!=null)
+ target.setLayout( source.getLayout() );
+ if (source.getLocation()!=null)
+ target.setLocation( source.getLocation() );
+ if (source.getPackedIndexPath()!=null)
+ target.setPackedIndexDir( source.getPackedIndexPath() );
+ if (source.getSchedulingDefinition()!=null)
+ target.setRefreshCronExpression( source.getSchedulingDefinition() );
+ target.setReleases( source.getReleaseSchemes( ).contains( ReleaseScheme.RELEASE.name() ) );
target.setRetentionCount( source.getRetentionCount() );
target.setRetentionPeriod( source.getRetentionPeriod().getDays() );
target.setScanned( source.isScanned() );
target.setSkipPackedIndexCreation( source.isSkipPackedIndexCreation() );
- target.setSnapshots( source.getReleaseSchemes( ).contains( ReleaseScheme.SNAPSHOT ) );
+ target.setSnapshots( source.getReleaseSchemes( ).contains( ReleaseScheme.SNAPSHOT.name() ) );
target.setStageRepoNeeded( source.hasStagingRepository() );
}
@@ -74,18 +83,40 @@ public class MavenRepositoryMapper extends RestServiceMapper<MavenManagedReposit
public MavenManagedRepository reverseMap( ManagedRepository source )
{
MavenManagedRepository result = new MavenManagedRepository( );
- StagingRepositoryFeature srf = source.getFeature( StagingRepositoryFeature.class );
- ArtifactCleanupFeature acf = source.getFeature( ArtifactCleanupFeature.class );
- result.setHasStagingRepository( srf.isStageRepoNeeded() );
- result.setBlocksRedeployments( source.blocksRedeployments() );
- result.setIndex( source.hasIndex() );
- result.setStagingRepository( srf.getStagingRepository().getId() );
- return null;
+ reverseUpdate( source, result );
+ return result;
}
@Override
public void reverseUpdate( ManagedRepository source, MavenManagedRepository target )
{
+ StagingRepositoryFeature srf = source.getFeature( StagingRepositoryFeature.class );
+ ArtifactCleanupFeature acf = source.getFeature( ArtifactCleanupFeature.class );
+ IndexCreationFeature icf = source.getFeature( IndexCreationFeature.class );
+
+
+ target.setId( source.getId( ) );
+ target.setName( source.getName( ) );
+ target.setDescription( source.getDescription() );
+
+ target.setBlocksRedeployments( source.blocksRedeployments() );
+ target.setDeleteSnapshotsOfRelease( acf.isDeleteReleasedSnapshots() );
+ target.setIndex( source.hasIndex() );
+ target.setIndexPath( icf.getIndexPath().toString() );
+ target.setLayout( source.getLayout() );
+ target.setLocation( source.getLocation().toString() );
+ target.setPackedIndexPath( icf.getPackedIndexPath().toString() );
+ target.setSchedulingDefinition( source.getSchedulingDefinition() );
+ for ( ReleaseScheme scheme: source.getActiveReleaseSchemes() ) {
+ target.addReleaseScheme( scheme.toString() );
+ }
+ target.setRetentionCount( acf.getRetentionCount() );
+ target.setRetentionPeriod( acf.getRetentionPeriod() );
+ target.setScanned( source.isScanned() );
+ target.setSkipPackedIndexCreation( icf.isSkipPackedIndexCreation() );
+ if (srf.getStagingRepository()!=null)
+ target.setStagingRepository( srf.getStagingRepository().getId() );
+ target.setHasStagingRepository( srf.isStageRepoNeeded() );
}
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/test/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapperTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/test/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapperTest.java
new file mode 100644
index 0000000..0fd7770
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/test/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapperTest.java
@@ -0,0 +1,231 @@
+package org.apache.archiva.rest.api.v2.model.map;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.common.filelock.DefaultFileLockManager;
+import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration;
+import org.apache.archiva.repository.EditableManagedRepository;
+import org.apache.archiva.repository.ReleaseScheme;
+import org.apache.archiva.repository.RepositoryType;
+import org.apache.archiva.repository.UnsupportedURIException;
+import org.apache.archiva.repository.base.managed.BasicManagedRepository;
+import org.apache.archiva.repository.features.ArtifactCleanupFeature;
+import org.apache.archiva.repository.features.IndexCreationFeature;
+import org.apache.archiva.repository.features.StagingRepositoryFeature;
+import org.apache.archiva.repository.storage.fs.FilesystemStorage;
+import org.apache.archiva.rest.api.v2.model.MavenManagedRepository;
+import org.apache.archiva.rest.api.v2.model.Repository;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Period;
+import java.util.Arrays;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Martin Schreier <ma...@apache.org>
+ */
+class MavenRepositoryMapperTest
+{
+
+ @Test
+ void map( )
+ {
+ MavenRepositoryMapper mapper = new MavenRepositoryMapper( );
+ MavenManagedRepository repo = new MavenManagedRepository( );
+ repo.setId( "repo01" );
+ repo.setName( "Repo 01" );
+ repo.setDescription( "This is repo 01" );
+ repo.setLocation( "/data/repo01" );
+ repo.setHasStagingRepository( true );
+ repo.setSchedulingDefinition( "0,1,2 * * * *" );
+ repo.setPackedIndexPath( ".index" );
+ repo.setIndexPath( ".indexer" );
+ repo.setIndex( true );
+ repo.setDeleteSnapshotsOfRelease( false );
+ repo.setBlocksRedeployments( false );
+ repo.setReleaseSchemes( Arrays.asList( ReleaseScheme.RELEASE.name(), ReleaseScheme.SNAPSHOT.name() ) );
+ repo.setCharacteristic( Repository.CHARACTERISTIC_MANAGED );
+ repo.setScanned( true );
+ repo.setRetentionPeriod( Period.ofDays( 10 ) );
+ repo.setRetentionCount( 15 );
+ repo.setSkipPackedIndexCreation( false );
+ repo.setStagingRepository( "stage-repo01" );
+ ManagedRepositoryConfiguration result = mapper.map( repo );
+
+ assertNotNull( result );
+ assertEquals( "repo01", result.getId( ) );
+ assertEquals( "Repo 01", result.getName( ) );
+ assertEquals( "This is repo 01", result.getDescription( ) );
+ assertEquals( "/data/repo01", result.getLocation( ) );
+ assertTrue( result.isStageRepoNeeded( ) );
+ assertEquals( "0,1,2 * * * *", result.getRefreshCronExpression( ) );
+ assertEquals( ".indexer", result.getIndexDir( ) );
+ assertEquals( ".index", result.getPackedIndexDir( ) );
+ assertFalse( result.isDeleteReleasedSnapshots( ) );
+ assertFalse( result.isBlockRedeployments( ) );
+ assertTrue( result.isSnapshots( ) );
+ assertTrue( result.isReleases( ) );
+ assertTrue( result.isScanned( ) );
+ assertEquals( 10, result.getRetentionPeriod( ) );
+ assertEquals( 15, result.getRetentionCount( ) );
+ assertFalse( result.isSkipPackedIndexCreation( ) );
+
+ }
+
+ @Test
+ void update( )
+ {
+ MavenRepositoryMapper mapper = new MavenRepositoryMapper( );
+ MavenManagedRepository repo = new MavenManagedRepository( );
+ ManagedRepositoryConfiguration result = new ManagedRepositoryConfiguration( );
+ repo.setId( "repo01" );
+ repo.setName( "Repo 01" );
+ repo.setDescription( "This is repo 01" );
+ repo.setLocation( "/data/repo01" );
+ repo.setHasStagingRepository( true );
+ repo.setSchedulingDefinition( "0,1,2 * * * *" );
+ repo.setPackedIndexPath( ".index" );
+ repo.setIndexPath( ".indexer" );
+ repo.setIndex( true );
+ repo.setDeleteSnapshotsOfRelease( false );
+ repo.setBlocksRedeployments( false );
+ repo.setReleaseSchemes( Arrays.asList( ReleaseScheme.RELEASE.name(), ReleaseScheme.SNAPSHOT.name() ) );
+ repo.setCharacteristic( Repository.CHARACTERISTIC_MANAGED );
+ repo.setScanned( true );
+ repo.setRetentionPeriod( Period.ofDays( 10 ) );
+ repo.setRetentionCount( 15 );
+ repo.setSkipPackedIndexCreation( false );
+ repo.setStagingRepository( "stage-repo01" );
+ mapper.update( repo, result );
+
+ assertNotNull( result );
+ assertEquals( "repo01", result.getId( ) );
+ assertEquals( "Repo 01", result.getName( ) );
+ assertEquals( "This is repo 01", result.getDescription( ) );
+ assertEquals( "/data/repo01", result.getLocation( ) );
+ assertTrue( result.isStageRepoNeeded( ) );
+ assertEquals( "0,1,2 * * * *", result.getRefreshCronExpression( ) );
+ assertEquals( ".indexer", result.getIndexDir( ) );
+ assertEquals( ".index", result.getPackedIndexDir( ) );
+ assertFalse( result.isDeleteReleasedSnapshots( ) );
+ assertFalse( result.isBlockRedeployments( ) );
+ assertTrue( result.isSnapshots( ) );
+ assertTrue( result.isReleases( ) );
+ assertTrue( result.isScanned( ) );
+ assertEquals( 10, result.getRetentionPeriod( ) );
+ assertEquals( 15, result.getRetentionCount( ) );
+ assertFalse( result.isSkipPackedIndexCreation( ) );
+ }
+
+ @Test
+ void reverseMap( ) throws IOException, URISyntaxException, UnsupportedURIException
+ {
+ MavenRepositoryMapper mapper = new MavenRepositoryMapper( );
+
+ Path tmpDir = Files.createTempDirectory( "mapper-test" );
+ FilesystemStorage fsStorage = new FilesystemStorage( tmpDir, new DefaultFileLockManager( ) );
+ EditableManagedRepository repository = new BasicManagedRepository( Locale.getDefault(), RepositoryType.MAVEN, "repo02", "Repo 02", fsStorage );
+ repository.setDescription( Locale.getDefault(), "This is repo 02" );
+ repository.setBlocksRedeployment( false );
+ repository.setLocation( new URI("test-path") );
+ repository.setScanned( true );
+ repository.setLayout( "maven2" );
+ repository.setSchedulingDefinition( "* 3,5,10 * * *" );
+ IndexCreationFeature icf = repository.getFeature( IndexCreationFeature.class );
+ icf.setIndexPath( new URI( ".indexer" ) );
+ icf.setPackedIndexPath( new URI( ".index" ) );
+ icf.setSkipPackedIndexCreation( false );
+ ArtifactCleanupFeature acf = repository.getFeature( ArtifactCleanupFeature.class );
+ acf.setDeleteReleasedSnapshots( false );
+ acf.setRetentionPeriod( Period.ofDays( 5 ) );
+ acf.setRetentionCount( 17 );
+ StagingRepositoryFeature srf = repository.getFeature( StagingRepositoryFeature.class );
+ srf.setStageRepoNeeded( false );
+
+ MavenManagedRepository result = mapper.reverseMap( repository );
+ assertEquals( "repo02", result.getId( ) );
+ assertEquals( "Repo 02", result.getName( ) );
+ assertEquals( "This is repo 02", result.getDescription( ) );
+ assertFalse( result.isBlocksRedeployments( ) );
+ assertEquals( "test-path", result.getLocation( ) );
+ assertTrue( result.isScanned( ) );
+ assertEquals( "maven2", result.getLayout( ) );
+ assertEquals( "* 3,5,10 * * *", result.getSchedulingDefinition( ) );
+ assertEquals( ".indexer", result.getIndexPath( ) );
+ assertEquals( ".index", result.getPackedIndexPath( ) );
+ assertFalse( result.isSkipPackedIndexCreation( ) );
+ assertFalse( result.isDeleteSnapshotsOfRelease( ) );
+ assertEquals( Period.ofDays( 5 ), result.getRetentionPeriod( ) );
+ assertEquals( 17, result.getRetentionCount( ) );
+ assertFalse( result.hasStagingRepository( ) );
+
+ }
+
+ @Test
+ void reverseUpdate( ) throws IOException, URISyntaxException, UnsupportedURIException
+ {
+ MavenRepositoryMapper mapper = new MavenRepositoryMapper( );
+ MavenManagedRepository result = new MavenManagedRepository( );
+ Path tmpDir = Files.createTempDirectory( "mapper-test" );
+ FilesystemStorage fsStorage = new FilesystemStorage( tmpDir, new DefaultFileLockManager( ) );
+ EditableManagedRepository repository = new BasicManagedRepository( Locale.getDefault(), RepositoryType.MAVEN, "repo02", "Repo 02", fsStorage );
+ repository.setDescription( Locale.getDefault(), "This is repo 02" );
+ repository.setBlocksRedeployment( false );
+ repository.setLocation( new URI("test-path") );
+ repository.setScanned( true );
+ repository.setLayout( "maven2" );
+ repository.setSchedulingDefinition( "* 3,5,10 * * *" );
+ IndexCreationFeature icf = repository.getFeature( IndexCreationFeature.class );
+ icf.setIndexPath( new URI( ".indexer" ) );
+ icf.setPackedIndexPath( new URI( ".index" ) );
+ icf.setSkipPackedIndexCreation( false );
+ ArtifactCleanupFeature acf = repository.getFeature( ArtifactCleanupFeature.class );
+ acf.setDeleteReleasedSnapshots( false );
+ acf.setRetentionPeriod( Period.ofDays( 5 ) );
+ acf.setRetentionCount( 17 );
+ StagingRepositoryFeature srf = repository.getFeature( StagingRepositoryFeature.class );
+ srf.setStageRepoNeeded( false );
+
+ mapper.reverseUpdate( repository, result );
+
+ assertEquals( "repo02", result.getId( ) );
+ assertEquals( "Repo 02", result.getName( ) );
+ assertEquals( "This is repo 02", result.getDescription( ) );
+ assertFalse( result.isBlocksRedeployments( ) );
+ assertEquals( "test-path", result.getLocation( ) );
+ assertTrue( result.isScanned( ) );
+ assertEquals( "maven2", result.getLayout( ) );
+ assertEquals( "* 3,5,10 * * *", result.getSchedulingDefinition( ) );
+ assertEquals( ".indexer", result.getIndexPath( ) );
+ assertEquals( ".index", result.getPackedIndexPath( ) );
+ assertFalse( result.isSkipPackedIndexCreation( ) );
+ assertFalse( result.isDeleteSnapshotsOfRelease( ) );
+ assertEquals( Period.ofDays( 5 ), result.getRetentionPeriod( ) );
+ assertEquals( 17, result.getRetentionCount( ) );
+ assertFalse( result.hasStagingRepository( ) );
+
+ }
+}
\ No newline at end of file