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/04/09 00:21:46 UTC
[20/43] git commit: Fixed old reference to exportID
Fixed old reference to exportID
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cf7d3306
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cf7d3306
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cf7d3306
Branch: refs/pull/96/merge
Commit: cf7d3306149d1704d16c7236b35353f7c0b0de56
Parents: 3a9bf5d
Author: grey <gr...@apigee.com>
Authored: Tue Apr 1 15:09:09 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Tue Apr 1 15:09:09 2014 -0700
----------------------------------------------------------------------
.../management/export/ExportServiceImpl.java | 16 ++++++++--------
.../management/cassandra/ExportServiceIT.java | 19 +++++++++++--------
2 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cf7d3306/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 94a533c..bcba8ae 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
@@ -197,7 +197,7 @@ public class ExportServiceImpl implements ExportService {
public void doExport( final JobExecution jobExecution ) throws Exception {
Map<String, Object> config = ( Map<String, Object> ) jobExecution.getJobData().getProperty( "exportInfo" );
- UUID scopedAppId = ( UUID ) config.get( "applicationId" );
+// UUID scopedAppId = ( UUID ) config.get( "applicationId" );
if ( config == null ) {
logger.error( "Export Information passed through is null" );
@@ -205,10 +205,10 @@ public class ExportServiceImpl implements ExportService {
}
//get the entity manager for the application, and the entity that this Export corresponds to.
UUID exportId = ( UUID ) jobExecution.getJobData().getProperty( EXPORT_ID );
- if ( scopedAppId == null ) {
- logger.error( "Export Information application uuid is null" );
- return;
- }
+// if ( scopedAppId == null ) {
+// logger.error( "Export Information application uuid is null" );
+// return;
+// }
EntityManager em = emf.getEntityManager( MANAGEMENT_APPLICATION_ID );
Export export = em.get( exportId, Export.class );
@@ -315,7 +315,7 @@ public class ExportServiceImpl implements ExportService {
//retrieves export entity
UUID exportId = ( UUID ) jobExecution.getJobData().getProperty( EXPORT_ID );
- EntityManager exportManager = emf.getEntityManager( ( UUID ) config.get( "applicationId" ) );
+ EntityManager exportManager = emf.getEntityManager( MANAGEMENT_APPLICATION_ID );
Export export = exportManager.get( exportId, Export.class );
String appFileName = null;
@@ -407,7 +407,7 @@ public class ExportServiceImpl implements ExportService {
//retrieves export entity
UUID exportId = ( UUID ) jobExecution.getJobData().getProperty( EXPORT_ID );
- EntityManager exportManager = emf.getEntityManager( ( UUID ) config.get( "applicationId" ) );
+ EntityManager exportManager = emf.getEntityManager( MANAGEMENT_APPLICATION_ID );
Export export = exportManager.get( exportId, Export.class );
//sets up a output stream for s3 backup.
@@ -497,7 +497,7 @@ public class ExportServiceImpl implements ExportService {
//retrieves export entity
UUID exportId = ( UUID ) jobExecution.getJobData().getProperty( EXPORT_ID );
- EntityManager exportManager = emf.getEntityManager( ( UUID ) config.get( "applicationId" ) );
+ EntityManager exportManager = emf.getEntityManager( MANAGEMENT_APPLICATION_ID );
Export export = exportManager.get( exportId, Export.class );
//sets up a output stream for s3 backup.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cf7d3306/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
index 72c9bcc..5764053 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
@@ -858,8 +858,8 @@ public class ExportServiceIT {
}
- @Ignore //For this test please input your s3 credentials into settings.xml or Attach a -D with relevant fields.
- //@Test
+ // @Ignore //For this test please input your s3 credentials into settings.xml or Attach a -D with relevant fields.
+ @Test
public void testIntegration100EntitiesOn() throws Exception {
S3Export s3Export = new S3ExportImpl();
@@ -934,11 +934,14 @@ public class ExportServiceIT {
blobStore.deleteContainer( bucketName );
assert ( false );
}
+ bo = blobStore.getBlob( bucketName, s3Export.getFilename() );
+
Long numOfFiles = blobStore.countBlobs( bucketName );
Long numWeWant = Long.valueOf( 1 );
+ blobStore.deleteContainer( bucketName );
assertEquals( numOfFiles, numWeWant );
- bo = blobStore.getBlob( bucketName, s3Export.getFilename() );
+
}
catch ( Exception e ) {
assert ( false );
@@ -948,8 +951,8 @@ public class ExportServiceIT {
blobStore.deleteContainer( bucketName );
}
- @Ignore
- //@Test
+ //@Ignore
+ @Test
public void testIntegration100EntitiesForAllApps() throws Exception {
S3Export s3Export = new S3ExportImpl();
@@ -1024,8 +1027,8 @@ public class ExportServiceIT {
Long numOfFiles = blobStore.countBlobs( bucketName );
//delete container containing said files
bo = blobStore.getBlob( bucketName, s3Export.getFilename() );
- blobStore.deleteContainer( bucketName );
Long numWeWant = Long.valueOf( 5 );
+ blobStore.deleteContainer( bucketName );
//asserts that the correct number of files was transferred over
assertEquals( numWeWant, numOfFiles );
}
@@ -1036,11 +1039,11 @@ public class ExportServiceIT {
}
assertNotNull( bo );
- blobStore.deleteContainer( bucketName );
}
- @Ignore
+ //@Ignore
+ @Test
public void testIntegration100EntitiesOnOneOrg() throws Exception {
S3Export s3Export = new S3ExportImpl();