From 28d8c4a2241b3590bd23f1e6662cb397285d70dc Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 24 May 2014 16:22:38 +0200 Subject: [PATCH] SONAR-5007 move org.sonar.server.es to org.sonar.server.search --- .../org/sonar/server/platform/ServerComponents.java | 2 +- .../qualityprofile/index/ActiveRuleIndex.java | 2 +- .../java/org/sonar/server/rule/index/RuleIndex.java | 2 +- .../java/org/sonar/server/search/BaseIndex.java | 1 - .../org/sonar/server/{es => search}/ESNode.java | 4 ++-- .../server/{es => search}/config/elasticsearch.json | 0 .../{es => search}/config/templates/default.json | 0 .../org/sonar/server/{es => search}/ESNodeTest.java | 2 +- .../sonar/server/{es => search}/NetworkUtils.java | 2 +- .../org/sonar/server/tester/DataStoreCleanup.java | 2 +- .../{es => search}/ESNodeTest/data-es-clean.zip | Bin .../{es => search}/ESNodeTest/data-es-corrupt.zip | Bin 12 files changed, 8 insertions(+), 9 deletions(-) rename sonar-server/src/main/java/org/sonar/server/{es => search}/ESNode.java (98%) rename sonar-server/src/main/resources/org/sonar/server/{es => search}/config/elasticsearch.json (100%) rename sonar-server/src/main/resources/org/sonar/server/{es => search}/config/templates/default.json (100%) rename sonar-server/src/test/java/org/sonar/server/{es => search}/ESNodeTest.java (99%) rename sonar-server/src/test/java/org/sonar/server/{es => search}/NetworkUtils.java (97%) rename sonar-server/src/test/resources/org/sonar/server/{es => search}/ESNodeTest/data-es-clean.zip (100%) rename sonar-server/src/test/resources/org/sonar/server/{es => search}/ESNodeTest/data-es-corrupt.zip (100%) diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 6bdb234aa20..b665c00243d 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -102,7 +102,7 @@ import org.sonar.server.debt.DebtModelXMLExporter; import org.sonar.server.debt.DebtRulesXMLImporter; import org.sonar.server.duplication.ws.DuplicationsWriter; import org.sonar.server.duplication.ws.DuplicationsWs; -import org.sonar.server.es.ESNode; +import org.sonar.server.search.ESNode; import org.sonar.server.issue.ActionService; import org.sonar.server.issue.AssignAction; import org.sonar.server.issue.CommentAction; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java index 9db06d73859..00e52e9da38 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java @@ -48,7 +48,7 @@ import org.sonar.core.cluster.WorkQueue; import org.sonar.core.qualityprofile.db.ActiveRuleDto; import org.sonar.core.qualityprofile.db.ActiveRuleKey; import org.sonar.core.qualityprofile.db.QualityProfileKey; -import org.sonar.server.es.ESNode; +import org.sonar.server.search.ESNode; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.search.BaseIndex; import org.sonar.server.search.IndexDefinition; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java index bf7a8d044f0..ae83823767e 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java @@ -37,7 +37,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.core.cluster.WorkQueue; import org.sonar.core.rule.RuleDto; -import org.sonar.server.es.ESNode; +import org.sonar.server.search.ESNode; import org.sonar.server.qualityprofile.index.ActiveRuleNormalizer; import org.sonar.server.rule.Rule; import org.sonar.server.search.BaseIndex; diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java index cc4cc006b65..670374438a1 100644 --- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java +++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java @@ -36,7 +36,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.core.cluster.WorkQueue; import org.sonar.core.persistence.Dto; -import org.sonar.server.es.ESNode; import java.io.IOException; import java.io.Serializable; diff --git a/sonar-server/src/main/java/org/sonar/server/es/ESNode.java b/sonar-server/src/main/java/org/sonar/server/search/ESNode.java similarity index 98% rename from sonar-server/src/main/java/org/sonar/server/es/ESNode.java rename to sonar-server/src/main/java/org/sonar/server/search/ESNode.java index 380a90f5387..5ab1e56201d 100644 --- a/sonar-server/src/main/java/org/sonar/server/es/ESNode.java +++ b/sonar-server/src/main/java/org/sonar/server/search/ESNode.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.es; +package org.sonar.server.search; import com.google.common.annotations.VisibleForTesting; import org.apache.commons.io.FileUtils; @@ -71,7 +71,7 @@ public class ESNode implements Startable { @Override public void start() { - LOG.info("Starting Elasticsearch..."); + LOG.info("Start Elasticsearch..."); initLogging(); ImmutableSettings.Builder esSettings = ImmutableSettings.builder() diff --git a/sonar-server/src/main/resources/org/sonar/server/es/config/elasticsearch.json b/sonar-server/src/main/resources/org/sonar/server/search/config/elasticsearch.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/es/config/elasticsearch.json rename to sonar-server/src/main/resources/org/sonar/server/search/config/elasticsearch.json diff --git a/sonar-server/src/main/resources/org/sonar/server/es/config/templates/default.json b/sonar-server/src/main/resources/org/sonar/server/search/config/templates/default.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/es/config/templates/default.json rename to sonar-server/src/main/resources/org/sonar/server/search/config/templates/default.json diff --git a/sonar-server/src/test/java/org/sonar/server/es/ESNodeTest.java b/sonar-server/src/test/java/org/sonar/server/search/ESNodeTest.java similarity index 99% rename from sonar-server/src/test/java/org/sonar/server/es/ESNodeTest.java rename to sonar-server/src/test/java/org/sonar/server/search/ESNodeTest.java index 19b66f6e3ef..1c98d7020ed 100644 --- a/sonar-server/src/test/java/org/sonar/server/es/ESNodeTest.java +++ b/sonar-server/src/test/java/org/sonar/server/search/ESNodeTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.es; +package org.sonar.server.search; import com.google.common.io.Resources; import org.apache.commons.io.FileUtils; diff --git a/sonar-server/src/test/java/org/sonar/server/es/NetworkUtils.java b/sonar-server/src/test/java/org/sonar/server/search/NetworkUtils.java similarity index 97% rename from sonar-server/src/test/java/org/sonar/server/es/NetworkUtils.java rename to sonar-server/src/test/java/org/sonar/server/search/NetworkUtils.java index 4b38d4b96d9..8a76d42d29a 100644 --- a/sonar-server/src/test/java/org/sonar/server/es/NetworkUtils.java +++ b/sonar-server/src/test/java/org/sonar/server/search/NetworkUtils.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.es; +package org.sonar.server.search; import java.io.IOException; import java.net.ServerSocket; diff --git a/sonar-server/src/test/java/org/sonar/server/tester/DataStoreCleanup.java b/sonar-server/src/test/java/org/sonar/server/tester/DataStoreCleanup.java index c04c70da395..889a12f58c3 100644 --- a/sonar-server/src/test/java/org/sonar/server/tester/DataStoreCleanup.java +++ b/sonar-server/src/test/java/org/sonar/server/tester/DataStoreCleanup.java @@ -27,7 +27,7 @@ import org.sonar.api.ServerComponent; import org.sonar.core.persistence.DatabaseVersion; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.es.ESNode; +import org.sonar.server.search.ESNode; import java.sql.Connection; diff --git a/sonar-server/src/test/resources/org/sonar/server/es/ESNodeTest/data-es-clean.zip b/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-clean.zip similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/es/ESNodeTest/data-es-clean.zip rename to sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-clean.zip diff --git a/sonar-server/src/test/resources/org/sonar/server/es/ESNodeTest/data-es-corrupt.zip b/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-corrupt.zip similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/es/ESNodeTest/data-es-corrupt.zip rename to sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-corrupt.zip -- 2.39.5