From 6e6cea30338f31063d68fcd867946e09d60a6006 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 5 Nov 2012 23:20:32 +0100
Subject: [PATCH] Fix some quality flaws

---
 .../src/main/java/org/sonar/plugins/cpd/CpdSensor.java       | 1 -
 .../java/org/sonar/batch/bootstrap/ProjectExclusions.java    | 5 ++---
 .../main/java/org/sonar/batch/bootstrap/ProjectSettings.java | 1 -
 .../main/java/org/sonar/batch/bootstrap/ServerClient.java    | 2 +-
 .../java/org/sonar/core/persistence/DatabaseVersion.java     | 3 ---
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java
index bd3f6420710..80e211dc695 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java
@@ -20,7 +20,6 @@
 package org.sonar.plugins.cpd;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.configuration.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
index 9b078d2f249..a46354e9dd2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
@@ -24,7 +24,6 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.BatchComponent;
-import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.batch.bootstrap.ProjectBuilder;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
@@ -50,8 +49,8 @@ public class ProjectExclusions implements BatchComponent {
   }
 
   public ProjectExclusions(Settings settings, ProjectReactor reactor) {
-      this(settings, reactor, new ProjectBuilder[0]);
-    }
+    this(settings, reactor, new ProjectBuilder[0]);
+  }
 
   public void start() {
     LOG.info("Apply project exclusions");
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectSettings.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectSettings.java
index 9a35a3ef117..871a3a5fde1 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectSettings.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectSettings.java
@@ -61,7 +61,6 @@ public class ProjectSettings extends Settings {
     addBuildProperties(project);
     addEnvironmentVariables();
     addSystemProperties();
-    //addProgrammaticProperties();
     return this;
   }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java
index 9f7490501bc..e10fc311e2e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
-import org.sonar.api.platform.Server;
 import org.sonar.api.utils.HttpDownloader;
 import org.sonar.api.utils.SonarException;
 import org.sonar.batch.bootstrapper.EnvironmentInformation;
@@ -45,6 +44,7 @@ import java.util.Date;
 
 /**
  * TODO extends Server when removing the deprecated org.sonar.batch.ServerMetadata
+ *
  * @since 3.4
  */
 public class ServerClient implements BatchComponent {
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index 3ed5fba82fe..c22f9253ff3 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -22,10 +22,7 @@ package org.sonar.core.persistence;
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
-import org.sonar.api.CoreProperties;
 import org.sonar.api.ServerComponent;
-import org.sonar.core.properties.PropertiesMapper;
-import org.sonar.core.properties.PropertyDto;
 
 import java.util.Collections;
 import java.util.List;