SONAR-3895 remove unused code and fix quality flaws

4 files changed, 3 insertions, 23 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index eb261aa6f7a..23557e76574 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -21,7 +21,6 @@ package org.sonar.server.platform;
 
 import org.apache.commons.configuration.BaseConfiguration;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.Plugins;
 import org.sonar.api.config.EmailSettings;
 import org.sonar.api.platform.ComponentContainer;
 import org.sonar.api.platform.Server;
@@ -33,7 +32,6 @@ import org.sonar.api.resources.ResourceTypes;
 import org.sonar.api.rules.AnnotationRuleParser;
 import org.sonar.api.rules.XMLRuleParser;
 import org.sonar.api.utils.HttpDownloader;
-import org.sonar.api.utils.IocContainer;
 import org.sonar.api.utils.TimeProfiler;
 import org.sonar.api.utils.UriReader;
 import org.sonar.api.workflow.internal.DefaultWorkflow;
@@ -157,7 +155,6 @@ public final class Platform {
   private void startDatabaseConnectors(ServletContext servletContext) {
     rootContainer = new ComponentContainer();
     rootContainer.addSingleton(servletContext);
-    rootContainer.addSingleton(IocContainer.class); // for backward compatibility
     rootContainer.addSingleton(new BaseConfiguration());
     rootContainer.addSingleton(ServerSettings.class);
     rootContainer.addSingleton(ServerImpl.class);
@@ -219,7 +216,6 @@ public final class Platform {
     servicesContainer.addSingleton(ServerIdGenerator.class);
     servicesContainer.addSingleton(DefaultModelFinder.class); // depends on plugins
     servicesContainer.addSingleton(DefaultModelManager.class);
-    servicesContainer.addSingleton(Plugins.class);
     servicesContainer.addSingleton(ChartFactory.class);
     servicesContainer.addSingleton(Languages.class);
     servicesContainer.addSingleton(Views.class);
diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/DefaultServerPluginRepository.java b/sonar-server/src/main/java/org/sonar/server/plugins/DefaultServerPluginRepository.java
index 7ba9f79f6ed..9b678016e9e 100644
--- a/sonar-server/src/main/java/org/sonar/server/plugins/DefaultServerPluginRepository.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/DefaultServerPluginRepository.java
@@ -72,10 +72,6 @@ public class DefaultServerPluginRepository implements ServerPluginRepository {
     return disabledPlugins.contains(pluginKey);
   }
 
-  public Collection<Plugin> getPlugins() {
-    return pluginsByKey.values();
-  }
-
   public Plugin getPlugin(String key) {
     return pluginsByKey.get(key);
   }
@@ -98,18 +94,7 @@ public class DefaultServerPluginRepository implements ServerPluginRepository {
     return clazz;
   }
 
-
-  public Property[] getProperties(Plugin plugin) {
-    if (plugin != null) {
-      Class<? extends Plugin> classInstance = plugin.getClass();
-      if (classInstance.isAnnotationPresent(Properties.class)) {
-        return classInstance.getAnnotation(Properties.class).value();
-      }
-    }
-    return new Property[0];
-  }
-
-  public Collection<PluginMetadata> getMetadata() {
+public Collection<PluginMetadata> getMetadata() {
     return deployer.getMetadata();
   }
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
index a4f707b32f5..11f0b26e862 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
@@ -27,8 +27,8 @@
         </tr>
         </thead>
         <tbody>
-        <tr>
-          <td>System is up to date</td>
+        <tr class="even">
+          <td>System is up to date.</td>
         </tr>
         </tbody>
       </table>
diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/DefaultServerPluginRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/DefaultServerPluginRepositoryTest.java
index 39b991dd3e0..0793b0b8e79 100644
--- a/sonar-server/src/test/java/org/sonar/server/plugins/DefaultServerPluginRepositoryTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/plugins/DefaultServerPluginRepositoryTest.java
@@ -66,7 +66,6 @@ public class DefaultServerPluginRepositoryTest {
     repository = new DefaultServerPluginRepository(deployer);
     repository.start();
 
-    assertThat(repository.getPlugins().size(), Is.is(1));
     assertThat(repository.getPlugin("artifactsize"), not(nullValue()));
     assertThat(repository.getClassLoader("artifactsize"), not(nullValue()));
     assertThat(repository.getClass("artifactsize", "org.sonar.plugins.artifactsize.ArtifactSizeMetrics"), not(nullValue()));