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
commit e015e1cd149264deb3a584010daa854357f19929 Author: Martin Stockhammer <[email protected]> AuthorDate: Sat Mar 7 17:13:03 2020 +0100 Renaming method names --- .../repository/ManagedRepositoryContent.java | 25 +++++++++++++++++++--- .../mock/ManagedRepositoryContentMock.java | 6 +++--- .../scanner/mock/ManagedRepositoryContentMock.java | 6 +++--- .../mock/ManagedRepositoryContentMock.java | 6 +++--- .../content/ManagedDefaultRepositoryContent.java | 24 ++++++++++++++++++--- 5 files changed, 52 insertions(+), 15 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java index 6811bb2..a4565c4 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java @@ -204,9 +204,10 @@ public interface ManagedRepositoryContent extends RepositoryContent * given namespace. * * @param namespace the namespace, which is the parent namespace + * @param recurse <code>true</code>, if all sub namespaces should be searched too, otherwise <code>false</code> * @return a list of artifacts or a empty list, if no artifacts are available for the specified namespace */ - List<? extends Artifact> getArtifactsStartingWith( Namespace namespace ) throws ContentAccessException; + List<? extends Artifact> getArtifacts( Namespace namespace, boolean recurse ) throws ContentAccessException; /** @@ -231,10 +232,11 @@ public interface ManagedRepositoryContent extends RepositoryContent * make sure, that the stream is closed after using it. * * @param namespace the namespace from where the artifacts should be returned + * @param recurse <code>true</code>, if all sub namespaces should be searched too, otherwise <code>false</code> * @return a stream of artifacts. The stream is auto closable. You should always make sure, that the stream * is closed after use. */ - Stream<? extends Artifact> getArtifactStreamStartingWith( Namespace namespace ) throws ContentAccessException; + Stream<? extends Artifact> getArtifactStream( Namespace namespace, boolean recurse ) throws ContentAccessException; /** @@ -252,10 +254,27 @@ public interface ManagedRepositoryContent extends RepositoryContent * @param destination the coordinates of the destination * @throws IllegalArgumentException if the destination is not valid */ - void copyArtifact( Path sourceFile, ItemSelector destination ) throws IllegalArgumentException; + void copyArtifact( Path sourceFile, ContentItem destination ) throws IllegalArgumentException; + /** + * Returns the item that matches the given path. The item at the path must not exist. + * + * @param path the path string that points to the item + * @return the content item if the path is a valid item path + * @throws LayoutException if the path is not valid for the repository layout + */ + ContentItem toItem(String path) throws LayoutException; + + /** + * Returns the item that matches the given asset path. The asset must not exist. + * + * @param assetPath the path to the artifact or directory + * @return the item, if it is a valid path for the repository layout + * @throws LayoutException if the path is not valid for the repository + */ + ContentItem toItem(StorageAsset assetPath) throws LayoutException; /// ***************** End of new generation interface ********************** 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 b5adf5c..cc7aac6 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 @@ -151,7 +151,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public List<? extends Artifact> getArtifactsStartingWith( Namespace namespace ) throws ContentAccessException + public List<? extends Artifact> getArtifacts( Namespace namespace, boolean recurse ) throws ContentAccessException { return null; } @@ -163,7 +163,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public Stream<? extends Artifact> getArtifactStreamStartingWith( Namespace namespace ) throws ContentAccessException + public Stream<? extends Artifact> getArtifactStream( Namespace namespace, boolean recurse ) throws ContentAccessException { return null; } @@ -175,7 +175,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public void copyArtifact( Path sourceFile, ItemSelector destination ) throws IllegalArgumentException + public void copyArtifact( Path sourceFile, ContentItem destination ) throws IllegalArgumentException { } 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 5d2520f..09794b7 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 @@ -152,7 +152,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public List<? extends Artifact> getArtifactsStartingWith( Namespace namespace ) throws ContentAccessException + public List<? extends Artifact> getArtifacts( Namespace namespace, boolean recurse ) throws ContentAccessException { return null; } @@ -164,7 +164,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public Stream<? extends Artifact> getArtifactStreamStartingWith( Namespace namespace ) throws ContentAccessException + public Stream<? extends Artifact> getArtifactStream( Namespace namespace, boolean recurse ) throws ContentAccessException { return null; } @@ -176,7 +176,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public void copyArtifact( Path sourceFile, ItemSelector destination ) throws IllegalArgumentException + public void copyArtifact( Path sourceFile, ContentItem destination ) throws IllegalArgumentException { } 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 5314c18..fd655b8 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 @@ -156,7 +156,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public List<? extends Artifact> getArtifactsStartingWith( Namespace namespace ) throws ContentAccessException + public List<? extends Artifact> getArtifacts( Namespace namespace, boolean recurse ) throws ContentAccessException { return null; } @@ -168,7 +168,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public Stream<? extends Artifact> getArtifactStreamStartingWith( Namespace namespace ) throws ContentAccessException + public Stream<? extends Artifact> getArtifactStream( Namespace namespace, boolean recurse ) throws ContentAccessException { return null; } @@ -180,7 +180,7 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent } @Override - public void copyArtifact( Path sourceFile, ItemSelector destination ) throws IllegalArgumentException + public void copyArtifact( Path sourceFile, ContentItem destination ) throws IllegalArgumentException { } 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 e77ba3f..e82ce34 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 @@ -600,7 +600,7 @@ public class ManagedDefaultRepositoryContent TBD */ @Override - public List<? extends Artifact> getArtifactsStartingWith( Namespace namespace ) + public List<? extends Artifact> getArtifacts( Namespace namespace, boolean recurse ) { return null; } @@ -618,7 +618,7 @@ public class ManagedDefaultRepositoryContent TBD */ @Override - public Stream<? extends Artifact> getArtifactStreamStartingWith( Namespace namespace ) + public Stream<? extends Artifact> getArtifactStream( Namespace namespace, boolean recurse ) { return null; } @@ -636,11 +636,29 @@ public class ManagedDefaultRepositoryContent TBD */ @Override - public void copyArtifact( Path sourceFile, ItemSelector destination ) throws IllegalArgumentException + public void copyArtifact( Path sourceFile, ContentItem destination ) throws IllegalArgumentException { } + /** + * TBD + * @param path the path string that points to the item + * @return + * @throws LayoutException + */ + @Override + public ContentItem toItem( String path ) throws LayoutException + { + return getItemFromPath( getAssetByPath( path ) ); + } + + @Override + public ContentItem toItem( StorageAsset assetPath ) throws LayoutException + { + return getItemFromPath( assetPath ); + } + @Override public void deleteVersion( VersionedReference ref ) throws ContentNotFoundException, ContentAccessException {
