Better Performance. Added option to avoid updating of snapshot addons

forge · Jul 11, 2013 · 9a2f4e2 · 9a2f4e2
1 parent 3f6b216
commit 9a2f4e2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/AddonManagerImpl.java b/addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/AddonManagerImpl.java
@@ -60,12 +60,27 @@ public class AddonManagerImpl implements AddonManager
 {
    private final Furnace furnace;
    private final AddonDependencyResolver resolver;
+   private final boolean updateSnapshotDependencies;
 
    @Inject
    public AddonManagerImpl(final Furnace forge, final AddonDependencyResolver resolver)
    {
       this.furnace = forge;
       this.resolver = resolver;
+      this.updateSnapshotDependencies = true;
+   }
+
+   /**
+    * Used by Arquillian
+    * 
+    * @param updateDependencies if forge should care about updating SNAPSHOT dependencies
+    */
+   public AddonManagerImpl(final Furnace forge, final AddonDependencyResolver resolver,
+            boolean updateSnapshotDependencies)
+   {
+      this.furnace = forge;
+      this.resolver = resolver;
+      this.updateSnapshotDependencies = updateSnapshotDependencies;
    }
 
    @Override
@@ -203,8 +218,7 @@ private AddonActionRequest createRequest(final AddonInfo addonInfo, final Mutabl
       if (installedAddons.contains(addon))
       {
          // Already contains the installed addon. Update ONLY if the version is SNAPSHOT
-         // TODO: Another asserts may be made at this point, like using timestamps
-         if (Versions.isSnapshot(addonInfo.getAddon().getVersion()))
+         if (Versions.isSnapshot(addonInfo.getAddon().getVersion()) && updateSnapshotDependencies)
          {
             request = createUpdateRequest(addonInfo, addonInfo, repository, furnace);
          }

diff --git a/arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java b/arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java
@@ -130,7 +130,7 @@ public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException
       else if (archive instanceof ForgeRemoteAddon)
       {
          ForgeRemoteAddon remoteAddon = (ForgeRemoteAddon) archive;
-         AddonManager addonManager = new AddonManagerImpl(runnable.furnace, new MavenDependencyResolver());
+         AddonManager addonManager = new AddonManagerImpl(runnable.furnace, new MavenDependencyResolver(), false);
 
          addonManager.install(remoteAddon.getAddonId()).perform();