You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/01 02:20:39 UTC
git commit: Removed comments from the test management services. Added
error checking for the schedule method. Added comment to the resource on the
error message.
Repository: incubator-usergrid
Updated Branches:
refs/pull/60/head 11b235be4 -> 027a754ff
Removed comments from the test management services.
Added error checking for the schedule method.
Added comment to the resource on the error message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/027a754f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/027a754f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/027a754f
Branch: refs/pull/60/head
Commit: 027a754ff6c19d25cfd45f43565b6fca8d11253d
Parents: 11b235b
Author: grey <gr...@apigee.com>
Authored: Fri Feb 28 17:04:39 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Fri Feb 28 17:04:39 2014 -0800
----------------------------------------------------------------------
.../applications/ApplicationResource.java | 1 +
.../management/export/ExportServiceImpl.java | 21 ++++++++++++++++++--
.../cassandra/ManagementServiceIT.java | 6 ------
3 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/027a754f/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
index 158991a..62ecf34 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -306,6 +306,7 @@ public class ApplicationResource extends AbstractContextResource {
entity = smf.getServiceManager( applicationId ).getEntityManager().get( jobUUIDStr, Export.class );
}
catch ( Exception e ) {
+ //this might be due to other reasons, but gotta look up what service manager does.
return Response.status( SC_BAD_REQUEST ).build();
}
//validate this user owns it
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/027a754f/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
index f5cc642..7f28bc7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
@@ -80,12 +80,29 @@ public class ExportServiceImpl implements ExportService {
return null;
}
- EntityManager em = emf.getEntityManager( config.getApplicationId() );
+ if ( config.getApplicationId() == null ) {
+ logger.error( "application information from export info could not be found" );
+ return null;
+ }
+
+ EntityManager em = null;
+ try {
+ em = emf.getEntityManager( config.getApplicationId() );
+ }catch (Exception e) {
+ logger.error( "application doesn't exist within the current context" );
+ return null;
+ }
Export export = new Export();
//update state
- export = em.create( export );
+ try{
+ export = em.create( export );
+ }catch(Exception e) {
+ logger.error( "Export entity creation failed" );
+ return null;
+ }
+
export.setState( Export.State.CREATED );
em.update( export );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/027a754f/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 70010d4..990c26b 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -998,8 +998,6 @@ public class ManagementServiceIT {
public void testFileExportOneCollection() throws Exception {
File f = null;
-// String orgName = "ed-organization";
-// String appName = "ed-app";
try {
f = new File( "exportOneCollection.json" );
@@ -1009,10 +1007,6 @@ public class ManagementServiceIT {
//consumed because this checks to see if the file exists. If it doesn't, don't do anything and carry on.
}
- //UUID appId = setup.getEmf().createApplication( orgName, appName );
-
-
-
EntityManager em = setup.getEmf().getEntityManager( applicationId);
em.createApplicationCollection( "baconators" );
//intialize user object to be posted