From: Stephane Gamard Date: Wed, 13 Aug 2014 15:53:14 +0000 (+0200) Subject: format code X-Git-Tag: 4.5-RC1~163 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f661df1a2d5f08e79d7d0ac6197d15feeeaea906;p=sonarqube.git format code --- diff --git a/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java b/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java index 5ed52d9da80..c2c90649575 100644 --- a/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java +++ b/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java @@ -124,7 +124,7 @@ public class ProcessWrapper extends Thread implements Terminable { } public ProcessWrapper setLogDir(File logDirectory) { - this.setEnvProperty("sonar.path.logs",logDirectory.getAbsolutePath()); + this.setEnvProperty("sonar.path.logs", logDirectory.getAbsolutePath()); return this; } diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java index 8edce3858fd..b0b78ff8cb8 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java @@ -145,10 +145,10 @@ public class SearchServer extends MonitoredProcess { .build().start(); node.client().admin().indices() - .preparePutTemplate("default") - .setTemplate("*") - .addMapping("_default_", "{\"dynamic\": \"strict\"}") - .get(); + .preparePutTemplate("default") + .setTemplate("*") + .addMapping("_default_", "{\"dynamic\": \"strict\"}") + .get(); if (this.isBlocking) { while (node != null && !node.isClosed()) { diff --git a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java index aebc0c85984..b0660b85e33 100644 --- a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java +++ b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java @@ -37,7 +37,6 @@ import org.sonar.process.Props; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistrationException; import javax.management.MBeanServer; - import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.ServerSocket; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java index 81d8929466e..19efab2b24d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java @@ -32,7 +32,7 @@ public class IndexDefinition { private IndexDefinition(String indexName, String indexType) { this.indexName = indexName; this.indexType = indexType; -} + } public String getIndexName() { return indexName; @@ -50,11 +50,11 @@ public class IndexDefinition { return MANAGEMENT_TYPE; } - public static final IndexDefinition RULE = new IndexDefinition("rules","rules"); - public static final IndexDefinition ACTIVE_RULE = new IndexDefinition("rules","activeRules"); - public static final IndexDefinition LOG = new IndexDefinition("logs","sonarLogs"); + public static final IndexDefinition RULE = new IndexDefinition("rules", "rules"); + public static final IndexDefinition ACTIVE_RULE = new IndexDefinition("rules", "activeRules"); + public static final IndexDefinition LOG = new IndexDefinition("logs", "sonarLogs"); @VisibleForTesting - protected static IndexDefinition TEST = new IndexDefinition("test","test"); + protected static IndexDefinition TEST = new IndexDefinition("test", "test"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java b/server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java index 649fd8c9df0..c1e94158024 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java +++ b/server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java @@ -35,7 +35,6 @@ import org.sonar.server.search.IndexProperties; import org.sonar.server.ws.WsTester; import javax.annotation.Nullable; - import java.io.File; import java.util.Arrays; import java.util.List;