Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing redundant method for root dir

This commit is contained in:
Martin Stockhammer 2020-06-04 20:15:38 +02:00
parent de76d28cab
commit 6c519af1f0
5 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -160,11 +160,6 @@ public abstract class AbstractRepository implements EditableRepository, EventHan
return location;
}
@Override
public StorageAsset getLocalPath() {
return storage.getRoot( );
}
@Override
public StorageAsset getRoot( )
{

8
archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
View File

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

6
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
View File

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