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 2019/07/19 17:34:41 UTC
[archiva] 01/02: Removing usage of Repository.getLocalPath
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/storage_refactoring
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit d599b89e3d259266373717897f8b7fd24fc7fb8e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Jul 14 01:18:42 2019 +0200
Removing usage of Repository.getLocalPath
---
.../org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java | 6 +++---
.../java/org/apache/archiva/indexer/maven/MavenIndexManager.java | 8 ++++----
.../org/apache/archiva/indexer/maven/MavenIndexManagerTest.java | 8 ++++----
.../dependency/tree/maven2/Maven3DependencyTreeBuilder.java | 2 +-
.../repository/storage/maven2/RepositoryModelResolver.java | 4 ++--
.../apache/archiva/repository/maven2/MavenRepositoryProvider.java | 6 +++---
.../archiva/repository/index/mock/ArchivaIndexManagerMock.java | 6 +++---
.../scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java | 8 ++++----
.../java/org/apache/archiva/mock/ArchivaIndexManagerMock.java | 6 +++---
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java
index 7e2db9b..064045d 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java
@@ -526,7 +526,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
private StorageAsset getIndexPath( Repository repo) throws IOException {
IndexCreationFeature icf = repo.getFeature(IndexCreationFeature.class).get();
- Path repoDir = repo.getLocalPath();
+ Path repoDir = repo.getAsset("").getFilePath();
URI indexDir = icf.getIndexPath();
String indexPath = indexDir.getPath();
Path indexDirectory = null;
@@ -565,7 +565,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
// create remote repository path
- Path repoDir = remoteRepository.getLocalPath();
+ Path repoDir = remoteRepository.getAsset("").getFilePath();
if ( !Files.exists( repoDir ) )
{
Files.createDirectories( repoDir );
@@ -615,7 +615,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
IndexingContext context;
// take care first about repository location as can be relative
- Path repositoryDirectory = repository.getLocalPath();
+ Path repositoryDirectory = repository.getAsset("").getFilePath();
if ( !Files.exists( repositoryDirectory ) )
{
diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
index 705a10d..d049112 100644
--- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
@@ -626,12 +626,12 @@ public class MavenIndexManager implements ArchivaIndexManager {
private StorageAsset getIndexPath( Repository repo) throws IOException {
IndexCreationFeature icf = repo.getFeature(IndexCreationFeature.class).get();
- return getIndexPath( icf.getIndexPath(), repo.getLocalPath(), DEFAULT_INDEX_PATH);
+ return getIndexPath( icf.getIndexPath(), repo.getAsset( "" ).getFilePath(), DEFAULT_INDEX_PATH);
}
private StorageAsset getPackedIndexPath(Repository repo) throws IOException {
IndexCreationFeature icf = repo.getFeature(IndexCreationFeature.class).get();
- return getIndexPath(icf.getPackedIndexPath(), repo.getLocalPath(), DEFAULT_PACKED_INDEX_PATH);
+ return getIndexPath(icf.getPackedIndexPath(), repo.getAsset( "" ).getFilePath(), DEFAULT_PACKED_INDEX_PATH);
}
private IndexingContext createRemoteContext(RemoteRepository remoteRepository ) throws IOException
@@ -642,7 +642,7 @@ public class MavenIndexManager implements ArchivaIndexManager {
// create remote repository path
- Path repoDir = remoteRepository.getLocalPath();
+ Path repoDir = remoteRepository.getAsset( "" ).getFilePath();
if ( !Files.exists( repoDir ) )
{
Files.createDirectories( repoDir );
@@ -701,7 +701,7 @@ public class MavenIndexManager implements ArchivaIndexManager {
IndexingContext context;
// take care first about repository location as can be relative
- Path repositoryDirectory = repository.getLocalPath();
+ Path repositoryDirectory = repository.getAsset( "" ).getFilePath();
if ( !Files.exists( repositoryDirectory ) )
{
diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
index ae512f1..2698575 100644
--- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
@@ -93,7 +93,7 @@ public class MavenIndexManagerTest {
@Test
public void pack() throws Exception {
createTestContext();
- Path destDir = repository.getLocalPath().resolve("org/apache/archiva/archiva-webapp/1.0");
+ Path destDir = repository.getAsset( "" ).getFilePath().resolve("org/apache/archiva/archiva-webapp/1.0");
Path srcDir = Paths.get("src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0");
org.apache.commons.io.FileUtils.copyDirectory(srcDir.toFile(),destDir.toFile());
mavenIndexManager.scan(ctx);
@@ -110,7 +110,7 @@ public class MavenIndexManagerTest {
@Test
public void scan() throws Exception {
createTestContext();
- Path destDir = repository.getLocalPath().resolve("org/apache/archiva/archiva-webapp/1.0");
+ Path destDir = repository.getAsset("").getFilePath().resolve("org/apache/archiva/archiva-webapp/1.0");
Path srcDir = Paths.get("src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0");
org.apache.commons.io.FileUtils.copyDirectory(srcDir.toFile(),destDir.toFile());
mavenIndexManager.scan(ctx);
@@ -138,7 +138,7 @@ public class MavenIndexManagerTest {
public void addArtifactsToIndex() throws Exception {
ArchivaIndexingContext ctx = createTestContext();
- Path destDir = repository.getLocalPath().resolve("org/apache/archiva/archiva-search/1.0");
+ Path destDir = repository.getAsset( "" ).getFilePath().resolve("org/apache/archiva/archiva-search/1.0");
Path srcDir = Paths.get("src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0");
org.apache.commons.io.FileUtils.copyDirectory(srcDir.toFile(), destDir.toFile());
List<URI> uriList = new ArrayList<>();
@@ -156,7 +156,7 @@ public class MavenIndexManagerTest {
@Test
public void removeArtifactsFromIndex() throws Exception {
ArchivaIndexingContext ctx = createTestContext();
- Path destDir = repository.getLocalPath().resolve("org/apache/archiva/archiva-search/1.0");
+ Path destDir = repository.getAsset( "" ).getFilePath().resolve("org/apache/archiva/archiva-search/1.0");
Path srcDir = Paths.get("src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0");
org.apache.commons.io.FileUtils.copyDirectory(srcDir.toFile(), destDir.toFile());
List<URI> uriList = new ArrayList<>();
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
index d200d08..4fee9ee 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
@@ -233,7 +233,7 @@ public class Maven3DependencyTreeBuilder
for ( String repoId : repositoryIds )
{
ManagedRepository managedRepo = repositoryRegistry.getManagedRepository(repoId);
- Path repoDir = managedRepo.getLocalPath();
+ Path repoDir = managedRepo.getAsset("").getFilePath();
Path file = pathTranslator.toFile( repoDir, projectArtifact.getGroupId(), projectArtifact.getArtifactId(),
projectArtifact.getBaseVersion(),
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
index c214a50..f978d55 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
@@ -123,7 +123,7 @@ public class RepositoryModelResolver
this.targetRepository = targetRepository;
- this.session = MavenSystemManager.newRepositorySystemSession( managedRepository.getLocalPath().toString() );
+ this.session = MavenSystemManager.newRepositorySystemSession( managedRepository.getAsset("").getFilePath().toString() );
this.versionRangeResolver = mavenSystemManager.getLocator().getService(VersionRangeResolver.class);
@@ -300,7 +300,7 @@ public class RepositoryModelResolver
Path tmpSha1 = null;
Path tmpResource = null;
String artifactPath = pathTranslator.toPath( groupId, artifactId, version, filename );
- Path resource = targetRepository.getLocalPath().resolve( artifactPath );
+ Path resource = targetRepository.getAsset("").getFilePath().resolve( artifactPath );
Path workingDirectory = createWorkingDirectory( targetRepository.getLocation().toString() );
try
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java
index ee21a79..bbcb658 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java
@@ -168,14 +168,14 @@ public class MavenRepositoryProvider implements RepositoryProvider {
throw new RepositoryException("The location entry is not a valid uri: " + cfg.getLocation());
}
setBaseConfig(repo, cfg);
- Path repoDir = repo.getLocalPath();
+ Path repoDir = repo.getAsset("").getFilePath();
if (!Files.exists(repoDir)) {
log.debug("Creating repo directory {}", repoDir);
try {
Files.createDirectories(repoDir);
} catch (IOException e) {
- log.error("Could not create directory {} for repository {}", repo.getLocalPath(), repo.getId(), e);
- throw new RepositoryException("Could not create directory for repository " + repo.getLocalPath());
+ log.error("Could not create directory {} for repository {}", repoDir, repo.getId(), e);
+ throw new RepositoryException("Could not create directory for repository " + repoDir);
}
}
repo.setSchedulingDefinition(cfg.getRefreshCronExpression());
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java
index c5d6dcb..171563a 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java
@@ -529,7 +529,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
private StorageAsset getIndexPath( Repository repo) throws IOException {
IndexCreationFeature icf = repo.getFeature(IndexCreationFeature.class).get();
- Path repoDir = repo.getLocalPath();
+ Path repoDir = repo.getAsset( "" ).getFilePath();
URI indexDir = icf.getIndexPath();
String indexPath = indexDir.getPath();
Path indexDirectory = null;
@@ -568,7 +568,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
// create remote repository path
- Path repoDir = remoteRepository.getLocalPath();
+ Path repoDir = remoteRepository.getAsset("").getFilePath();
if ( !Files.exists( repoDir ) )
{
Files.createDirectories( repoDir );
@@ -618,7 +618,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
IndexingContext context;
// take care first about repository location as can be relative
- Path repositoryDirectory = repository.getLocalPath();
+ Path repositoryDirectory = repository.getAsset("").getFilePath();
if ( !Files.exists( repositoryDirectory ) )
{
diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
index 80f70ac..a890ca4 100644
--- a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
@@ -132,7 +132,7 @@ public class ArchivaIndexingTaskExecutorTest
public void testAddArtifactToIndex()
throws Exception
{
- Path basePath = repo.getLocalPath();
+ Path basePath = repo.getAsset("").getFilePath();
Path artifactFile = basePath.resolve(
"org/apache/archiva/archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar" );
@@ -174,7 +174,7 @@ public class ArchivaIndexingTaskExecutorTest
public void testUpdateArtifactInIndex()
throws Exception
{
- Path basePath = repo.getLocalPath();
+ Path basePath = repo.getAsset("").getFilePath();
Path artifactFile = basePath.resolve(
"org/apache/archiva/archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar" );
@@ -211,7 +211,7 @@ public class ArchivaIndexingTaskExecutorTest
public void testRemoveArtifactFromIndex()
throws Exception
{
- Path basePath = repo.getLocalPath();
+ Path basePath = repo.getAsset("").getFilePath();
Path artifactFile = basePath.resolve(
"org/apache/archiva/archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar" );
@@ -274,7 +274,7 @@ public class ArchivaIndexingTaskExecutorTest
throws Exception
{
- Path basePath = repo.getLocalPath();
+ Path basePath = repo.getAsset("").getFilePath();
IndexCreationFeature icf = repo.getFeature( IndexCreationFeature.class ).get();
StorageAsset packedIndexDirectory = icf.getLocalPackedIndexPath();
StorageAsset indexerDirectory = icf.getLocalIndexPath();
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/ArchivaIndexManagerMock.java
index 8f1e3e1..60f0a7b 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/ArchivaIndexManagerMock.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/ArchivaIndexManagerMock.java
@@ -513,7 +513,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
private StorageAsset getIndexPath( Repository repo) throws IOException {
IndexCreationFeature icf = repo.getFeature(IndexCreationFeature.class).get();
- Path repoDir = repo.getLocalPath();
+ Path repoDir = repo.getAsset("").getFilePath();
URI indexDir = icf.getIndexPath();
String indexPath = indexDir.getPath();
Path indexDirectory = null;
@@ -552,7 +552,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
// create remote repository path
- Path repoDir = remoteRepository.getLocalPath();
+ Path repoDir = remoteRepository.getAsset("").getFilePath();
if ( !Files.exists( repoDir ) )
{
Files.createDirectories( repoDir );
@@ -602,7 +602,7 @@ public class ArchivaIndexManagerMock implements ArchivaIndexManager {
IndexingContext context;
// take care first about repository location as can be relative
- Path repositoryDirectory = repository.getLocalPath();
+ Path repositoryDirectory = repository.getAsset("").getFilePath();
if ( !Files.exists( repositoryDirectory ) )
{