SONAR-10591 do not instantiate class PluginWSCommons

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 2ca98540648ffeb5a0161a187cb9dd4e15aefee5..5e090f7be8511998eebdd900dae26ff9a31ed029 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -148,7 +148,6 @@ import org.sonar.server.plugins.ws.InstallAction;
 import org.sonar.server.plugins.ws.InstalledAction;
 import org.sonar.server.plugins.ws.PendingAction;
 import org.sonar.server.plugins.ws.PluginUpdateAggregator;
-import org.sonar.server.plugins.ws.PluginWSCommons;
 import org.sonar.server.plugins.ws.PluginsWs;
 import org.sonar.server.plugins.ws.UninstallAction;
 import org.sonar.server.plugins.ws.UpdatesAction;
@@ -526,7 +525,6 @@ public class PlatformLevel4 extends PlatformLevel {
       SystemWs.class,
 
       // Plugins WS
-      PluginWSCommons.class,
       PluginUpdateAggregator.class,
       InstalledAction.class,
       AvailableAction.class,
@@ -582,7 +580,7 @@ public class PlatformLevel4 extends PlatformLevel {
 
     // edition
     addIfStartupLeader(FinalizeEditionChange.class);
-    
+
     // system info
     addIfCluster(WebSystemInfoModule.forClusterMode()).otherwiseAdd(WebSystemInfoModule.forStandaloneMode());
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java
index ee6f33dc08a18ef513e7e960b669891f1e7188f4..c9c0aef5a15fef1b58cc341662817741abaeeb26 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java
@@ -55,11 +55,9 @@ public class UpgradesAction implements SystemWsAction {
   private static final String ARRAY_INCOMPATIBLE = "incompatible";
 
   private final UpdateCenterMatrixFactory updateCenterFactory;
-  private final PluginWSCommons pluginWSCommons;
 
-  public UpgradesAction(UpdateCenterMatrixFactory updateCenterFactory, PluginWSCommons pluginWSCommons) {
+  public UpgradesAction(UpdateCenterMatrixFactory updateCenterFactory) {
     this.updateCenterFactory = updateCenterFactory;
-    this.pluginWSCommons = pluginWSCommons;
   }
 
   private static void writeMetadata(JsonWriter jsonWriter, Release release) {
@@ -87,10 +85,7 @@ public class UpgradesAction implements SystemWsAction {
   public void handle(Request request, Response response) throws Exception {
     try (JsonWriter jsonWriter = response.newJsonWriter()) {
       jsonWriter.setSerializeEmptys(false);
-
       writeResponse(jsonWriter);
-
-      jsonWriter.close();
     }
   }
 
@@ -106,7 +101,7 @@ public class UpgradesAction implements SystemWsAction {
     jsonWriter.endObject();
   }
 
-  private void writeUpgrades(JsonWriter jsonWriter, Optional<UpdateCenter> updateCenter) {
+  private static void writeUpgrades(JsonWriter jsonWriter, Optional<UpdateCenter> updateCenter) {
     jsonWriter.name(ARRAY_UPGRADES).beginArray();
 
     if (updateCenter.isPresent()) {
@@ -118,7 +113,7 @@ public class UpgradesAction implements SystemWsAction {
     jsonWriter.endArray();
   }
 
-  private void writeUpgrade(JsonWriter jsonWriter, SonarUpdate sonarUpdate) {
+  private static void writeUpgrade(JsonWriter jsonWriter, SonarUpdate sonarUpdate) {
     jsonWriter.beginObject();
 
     writeMetadata(jsonWriter, sonarUpdate.getRelease());
@@ -128,7 +123,7 @@ public class UpgradesAction implements SystemWsAction {
     jsonWriter.endObject();
   }
 
-  private void writePlugins(JsonWriter jsonWriter, SonarUpdate sonarUpdate) {
+  private static void writePlugins(JsonWriter jsonWriter, SonarUpdate sonarUpdate) {
     jsonWriter.name(OBJECT_PLUGINS).beginObject();
 
     writePluginsToUpdate(jsonWriter, sonarUpdate.getPluginsToUpgrade());
@@ -138,12 +133,12 @@ public class UpgradesAction implements SystemWsAction {
     jsonWriter.endObject();
   }
 
-  private void writePluginsToUpdate(JsonWriter jsonWriter, List<Release> pluginsToUpgrade) {
+  private static void writePluginsToUpdate(JsonWriter jsonWriter, List<Release> pluginsToUpgrade) {
     jsonWriter.name(ARRAY_REQUIRE_UPDATE).beginArray();
     for (Release release : pluginsToUpgrade) {
       jsonWriter.beginObject();
 
-      pluginWSCommons.writePlugin(jsonWriter, (Plugin) release.getArtifact());
+      PluginWSCommons.writePlugin(jsonWriter, (Plugin) release.getArtifact());
       String version = isNotBlank(release.getDisplayVersion()) ? release.getDisplayVersion() : release.getVersion().toString();
       jsonWriter.prop(PROPERTY_VERSION, version);
 
@@ -153,12 +148,12 @@ public class UpgradesAction implements SystemWsAction {
     jsonWriter.endArray();
   }
 
-  private void writeIncompatiblePlugins(JsonWriter jsonWriter, List<Plugin> incompatiblePlugins) {
+  private static void writeIncompatiblePlugins(JsonWriter jsonWriter, List<Plugin> incompatiblePlugins) {
     jsonWriter.name(ARRAY_INCOMPATIBLE).beginArray();
 
     for (Plugin incompatiblePlugin : incompatiblePlugins) {
       jsonWriter.beginObject();
-      pluginWSCommons.writePlugin(jsonWriter, incompatiblePlugin);
+      PluginWSCommons.writePlugin(jsonWriter, incompatiblePlugin);
       jsonWriter.endObject();
     }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
index 254805884d93066ad5644fa106c7324c783b0433..0be17a3958dd5702981c9757ae65d5423fba474c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
@@ -105,7 +105,6 @@ public class ServerPluginRepository implements PluginRepository, Startable {
 
   @Override
   public void start() {
-    long begin = System.currentTimeMillis();
     loadPreInstalledPlugins();
     copyBundledPlugins();
     moveDownloadedPlugins();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java
index d5370f3f58deb4881e5166707fcbcc08355ed02f..921feb06e38e55dee03edf10266bb78be1ad3250 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java
@@ -41,12 +41,10 @@ public class AvailableAction implements PluginsWsAction {
 
   private final UserSession userSession;
   private final UpdateCenterMatrixFactory updateCenterFactory;
-  private final PluginWSCommons pluginWSCommons;
 
-  public AvailableAction(UserSession userSession, UpdateCenterMatrixFactory updateCenterFactory, PluginWSCommons pluginWSCommons) {
+  public AvailableAction(UserSession userSession, UpdateCenterMatrixFactory updateCenterFactory) {
     this.userSession = userSession;
     this.updateCenterFactory = updateCenterFactory;
-    this.pluginWSCommons = pluginWSCommons;
   }
 
   @Override
@@ -79,17 +77,17 @@ public class AvailableAction implements PluginsWsAction {
     Optional<UpdateCenter> updateCenter = updateCenterFactory.getUpdateCenter(DO_NOT_FORCE_REFRESH);
 
     writePlugins(jsonWriter, updateCenter);
-    pluginWSCommons.writeUpdateCenterProperties(jsonWriter, updateCenter);
+    PluginWSCommons.writeUpdateCenterProperties(jsonWriter, updateCenter);
 
     jsonWriter.endObject();
     jsonWriter.close();
   }
 
-  private void writePlugins(JsonWriter jsonWriter, Optional<UpdateCenter> updateCenter) {
+  private static void writePlugins(JsonWriter jsonWriter, Optional<UpdateCenter> updateCenter) {
     jsonWriter.name(ARRAY_PLUGINS).beginArray();
     if (updateCenter.isPresent()) {
       for (PluginUpdate pluginUpdate : retrieveAvailablePlugins(updateCenter.get())) {
-        pluginWSCommons.writePluginUpdate(jsonWriter, pluginUpdate);
+        PluginWSCommons.writePluginUpdate(jsonWriter, pluginUpdate);
       }
     }
     jsonWriter.endArray();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
index 1fd5ab02a4ee8c689f1d1db6f26d8d6c4bddfa24..8cd0e1ae351e03fb48af092f4bcecf49687373c9 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
@@ -68,8 +68,6 @@ public class PluginWSCommons {
   private static final String PROPERTY_HOMEPAGE_URL = "homepageUrl";
   private static final String PROPERTY_ISSUE_TRACKER_URL = "issueTrackerUrl";
   private static final String PROPERTY_EDITION_BUNDLED = "editionBundled";
-  private static final String OBJECT_ARTIFACT = "artifact";
-  private static final String PROPERTY_URL = "url";
   private static final String PROPERTY_TERMS_AND_CONDITIONS_URL = "termsAndConditionsUrl";
   private static final String OBJECT_UPDATE = "update";
   private static final String OBJECT_RELEASE = "release";
@@ -91,6 +89,10 @@ public class PluginWSCommons {
   public static final Comparator<PluginUpdate> NAME_KEY_PLUGIN_UPDATE_ORDERING = Ordering.from(NAME_KEY_PLUGIN_ORDERING)
     .onResultOf(PluginUpdateToPlugin.INSTANCE);
 
+  private PluginWSCommons() {
+    // prevent instantiation
+  }
+
   public static void writePluginInfo(JsonWriter json, PluginInfo pluginInfo, @Nullable String category, @Nullable PluginDto pluginDto, @Nullable InstalledPlugin installedFile) {
     json.beginObject();
     json.prop(PROPERTY_KEY, pluginInfo.getKey());
@@ -120,7 +122,7 @@ public class PluginWSCommons {
     json.endObject();
   }
 
-  public void writePlugin(JsonWriter jsonWriter, Plugin plugin) {
+  public static void writePlugin(JsonWriter jsonWriter, Plugin plugin) {
     jsonWriter.prop(PROPERTY_KEY, plugin.getKey());
     jsonWriter.prop(PROPERTY_NAME, plugin.getName());
     jsonWriter.prop(PROPERTY_CATEGORY, plugin.getCategory());
@@ -134,7 +136,7 @@ public class PluginWSCommons {
     jsonWriter.prop(PROPERTY_EDITION_BUNDLED, isEditionBundled(plugin));
   }
 
-  public void writePluginUpdate(JsonWriter json, PluginUpdate pluginUpdate) {
+  public static void writePluginUpdate(JsonWriter json, PluginUpdate pluginUpdate) {
     Plugin plugin = pluginUpdate.getPlugin();
 
     json.beginObject();
@@ -144,7 +146,7 @@ public class PluginWSCommons {
     json.endObject();
   }
 
-  public void writeRelease(JsonWriter jsonWriter, Release release) {
+  public static void writeRelease(JsonWriter jsonWriter, Release release) {
     jsonWriter.name(OBJECT_RELEASE).beginObject();
 
     String version = isNotBlank(release.getDisplayVersion()) ? release.getDisplayVersion() : release.getVersion().toString();
@@ -156,7 +158,7 @@ public class PluginWSCommons {
     jsonWriter.endObject();
   }
 
-  public void writeArtifact(JsonWriter jsonWriter, Release release) {
+  public static void writeArtifact(JsonWriter jsonWriter, Release release) {
     jsonWriter.name(OBJECT_ARTIFACT).beginObject();
 
     jsonWriter.prop(PROPERTY_NAME, release.getFilename());
@@ -180,7 +182,7 @@ public class PluginWSCommons {
    * }
    * </pre>
    */
-  public void writeUpdate(JsonWriter jsonWriter, PluginUpdate pluginUpdate) {
+  public static void writeUpdate(JsonWriter jsonWriter, PluginUpdate pluginUpdate) {
     jsonWriter.name(OBJECT_UPDATE).beginObject();
 
     writeUpdateProperties(jsonWriter, pluginUpdate);
@@ -201,7 +203,7 @@ public class PluginWSCommons {
    * ]
    * </pre>
    */
-  public void writeUpdateProperties(JsonWriter jsonWriter, PluginUpdate pluginUpdate) {
+  public static void writeUpdateProperties(JsonWriter jsonWriter, PluginUpdate pluginUpdate) {
     jsonWriter.prop(PROPERTY_STATUS, toJSon(pluginUpdate.getStatus()));
 
     jsonWriter.name(ARRAY_REQUIRES).beginArray();
@@ -238,7 +240,7 @@ public class PluginWSCommons {
    * "updateCenterRefresh": "2015-04-24T16:08:36+0200"
    * </pre>
    */
-  public void writeUpdateCenterProperties(JsonWriter json, Optional<UpdateCenter> updateCenter) {
+  public static void writeUpdateCenterProperties(JsonWriter json, Optional<UpdateCenter> updateCenter) {
     if (updateCenter.isPresent()) {
       json.propDateTime(PROPERTY_UPDATE_CENTER_REFRESH, updateCenter.get().getDate());
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
index 92fd2c8ec76b5c037cbfc260d861f54839b8b622..58e3e8ab022d820b326f5cdf69ac04076ce5cd80 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
@@ -54,15 +54,12 @@ public class UpdatesAction implements PluginsWsAction {
 
   private final UserSession userSession;
   private final UpdateCenterMatrixFactory updateCenterMatrixFactory;
-  private final PluginWSCommons pluginWSCommons;
   private final PluginUpdateAggregator aggregator;
 
   public UpdatesAction(UserSession userSession, UpdateCenterMatrixFactory updateCenterMatrixFactory,
-    PluginWSCommons pluginWSCommons,
     PluginUpdateAggregator aggregator) {
     this.userSession = userSession;
     this.updateCenterMatrixFactory = updateCenterMatrixFactory;
-    this.pluginWSCommons = pluginWSCommons;
     this.aggregator = aggregator;
   }
 
@@ -93,7 +90,7 @@ public class UpdatesAction implements PluginsWsAction {
 
     writePlugins(jsonWriter, updateCenter);
 
-    pluginWSCommons.writeUpdateCenterProperties(jsonWriter, updateCenter);
+    PluginWSCommons.writeUpdateCenterProperties(jsonWriter, updateCenter);
 
     jsonWriter.endObject();
     jsonWriter.close();
@@ -110,23 +107,23 @@ public class UpdatesAction implements PluginsWsAction {
     jsonWriter.endArray();
   }
 
-  private void writePluginUpdateAggregate(JsonWriter jsonWriter, PluginUpdateAggregate aggregate) {
+  private static void writePluginUpdateAggregate(JsonWriter jsonWriter, PluginUpdateAggregate aggregate) {
     jsonWriter.beginObject();
     Plugin plugin = aggregate.getPlugin();
 
-    pluginWSCommons.writePlugin(jsonWriter, plugin);
+    PluginWSCommons.writePlugin(jsonWriter, plugin);
 
     writeUpdates(jsonWriter, aggregate.getUpdates());
 
     jsonWriter.endObject();
   }
 
-  private void writeUpdates(JsonWriter jsonWriter, Collection<PluginUpdate> pluginUpdates) {
+  private static void writeUpdates(JsonWriter jsonWriter, Collection<PluginUpdate> pluginUpdates) {
     jsonWriter.name(ARRAY_UPDATES).beginArray();
     for (PluginUpdate pluginUpdate : ImmutableSortedSet.copyOf(PLUGIN_UPDATE_BY_VERSION_ORDERING, pluginUpdates)) {
       jsonWriter.beginObject();
-      pluginWSCommons.writeRelease(jsonWriter, pluginUpdate.getRelease());
-      pluginWSCommons.writeUpdateProperties(jsonWriter, pluginUpdate);
+      PluginWSCommons.writeRelease(jsonWriter, pluginUpdate.getRelease());
+      PluginWSCommons.writeUpdateProperties(jsonWriter, pluginUpdate);
       jsonWriter.endObject();
     }
     jsonWriter.endArray();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
index 3ce52d6d6942cce568cadeaf4be11aa05742d68f..8a1e8d39b3305b53ffac265304823d7c0c5cd890 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
@@ -26,7 +26,6 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.server.plugins.UpdateCenterMatrixFactory;
-import org.sonar.server.plugins.ws.PluginWSCommons;
 import org.sonar.server.ws.WsActionTester;
 import org.sonar.server.ws.WsTester;
 import org.sonar.updatecenter.common.Plugin;
@@ -52,7 +51,7 @@ public class UpgradesActionTest {
 
   private UpdateCenterMatrixFactory updateCenterFactory = mock(UpdateCenterMatrixFactory.class);
   private UpdateCenter updateCenter = mock(UpdateCenter.class);
-  private UpgradesAction underTest = new UpgradesAction(updateCenterFactory, new PluginWSCommons());
+  private UpgradesAction underTest = new UpgradesAction(updateCenterFactory);
 
   private Request request = mock(Request.class);
   private WsTester.TestResponse response = new WsTester.TestResponse();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java
index 3d3a7be11616a8e999321b42115045dade1e15e0..0b61fb221c08b042e518ba6b5ae8e6725150f422 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java
@@ -32,7 +32,6 @@ import org.sonar.server.ws.WsTester;
 import org.sonar.updatecenter.common.Plugin;
 import org.sonar.updatecenter.common.PluginUpdate;
 import org.sonar.updatecenter.common.Release;
-import org.sonar.updatecenter.common.UpdateCenter;
 
 import static com.google.common.collect.ImmutableList.of;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -67,7 +66,7 @@ public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActio
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
-  private AvailableAction underTest = new AvailableAction(userSession, updateCenterFactory, new PluginWSCommons());
+  private AvailableAction underTest = new AvailableAction(userSession, updateCenterFactory);
 
   @Test
   public void action_available_is_defined() {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
index d7881941f37a15fd64d317dc36ba3b64c829a5f1..1a622809b3382332564423ddc60ac993b95ccd6e 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
@@ -51,7 +51,6 @@ public class PluginWSCommonsTest {
 
   private WsTester.TestResponse response = new WsTester.TestResponse();
   private JsonWriter jsonWriter = response.newJsonWriter();
-  private PluginWSCommons underTest = new PluginWSCommons();
 
   @Test
   public void verify_properties_written_by_writePluginMetadata() {
@@ -139,7 +138,7 @@ public class PluginWSCommonsTest {
 
   @Test
   public void verify_properties_written_by_writePluginUpdate() {
-    underTest.writePluginUpdate(jsonWriter, PluginUpdate.createForPluginRelease(newRelease(), version("1.0")));
+    PluginWSCommons.writePluginUpdate(jsonWriter, PluginUpdate.createForPluginRelease(newRelease(), version("1.0")));
 
     jsonWriter.close();
     assertJson(response.outputAsString()).isSimilarTo("{" +
@@ -161,7 +160,7 @@ public class PluginWSCommonsTest {
   @Test
   public void verify_properties_written_by_writeMetadata_from_plugin() {
     jsonWriter.beginObject();
-    underTest.writePlugin(jsonWriter, newPlugin());
+    PluginWSCommons.writePlugin(jsonWriter, newPlugin());
     jsonWriter.endObject();
 
     jsonWriter.close();
@@ -180,7 +179,7 @@ public class PluginWSCommonsTest {
   @Test
   public void writeRelease() {
     jsonWriter.beginObject();
-    underTest.writeRelease(jsonWriter, newRelease().setDisplayVersion("1.0 (build 42)"));
+    PluginWSCommons.writeRelease(jsonWriter, newRelease().setDisplayVersion("1.0 (build 42)"));
     jsonWriter.endObject();
 
     jsonWriter.close();
@@ -197,7 +196,7 @@ public class PluginWSCommonsTest {
   @Test
   public void writeArtifact_from_release_writes_artifact_object_and_file_name() {
     jsonWriter.beginObject();
-    underTest.writeArtifact(jsonWriter, release("pkey").setDownloadUrl("http://toto.com/file.jar"));
+    PluginWSCommons.writeArtifact(jsonWriter, release("pkey").setDownloadUrl("http://toto.com/file.jar"));
     jsonWriter.endObject();
 
     jsonWriter.close();
@@ -236,7 +235,7 @@ public class PluginWSCommonsTest {
       new Release(newPlugin(), version("1.0")).addOutgoingDependency(newRelease()));
 
     jsonWriter.beginObject();
-    underTest.writeUpdate(jsonWriter, pluginUpdate);
+    PluginWSCommons.writeUpdate(jsonWriter, pluginUpdate);
     jsonWriter.endObject();
 
     jsonWriter.close();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
index ef01d55bcf3ceb32e836ac2fec38c71aa4c0aa8f..62dc781d0f51a06a07c1b3cbb2719fb5fc46ae99 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
@@ -80,8 +80,7 @@ public class UpdatesActionTest extends AbstractUpdateCenterBasedPluginsWsActionT
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
-  private UpdatesAction underTest = new UpdatesAction(userSession, updateCenterFactory,
-    new PluginWSCommons(), new PluginUpdateAggregator());
+  private UpdatesAction underTest = new UpdatesAction(userSession, updateCenterFactory, new PluginUpdateAggregator());
 
   @Test
   public void action_updatable_is_defined() {

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/Slf4jLogger.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/Slf4jLogger.java
deleted file mode 100644 (file)
index ea678ab..0000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/Slf4jLogger.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.scanner.bootstrap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Slf4jLogger implements org.sonar.home.cache.Logger {
-
-  private static final Logger LOG = LoggerFactory.getLogger(Slf4jLogger.class);
-
-  @Override
-  public void debug(String msg) {
-    LOG.debug(msg);
-  }
-
-  @Override
-  public void info(String msg) {
-    LOG.info(msg);
-  }
-
-  @Override
-  public void warn(String msg) {
-    LOG.warn(msg);
-  }
-
-  @Override
-  public void error(String msg, Throwable t) {
-    LOG.error(msg, t);
-  }
-
-  @Override
-  public void error(String msg) {
-    LOG.error(msg);
-  }
-
-}