Skip to content

Refactor packages and configuration prefixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pith merged 1 commit into from
Nov 3, 2015
Merged

Refactor packages and configuration prefixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...stence/elasticsearch/ElasticSearchIT.java → ...dstack/elasticsearch/ElasticSearchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...tack.seed.persistence.elasticsearch.props → ...uration/org.seedstack.elasticsearch.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions ...ch/internal/ElasticSearchClientProxy.java → ...ch/internal/ElasticSearchClientProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...arch/internal/ElasticSearchErrorCode.java → ...arch/internal/ElasticSearchErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...csearch/internal/ElasticSearchModule.java → ...csearch/internal/ElasticSearchModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...csearch/internal/ElasticSearchPlugin.java → ...csearch/internal/ElasticSearchPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand All @@ -50,7 +50,7 @@ public class ElasticSearchPlugin extends AbstractPlugin {

@Override
public String name() {
return "seed-elasticsearch-plugin";
return "elasticsearch";
}

@Override
Expand Down
0 ...nternal.ElasticSearchErrorCode.properties → ...nternal.ElasticSearchErrorCode.properties
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.seedstack.seed.persistence.elasticsearch.internal.ElasticSearchPlugin
org.seedstack.elasticsearch.internal.ElasticSearchPlugin