Don't provide defaults for fields that can't have reasonable defaults.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f015c92c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f015c92c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f015c92c Branch: refs/heads/release-2.1.1 Commit: f015c92c56092a4022a8c29d9203131ef797e057 Parents: cfb188d Author: Dave Johnson <[email protected]> Authored: Thu Jun 16 11:09:03 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Jun 16 11:09:03 2016 -0400 ---------------------------------------------------------------------- .../persistence/collection/uniquevalues/AkkaFig.java | 10 +++------- .../src/test/resources/usergrid.properties | 13 +++++++++++++ .../test/resources/usergrid-custom-test.properties | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f015c92c/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/AkkaFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/AkkaFig.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/AkkaFig.java index 3ebb6aa..e709920 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/AkkaFig.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/AkkaFig.java @@ -24,8 +24,10 @@ import org.safehaus.guicyfig.FigSingleton; import org.safehaus.guicyfig.GuicyFig; import org.safehaus.guicyfig.Key; +import java.io.Serializable; + @FigSingleton -public interface AkkaFig extends GuicyFig { +public interface AkkaFig extends GuicyFig, Serializable { String AKKA_ENABLED = "collection.akka.enabled"; @@ -59,28 +61,24 @@ public interface AkkaFig extends GuicyFig { * Hostname to be used in Akka configuration. */ @Key(AKKA_HOSTNAME) - @Default("localhost") String getHostname(); /** * local port to be used in Akka configuration. */ @Key(AKKA_PORT) - @Default("2551") int getPort(); /** * Local region to be used in Akka configuration. */ @Key(AKKA_REGION) - @Default("us-east") String getRegion(); /** * Comma separated list of regions known to cluster. */ @Key(AKKA_REGION_LIST) - @Default("us-east") String getRegionList(); /** @@ -95,7 +93,6 @@ public interface AkkaFig extends GuicyFig { * Regions MUST be listed in the 'usergrid.queue.regionList' */ @Key(AKKA_REGION_SEEDS) - @Default("us-east:localhost:2551") String getRegionSeeds(); /** @@ -103,7 +100,6 @@ public interface AkkaFig extends GuicyFig { * Comma-separated lists of region types each with format {region}:{type} */ @Key(AKKA_UNIQUEVALUE_REGION_TYPES) - @Default("us-east:user") String getRegionTypes(); /** http://git-wip-us.apache.org/repos/asf/usergrid/blob/f015c92c/stack/corepersistence/collection/src/test/resources/usergrid.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/resources/usergrid.properties b/stack/corepersistence/collection/src/test/resources/usergrid.properties index 8de5c27..d2650f7 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid.properties @@ -1,3 +1,16 @@ # This property is required to be set and cannot be defaulted anywhere usergrid.cluster_name=usergrid +collection.akka.enabled=true + +collection.akka.hostname=localhost +collection.akka.port=2551 +collection.akka.region=us-east +usergrid.queue.regionList=us-east +collection.akka.region.seeds=us-east\:localhost\:2551 + +collection.akka.uniquevalue.actors=300 +collection.akka.uniquevalue.cache.ttl=10 +collection.akka.uniquevalue.reservation.ttl=10 + +collection.akka.uniquevalue.region.types http://git-wip-us.apache.org/repos/asf/usergrid/blob/f015c92c/stack/rest/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties index c485bd5..660e8b8 100644 --- a/stack/rest/src/test/resources/usergrid-custom-test.properties +++ b/stack/rest/src/test/resources/usergrid-custom-test.properties @@ -52,3 +52,18 @@ usergrid.cluster_name=usergrid # this is here for PagingResourceIT.pagingEntitiesAcrossShardsWithGraph usergrid.graph.shard.size=100 usergrid.graph.shard.repair.chance=1.0 + +collection.akka.enabled=true + +collection.akka.hostname=localhost +collection.akka.port=2551 +collection.akka.region=us-east +usergrid.queue.regionList=us-east +collection.akka.region.seeds=us-east\:localhost\:2551 + +collection.akka.uniquevalue.actors=300 +collection.akka.uniquevalue.cache.ttl=10 +collection.akka.uniquevalue.reservation.ttl=10 + +collection.akka.uniquevalue.region.types +
