Fix some quality flaws

diff --git a/sonar-batch/src/main/java/org/sonar/batch/DefaultSensorContext.java b/sonar-batch/src/main/java/org/sonar/batch/DefaultSensorContext.java
index 9f20029e6330379e7d74c4b516bc548fa7dfad81..57c75b2551f7797e9887b4b66e515ff6e802ddea 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/DefaultSensorContext.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/DefaultSensorContext.java
@@ -182,6 +182,6 @@ public class DefaultSensorContext implements SensorContext {
   }
 
   private Resource resourceOrProject(Resource resource) {
-    return (resource != null ? resource : project);
+    return resource!=null ? resource : project;
   }
 }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/DecoratorsExecutor.java b/sonar-batch/src/main/java/org/sonar/batch/phases/DecoratorsExecutor.java
index 539fc1e4529e440889c61767933045a730b050bf..75b6cd54be0927ec53a6f0882677b28d47c00b08 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/DecoratorsExecutor.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/phases/DecoratorsExecutor.java
@@ -61,7 +61,7 @@ public class DecoratorsExecutor implements BatchComponent {
   DecoratorContext decorateResource(Resource resource, Collection<Decorator> decorators, boolean executeDecorators) {
     List<DecoratorContext> childrenContexts = Lists.newArrayList();
     for (Resource child : index.getChildren(resource)) {
-      boolean isModule = (child instanceof Project);
+      boolean isModule = child instanceof Project;
       DefaultDecoratorContext childContext = (DefaultDecoratorContext) decorateResource(child, decorators, !isModule);
       childrenContexts.add(childContext.setReadOnly(true));
     }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java b/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
index 0dd90eca8dff1611ab828d83965a768b574ba9a3..02056e53899c1787641b8c9672ecb825cc7dc6bf 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
@@ -74,7 +74,7 @@ public class UpdateStatusJob implements BatchComponent {
 
   private void enableCurrentSnapshot() {
     Snapshot previousLastSnapshot = resourcePersister.getLastSnapshot(snapshot, false);
-    boolean isLast = (previousLastSnapshot == null || previousLastSnapshot.getCreatedAt().before(snapshot.getCreatedAt()));
+    boolean isLast = previousLastSnapshot == null || previousLastSnapshot.getCreatedAt().before(snapshot.getCreatedAt());
     setFlags(snapshot, isLast, Snapshot.STATUS_PROCESSED);
     logSuccess(LoggerFactory.getLogger(getClass()));
   }
@@ -113,7 +113,7 @@ public class UpdateStatusJob implements BatchComponent {
     query.setParameter("last", last);
     query.setParameter("rootId", snapshot.getId());
     query.setParameter("path", snapshot.getPath() + snapshot.getId() + ".%");
-    query.setParameter("pathRootId", (snapshot.getRootId() == null ? snapshot.getId() : snapshot.getRootId()));
+    query.setParameter("pathRootId", snapshot.getRootId()==null ? snapshot.getId() : snapshot.getRootId());
     query.executeUpdate();
     session.commit();
 

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileSystemAdapter.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileSystemAdapter.java
index 4201a6b5bf1e077368dac1bef0706090029825a6..4379089c86e3457100bfb57a6cdc324f5daaf2a8 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileSystemAdapter.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileSystemAdapter.java
@@ -176,7 +176,7 @@ public class DeprecatedFileSystemAdapter implements ProjectFileSystem {
 
   public File getFileFromBuildDirectory(String filename) {
     File file = new File(getBuildDir(), filename);
-    return (file.exists() ? file : null);
+    return file.exists() ? file : null;
   }
 
   public Resource toResource(File file) {
@@ -187,7 +187,7 @@ public class DeprecatedFileSystemAdapter implements ProjectFileSystem {
     if (relativePath == null) {
       return null;
     }
-    return (file.isFile() ? new org.sonar.api.resources.File(relativePath.path()) : new org.sonar.api.resources.Directory(relativePath.path()));
+    return file.isFile() ? new org.sonar.api.resources.File(relativePath.path()) : new org.sonar.api.resources.Directory(relativePath.path());
   }
 
   public List<InputFile> mainFiles(String... langs) {

diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
index f7c651d1bfa3a2e383503bcbd5f80a10d10456f3..d64bba6953003de08f2c3ac57b4a4ffa47cc7e07 100644 (file)
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
@@ -39,7 +39,7 @@ public class CodeColorizer {
   }
 
   public String toHtml(Reader code, HtmlOptions options) {
-    HtmlOptions opts = (options == null ? HtmlOptions.DEFAULT : options);
+    HtmlOptions opts = options == null ? HtmlOptions.DEFAULT : options;
     return new HtmlRenderer(opts).render(code, tokenizers);
   }
 

diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
index 2ba72828e92e41d9a7b3a9a1a57f58bb0580f331..c230e9c21ddf977e6eba8373f710a109731386f4 100644 (file)
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
@@ -63,7 +63,7 @@ public class LiteralTokenizer extends Tokenizer {
 
     public boolean match(int endFlag) {
       literalValue.append((char) endFlag);
-      return (code.lastChar() == firstChar && evenNumberOfBackSlashBeforeDelimiter() && literalValue.length() > 1);
+      return code.lastChar()==firstChar && evenNumberOfBackSlashBeforeDelimiter() && literalValue.length()>1;
     }
 
     private boolean evenNumberOfBackSlashBeforeDelimiter() {

diff --git a/sonar-core/src/main/java/org/sonar/core/component/ScanGraph.java b/sonar-core/src/main/java/org/sonar/core/component/ScanGraph.java
index c7cca6317165c54345b399914b70abf3e07cfca1..91db3d7440ec73c750c83619b4c152cde5a3719c 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/component/ScanGraph.java
+++ b/sonar-core/src/main/java/org/sonar/core/component/ScanGraph.java
@@ -55,7 +55,7 @@ public class ScanGraph extends BeanGraph implements BatchComponent {
 
   public ComponentVertex getComponent(String key) {
     Vertex vertex = GraphUtil.single(getUnderlyingGraph().getVertices("key", key));
-    return (vertex != null ? wrapComponent(vertex) : null);
+    return vertex != null ? wrapComponent(vertex) : null;
   }
 
   public ComponentVertex addComponent(Resource resource, @Nullable Snapshot snapshot) {

diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDao.java b/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDao.java
index 9a41364b0713f6a266b8d1b1f3d527ad2e1b5060..f0255c2cedb920d0bbbb5bd8219ee00bb13005ae 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDao.java
@@ -48,7 +48,7 @@ public class ActiveDashboardDao implements BatchComponent, ServerComponent {
     ActiveDashboardMapper mapper = session.getMapper(ActiveDashboardMapper.class);
     try {
       Integer max = mapper.selectMaxOrderIndexForNullUser();
-      return (max != null ? max.intValue() : 0);
+      return max != null ? max.intValue() : 0;
     } finally {
       session.close();
     }

diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
index 467590c4c838c13f62a949feda8dba3974fc0115..8000f3400abf11ae7b21990c12f728d7ff586443 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
@@ -88,10 +88,6 @@ public class RemotePlugin {
     return files;
   }
 
-  public String getPluginFilename() {
-    return (!files.isEmpty() ? files.get(0).getFilename() : null);
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java b/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java
index a0626f6ad50e42fdfb458d7c76385f24c8560592..de478043f7d5f51725018528d1fa6bd0823a9907 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java
@@ -71,7 +71,7 @@ public class MeasuresDao extends BaseDao {
     return CollectionUtils.select(getMetricsByName().values(), new Predicate() {
       public boolean evaluate(Object o) {
         Metric m = (Metric) o;
-        return (m.getEnabled() && m.getOrigin() != Metric.Origin.JAV);
+        return m.getEnabled() && m.getOrigin() != Metric.Origin.JAV;
       }
     });
   }

diff --git a/sonar-duplications/src/main/java/org/sonar/duplications/block/ByteArray.java b/sonar-duplications/src/main/java/org/sonar/duplications/block/ByteArray.java
index 7b1c4e5936b13027073dcd122d6c9c2587b697d9..69034c3936e52c54d66b605cb1a549133adb973a 100644 (file)
--- a/sonar-duplications/src/main/java/org/sonar/duplications/block/ByteArray.java
+++ b/sonar-duplications/src/main/java/org/sonar/duplications/block/ByteArray.java
@@ -96,7 +96,7 @@ public final class ByteArray {
   public String toHexString() {
     StringBuilder hex = new StringBuilder(2 * bytes.length);
     for (byte b : bytes) {
-      hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
+      hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt(b & 0x0F));
     }
     return hex.toString();
   }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java
index 8a626cdfd96a50b6f10864f81918eb3092686529..bdca4449e656314ed59e3ab8ba59a36ac432b1ea 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java
@@ -106,7 +106,7 @@ public class CountDistributionBuilder implements MeasureBuilder {
       Map<String, String> map = KeyValueFormat.parse(measure.getData());
       for (Map.Entry<String, String> entry : map.entrySet()) {
         String key = entry.getKey();
-        int value = (StringUtils.isBlank(entry.getValue()) ? 0 : Integer.parseInt(entry.getValue()));
+        int value = StringUtils.isBlank(entry.getValue()) ? 0 : Integer.parseInt(entry.getValue());
         if (NumberUtils.isNumber(key)) {
           add(NumberUtils.toInt(key), value);
         } else {

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasureUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasureUtils.java
index 9f77587903cf5218b2be753e25b40c1876f61f71..f97e18a1ef2f48848d11285001375e777b1472c5 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasureUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasureUtils.java
@@ -87,7 +87,7 @@ public final class MeasureUtils {
     if (measure != null) {
       result = measure.getVariation(periodIndex);
     }
-    return (result != null ? result : defaultValue);
+    return result != null ? result : defaultValue;
   }
 
   public static Long getVariationAsLong(Measure measure, int periodIndex) {

diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java b/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java
index c3b8ac9334a2b279501fd624ae20ae7b7fd8ed96..391ca09ebe9b4b6676840ae322c0aa71ab5c3496 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java
@@ -92,7 +92,7 @@ public class ServerExtensionInstaller {
   }
 
   static boolean isType(Object extension, Class<? extends Extension> extensionClass) {
-    Class clazz = (extension instanceof Class ? (Class) extension : extension.getClass());
+    Class clazz = extension instanceof Class ? (Class) extension : extension.getClass();
     return extensionClass.isAssignableFrom(clazz);
   }
 }