From: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Date: Thu, 17 Mar 2016 10:06:19 +0000 (+0100)
Subject: SONAR-6732 remove DefaultHttpDownloader from CE container
X-Git-Tag: 5.5-M11~66
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9f93a28f1f03436ba2806dd95579bfdf29d20661;p=sonarqube.git

SONAR-6732 remove DefaultHttpDownloader from CE container
---

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
index 2ba3b853a77..3b05c1e7047 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
@@ -50,7 +50,6 @@ import org.sonar.core.platform.SonarQubeVersionProvider;
 import org.sonar.core.timemachine.Periods;
 import org.sonar.core.user.DefaultUserFinder;
 import org.sonar.core.user.DeprecatedUserFinder;
-import org.sonar.core.util.DefaultHttpDownloader;
 import org.sonar.core.util.UuidFactoryImpl;
 import org.sonar.db.DaoModule;
 import org.sonar.db.DatabaseChecker;
@@ -197,7 +196,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer {
   private static final Object[] LEVEL_3_COMPONENTS = new Object[] {
     PersistentSettings.class,
     ServerMetadataPersister.class,
-    DefaultHttpDownloader.class,
+//    DefaultHttpDownloader.class, does not make sense to use it from Compute Engine
     UriReader.class,
     ServerIdGenerator.class
   };
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
index 7310d34be0c..10bac84f6b8 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
@@ -80,7 +80,7 @@ public class ComputeEngineContainerImplTest {
       );
     assertThat(picoContainer.getParent().getComponentAdapters()).hasSize(
       CONTAINER_ITSELF
-      + 5 // level 3
+      + 4 // level 3
       );
     assertThat(picoContainer.getParent().getParent().getComponentAdapters()).hasSize(
       CONTAINER_ITSELF