Get rid usage of deprecated ArtifactFactory

mojohaus · Sep 17, 2023 · cb98f62 · cb98f62
1 parent 7dc5432
commit cb98f62
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git a/mrm-api/src/main/java/org/codehaus/mojo/mrm/plugin/FactoryHelper.java b/mrm-api/src/main/java/org/codehaus/mojo/mrm/plugin/FactoryHelper.java
@@ -17,7 +17,6 @@
 package org.codehaus.mojo.mrm.plugin;
 
 import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import org.eclipse.aether.RepositorySystem;
 
@@ -38,12 +37,6 @@ public interface FactoryHelper {
      */
     RepositoryMetadataManager getRepositoryMetadataManager();
 
-    /**
-     * @return returns the {@link ArtifactFactory} instance
-     * @since 1.0
-     */
-    ArtifactFactory getArtifactFactory();
-
     /**
      * @return returns the {@link ArchetypeManager} instance
      * @since 1.0

diff --git a/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStore.java b/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStore.java
@@ -27,7 +27,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archetype.ArchetypeManager;
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.*;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -86,8 +85,6 @@ public class ProxyArtifactStore extends BaseArtifactStore {
 
     private final RepositoryMetadataManager repositoryMetadataManager;
 
-    private final ArtifactFactory artifactFactory;
-
     private final ArchetypeManager archetypeManager;
 
     /**
@@ -100,7 +97,6 @@ public class ProxyArtifactStore extends BaseArtifactStore {
     public ProxyArtifactStore(FactoryHelper factoryHelper, MavenSession session, Log log) {
         this.repositorySystem = Objects.requireNonNull(factoryHelper.getRepositorySystem());
         this.repositoryMetadataManager = Objects.requireNonNull(factoryHelper.getRepositoryMetadataManager());
-        this.artifactFactory = Objects.requireNonNull(factoryHelper.getArtifactFactory());
         this.archetypeManager = Objects.requireNonNull(factoryHelper.getArchetypeManager());
         this.log = log;
         this.session = Objects.requireNonNull(session);
@@ -255,8 +251,7 @@ public Metadata getMetadata(String path) throws MetadataNotFoundException {
         String artifactId = slashIndex == -1 ? null : path.substring(slashIndex + 1);
         String groupId = slashIndex == -1 ? null : path.substring(0, slashIndex).replace('/', '.');
         if (!StringUtils.isEmpty(artifactId) && !StringUtils.isEmpty(groupId)) {
-            org.apache.maven.artifact.Artifact artifact =
-                    artifactFactory.createDependencyArtifact(groupId, artifactId, ANY_VERSION, "pom", null, "compile");
+            org.apache.maven.artifact.Artifact artifact = createDependencyArtifact(groupId, artifactId);
             ArtifactRepositoryMetadata artifactRepositoryMetadata = new ArtifactRepositoryMetadata(artifact);
             try {
                 repositoryMetadataManager.resolve(
@@ -286,6 +281,12 @@ public Metadata getMetadata(String path) throws MetadataNotFoundException {
         return metadata;
     }
 
+    private org.apache.maven.artifact.Artifact createDependencyArtifact(String groupId, String artifactId) {
+
+        return new org.apache.maven.artifact.DefaultArtifact(
+                groupId, artifactId, ANY_VERSION, "compile", "pom", "", null);
+    }
+
     @Override
     public long getMetadataLastModified(String path) throws MetadataNotFoundException {
         Metadata metadata = getMetadata(path);

diff --git a/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/plugin/DefaultFactoryHelper.java b/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/plugin/DefaultFactoryHelper.java
@@ -5,7 +5,6 @@
 import javax.inject.Singleton;
 
 import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import org.eclipse.aether.RepositorySystem;
 
@@ -21,19 +20,15 @@ public class DefaultFactoryHelper implements FactoryHelper {
 
     private RepositoryMetadataManager repositoryMetadataManager;
 
-    private ArtifactFactory artifactFactory;
-
     private ArchetypeManager archetypeManager;
 
     @Inject
     public DefaultFactoryHelper(
             RepositorySystem repositorySystem,
             RepositoryMetadataManager repositoryMetadataManager,
-            ArtifactFactory artifactFactory,
             ArchetypeManager archetypeManager) {
         this.repositorySystem = repositorySystem;
         this.repositoryMetadataManager = repositoryMetadataManager;
-        this.artifactFactory = artifactFactory;
         this.archetypeManager = archetypeManager;
     }
 
@@ -47,11 +42,6 @@ public RepositoryMetadataManager getRepositoryMetadataManager() {
         return repositoryMetadataManager;
     }
 
-    @Override
-    public ArtifactFactory getArtifactFactory() {
-        return artifactFactory;
-    }
-
     @Override
     public ArchetypeManager getArchetypeManager() {
         return archetypeManager;

diff --git a/mrm-maven-plugin/src/test/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStoreTest.java b/mrm-maven-plugin/src/test/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStoreTest.java
@@ -22,7 +22,6 @@
 import java.util.Collections;
 
 import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
@@ -65,7 +64,6 @@ void verifyArtifactNotFoundExceptionOnGet() throws Exception {
         FactoryHelper factoryHelper = mock(FactoryHelper.class);
         when(factoryHelper.getRepositorySystem()).thenReturn(repositorySystem);
         when(factoryHelper.getRepositoryMetadataManager()).then(i -> mock(RepositoryMetadataManager.class));
-        when(factoryHelper.getArtifactFactory()).then(i -> mock(ArtifactFactory.class));
         when(factoryHelper.getArchetypeManager()).then(i -> mock(ArchetypeManager.class));
 
         ProxyArtifactStore store = new ProxyArtifactStore(factoryHelper, mavenSession, null);
@@ -82,7 +80,6 @@ void verifyArtifactResolutionExceptionOnGet() throws Exception {
         FactoryHelper factoryHelper = mock(FactoryHelper.class);
         when(factoryHelper.getRepositorySystem()).thenReturn(repositorySystem);
         when(factoryHelper.getRepositoryMetadataManager()).then(i -> mock(RepositoryMetadataManager.class));
-        when(factoryHelper.getArtifactFactory()).then(i -> mock(ArtifactFactory.class));
         when(factoryHelper.getArchetypeManager()).then(i -> mock(ArchetypeManager.class));
 
         ProxyArtifactStore store = new ProxyArtifactStore(factoryHelper, mavenSession, null);
@@ -99,7 +96,6 @@ void verifyArchetypeCatalogNotFoundException() throws Exception {
         FactoryHelper factoryHelper = mock(FactoryHelper.class);
         when(factoryHelper.getRepositorySystem()).then(i -> mock(RepositorySystem.class));
         when(factoryHelper.getRepositoryMetadataManager()).then(i -> mock(RepositoryMetadataManager.class));
-        when(factoryHelper.getArtifactFactory()).then(i -> mock(ArtifactFactory.class));
         when(factoryHelper.getArchetypeManager()).thenReturn(archetypeManager);
         ProxyArtifactStore store = new ProxyArtifactStore(factoryHelper, mavenSession, null);