[archiva] branch feature/storage_refactoring updated: Fixing paths in unit tests

[ma...@apache.org]

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


The following commit(s) were added to refs/heads/feature/storage_refactoring by this push:
     new ee2c1a7  Fixing paths in unit tests
ee2c1a7 is described below

commit ee2c1a7b2b623cf76c8a5deff5e8ddb836de2eaa
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Aug 3 21:00:48 2019 +0200

    Fixing paths in unit tests
---
 .../java/org/apache/archiva/repository/Repository.java   | 16 +++++-----------
 .../archiva/repository/AbstractRemoteRepository.java     |  5 +++--
 .../apache/archiva/repository/AbstractRepository.java    | 15 ++-------------
 3 files changed, 10 insertions(+), 26 deletions(-)

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 d6c38a0..cc43ab2 100644
--- 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
@@ -22,6 +22,7 @@ package org.apache.archiva.repository;
 import org.apache.archiva.indexer.ArchivaIndexingContext;
 import org.apache.archiva.repository.storage.RepositoryStorage;
 import org.apache.archiva.repository.features.RepositoryFeature;
+import org.apache.archiva.repository.storage.StorageAsset;
 
 import java.net.URI;
 import java.nio.file.Path;
@@ -89,19 +90,12 @@ public interface Repository extends RepositoryEventHandler, RepositoryStorage {
 
 
     /**
-     * Returns the local path that this repository uses, if it stores data locally. You should keep in
-     * mind, that repository implementations may not store any data in this directory. E.g. if the
-     * repository data is handled by a database. So the content of this directory is very implementation
-     * specific. Users of this directory must know about the repository file layout if they use this
-     * path.
+     * 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.
      *
-     * Repository implementations should always return a valid path, even if there is no locally stored data.
-     *
-     * Some extensions may use the path to store their own repository specific data, e.g. statistics, metadata,...
-     *
-     * @return the filesystem path to the repository.
      */
-    Path getLocalPath();
+    StorageAsset getLocalPath();
 
 
     /**
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRemoteRepository.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRemoteRepository.java
index ee324f2..5e58f54 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRemoteRepository.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRemoteRepository.java
@@ -21,6 +21,7 @@ package org.apache.archiva.repository;
 
 
 import org.apache.archiva.repository.storage.RepositoryStorage;
+import org.apache.archiva.repository.storage.StorageAsset;
 
 import java.net.URI;
 import java.nio.file.Path;
@@ -147,8 +148,8 @@ public abstract class AbstractRemoteRepository extends AbstractRepository implem
      * @return
      */
     @Override
-    public Path getLocalPath() {
-        return getStorage().getAsset("").getFilePath();
+    public StorageAsset getLocalPath() {
+        return getStorage().getAsset("");
     }
 
     @Override
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java
index cb1d9f7..f735ced 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java
@@ -147,19 +147,8 @@ public abstract class AbstractRepository implements EditableRepository, Reposito
     }
 
     @Override
-    public Path getLocalPath() {
-        return storage.getAsset("").getFilePath();
-//        Path localPath;
-//        if (StringUtils.isEmpty(getLocation().getScheme()) || "file".equals(getLocation().getScheme()) ) {
-//            localPath = PathUtil.getPathFromUri(getLocation());
-//            if (localPath.isAbsolute()) {
-//                return localPath;
-//            } else {
-//                return repositoryBase.resolve(localPath);
-//            }
-//        } else {
-//            return repositoryBase.resolve(getId());
-//        }
+    public StorageAsset getLocalPath() {
+        return storage.getAsset("");
     }
 
     @Override