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 c13d7e4 Adding item selector api to repository content
c13d7e4 is described below
commit c13d7e4346eff401d544479ab717686b35ea0c86
Author: Martin Stockhammer <[email protected]>
AuthorDate: Fri Feb 14 22:00:14 2020 +0100
Adding item selector api to repository content
---
.../archiva/repository/RepositoryContent.java | 15 +++++
.../archiva/repository/content/PathParser.java | 10 ++++
.../mock/ManagedRepositoryContentMock.java | 6 ++
.../mock/RemoteRepositoryContentMock.java | 6 ++
.../scanner/mock/ManagedRepositoryContentMock.java | 6 ++
.../mock/ManagedRepositoryContentMock.java | 6 ++
.../mock/RemoteRepositoryContentMock.java | 6 ++
.../maven2/AbstractDefaultRepositoryContent.java | 8 ++-
.../content/maven2/DefaultPathParser.java | 34 +++++++++++
.../AbstractDefaultRepositoryContentTestCase.java | 70 ++++++++++++++++++++++
.../ManagedDefaultRepositoryContentTest.java | 6 ++
.../maven2/RemoteDefaultRepositoryContentTest.java | 6 ++
12 files changed, 178 insertions(+), 1 deletion(-)
diff --git
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContent.java
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContent.java
index 0afe493..f72645d 100644
---
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContent.java
+++
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContent.java
@@ -57,4 +57,19 @@ public interface RepositoryContent
* @return the path to the content item
*/
String toPath( ItemSelector selector );
+
+ /**
+ * Return a item selector that matches the given path. This is kind of
reverse method for the {@link #toPath(ItemSelector)}
+ * method and fills the selector with the known information. It may not
make sense for every path, and the following
+ * must <b>not be true</b>:
+ * <pre>
+ * selector.equals(r.toItemSelector(r.toPath(selector)))
+ * </pre>
+ *
+ * The methods on the ManagedRepository give more reliable results.
+ *
+ * @param path the repository path
+ * @return a item selector that would select the given path
+ */
+ ItemSelector toItemSelector(String path) throws LayoutException;
}
diff --git
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/PathParser.java
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/PathParser.java
index ddbcb6d..3133c07 100644
---
a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/PathParser.java
+++
b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/PathParser.java
@@ -40,4 +40,14 @@ public interface PathParser
ArtifactReference toArtifactReference( String path )
throws LayoutException;
+
+ /**
+ * Return a item selector for the given path.
+ * @param path the path relative to the repository
+ * @return a item selector instance
+ * @throws LayoutException if the path does not reference a valid item
+ */
+ ItemSelector toItemSelector(String path) throws LayoutException;
+
+
}
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 0ba3658..c252a8a 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
@@ -224,6 +224,12 @@ public class ManagedRepositoryContentMock implements
ManagedRepositoryContent
}
@Override
+ public ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return null;
+ }
+
+ @Override
public String toPath( ArchivaArtifact reference )
{
return null;
diff --git
a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
index 1760012..bdf951f 100644
---
a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
+++
b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
@@ -78,6 +78,12 @@ public class RemoteRepositoryContentMock implements
RemoteRepositoryContent
}
@Override
+ public ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return null;
+ }
+
+ @Override
public RepositoryURL toURL( ArtifactReference reference )
{
return null;
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 7f2dec2..69fa8d9 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
@@ -454,6 +454,12 @@ public class ManagedRepositoryContentMock implements
ManagedRepositoryContent
}
@Override
+ public ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return null;
+ }
+
+ @Override
public String toPath( ArchivaArtifact reference )
{
return null;
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 881e90f..53950cc 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
@@ -458,6 +458,12 @@ public class ManagedRepositoryContentMock implements
ManagedRepositoryContent
}
@Override
+ public ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return null;
+ }
+
+ @Override
public String toPath( ArchivaArtifact reference )
{
return null;
diff --git
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
index 78fff18..057d09a 100644
---
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
+++
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java
@@ -100,6 +100,12 @@ public class RemoteRepositoryContentMock implements
RemoteRepositoryContent
}
@Override
+ public ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return null;
+ }
+
+ @Override
public RepositoryURL toURL( ArtifactReference reference )
{
return null;
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
index 1713ec7..5c7da20 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
@@ -81,7 +81,13 @@ public abstract class AbstractDefaultRepositoryContent
implements RepositoryCont
return defaultPathParser.toArtifactReference( path );
}
- public String toPath (ProjectReference reference) {
+ @Override
+ public ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return defaultPathParser.toItemSelector( path );
+ }
+
+ public String toPath ( ProjectReference reference) {
final StringBuilder path = new StringBuilder();
path.append( formatAsDirectory( reference.getGroupId() ) ).append(
PATH_SEPARATOR );
path.append( reference.getArtifactId( ) );
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
index 64a430c..98cc529 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
@@ -20,6 +20,7 @@ package org.apache.archiva.repository.content.maven2;
*/
import org.apache.archiva.metadata.model.ArtifactMetadata;
+import org.apache.archiva.metadata.model.FacetedMetadata;
import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import
org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider;
@@ -27,7 +28,9 @@ import
org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMapp
import
org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator;
import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.repository.LayoutException;
+import org.apache.archiva.repository.content.ItemSelector;
import org.apache.archiva.repository.content.PathParser;
+import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -88,4 +91,35 @@ public class DefaultPathParser
return artifact;
}
+ @Override
+ public ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ if ( StringUtils.isBlank( path ) )
+ {
+ throw new LayoutException( "Unable to convert blank path." );
+ }
+
+ try
+ {
+ ArtifactMetadata metadata = pathTranslator.getArtifactForPath(
null, path );
+ ArchivaItemSelector.Builder builder = ArchivaItemSelector.builder(
).withNamespace( metadata.getNamespace( ) )
+ .withProjectId( metadata.getProject( ) )
+ .withVersion( metadata.getProjectVersion( ) )
+ .withArtifactId( metadata.getProject( ) )
+ .withArtifactVersion( metadata.getVersion( ) );
+ MavenArtifactFacet facet = (MavenArtifactFacet) metadata.getFacet(
MavenArtifactFacet.FACET_ID );
+ if ( facet != null )
+ {
+ builder.withClassifier( facet.getClassifier() );
+ builder.withType( facet.getType() );
+ }
+ return builder.build( );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new LayoutException( e.getMessage(), e );
+ }
+
+ }
+
}
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
index d697815..3c84331 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
@@ -23,6 +23,7 @@ import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
import org.apache.archiva.repository.LayoutException;
import org.apache.archiva.repository.content.ItemSelector;
+import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
@@ -98,6 +99,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase
String path =
"ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type);
}
/**
@@ -119,6 +121,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path = "javax/comm/3.0-u1/comm-3.0-u1.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
/**
@@ -168,6 +171,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
*/
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
@Test
@@ -182,6 +186,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path = "com/foo/foo-tool/1.0/foo-tool-1.0.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
@Test
@@ -196,6 +201,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path = "commons-lang/commons-lang/2.1/commons-lang-2.1.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
/**
@@ -213,6 +219,8 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path =
"test/maven-arch/test-arch/2.0.3-SNAPSHOT/test-arch-2.0.3-SNAPSHOT.pom";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
+
}
/**
@@ -230,6 +238,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path =
"com/company/department/com.company.department/0.2/com.company.department-0.2.pom";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
/**
@@ -248,6 +257,8 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
"com/company/department/com.company.department.project/0.3/com.company.department.project-0.3.pom";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
+
}
/**
@@ -268,6 +279,8 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path =
"com/foo/lib/foo-lib/2.1-alpha-1/foo-lib-2.1-alpha-1-sources.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
+
}
/**
@@ -289,6 +302,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
"org/apache/archiva/test/redonkulous/3.1-beta-1-SNAPSHOT/redonkulous-3.1-beta-1-20050831.101112-42.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
/**
@@ -307,6 +321,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path =
"maven/maven-test-plugin/1.8.2/maven-test-plugin-1.8.2.pom";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
/**
@@ -325,6 +340,8 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path =
"maven/maven-test-plugin/1.8.2/maven-test-plugin-1.8.2.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
+
}
/**
@@ -342,6 +359,7 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
String path =
"org/codehaus/mojo/cobertura-maven-plugin/2.1/cobertura-maven-plugin-2.1.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
+ assertLayoutCi( path, groupId, artifactId, version, classifier, type );
}
@Test
@@ -449,6 +467,24 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
assertEquals( expectedId + " - Type", type, actualReference.getType()
);
}
+ private void assertItemSelector( ItemSelector actualReference, String
groupId, String artifactId,
+ String version, String classifier,
String type )
+ {
+ String expectedId =
+ "ArtifactReference - " + groupId + ":" + artifactId + ":" +
version + ":" + classifier + ":" + type;
+
+ assertNotNull( expectedId + " - Should not be null.", actualReference
);
+
+ assertEquals( expectedId + " - Group ID", groupId,
actualReference.getNamespace() );
+ assertEquals( expectedId + " - Artifact ID", artifactId,
actualReference.getArtifactId() );
+ if ( StringUtils.isNotBlank( classifier ) )
+ {
+ assertEquals( expectedId + " - Classifier", classifier,
actualReference.getClassifier() );
+ }
+ assertEquals( expectedId + " - Version ID", version,
actualReference.getArtifactVersion() );
+ assertEquals( expectedId + " - Type", type, actualReference.getType()
);
+ }
+
private void assertBadPath( String path, String reason )
{
try
@@ -487,6 +523,27 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
assertEquals( "Artifact <" + expectedArtifact + "> to path:", path,
toPath( testReference ) );
}
+ private void assertLayoutCi( String path, String groupId, String
artifactId, String version, String classifier,
+ String type )
+ throws LayoutException
+ {
+ ItemSelector expectedArtifact = createItemSelector( groupId,
artifactId, version, classifier, type );
+
+ // --- Artifact Tests.
+
+ // Artifact to Path
+ assertEquals( "Artifact <" + expectedArtifact + "> to path:", path,
toPath( expectedArtifact ) );
+
+ // --- Artifact Reference Tests
+
+ // Path to Artifact Reference.
+ ItemSelector testReference = toItemSelector( path );
+ assertItemSelector( testReference, groupId, artifactId, version,
classifier, type );
+
+ // And back again, using test Reference from previous step.
+ assertEquals( "Artifact <" + expectedArtifact + "> to path:", path,
toPath( testReference ) );
+ }
+
protected ArtifactReference createArtifact( String groupId, String
artifactId, String version, String classifier,
String type )
{
@@ -500,6 +557,17 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
return artifact;
}
+ protected ItemSelector createItemSelector(String groupId, String
artifactId, String version, String classifier,
+ String type) {
+ return ArchivaItemSelector.builder( ).withNamespace( groupId )
+ .withArtifactId( artifactId )
+ .withVersion( version )
+ .withClassifier( classifier )
+ .withType( type )
+ .build( );
+
+ }
+
protected abstract ArtifactReference toArtifactReference( String path )
throws LayoutException;
@@ -507,4 +575,6 @@ public abstract class
AbstractDefaultRepositoryContentTestCase
protected abstract String toPath( ItemSelector selector );
+
+ protected abstract ItemSelector toItemSelector(String path) throws
LayoutException;
}
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
index baa518e..d75ec2a 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
@@ -255,6 +255,12 @@ public class ManagedDefaultRepositoryContentTest
}
@Override
+ protected ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return repoContent.toItemSelector( path );
+ }
+
+ @Override
protected String toPath( ArtifactReference reference )
{
return repoContent.toPath( reference );
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
index 33f8456..40d6c55 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
@@ -62,6 +62,12 @@ public class RemoteDefaultRepositoryContentTest
}
@Override
+ protected ItemSelector toItemSelector( String path ) throws LayoutException
+ {
+ return repoContent.toItemSelector( path );
+ }
+
+ @Override
protected String toPath( ArtifactReference reference )
{
return repoContent.toPath( reference );
