Maven API refactoring

forge · Nov 9, 2012 · aebf710 · aebf710
1 parent 2cde1cd
commit aebf710
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 35 deletions.
diff --git a/maven/src/main/java/org/jboss/forge/maven/container/MavenConvertUtils.java b/maven/src/main/java/org/jboss/forge/maven/container/MavenConvertUtils.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2012 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.jboss.forge.maven.container;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Settings;
+import org.jboss.forge.maven.dependency.Dependency;
+import org.jboss.forge.maven.dependency.DependencyRepository;
+import org.sonatype.aether.artifact.Artifact;
+import org.sonatype.aether.repository.Authentication;
+import org.sonatype.aether.repository.RemoteRepository;
+import org.sonatype.aether.util.artifact.DefaultArtifact;
+
+public class MavenConvertUtils
+{
+   static RemoteRepository convertToMavenRepo(final DependencyRepository repo, final Settings settings)
+   {
+      RemoteRepository remoteRepository = new RemoteRepository(repo.getId(), "default", repo.getUrl());
+      Proxy activeProxy = settings.getActiveProxy();
+      if (activeProxy != null)
+      {
+         Authentication auth = new Authentication(activeProxy.getUsername(), activeProxy.getPassword());
+         remoteRepository.setProxy(new org.sonatype.aether.repository.Proxy(activeProxy.getProtocol(), activeProxy
+                  .getHost(), activeProxy.getPort(), auth));
+      }
+      return remoteRepository;
+   }
+
+   static List<RemoteRepository> convertToMavenRepos(final List<DependencyRepository> repositories,
+            final Settings settings)
+   {
+      List<RemoteRepository> remoteRepos = new ArrayList<RemoteRepository>();
+      for (DependencyRepository deprep : repositories)
+      {
+         remoteRepos.add(convertToMavenRepo(deprep, settings));
+      }
+      return remoteRepos;
+   }
+
+   static Artifact dependencyToMavenArtifact(final Dependency dep)
+   {
+      Artifact artifact = new DefaultArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getClassifier(),
+               dep.getPackagingType() == null ? "jar" : dep.getPackagingType(), dep.getVersion());
+      return artifact;
+   }
+}
diff --git a/maven/src/main/java/org/jboss/forge/maven/container/MavenDependencyResolver.java b/maven/src/main/java/org/jboss/forge/maven/container/MavenDependencyResolver.java
@@ -7,6 +7,9 @@
 
 package org.jboss.forge.maven.container;
 
+import static org.jboss.forge.maven.container.MavenConvertUtils.convertToMavenRepos;
+import static org.jboss.forge.maven.container.MavenConvertUtils.dependencyToMavenArtifact;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -17,27 +20,23 @@
 import javax.inject.Singleton;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Settings;
 import org.jboss.forge.maven.dependency.Dependency;
 import org.jboss.forge.maven.dependency.DependencyBuilder;
 import org.jboss.forge.maven.dependency.DependencyFilter;
 import org.jboss.forge.maven.dependency.DependencyQuery;
-import org.jboss.forge.maven.dependency.DependencyRepository;
 import org.jboss.forge.maven.dependency.DependencyResolver;
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.collection.CollectRequest;
 import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.Authentication;
 import org.sonatype.aether.repository.LocalRepository;
 import org.sonatype.aether.repository.RemoteRepository;
 import org.sonatype.aether.resolution.DependencyRequest;
 import org.sonatype.aether.resolution.DependencyResolutionException;
 import org.sonatype.aether.resolution.DependencyResult;
 import org.sonatype.aether.resolution.VersionRangeRequest;
 import org.sonatype.aether.resolution.VersionRangeResult;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
 import org.sonatype.aether.version.Version;
 
 @Singleton
@@ -175,35 +174,4 @@ private MavenRepositorySystemSession setupRepoSession(final RepositorySystem rep
 
       return session;
    }
-
-   private RemoteRepository convertToMavenRepo(final DependencyRepository repo, final Settings settings)
-   {
-      RemoteRepository remoteRepository = new RemoteRepository(repo.getId(), "default", repo.getUrl());
-      Proxy activeProxy = settings.getActiveProxy();
-      if (activeProxy != null)
-      {
-         Authentication auth = new Authentication(activeProxy.getUsername(), activeProxy.getPassword());
-         remoteRepository.setProxy(new org.sonatype.aether.repository.Proxy(activeProxy.getProtocol(), activeProxy
-                  .getHost(), activeProxy.getPort(), auth));
-      }
-      return remoteRepository;
-   }
-
-   private List<RemoteRepository> convertToMavenRepos(final List<DependencyRepository> repositories,
-            final Settings settings)
-   {
-      List<RemoteRepository> remoteRepos = new ArrayList<RemoteRepository>();
-      for (DependencyRepository deprep : repositories)
-      {
-         remoteRepos.add(convertToMavenRepo(deprep, settings));
-      }
-      return remoteRepos;
-   }
-
-   private Artifact dependencyToMavenArtifact(final Dependency dep)
-   {
-      Artifact artifact = new DefaultArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getClassifier(),
-               dep.getPackagingType() == null ? "jar" : dep.getPackagingType(), dep.getVersion());
-      return artifact;
-   }
 }