SHRINKRES-172 Fixed offline() API in MavenImporter

shrinkwrap · Mar 14, 2014 · 4c60f30 · 4c60f30
1 parent 74e858e
commit 4c60f30
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/...ava/org/jboss/shrinkwrap/resolver/api/maven/archive/importer/ConfiguredMavenImporter.java b/...ava/org/jboss/shrinkwrap/resolver/api/maven/archive/importer/ConfiguredMavenImporter.java
@@ -24,19 +24,4 @@
  */
 public interface ConfiguredMavenImporter extends PomlessMavenImporter {
 
-    /**
-     * Sets whether resolution should be done in "offline" (ie. not connected to Internet) mode.
-     *
-     * @param offline
-     * @return
-     */
-    PomlessMavenImporter offline(boolean offline);
-
-    /**
-     * Sets that resolution should be done in "offline" (ie. not connected to Internet) mode. Alias to
-     * {@link ConfiguredMavenImporter#offline(boolean)}, passing <code>true</code> as a parameter.
-     *
-     * @return
-     */
-    PomlessMavenImporter offline();
 }
diff --git a/...n/java/org/jboss/shrinkwrap/resolver/api/maven/archive/importer/PomlessMavenImporter.java b/...n/java/org/jboss/shrinkwrap/resolver/api/maven/archive/importer/PomlessMavenImporter.java
@@ -117,4 +117,21 @@ PomEquippedMavenImporter loadPomFromClassLoaderResource(String pathToPomResource
      */
     PomEquippedMavenImporter loadPomFromClassLoaderResource(String pathToPomResource, ClassLoader cl, String... profiles)
             throws IllegalArgumentException, InvalidConfigurationFileException;
+
+    /**
+     * <i>Optional operation</i>. Sets whether resolution should be done in "offline" (ie. not connected to Internet) mode.
+     * By default, resolution is done in online mode
+     *
+     * @param offline
+     * @return
+     */
+    PomlessMavenImporter offline(boolean offline);
+
+    /**
+     * <i>Optional operation</i>. Sets that resolution should be done in "offline" (ie. not connected to Internet) mode. Alias to
+     * {@link ConfiguredMavenImporter#offline(boolean)}, passing <code>true</code> as a parameter.
+     *
+     * @return
+     */
+    PomlessMavenImporter offline();
 }
diff --git a/...test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/usecases/UseCasesTestCase.java b/...test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/usecases/UseCasesTestCase.java
@@ -21,13 +21,15 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.resolver.api.Resolvers;
 import org.jboss.shrinkwrap.resolver.api.maven.ConfigurableMavenResolverSystem;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem;
 import org.jboss.shrinkwrap.resolver.api.maven.ScopeType;
+import org.jboss.shrinkwrap.resolver.api.maven.archive.importer.MavenImporter;
 import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinate;
 import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependencies;
 import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependency;
@@ -388,6 +390,8 @@ public void dependencyInfo() {
     @Test
     public void offline() {
         Maven.resolver().offline().resolve("groupId:artifactId:version").withoutTransitivity().asSingle(File.class);
+
+        ShrinkWrap.create(MavenImporter.class).offline().loadPomFromClassLoaderResource("/path/to/pom").importBuildOutput();
     }
 
     /**