Removing redundant method for root dir

diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java
index f497efcec0cac20447e5017cd1c424946dba602a..e8c26f9f266a0190ea14fb5561aa0590de97679c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java
+++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java
@@ -89,15 +89,6 @@ public interface Repository extends EventSource, RepositoryStorage {
     URI getLocation();
 
 
-    /**
-     * Returns a storage representation to the local data stored for this repository.
-     * The repository implementation may not store the real artifacts in this path. The directory structure
-     * is completely implementation dependant.
-     *
-     */
-    StorageAsset getLocalPath();
-
-
     /**
      * A repository may allow additional locations that can be used, if the primary location is not available.
      * @return

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRemoteRepository.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRemoteRepository.java
index b53997eb022bec7744070b6ae0d5c4ee819ddbba..51d7a98da97f206ab795ad169333853c4015e496 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRemoteRepository.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRemoteRepository.java
@@ -25,7 +25,6 @@ import org.apache.archiva.repository.RemoteRepositoryContent;
 import org.apache.archiva.repository.RepositoryCredentials;
 import org.apache.archiva.repository.RepositoryType;
 import org.apache.archiva.repository.storage.RepositoryStorage;
-import org.apache.archiva.repository.storage.StorageAsset;
 
 import java.net.URI;
 import java.time.Duration;
@@ -146,15 +145,6 @@ public abstract class AbstractRemoteRepository extends AbstractRepository implem
         return timeout;
     }
 
-    /**
-     * Remote repositories resolve always relative to the base directory.
-     * @return
-     */
-    @Override
-    public StorageAsset getLocalPath() {
-        return getStorage().getRoot();
-    }
-
     @Override
     public String toString() {
         StringBuilder str = new StringBuilder();

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepository.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepository.java
index 6fb6a2f90e90aaef1f3937ac2e70c64e23948e19..84304507189a9e73c3c577b8e4a15fc038c417bb 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepository.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepository.java
@@ -160,11 +160,6 @@ public abstract class AbstractRepository implements EditableRepository, EventHan
         return location;
     }
 
-    @Override
-    public StorageAsset getLocalPath() {
-        return storage.getRoot( );
-    }
-
     @Override
     public StorageAsset getRoot( )
     {

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 3f44b5f8a0cf85c71edc9a3e1c6f4217e953f94c..450ebd3ef9429895e745392e145b34ea5bfca47a 100644 (file)
--- 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().getFilePath();
+        Path basePath = repo.getRoot().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().getFilePath();
+        Path basePath = repo.getRoot().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().getFilePath();
+        Path basePath = repo.getRoot().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().getFilePath();
+        Path basePath = repo.getRoot().getFilePath();
         IndexCreationFeature icf = repo.getFeature( IndexCreationFeature.class ).get();
         StorageAsset packedIndexDirectory = icf.getLocalPackedIndexPath();
         StorageAsset indexerDirectory = icf.getLocalIndexPath();

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
index 5978409f6d6983a96864bbd0d688b0b6c8971802..093830bc59ce59c930c30abda3dbe48f8e7e5b1f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
@@ -284,7 +284,7 @@ public class ArchivaDavResourceFactory
             repositoryRequestInfo = repo.getRequestInfo();
             String logicalResource = getLogicalResource( archivaLocator, null, false );
             resourcesInAbsolutePath.add(
-                managedRepositoryContent.getRepository().getLocalPath().getFilePath().resolve(logicalResource ).toAbsolutePath().toString() );
+                managedRepositoryContent.getRepository().getRoot().getFilePath().resolve(logicalResource ).toAbsolutePath().toString() );
 
         }
 
@@ -469,7 +469,7 @@ public class ArchivaDavResourceFactory
                         logicalResource = logicalResource.substring( 1 );
                     }
                     resourcesInAbsolutePath.add(
-                        managedRepositoryContent.getRepository().getLocalPath().resolve( logicalResource ).getFilePath().toAbsolutePath().toString() );
+                        managedRepositoryContent.getRepository().getRoot().resolve( logicalResource ).getFilePath().toAbsolutePath().toString() );
                 }
                 catch ( DavException e )
                 {
@@ -686,7 +686,7 @@ public class ArchivaDavResourceFactory
                  * create the collections themselves.
                  */
 
-                StorageAsset rootDirectory = managedRepositoryContent.getRepository( ).getLocalPath();
+                StorageAsset rootDirectory = managedRepositoryContent.getRepository( ).getRoot();
                 StorageAsset destDir = rootDirectory.resolve( logicalResource.getPath() ).getParent();
 
                 if ( !destDir.exists() )