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/10/14 21:43:03 UTC
[3/3] git commit: Merge branch 'two-dot-o' into pr/42
Merge branch 'two-dot-o' into pr/42
Conflicts:
portal/js/global/ug-service.js
portal/js/users/users-profile.html
stack/pom.xml
stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
stack/services/src/main/resources/usergrid-services-context.xml
stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4afccfd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4afccfd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4afccfd3
Branch: refs/heads/two-dot-o-import
Commit: 4afccfd3c0024ffdce08be2b8bc63173dd592d1f
Parents: b10dd71
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Oct 14 15:40:09 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Oct 14 15:40:09 2014 -0400
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 11 +++-
.../usergrid/persistence/EntityManager.java | 4 ++
.../cassandra/EntityManagerImpl.java | 7 ++
.../organizations/OrganizationResource.java | 9 ++-
.../applications/ApplicationResource.java | 2 +-
.../management/importUG/FileImportJob.java | 19 +++---
.../usergrid/management/importUG/ImportJob.java | 8 +--
.../management/importUG/ImportService.java | 2 +-
.../management/importUG/ImportServiceImpl.java | 14 ++--
.../usergrid/management/importUG/S3Import.java | 2 +-
.../management/importUG/S3ImportImpl.java | 6 +-
.../org/apache/usergrid/ServiceITSetup.java | 2 +-
.../org/apache/usergrid/ServiceITSetupImpl.java | 2 +-
.../management/cassandra/ExportServiceIT.java | 4 --
.../management/cassandra/ImportServiceIT.java | 67 +++++++++++---------
.../cassandra/ManagementServiceIT.java | 1 -
.../management/cassandra/MockS3ImportImpl.java | 2 +-
17 files changed, 90 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 8753670..d1a0442 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -88,7 +88,6 @@ import static org.apache.usergrid.persistence.Schema.TYPE_ENTITY;
import static org.apache.usergrid.persistence.Schema.getDefaultSchema;
import org.apache.usergrid.persistence.SimpleEntityRef;
import static org.apache.usergrid.persistence.SimpleEntityRef.getUuid;
-import static org.apache.usergrid.persistence.SimpleEntityRef.ref;
import org.apache.usergrid.persistence.SimpleRoleRef;
import org.apache.usergrid.persistence.TypedEntity;
import org.apache.usergrid.persistence.cassandra.ApplicationCF;
@@ -129,7 +128,6 @@ import org.apache.usergrid.persistence.index.query.CounterResolution;
import org.apache.usergrid.persistence.index.query.Identifier;
import org.apache.usergrid.persistence.index.query.Query;
import org.apache.usergrid.persistence.index.query.Query.Level;
-import static org.apache.usergrid.persistence.index.query.Query.Level.REFS;
import org.apache.usergrid.persistence.map.MapManager;
import org.apache.usergrid.persistence.map.MapScope;
import org.apache.usergrid.persistence.map.impl.MapScopeImpl;
@@ -1484,6 +1482,14 @@ public class CpEntityManager implements EntityManager {
@Override
+ public Results getConnectedEntities(UUID uuid, String connectionType,
+ String connectedEntityType, Level resultsLevel) throws Exception {
+
+ return getConnectedEntities( get(uuid), connectionType, connectedEntityType, resultsLevel);
+ }
+
+
+ @Override
public Results getConnectedEntities( EntityRef entityRef, String connectionType,
String connectedEntityType, Level resultsLevel ) throws Exception {
@@ -2990,7 +2996,6 @@ public class CpEntityManager implements EntityManager {
batch.execute();
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
index 3684d7e..4af858a 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
@@ -457,6 +457,9 @@ public interface EntityManager {
public Results getConnectedEntities( EntityRef entityRef, String connectionType,
String connectedEntityType, Level resultsLevel ) throws Exception;
+ public Results getConnectedEntities( UUID uuid, String connectionType,
+ String connectedEntityType, Level resultsLevel ) throws Exception;
+
/**
* Gets the entities connecting to this entity, optionally with the specified connection
* type and/or entity type.
@@ -695,4 +698,5 @@ public interface EntityManager {
public void flushManagerCaches();
public void reindex( final EntityManagerFactory.ProgressObserver po ) throws Exception;
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
index 7437c7a..32c259a 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -2929,4 +2929,11 @@ public class EntityManagerImpl implements EntityManager {
throw new UnsupportedOperationException("Not supported.");
}
+ @Override
+ public Results getConnectedEntities(UUID uuid, String connectionType,
+ String connectedEntityType, Level resultsLevel) throws Exception {
+
+ return getConnectedEntities( get(uuid), connectionType, connectedEntityType, resultsLevel);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git 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
index 241d66d..fb4260c 100644
--- 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
@@ -54,6 +54,9 @@ import java.util.UUID;
import static javax.servlet.http.HttpServletResponse.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static org.apache.usergrid.corepersistence.CpEntityManagerFactory.MANAGEMENT_APPLICATION_ID;
+import org.apache.usergrid.persistence.Entity;
+import org.apache.usergrid.persistence.index.query.Query.Level;
@Component("org.apache.usergrid.rest.management.organizations.OrganizationResource")
@@ -419,7 +422,7 @@ public class OrganizationResource extends AbstractContextResource {
Import entity;
try {
- entity = smf.getServiceManager( CassandraService.MANAGEMENT_APPLICATION_ID ).getEntityManager()
+ entity = smf.getServiceManager( MANAGEMENT_APPLICATION_ID ).getEntityManager()
.get( importEntityUUIDStr, Import.class );
}
catch ( Exception e ) { //this might not be a bad request and needs better error checking
@@ -443,8 +446,8 @@ public class OrganizationResource extends AbstractContextResource {
List<Entity> entity;
try {
- entity = smf.getServiceManager( CassandraService.MANAGEMENT_APPLICATION_ID ).getEntityManager()
- .getConnectedEntities(importEntityUUIDStr ,"includes",null, Results.Level.ALL_PROPERTIES).getEntities();
+ entity = smf.getServiceManager( MANAGEMENT_APPLICATION_ID ).getEntityManager()
+ .getConnectedEntities(importEntityUUIDStr ,"includes", null, Level.ALL_PROPERTIES).getEntities();
}
catch ( Exception e ) { //this might not be a bad request and needs better error checking
return Response.status( SC_BAD_REQUEST ).type( JSONPUtils.jsonMediaType( callback ) )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/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 9f7c781..c204b8c 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
@@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.export.ExportService;
-import org.apache.usergrid.management.importUG.ImportService;
+import org.apache.usergrid.management.importug.ImportService;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.applications.ServiceResource;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
index 85e3f46..2f0dcba 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.usergrid.management.importUG;
+package org.apache.usergrid.management.importug;
import org.apache.usergrid.batch.JobExecution;
import org.apache.usergrid.batch.job.OnlyOnceJob;
@@ -32,18 +32,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.UUID;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
+import static org.apache.usergrid.corepersistence.CpEntityManagerFactory.MANAGEMENT_APPLICATION_ID;
+import org.apache.usergrid.persistence.index.query.Query.Level;
+
-/**
- * Created by ApigeeCorporation on 7/8/14.
- */
@Component("fileImportJob")
public class FileImportJob extends OnlyOnceJob {
public static final String FILE_IMPORT_ID = "fileImportId";
private static final Logger logger = LoggerFactory.getLogger(FileImportJob.class);
- //injected the Entity Manager Factory
+ // injected the Entity Manager Factory
protected EntityManagerFactory emf;
@Autowired
@@ -82,8 +81,9 @@ public class FileImportJob extends OnlyOnceJob {
this.importService = importService;
}
- /*
- This method is called when the job is retried maximum times by the scheduler but still fails. Thus the scheduler marks it as DEAD.
+ /**
+ * This method is called when the job is retried maximum times by the scheduler but still fails.
+ * Thus the scheduler marks it as DEAD.
*/
@Override
public void dead( final JobExecution execution ) throws Exception {
@@ -98,7 +98,8 @@ public class FileImportJob extends OnlyOnceJob {
rootEm.update(fileImport);
// If one file Job fails, mark the main import Job also as failed
- Results ImportJobResults = rootEm.getConnectingEntities(fileImport.getUuid(), "includes", null, Results.Level.ALL_PROPERTIES);
+ Results ImportJobResults = rootEm.getConnectingEntities(
+ fileImport, "includes", null, Level.ALL_PROPERTIES);
List<Entity> importEntity = ImportJobResults.getEntities();
UUID importId = importEntity.get(0).getUuid();
Import importUG = rootEm.get(importId, Import.class);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
index 0ee687e..089ecd6 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.usergrid.management.importUG;
+package org.apache.usergrid.management.importug;
import org.apache.usergrid.batch.JobExecution;
import org.apache.usergrid.batch.job.OnlyOnceJob;
+import static org.apache.usergrid.corepersistence.CpEntityManagerFactory.MANAGEMENT_APPLICATION_ID;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.EntityManagerFactory;
import org.apache.usergrid.persistence.entities.Import;
@@ -27,11 +28,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-/**
- * Created by ApigeeCorporation on 7/8/14.
- */
+
@Component("importJob")
public class ImportJob extends OnlyOnceJob {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportService.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportService.java
index 08b60c2..3e8aa4a 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.usergrid.management.importUG;
+package org.apache.usergrid.management.importug;
import org.apache.usergrid.batch.JobExecution;
import org.apache.usergrid.persistence.entities.FileImport;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
index 7f6ed81..5cd505a 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.usergrid.management.importUG;
+package org.apache.usergrid.management.importug;
import org.apache.usergrid.batch.JobExecution;
import org.apache.usergrid.batch.service.SchedulerService;
@@ -43,12 +43,10 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
+import static org.apache.usergrid.corepersistence.CpEntityManagerFactory.MANAGEMENT_APPLICATION_ID;
+import org.apache.usergrid.persistence.index.query.Query.Level;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-/**
- * Created by ApigeeCorporation on 7/8/14.
- */
public class ImportServiceImpl implements ImportService {
public static final String IMPORT_ID = "importId";
@@ -399,7 +397,7 @@ public class ImportServiceImpl implements ImportService {
// schedule each file as a separate job
for (File eachfile : files) {
- UUID jobID = scheduleFile(eachfile.getPath(), rooteEm.getRef(importId));
+ UUID jobID = scheduleFile(eachfile.getPath(), importUG);
Map<String, Object> fileJobID = new HashMap<String, Object>();
fileJobID.put("FileName", eachfile.getName());
fileJobID.put("JobID", jobID.toString());
@@ -613,12 +611,12 @@ public class ImportServiceImpl implements ImportService {
rootEm.update(fileImport);
//check other files status and mark the status of import Job as Finished if all others are finished
- Results ImportJobResults = rootEm.getConnectingEntities(fileImport.getUuid(), "includes", null, Results.Level.ALL_PROPERTIES);
+ Results ImportJobResults = rootEm.getConnectingEntities(fileImport, "includes", null, Level.ALL_PROPERTIES);
List<Entity> importEntity = ImportJobResults.getEntities();
UUID importId = importEntity.get(0).getUuid();
Import importUG = rootEm.get(importId, Import.class);
- Results entities = rootEm.getConnectedEntities(importId, "includes", null, Results.Level.ALL_PROPERTIES);
+ Results entities = rootEm.getConnectedEntities( importUG, "includes", null, Level.ALL_PROPERTIES);
List<Entity> importFile = entities.getEntities();
int count = 0;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3Import.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3Import.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3Import.java
index eb6493d..f687b38 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3Import.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3Import.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.usergrid.management.importUG;
+package org.apache.usergrid.management.importug;
import java.util.ArrayList;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3ImportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3ImportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3ImportImpl.java
index 5eb8a85..53a77d9 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3ImportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/S3ImportImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.usergrid.management.importUG;
+package org.apache.usergrid.management.importug;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
@@ -41,9 +41,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-/**
- * Created by ApigeeCorporation on 7/8/14.
- */
+
public class S3ImportImpl implements S3Import {
private BlobStore blobStore;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java
index 9dcfc5d..5a08338 100644
--- a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java
+++ b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java
@@ -20,7 +20,7 @@ package org.apache.usergrid;
import org.apache.usergrid.management.ApplicationCreator;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.management.export.ExportService;
-import org.apache.usergrid.management.importUG.ImportService;
+import org.apache.usergrid.management.importug.ImportService;
import org.apache.usergrid.security.providers.SignInProviderFactory;
import org.apache.usergrid.security.tokens.TokenService;
import org.apache.usergrid.services.ServiceManagerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java
index 734e951..9f5ac16 100644
--- a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java
+++ b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java
@@ -21,7 +21,7 @@ import org.apache.usergrid.cassandra.CassandraResource;
import org.apache.usergrid.management.ApplicationCreator;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.management.export.ExportService;
-import org.apache.usergrid.management.importUG.ImportService;
+import org.apache.usergrid.management.importug.ImportService;
import org.apache.usergrid.persistence.cassandra.CassandraService;
import org.apache.usergrid.security.providers.SignInProviderFactory;
import org.apache.usergrid.security.tokens.TokenService;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/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 d4167ad..d3f96a7 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
@@ -63,10 +63,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-/**
- *
- *
- */
@Concurrent
public class ExportServiceIT {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ImportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ImportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ImportServiceIT.java
index f44f442..3cabb89 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ImportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ImportServiceIT.java
@@ -32,9 +32,9 @@ import org.apache.usergrid.management.UserInfo;
import org.apache.usergrid.management.export.ExportService;
import org.apache.usergrid.management.export.S3Export;
import org.apache.usergrid.management.export.S3ExportImpl;
-import org.apache.usergrid.management.importUG.ImportService;
-import org.apache.usergrid.management.importUG.S3Import;
-import org.apache.usergrid.management.importUG.S3ImportImpl;
+import org.apache.usergrid.management.importug.ImportService;
+import org.apache.usergrid.management.importug.S3Import;
+import org.apache.usergrid.management.importug.S3ImportImpl;
import org.apache.usergrid.persistence.*;
import org.apache.usergrid.persistence.entities.JobData;
import org.jclouds.ContextBuilder;
@@ -48,15 +48,14 @@ import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
+import org.apache.usergrid.persistence.index.query.Query.Level;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-/**
- * Created by ApigeeCorporation on 7/8/14.
- */
+
@Concurrent
public class ImportServiceIT {
@@ -73,7 +72,7 @@ public class ImportServiceIT {
public ClearShiroSubject clearShiroSubject = new ClearShiroSubject();
@ClassRule
- public static final ServiceITSetup setup = new ServiceITSetupImpl( cassandraResource );
+ public static final ServiceITSetup setup = new ServiceITSetupImpl( cassandraResource, ServiceITSuite.elasticSearchResource );
@BeforeClass
@@ -99,12 +98,17 @@ public class ImportServiceIT {
userProperties = new LinkedHashMap<String, Object>();
userProperties.put( "name", "user" + i );
userProperties.put( "email", "user" + i + "@test.com" );
- entityTest[i] = emTest.create( "usertests", userProperties );
+ entityTest[i] = emTest.create( "testobject", userProperties );
}
//create connection
- emTest.createConnection( emTest.getRef(entityTest[0].getUuid()), "related", emTest.getRef(entityTest[1].getUuid()));
- emTest.createConnection( emTest.getRef(entityTest[1].getUuid()), "related", emTest.getRef( entityTest[0].getUuid()));
+ emTest.createConnection( new SimpleEntityRef( "testobject", entityTest[0].getUuid()),
+ "related",
+ new SimpleEntityRef( "testobject", entityTest[1].getUuid()));
+
+ emTest.createConnection( new SimpleEntityRef( "testobject", entityTest[1].getUuid()),
+ "related",
+ new SimpleEntityRef( "testobject", entityTest[0].getUuid()));
}
@Ignore //For this test please input your s3 credentials into settings.xml or Attach a -D with relevant fields.
@@ -124,12 +128,14 @@ public class ImportServiceIT {
userProperties = new LinkedHashMap<String, Object>();
userProperties.put( "username", "user" + i );
userProperties.put( "email", "user" + i + "@test.com" );
- entity[i] = em.create( "users", userProperties );
+ entity[i] = em.create( "user", userProperties );
}
//creates test connections between first 2 users
- em.createConnection( em.getRef(entity[0].getUuid()), "related", em.getRef(entity[1].getUuid()));
- em.createConnection( em.getRef(entity[1].getUuid()), "related", em.getRef( entity[0].getUuid()));
+ em.createConnection( new SimpleEntityRef( "user", entity[0].getUuid()),
+ "related", new SimpleEntityRef( "user", entity[1].getUuid()));
+ em.createConnection( new SimpleEntityRef( "user", entity[1].getUuid()),
+ "related", new SimpleEntityRef( "user", entity[0].getUuid()));
//Export the collection which needs to be tested for import
ExportService exportService = setup.getExportService();
@@ -180,14 +186,14 @@ public class ImportServiceIT {
assertThat(importService.getEphemeralFile().size(), is(not(0)));
//check if entities are actually updated i.e. created and modified should be different
- Results collections = em.getCollection(applicationId, "users", null, Results.Level.ALL_PROPERTIES);
+ Results collections = em.getCollection(applicationId, "users", null, Level.ALL_PROPERTIES);
List<Entity> entities = collections.getEntities();
// check if connections are created for only the 1st 2 entities in user collection
Results r;
List<ConnectionRef> connections;
for (int i = 0; i < 2; i++) {
- r = em.getConnectedEntities(entities.get(i).getUuid(), "related", null, Results.Level.IDS);
+ r = em.getConnectedEntities(entities.get(i), "related", null, Level.IDS);
connections = r.getConnections();
assertNotNull(connections);
}
@@ -198,7 +204,7 @@ public class ImportServiceIT {
for (int i = 0; i < 3; i++) {
- er = em.getRef(entities.get(i).getUuid());
+ er = entities.get(i);
dictionaries1 = em.getDictionaryAsMap(er, "connected_types");
dictionaries2 = em.getDictionaryAsMap(er, "connecting_types");
@@ -229,16 +235,18 @@ public class ImportServiceIT {
Map<String, Object> userProperties = null;
Entity entity[] = new Entity[5];
- //creates entities for a custom collection called "custom"
+ //creates entities for a custom collection "custom" entities
for ( int i = 0; i < 5; i++ ) {
userProperties = new LinkedHashMap<String, Object>();
userProperties.put( "parameter1", "user" + i );
userProperties.put( "parameter2", "user" + i + "@test.com" );
- entity[i] = em.create( "customs", userProperties );
+ entity[i] = em.create( "custom", userProperties );
}
//creates connections
- em.createConnection( em.getRef( entity[0].getUuid() ), "related", em.getRef( entity[1].getUuid() ) );
- em.createConnection( em.getRef( entity[1].getUuid() ), "related", em.getRef( entity[0].getUuid() ) );
+ em.createConnection( new SimpleEntityRef( "custom", entity[0].getUuid() ),
+ "related", new SimpleEntityRef( "custom", entity[1].getUuid() ) );
+ em.createConnection( new SimpleEntityRef( "custom", entity[1].getUuid() ),
+ "related", new SimpleEntityRef( "custom", entity[0].getUuid() ) );
//Export the application which needs to be tested for import
@@ -292,7 +300,7 @@ public class ImportServiceIT {
// check if all collections in the application are updated
while (collectionsItr.hasNext()) {
String collectionName = collectionsItr.next();
- Results collection = em.getCollection(applicationId, collectionName, null, Results.Level.ALL_PROPERTIES);
+ Results collection = em.getCollection(applicationId, collectionName, null, Level.ALL_PROPERTIES);
List<Entity> entities = collection.getEntities();
for (Entity eachEntity : entities) {
//check for dictionaries --> checking permissions in the dictionaries
@@ -302,11 +310,11 @@ public class ImportServiceIT {
//checking for permissions for the roles collection
if (collectionName.equals("roles")) {
if (eachEntity.getName().equalsIgnoreCase("admin")) {
- er = em.getRef(eachEntity.getUuid());
+ er = eachEntity;
dictionaries = em.getDictionaryAsMap(er, "permissions");
assertThat(dictionaries.size(), is(0));
} else {
- er = em.getRef(eachEntity.getUuid());
+ er = eachEntity;
dictionaries = em.getDictionaryAsMap(er, "permissions");
assertThat(dictionaries.size(), is(not(0)));
}
@@ -317,7 +325,7 @@ public class ImportServiceIT {
Results r;
List<ConnectionRef> connections;
for (int i = 0; i < 2; i++) {
- r = em.getConnectedEntities(entities.get(i).getUuid(), "related", null, Results.Level.IDS);
+ r = em.getConnectedEntities(entities.get(i), "related", null,Level.IDS);
connections = r.getConnections();
assertNotNull(connections);
}
@@ -352,8 +360,9 @@ public class ImportServiceIT {
}
//creates test connections between first 2 entities in usertests collection
- ConnectedEntityRef ref=em.createConnection( em.getRef(entity[0].getUuid()), "related", em.getRef(entity[1].getUuid()));
- em.createConnection( em.getRef(entity[1].getUuid()), "related", em.getRef( entity[0].getUuid()));
+ ConnectedEntityRef ref = em.createConnection( entity[0], "related", entity[1]);
+
+ em.createConnection( entity[1], "related", entity[0]);
//create 2nd test application, add entities to it, create connections and set permissions
createAndSetup2ndApplication();
@@ -414,7 +423,7 @@ public class ImportServiceIT {
Iterator<String> itr = collections.iterator();
while (itr.hasNext()) {
String collectionName = itr.next();
- Results collection = em.getCollection(appID, collectionName, null, Results.Level.ALL_PROPERTIES);
+ Results collection = em.getCollection(appID, collectionName, null, Level.ALL_PROPERTIES);
List<Entity> entities = collection.getEntities();
if (collectionName.equals("usertests")) {
@@ -423,7 +432,7 @@ public class ImportServiceIT {
Results r;
List<ConnectionRef> connections;
for (int i = 0; i < 2; i++) {
- r = em.getConnectedEntities(entities.get(i).getUuid(), "related", null, Results.Level.IDS);
+ r = em.getConnectedEntities(entities.get(i), "related", null, Level.IDS);
connections = r.getConnections();
assertNotNull(connections);
}
@@ -432,7 +441,7 @@ public class ImportServiceIT {
EntityRef er;
Map<Object, Object> dictionaries1, dictionaries2;
for (int i = 0; i < 3; i++) {
- er = em.getRef(entities.get(i).getUuid());
+ er = entities.get(i);
dictionaries1 = em.getDictionaryAsMap(er, "connected_types");
dictionaries2 = em.getDictionaryAsMap(er, "connecting_types");
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/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 6eb2865..a2dc45c 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
@@ -52,7 +52,6 @@ import org.apache.usergrid.utils.JsonUtils;
import org.apache.usergrid.utils.UUIDUtils;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
-import static org.apache.usergrid.management.EmailFlowIT.setup;
import static org.apache.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4afccfd3/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ImportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ImportImpl.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ImportImpl.java
index 41bee0c..b6b54b0 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ImportImpl.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ImportImpl.java
@@ -17,7 +17,7 @@
package org.apache.usergrid.management.cassandra;
-import org.apache.usergrid.management.importUG.S3Import;
+import org.apache.usergrid.management.importug.S3Import;
import java.io.File;
import java.util.ArrayList;