Cherry picking Akka/UV changes into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ae09ac3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ae09ac3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8ae09ac3 Branch: refs/heads/usergrid-1268-akka-211 Commit: 8ae09ac397bbc07fa217a0bb4ed715d10864edde Parents: 2c08979 Author: Dave Johnson <[email protected]> Authored: Thu Apr 21 14:46:24 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon Apr 25 15:49:17 2016 -0400 ---------------------------------------------------------------------- .../usergrid/rest/applications/CollectionResource.java | 13 +------------ .../applications/collection/CollectionsResourceIT.java | 1 + 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/8ae09ac3/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java index ba7aef0..9373b4d 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java @@ -86,7 +86,7 @@ public class CollectionResource extends ServiceResource { * POST settings for a collection. * * Expects a JSON object which may include: - * - fields: (array) field names to be indexed, '*' for all and 'none' for no indexing + * - fields: (array or string) either an array of field names to be indexed, or 'all' or 'none' * - region: (string) name of the authoritative region for this collection */ @POST @@ -123,17 +123,6 @@ public class CollectionResource extends ServiceResource { executeServicePostRequestForSettings( ui,response, ServiceAction.POST, payload ); - if(payload.getProperty( "fields" )==null){ - throw new NullArgumentException( "fields" ); - } - - if(! (payload.getProperty( "fields" ) instanceof ArrayList)){ - throw new NullArgumentException( "fields must be of json array type" ); - } - - - executeServicePostRequestForSettings( ui,response, ServiceAction.POST,payload ); - return response; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/8ae09ac3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java index 98a5fb2..2c8e305 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java @@ -1061,6 +1061,7 @@ public class CollectionsResourceIT extends AbstractRestIT { assertEquals( 0, connectionsByQuery.getNumOfEntities() ); } + @Test public void testCollectionRegion() {
