Browse Source

Fixing paths in unit tests

pull/51/head
Martin Stockhammer 4 years ago
parent
commit
ee2c1a7b2b

+ 5
- 11
archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java View File

@@ -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();


/**

+ 3
- 2
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRemoteRepository.java View File

@@ -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

+ 2
- 13
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java View File

@@ -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

Loading…
Cancel
Save