This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new cb0e5f8 Removing method from repository layout
cb0e5f8 is described below
commit cb0e5f8eeab97320617eeb026be5e47d0ab50af8
Author: Martin Stockhammer <[email protected]>
AuthorDate: Wed Jun 3 16:03:29 2020 +0200
Removing method from repository layout
---
.../archiva/repository/BaseRepositoryContentLayout.java | 13 -------------
.../archiva/repository/metadata/base/MetadataTools.java | 15 ++++++++-------
.../repository/mock/ManagedRepositoryContentMock.java | 6 ------
.../scanner/mock/ManagedRepositoryContentMock.java | 6 ------
.../repository/mock/ManagedRepositoryContentMock.java | 6 ------
.../maven/content/ManagedDefaultRepositoryContent.java | 6 ------
.../dependency/tree/Maven3DependencyTreeBuilder.java | 9 +--------
7 files changed, 9 insertions(+), 52 deletions(-)
diff --git
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java
index 3cb7b15..71562b1 100644
---
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java
+++
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/BaseRepositoryContentLayout.java
@@ -270,17 +270,4 @@ public interface BaseRepositoryContentLayout extends
ManagedRepositoryContentLay
/// ***************** End of new generation interface
**********************
- /**
- * <p>
- * Convenience method to get the repository (on disk) root directory.
- * </p>
- * <p>
- * Equivalent to calling <code>.getRepository().getLocation()</code>
- * </p>
- *
- * @return the repository (on disk) root directory.
- */
- String getRepoRoot();
-
-
}
diff --git
a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
index a31554b..a9eebef 100644
---
a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
+++
b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
@@ -937,23 +937,24 @@ public class MetadataTools
path = path.substring( 0, idx );
}
- Path repoDir = Paths.get( managedRepository.getRepoRoot(), path );
+ StorageAsset repoDir = managedRepository.getGenericContent(
).getRepository( ).getAsset( "" );
- if ( !Files.exists(repoDir))
+ if ( !repoDir.exists())
{
throw new IOException( "Unable to gather the list of snapshot
versions on a non-existant directory: "
- + repoDir.toAbsolutePath() );
+ + repoDir.toString() );
}
- if ( !Files.isDirectory( repoDir ))
+ if ( !repoDir.isContainer())
{
throw new IOException(
- "Unable to gather the list of snapshot versions on a
non-directory: " + repoDir.toAbsolutePath() );
+ "Unable to gather the list of snapshot versions on a
non-directory: " + repoDir.toString() );
}
- try(Stream<Path> stream = Files.list(repoDir)) {
+ Path repoRoot = repoDir.getFilePath( );
+ try(Stream<Path> stream = Files.list(repoRoot)) {
String result = stream.filter( Files::isRegularFile ).map( path1
->
- PathUtil.getRelative( managedRepository.getRepoRoot(), path1 )
+ repoRoot.relativize( path1 ).toString()
).filter( filetypes::matchesArtifactPattern ).findFirst().orElse(
null );
if (result!=null) {
return
managedRepository.getGenericContent().toArtifactReference( result );
diff --git
a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
index 60e8fd3..69af3d3 100644
---
a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
+++
b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
@@ -304,12 +304,6 @@ public class ManagedRepositoryContentMock implements
BaseRepositoryContentLayout
}
@Override
- public String getRepoRoot( )
- {
- return null;
- }
-
- @Override
public ManagedRepository getRepository( )
{
return repository;
diff --git
a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java
b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java
index ecc6430..06e9680 100644
---
a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java
+++
b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java
@@ -305,12 +305,6 @@ public class ManagedRepositoryContentMock implements
BaseRepositoryContentLayout
return repository.getId();
}
- @Override
- public String getRepoRoot( )
- {
- return getRepoRootAsset().getFilePath().toString();
- }
-
private StorageAsset getRepoRootAsset() {
if (fsStorage==null) {
try {
diff --git
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
index 63a0372..831b2c6 100644
---
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
+++
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
@@ -326,12 +326,6 @@ public class ManagedRepositoryContentMock implements
BaseRepositoryContentLayout
return repository.getId();
}
- @Override
- public String getRepoRoot( )
- {
- return getRepoRootAsset().getFilePath().toString();
- }
-
private StorageAsset getRepoRootAsset() {
if (fsStorage==null) {
try {
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java
index f63d83a..6349618 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java
@@ -1374,12 +1374,6 @@ public class ManagedDefaultRepositoryContent
}
- @Override
- public String getRepoRoot( )
- {
- return convertUriToPath( repository.getLocation( ) );
- }
-
private String convertUriToPath( URI uri )
{
if ( uri.getScheme( ) == null )
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java
index b7dbc09..d8d0a0c 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java
@@ -159,14 +159,7 @@ public class Maven3DependencyTreeBuilder
// FIXME take care of relative path
ResolveRequest resolveRequest = new ResolveRequest();
resolveRequest.dependencyVisitor = dependencyVisitor;
- try
- {
- resolveRequest.localRepoDir = repository.getContent().getLayout(
BaseRepositoryContentLayout.class ).getRepoRoot();
- }
- catch ( LayoutException e )
- {
- throw new DependencyTreeBuilderException( "Could not convert to
layout " + e.getMessage( ), e );
- }
+ resolveRequest.localRepoDir = repository.getAsset( ""
).getFilePath().toAbsolutePath().toString();
resolveRequest.groupId = groupId;
resolveRequest.artifactId = artifactId;
resolveRequest.version = version;
