You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/12 19:18:07 UTC
[1/2] incubator-usergrid git commit: Removed unused test files
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-import fa34326c2 -> 3e2604a40
Removed unused test files
Fixed incorrect tests
Moved "import" endpoint to "imports"
moved "includes" endpoint for files to "files"
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a754959d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a754959d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a754959d
Branch: refs/heads/two-dot-o-import
Commit: a754959d349b1a449dd4441c431b4565c6e97e31
Parents: 04f323e
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Feb 12 11:17:02 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Feb 12 11:17:02 2015 -0700
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
.../applications/ApplicationResource.java | 2 +-
.../applications/imports/ImportsResource.java | 2 +-
.../rest/management/ImportResourceIT.java | 48 +--
.../resources/testImport.testApplication.2.json | 56 ----
.../resources/testImport.testCollection.1.json | 13 -
...testImportInvalidJson.testApplication.3.json | 290 ++++++++++---------
.../management/importer/ImportServiceImpl.java | 2 +-
8 files changed, 180 insertions(+), 235 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 46157ab..2710019 100644
--- a/stack/awscluster/pom.xml
+++ b/stack/awscluster/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws.s3.release-bucket>ug-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>ug-cloudformation-todd</aws.s3.release-bucket>
<!-- Pulls the file path from maven when using the dependency plugin. This doesn't work b/c it doesn't name the file properly to ROOT.war. Solve that to use the latest from the repo-->
<!--<stack.war>${org.apache.usergrid:usergrid-rest:war}</stack.war>-->
<stack.war>../rest/target/ROOT.war</stack.war>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/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 499c169..0c7889d 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
@@ -364,7 +364,7 @@ public class ApplicationResource extends AbstractContextResource {
}
- @Path( "import" )
+ @Path( "imports" )
@RequireOrganizationAccess
public ImportsResource importGetJson( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "" ) String callback )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
index cb61a1c..900b7b0 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
@@ -211,7 +211,7 @@ public class ImportsResource extends AbstractContextResource {
}
- @Path( RootResource.ENTITY_ID_PATH + "/includes" )
+ @Path( RootResource.ENTITY_ID_PATH + "/files" )
public FileIncludesResource getIncludes( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
throws Exception {
final UUID importId = UUID.fromString( entityId.getPath() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
index 2448f6d..61d61d1 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
@@ -138,7 +138,7 @@ public class ImportResourceIT extends AbstractRestIT {
.organization(org)
.app()
.addToPath(app)
- .addToPath("import")
+ .addToPath("imports")
.post(payload);
assertNotNull(entity);
@@ -148,7 +148,7 @@ public class ImportResourceIT extends AbstractRestIT {
.organization(org)
.app()
.addToPath(app)
- .addToPath("import")
+ .addToPath("imports")
.addToPath(entity.getUuid().toString())
.get();
@@ -176,7 +176,7 @@ public class ImportResourceIT extends AbstractRestIT {
.organization(org)
.app()
.addToPath(app)
- .addToPath("import")
+ .addToPath("imports")
.post(payload);
@@ -184,7 +184,7 @@ public class ImportResourceIT extends AbstractRestIT {
// test that you can access the organization using the currently set token.
this.management().orgs().organization(org).app().addToPath(app)
- .addToPath("import").addToPath(entity.getUuid().toString()).get();
+ .addToPath("imports").addToPath(entity.getUuid().toString()).get();
//create a new org/app
String newOrgName = "org" + UUIDUtils.newTimeUUID();
@@ -209,7 +209,7 @@ public class ImportResourceIT extends AbstractRestIT {
//try to read with the new token, which should fail as unauthorized
try {
this.management().orgs().organization(org).app().addToPath(app)
- .addToPath("import").addToPath(entity.getUuid().toString()).get();
+ .addToPath("imports").addToPath(entity.getUuid().toString()).get();
fail("Should not be able to read import job with unauthorized token");
} catch (UniformInterfaceException ex) {
errorParse(401, "unauthorized", ex);
@@ -227,7 +227,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity payload = new Entity();
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("import").post(payload);
+ this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -246,7 +246,7 @@ public class ImportResourceIT extends AbstractRestIT {
properties.remove("storage_info");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("import").post(payload);
+ this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -267,7 +267,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("import").post(payload);
+ this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -289,7 +289,7 @@ public class ImportResourceIT extends AbstractRestIT {
storage_info.remove("s3_key");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("import").post(payload);
+ this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -302,7 +302,7 @@ public class ImportResourceIT extends AbstractRestIT {
storage_info.remove("s3_access_id");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("import").post(payload);
+ this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -315,7 +315,7 @@ public class ImportResourceIT extends AbstractRestIT {
storage_info.remove("bucket_location");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("import").post(payload);
+ this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -420,7 +420,7 @@ public class ImportResourceIT extends AbstractRestIT {
//list out all the files in the resource directory you want uploaded
List<String> filenames = new ArrayList<>(1);
- filenames.add("testimport-bad-connection.json");
+ filenames.add("testImportCorrect.testCol.1.json");
// create 10 applications each with collection of 10 things, export all to S3
S3Upload s3Upload = new S3Upload();
s3Upload.copyToS3(
@@ -433,14 +433,14 @@ public class ImportResourceIT extends AbstractRestIT {
Entity importEntity = importCollection();
Entity importGet = this.management().orgs().organization( org ).app().addToPath( app )
- .addToPath( "import" ).addToPath( importEntity.getUuid().toString() ).get();
+ .addToPath( "imports" ).addToPath( importEntity.getUuid().toString() ).get();
refreshIndex();
Entity importGetIncludes = this.management().orgs().organization(org).app().addToPath(app)
- .addToPath("import" ).addToPath(importEntity.getUuid().toString() )
- .addToPath("includes" ).get();
+ .addToPath("imports" ).addToPath(importEntity.getUuid().toString() )
+ .addToPath("files" ).get();
ApiResponse importGetIncludesResponse = importGetIncludes.getResponse();
@@ -451,7 +451,7 @@ public class ImportResourceIT extends AbstractRestIT {
final Entity includesEntity = importGetIncludesResponse.getEntities().get( 0 );
- assertEquals( "testimport-bad-connection.json", includesEntity.getString( "fileName" ) );
+ assertEquals( "testImportCorrect.testCol.1.json", includesEntity.getString( "fileName" ) );
assertEquals(1, includesEntity.get( "importedConnectionCount" ));
assertEquals(1, includesEntity.get( "importedEntityCount" ));
@@ -484,7 +484,7 @@ public class ImportResourceIT extends AbstractRestIT {
//list out all the files in the resource directory you want uploaded
List<String> filenames = new ArrayList<>(1);
- filenames.add("testimport-bad-connection.json");
+ filenames.add("testImportCorrect.testCol.1.json");
filenames.add("testImport.testApplication.2.json");
// create 10 applications each with collection of 10 things, export all to S3
S3Upload s3Upload = new S3Upload();
@@ -498,7 +498,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity importEntity = importCollection();
Entity importGet = this.management().orgs().organization(org).app().addToPath(app)
- .addToPath( "import" ).addToPath(importEntity.getUuid().toString() ).get();
+ .addToPath( "imports" ).addToPath(importEntity.getUuid().toString() ).get();
assertNotNull(importGet);
@@ -543,7 +543,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity importEntity = importCollection();
Entity importGet = this.management().orgs().organization(org).app().addToPath(app)
- .addToPath("import" ).addToPath(importEntity.getUuid().toString() ).get();
+ .addToPath("imports" ).addToPath(importEntity.getUuid().toString() ).get();
assertNotNull(importGet);
@@ -588,12 +588,12 @@ public class ImportResourceIT extends AbstractRestIT {
// we should now have 100 Entities in the default app
- Entity importGet = this.management().orgs().organization( org ).app().addToPath( app ).addToPath("import")
+ Entity importGet = this.management().orgs().organization( org ).app().addToPath( app ).addToPath("imports")
.addToPath( importEntity.getUuid().toString() ).get();
Entity importGetIncludes = this.management().orgs().organization(org).app().addToPath(app)
- .addToPath("import" ).addToPath(importEntity.getUuid().toString() )
- .addToPath("includes" ).get();
+ .addToPath("imports" ).addToPath(importEntity.getUuid().toString() )
+ .addToPath("files" ).get();
assertNotNull(importGet);
//TODO: needs better error checking
@@ -625,7 +625,7 @@ public class ImportResourceIT extends AbstractRestIT {
}});
}});
- Entity importEntity = this.management().orgs().organization(org).app().addToPath(app).addToPath("import")
+ Entity importEntity = this.management().orgs().organization(org).app().addToPath(app).addToPath("imports")
.post(importPayload);
int maxRetries = 120;
@@ -638,7 +638,7 @@ public class ImportResourceIT extends AbstractRestIT {
.organization(org)
.app()
.addToPath(app)
- .addToPath("import")
+ .addToPath("imports")
.addToPath(importEntity.getUuid().toString())
.get();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/stack/rest/src/test/resources/testImport.testApplication.2.json
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/testImport.testApplication.2.json b/stack/rest/src/test/resources/testImport.testApplication.2.json
deleted file mode 100644
index f45d129..0000000
--- a/stack/rest/src/test/resources/testImport.testApplication.2.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[ {
- "Metadata" : {
- "uuid" : "589d95fa-ad7c-11e4-98bc-0f85bf181834",
- "type" : "qtsmagic",
- "created" : 1423171030223,
- "modified" : 1423171030223,
- "email" : "test0@anuff.com",
- "username" : "billybob0"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "589f91ca-ad7c-11e4-a250-63b6975ea888",
- "type" : "qtsmagic",
- "created" : 1423171030236,
- "modified" : 1423171030236,
- "email" : "test1@anuff.com",
- "username" : "billybob1"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "58a1186a-ad7c-11e4-bfc2-89e1e7bff3a8",
- "type" : "qtsmagic",
- "created" : 1423171030246,
- "modified" : 1423171030246,
- "email" : "test2@anuff.com",
- "username" : "billybob2"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "58a2c61a-ad7c-11e4-b2be-ab36d8b017f3",
- "type" : "qtsmagic",
- "created" : 1423171030257,
- "modified" : 1423171030257,
- "email" : "test3@anuff.com",
- "username" : "billybob3"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "58a44cba-ad7c-11e4-9fe5-fb8577a1f4a5",
- "type" : "qtsmagic",
- "created" : 1423171030267,
- "modified" : 1423171030267,
- "email" : "test4@anuff.com",
- "username" : "billybob4"
- },
- "connections" : { },
- "dictionaries" : { }
-} ]
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/stack/rest/src/test/resources/testImport.testCollection.1.json
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/testImport.testCollection.1.json b/stack/rest/src/test/resources/testImport.testCollection.1.json
deleted file mode 100644
index 181eb4e..0000000
--- a/stack/rest/src/test/resources/testImport.testCollection.1.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[ {
- "Metadata" : {
- "uuid" : "5db4619a-ad7c-11e4-adba-bd162708d0a6",
- "type" : "user",
- "name" : "me",
- "created" : 1423171038761,
- "modified" : 1423171038761,
- "username" : "junkRealName",
- "email" : "burp0@anuff.com"
- },
- "connections" : { },
- "dictionaries" : { }
-} ]
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/stack/rest/src/test/resources/testImportInvalidJson.testApplication.3.json
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/testImportInvalidJson.testApplication.3.json b/stack/rest/src/test/resources/testImportInvalidJson.testApplication.3.json
index 4a095a0..7551100 100644
--- a/stack/rest/src/test/resources/testImportInvalidJson.testApplication.3.json
+++ b/stack/rest/src/test/resources/testImportInvalidJson.testApplication.3.json
@@ -1,139 +1,153 @@
-[ {
- "Metadata" : {
- "uuid" : "a48f87da-ad7b-11e4-a929-1903ccb95468",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-0",
- "created" : 1423170728141,
- "modified" : 1423170728141,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- ,
- "connections" : {
- "related" : [ "a4921fea-ad7b-11e4-ab93-5b5c80acc33f" ]
- },
- "dictionaries" : {
- "connected_types" : {
- "related" : ""
- },
- "connecting_types" : {
- "related" : ""
- }
+{
+ "collections": {
+ "things": [
+ {
+ "Metadata": {
+ "uuid": "a48f87da-ad7b-11e4-a929-1903ccb95468",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-0",
+ "created": 1423170728141,
+ "modified": 1423170728141,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport",
+ "connections": {
+ "related": ["a4921fea-ad7b-11e4-ab93-5b5c80acc33f"]
+ },
+ "dictionaries": {
+ "connected_types": {
+ "related": ""
+ },
+ "connecting_types": {
+ "related": ""
+ }
+ }
+ },
+ {
+ "Metadata": {
+ "uuid": "a4921fea-ad7b-11e4-ab93-5b5c80acc33f",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-1",
+ "created": 1423170728158,
+ "modified": 1423170728158,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {
+ "related": ["a48f87da-ad7b-11e4-a929-1903ccb95468"]
+ },
+ "dictionaries": {
+ "connected_types": {
+ "related": ""
+ },
+ "connecting_types": {
+ "related": ""
+ }
+ }
+ },
+ {
+ "Metadata": {
+ "uuid": "a494b7fa-ad7b-11e4-b590-df421e4b4225",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-2",
+ "created": 1423170728175,
+ "modified": 1423170728175,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ },
+ {
+ "Metadata": {
+ "uuid": "a497771a-ad7b-11e4-9168-173fd0d6b09b",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-3",
+ "created": 1423170728193,
+ "modified": 1423170728193,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ },
+ {
+ "Metadata": {
+ "uuid": "a49a0f2a-ad7b-11e4-b8c5-01f63321a18b",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-4",
+ "created": 1423170728210,
+ "modified": 1423170728210,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ },
+ {
+ "Metadata": {
+ "uuid": "a49ca73a-ad7b-11e4-afa9-abe6d52a0752",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-5",
+ "created": 1423170728227,
+ "modified": 1423170728227,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ },
+ {
+ "Metadata": {
+ "uuid": "a49f1844-ad7b-11e4-a9b2-71d39c6a3448",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-6",
+ "created": 1423170728243,
+ "modified": 1423170728243,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ },
+ {
+ "Metadata": {
+ "uuid": "a4a1622a-ad7b-11e4-bf9f-3facb3ba8073",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-7",
+ "created": 1423170728258,
+ "modified": 1423170728258,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ },
+ {
+ "Metadata": {
+ "uuid": "a4a3ac1a-ad7b-11e4-868c-b1d8d4f657f1",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-8",
+ "created": 1423170728273,
+ "modified": 1423170728273,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ },
+ {
+ "Metadata": {
+ "uuid": "a4a6442a-ad7b-11e4-867e-976ae355c744",
+ "type": "thing",
+ "name": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-9",
+ "created": 1423170728290,
+ "modified": 1423170728290,
+ "originalAppId": "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
+ "originalAppName": "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
+ },
+ "connections": {},
+ "dictionaries": {}
+ }
+ ]
}
-}, {
- "Metadata" : {
- "uuid" : "a4921fea-ad7b-11e4-ab93-5b5c80acc33f",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-1",
- "created" : 1423170728158,
- "modified" : 1423170728158,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : {
- "related" : [ "a48f87da-ad7b-11e4-a929-1903ccb95468" ]
- },
- "dictionaries" : {
- "connected_types" : {
- "related" : ""
- },
- "connecting_types" : {
- "related" : ""
- }
- }
-}, {
- "Metadata" : {
- "uuid" : "a494b7fa-ad7b-11e4-b590-df421e4b4225",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-2",
- "created" : 1423170728175,
- "modified" : 1423170728175,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "a497771a-ad7b-11e4-9168-173fd0d6b09b",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-3",
- "created" : 1423170728193,
- "modified" : 1423170728193,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "a49a0f2a-ad7b-11e4-b8c5-01f63321a18b",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-4",
- "created" : 1423170728210,
- "modified" : 1423170728210,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "a49ca73a-ad7b-11e4-afa9-abe6d52a0752",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-5",
- "created" : 1423170728227,
- "modified" : 1423170728227,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "a49f1844-ad7b-11e4-a9b2-71d39c6a3448",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-6",
- "created" : 1423170728243,
- "modified" : 1423170728243,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "a4a1622a-ad7b-11e4-bf9f-3facb3ba8073",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-7",
- "created" : 1423170728258,
- "modified" : 1423170728258,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "a4a3ac1a-ad7b-11e4-868c-b1d8d4f657f1",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-8",
- "created" : 1423170728273,
- "modified" : 1423170728273,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-}, {
- "Metadata" : {
- "uuid" : "a4a6442a-ad7b-11e4-867e-976ae355c744",
- "type" : "thing",
- "name" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport-thing-9",
- "created" : 1423170728290,
- "modified" : 1423170728290,
- "originalAppId" : "a445ad9e-ad7b-11e4-9e42-e2c2c83d257d",
- "originalAppName" : "org.apache.usergrid.management.importer.importcollectionit9dc7ff35ad7b11e49e42e2c2c83d257d/testupdatebyimport"
- },
- "connections" : { },
- "dictionaries" : { }
-} ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a754959d/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
index 5ddee0c..b37c98e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
@@ -59,7 +59,7 @@ public class ImportServiceImpl implements ImportService {
public static final int HEARTBEAT_COUNT = 50;
public static final String APP_IMPORT_CONNECTION ="imports";
- public static final String IMPORT_FILE_INCLUDES_CONNECTION = "includes";
+ public static final String IMPORT_FILE_INCLUDES_CONNECTION = "files";
private static final Logger logger = LoggerFactory.getLogger(ImportServiceImpl.class);
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import
Posted by to...@apache.org.
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Conflicts:
stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.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/3e2604a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e2604a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e2604a4
Branch: refs/heads/two-dot-o-import
Commit: 3e2604a404593d8921a1083136f6b0fd01aad315
Parents: a754959 fa34326
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Feb 12 11:18:02 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Feb 12 11:18:02 2015 -0700
----------------------------------------------------------------------
.../organizations/OrganizationResource.java | 3 -
.../applications/ApplicationResource.java | 3 -
.../management/importer/FileImportTracker.java | 2 +-
.../management/importer/ImportServiceImpl.java | 77 ++++++++++----------
4 files changed, 38 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e2604a4/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e2604a4/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------