Merge branch 'two-dot-o-dev' into usergrid-103-upgrade-jersey
Conflicts:
stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8081401d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8081401d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8081401d
Branch: refs/heads/two-dot-o-dev
Commit: 8081401dc19443a0e968be5110b6ad7de22b8b12
Parents: 4918a5a b67f0b1
Author: Dave Johnson <[email protected]>
Authored: Wed Sep 9 18:32:12 2015 -0400
Committer: Dave Johnson <[email protected]>
Committed: Wed Sep 9 18:32:12 2015 -0400
----------------------------------------------------------------------
.../corepersistence/util/CpNamingUtils.java | 3 +
.../org/apache/usergrid/rest/ApiResponse.java | 14 ++
.../rest/applications/ServiceResource.java | 24 ++-
.../organizations/OrganizationResource.java | 55 ++++++
.../organizations/OrganizationsResource.java | 3 +-
.../usergrid/management/ManagementService.java | 10 ++
.../usergrid/management/OrganizationConfig.java | 170 +++++++++++++++++++
.../cassandra/ManagementServiceImpl.java | 84 +++++++++
8 files changed, 357 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8081401d/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --cc
stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
index eba9e27,866a74d..e98f366
---
a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
+++
b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
@@@ -17,9 -17,41 +17,10 @@@
package org.apache.usergrid.rest.applications;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.usergrid.management.OrganizationConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.commons.lang.StringUtils;
-
++import org.apache.usergrid.management.OrganizationConfig;
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.Query;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8081401d/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --cc
stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
index 2e17cfb,f45e1b2..8c5328e
---
a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
+++
b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
@@@ -17,13 -17,21 +17,14 @@@
package org.apache.usergrid.rest.management.organizations;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.commons.lang.NullArgumentException;
-
-import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.management.ActivationState;
+ import org.apache.usergrid.management.OrganizationConfig;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.export.ExportService;
-import org.apache.usergrid.management.importer.ImportService;
-import org.apache.usergrid.persistence.EntityRef;
-import org.apache.usergrid.persistence.SimpleEntityRef;
import org.apache.usergrid.persistence.entities.Export;
-import org.apache.usergrid.persistence.entities.Import;
import org.apache.usergrid.persistence.queue.impl.UsergridAwsCredentials;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
@@@ -364,4 -363,56 +365,58 @@@ public class OrganizationResource exten
}
+ @RequireOrganizationAccess
++ @JSONP
+ @GET
+ @Path("config")
- public JSONWithPadding getConfig( @Context UriInfo ui,
++ public ApiResponse getConfig( @Context UriInfo ui,
+ @QueryParam("callback")
@DefaultValue("callback") String callback )
+ throws Exception {
+
+ logger.info( "Get configuration for organization: " +
organization.getUuid() );
+
+ // TODO: check for super user, @RequireSystemAccess didn't work
+
+ ApiResponse response = createApiResponse();
+ response.setAction( "get organization configuration" );
+
+ // TODO: check for super user
+
+ OrganizationConfig orgConfig =
+ management.getOrganizationConfigByUuid(
organization.getUuid() );
+
+ response.setProperty( "configuration",
management.getOrganizationConfigData( orgConfig ) );
+ // response.setOrganizationConfig( orgConfig );
+
- return new JSONWithPadding( response, callback );
++ return response;
+ }
+
+
+ @RequireOrganizationAccess
+ @Consumes(MediaType.APPLICATION_JSON)
++ @JSONP
+ @PUT
+ @Path("config")
- public JSONWithPadding putConfig( @Context UriInfo ui, Map<String,
Object> json,
++ public ApiResponse putConfig( @Context UriInfo ui, Map<String, Object>
json,
+ @QueryParam("callback")
@DefaultValue("callback") String callback )
+ throws Exception {
+
+ logger.debug("Put configuration for organization: " +
organization.getUuid());
+
+ ApiResponse response = createApiResponse();
+ response.setAction("put organization configuration");
+
+ // TODO: check for super user
+
+ // response.setParams(ui.getQueryParameters());
+
+ OrganizationConfig orgConfig =
+ management.getOrganizationConfigByUuid(
organization.getUuid() );
+ orgConfig.addProperties(json);
+ management.updateOrganizationConfig(orgConfig);
+ response.setProperty( "configuration",
management.getOrganizationConfigData( orgConfig ) );
+
- return new JSONWithPadding( response, callback );
++ return response;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8081401d/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --cc
stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
index daa7264,4eac80d..27d8d6a
---
a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
+++
b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
@@@ -90,9 -96,6 +91,7 @@@ public class OrganizationsResource exte
if ( organization == null ) {
throw new ManagementException( "Could not find organization for
name: " + organizationName );
}
+
-
-
return getSubResource( OrganizationResource.class
).init(organization);
}
