From f2cf34451bcc6aa57bc418cc59f96eb733cd5809 Mon Sep 17 00:00:00 2001 From: pith Date: Tue, 3 Nov 2015 16:30:28 +0100 Subject: [PATCH] Refactor packages and configuration prefixes --- .../persistence => }/elasticsearch/ElasticSearchIT.java | 4 ++-- ...sticsearch.props => org.seedstack.elasticsearch.props} | 6 +++--- .../elasticsearch/internal/ElasticSearchClientProxy.java | 4 ++-- .../elasticsearch/internal/ElasticSearchErrorCode.java | 4 ++-- .../elasticsearch/internal/ElasticSearchModule.java | 2 +- .../elasticsearch/internal/ElasticSearchPlugin.java | 8 ++++---- ...sticsearch.internal.ElasticSearchErrorCode.properties} | 0 .../resources/META-INF/services/io.nuun.kernel.api.Plugin | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename src/it/java/org/seedstack/{seed/persistence => }/elasticsearch/ElasticSearchIT.java (96%) rename src/it/resources/META-INF/configuration/{org.seedstack.seed.persistence.elasticsearch.props => org.seedstack.elasticsearch.props} (68%) rename src/main/java/org/seedstack/{seed/persistence => }/elasticsearch/internal/ElasticSearchClientProxy.java (94%) rename src/main/java/org/seedstack/{seed/persistence => }/elasticsearch/internal/ElasticSearchErrorCode.java (79%) rename src/main/java/org/seedstack/{seed/persistence => }/elasticsearch/internal/ElasticSearchModule.java (95%) rename src/main/java/org/seedstack/{seed/persistence => }/elasticsearch/internal/ElasticSearchPlugin.java (97%) rename src/main/resources/META-INF/errors/{org.seedstack.seed.persistence.elasticsearch.internal.ElasticSearchErrorCode.properties => org.seedstack.elasticsearch.internal.ElasticSearchErrorCode.properties} (100%) diff --git a/src/it/java/org/seedstack/seed/persistence/elasticsearch/ElasticSearchIT.java b/src/it/java/org/seedstack/elasticsearch/ElasticSearchIT.java similarity index 96% rename from src/it/java/org/seedstack/seed/persistence/elasticsearch/ElasticSearchIT.java rename to src/it/java/org/seedstack/elasticsearch/ElasticSearchIT.java index dab1e8b..1017d53 100644 --- a/src/it/java/org/seedstack/seed/persistence/elasticsearch/ElasticSearchIT.java +++ b/src/it/java/org/seedstack/elasticsearch/ElasticSearchIT.java @@ -5,7 +5,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.seedstack.seed.persistence.elasticsearch; +package org.seedstack.elasticsearch; import org.assertj.core.api.Assertions; import org.elasticsearch.ElasticsearchException; @@ -14,7 +14,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.json.JSONException; import org.junit.Test; -import org.seedstack.seed.core.api.SeedException; +import org.seedstack.seed.SeedException; import org.seedstack.seed.it.AbstractSeedIT; import org.skyscreamer.jsonassert.JSONAssert; diff --git a/src/it/resources/META-INF/configuration/org.seedstack.seed.persistence.elasticsearch.props b/src/it/resources/META-INF/configuration/org.seedstack.elasticsearch.props similarity index 68% rename from src/it/resources/META-INF/configuration/org.seedstack.seed.persistence.elasticsearch.props rename to src/it/resources/META-INF/configuration/org.seedstack.elasticsearch.props index a7a62e9..2e9e0b8 100644 --- a/src/it/resources/META-INF/configuration/org.seedstack.seed.persistence.elasticsearch.props +++ b/src/it/resources/META-INF/configuration/org.seedstack.elasticsearch.props @@ -6,9 +6,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -[org.seedstack.seed] -persistence.elasticsearch.clients = client1, client2 +[org.seedstack.elasticsearch] +clients = client1, client2 -[org.seedstack.seed.persistence.elasticsearch.client.client1] +[org.seedstack.elasticsearch.client.client1] hosts = localhost diff --git a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchClientProxy.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java similarity index 94% rename from src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchClientProxy.java rename to src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java index af53f12..ef46bac 100644 --- a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchClientProxy.java +++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java @@ -5,9 +5,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.seedstack.seed.persistence.elasticsearch.internal; +package org.seedstack.elasticsearch.internal; -import org.seedstack.seed.core.api.SeedException; +import org.seedstack.seed.SeedException; import org.elasticsearch.client.Client; import java.lang.reflect.InvocationHandler; diff --git a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchErrorCode.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java similarity index 79% rename from src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchErrorCode.java rename to src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java index 6bc750a..40aba15 100644 --- a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchErrorCode.java +++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java @@ -8,9 +8,9 @@ /** * */ -package org.seedstack.seed.persistence.elasticsearch.internal; +package org.seedstack.elasticsearch.internal; -import org.seedstack.seed.core.api.ErrorCode; +import org.seedstack.seed.ErrorCode; enum ElasticSearchErrorCode implements ErrorCode { FORBIDDEN_CLIENT_CLOSE, diff --git a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchModule.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java similarity index 95% rename from src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchModule.java rename to src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java index 5bfc071..fe39e3b 100644 --- a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchModule.java +++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java @@ -5,7 +5,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.seedstack.seed.persistence.elasticsearch.internal; +package org.seedstack.elasticsearch.internal; import com.google.inject.Key; import com.google.inject.PrivateModule; diff --git a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchPlugin.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java similarity index 97% rename from src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchPlugin.java rename to src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java index 4ee7069..6d0cef8 100644 --- a/src/main/java/org/seedstack/seed/persistence/elasticsearch/internal/ElasticSearchPlugin.java +++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java @@ -5,7 +5,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.seedstack.seed.persistence.elasticsearch.internal; +package org.seedstack.elasticsearch.internal; import io.nuun.kernel.api.Plugin; import io.nuun.kernel.api.plugin.InitState; @@ -20,7 +20,7 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeBuilder; -import org.seedstack.seed.core.api.SeedException; +import org.seedstack.seed.SeedException; import org.seedstack.seed.core.internal.application.ApplicationPlugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ * @author redouane.loulou@ext.mpsa.com */ public class ElasticSearchPlugin extends AbstractPlugin { - public static final String ELASTIC_SEARCH_PLUGIN_CONFIGURATION_PREFIX = "org.seedstack.seed.persistence.elasticsearch"; + public static final String ELASTIC_SEARCH_PLUGIN_CONFIGURATION_PREFIX = "org.seedstack.elasticsearch"; public static final int DEFAULT_ELASTIC_SEARCH_PORT = 9300; public static final String ELASTIC_SEARCH_STORAGE_ROOT = "persistence-elasticsearch" + File.separator; private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchPlugin.class); @@ -50,7 +50,7 @@ public class ElasticSearchPlugin extends AbstractPlugin { @Override public String name() { - return "seed-elasticsearch-plugin"; + return "elasticsearch"; } @Override diff --git a/src/main/resources/META-INF/errors/org.seedstack.seed.persistence.elasticsearch.internal.ElasticSearchErrorCode.properties b/src/main/resources/META-INF/errors/org.seedstack.elasticsearch.internal.ElasticSearchErrorCode.properties similarity index 100% rename from src/main/resources/META-INF/errors/org.seedstack.seed.persistence.elasticsearch.internal.ElasticSearchErrorCode.properties rename to src/main/resources/META-INF/errors/org.seedstack.elasticsearch.internal.ElasticSearchErrorCode.properties diff --git a/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin b/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin index 77eaa47..c6a4f1b 100644 --- a/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin +++ b/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin @@ -1 +1 @@ -org.seedstack.seed.persistence.elasticsearch.internal.ElasticSearchPlugin \ No newline at end of file +org.seedstack.elasticsearch.internal.ElasticSearchPlugin \ No newline at end of file