Fix some violations

2 files changed, 13 insertions, 13 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/components/PastMeasuresLoader.java b/sonar-batch/src/main/java/org/sonar/batch/components/PastMeasuresLoader.java
index 3b835911d41..b0f3f1cf9e3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/components/PastMeasuresLoader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/components/PastMeasuresLoader.java
@@ -58,7 +58,7 @@ public class PastMeasuresLoader implements BatchExtension {
   }
 
   public List<Object[]> getPastMeasures(Resource resource, PastSnapshot projectPastSnapshot) {
-    if (projectPastSnapshot != null && projectPastSnapshot.getProjectSnapshot()!=null) {
+    if (projectPastSnapshot != null && projectPastSnapshot.getProjectSnapshot() != null) {
       return getPastMeasures(resource.getEffectiveKey(), projectPastSnapshot.getProjectSnapshot());
     }
     return Collections.emptyList();
@@ -66,32 +66,33 @@ public class PastMeasuresLoader implements BatchExtension {
 
   public List<Object[]> getPastMeasures(String resourceKey, Snapshot projectPastSnapshot) {
     String sql = "select m.metric_id, m.characteristic_id, m.rule_id, m.value from project_measures m, snapshots s" +
-        " where m.snapshot_id=s.id and m.metric_id in (:metricIds) " +
-        " and (s.root_snapshot_id=:rootSnapshotId or s.id=:rootSnapshotId) and s.status=:status and s.project_id=(select p.id from projects p where p.kee=:resourceKey and p.qualifier<>:lib)";
+      " where m.snapshot_id=s.id and m.metric_id in (:metricIds) " +
+      "       and (s.root_snapshot_id=:rootSnapshotId or s.id=:rootSnapshotId) " +
+      "       and s.status=:status and s.project_id=(select p.id from projects p where p.kee=:resourceKey and p.qualifier<>:lib)";
     return session.createNativeQuery(sql)
-        .setParameter("metricIds", metricByIds.keySet())
-        .setParameter("rootSnapshotId", ObjectUtils.defaultIfNull(projectPastSnapshot.getRootId(), projectPastSnapshot.getId()))
-        .setParameter("resourceKey", resourceKey)
-        .setParameter("lib", Qualifiers.LIBRARY)
-        .setParameter("status", Snapshot.STATUS_PROCESSED)
-        .getResultList();
+      .setParameter("metricIds", metricByIds.keySet())
+      .setParameter("rootSnapshotId", ObjectUtils.defaultIfNull(projectPastSnapshot.getRootId(), projectPastSnapshot.getId()))
+      .setParameter("resourceKey", resourceKey)
+      .setParameter("lib", Qualifiers.LIBRARY)
+      .setParameter("status", Snapshot.STATUS_PROCESSED)
+      .getResultList();
   }
 
   public static int getMetricId(Object[] row) {
     // can be BigDecimal on Oracle
-    return ((Number)row[0]).intValue();
+    return ((Number) row[0]).intValue();
   }
 
   public static Integer getCharacteristicId(Object[] row) {
     // can be BigDecimal on Oracle
     Number number = (Number) row[1];
-    return number!=null ? number.intValue() : null;
+    return number != null ? number.intValue() : null;
   }
 
   public static Integer getRuleId(Object[] row) {
     // can be BigDecimal on Oracle
     Number number = (Number) row[2];
-    return number!=null ? number.intValue() : null;
+    return number != null ? number.intValue() : null;
   }
 
   public static boolean hasValue(Object[] row) {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java b/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java
index 9ff30611eb9..7a7fb5a1886 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java
@@ -29,7 +29,6 @@ import org.sonar.api.resources.Project;
 import org.sonar.core.config.ConfigurationUtils;
 import org.sonar.jpa.session.DatabaseSessionFactory;
 
-import java.util.Iterator;
 import java.util.List;
 
 /**