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 2015/03/30 21:58:11 UTC
[07/50] incubator-usergrid git commit: Some fixes in Service module's
import tests, some still failing.
Some fixes in Service module's import tests, some still failing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/10481ce3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/10481ce3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/10481ce3
Branch: refs/heads/two-dot-o-dev
Commit: 10481ce32ca6938da8617e3004ba7f80188e4117
Parents: 531e659
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Mar 6 12:27:39 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Mar 6 12:27:39 2015 -0500
----------------------------------------------------------------------
.../resources/testImport.testApplication.2.json | 56 -------
.../resources/testImportCorrect.testCol.1.json | 18 ---
...testImportInvalidJson.testApplication.3.json | 153 -------------------
.../testimport-bad-json-testapp.3.json | 153 +++++++++++++++++++
.../resources/testimport-correct-testcol.1.json | 18 +++
.../test/resources/testimport-test-app.2.json | 56 +++++++
.../cassandra/ManagementServiceImpl.java | 22 ++-
.../management/importer/FileImportJob.java | 2 +-
.../management/importer/ImportServiceImpl.java | 26 ++--
9 files changed, 251 insertions(+), 253 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10481ce3/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/10481ce3/stack/rest/src/test/resources/testImportCorrect.testCol.1.json
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/testImportCorrect.testCol.1.json b/stack/rest/src/test/resources/testImportCorrect.testCol.1.json
deleted file mode 100644
index f5fb6c4..0000000
--- a/stack/rest/src/test/resources/testImportCorrect.testCol.1.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "collections" : {
- "things" : [
- {
- "Metadata" : {
- "uuid" : "e2c5fed0-a7ea-11e4-a129-a1a7aeaea66e",
- "name" : "thing0",
- "created" : 1422558799676,
- "modified" : 1422558799676,
- "index" : 0
- },
- "connections" : {
- "related" : [ "e2c896ea-a7ea-11e4-bebf-77bfb1f0c5f4" ]
- }
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10481ce3/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
deleted file mode 100644
index 7551100..0000000
--- a/stack/rest/src/test/resources/testImportInvalidJson.testApplication.3.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
- "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": {}
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10481ce3/stack/rest/src/test/resources/testimport-bad-json-testapp.3.json
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/testimport-bad-json-testapp.3.json b/stack/rest/src/test/resources/testimport-bad-json-testapp.3.json
new file mode 100644
index 0000000..7551100
--- /dev/null
+++ b/stack/rest/src/test/resources/testimport-bad-json-testapp.3.json
@@ -0,0 +1,153 @@
+{
+ "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": {}
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10481ce3/stack/rest/src/test/resources/testimport-correct-testcol.1.json
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/testimport-correct-testcol.1.json b/stack/rest/src/test/resources/testimport-correct-testcol.1.json
new file mode 100644
index 0000000..f5fb6c4
--- /dev/null
+++ b/stack/rest/src/test/resources/testimport-correct-testcol.1.json
@@ -0,0 +1,18 @@
+{
+ "collections" : {
+ "things" : [
+ {
+ "Metadata" : {
+ "uuid" : "e2c5fed0-a7ea-11e4-a129-a1a7aeaea66e",
+ "name" : "thing0",
+ "created" : 1422558799676,
+ "modified" : 1422558799676,
+ "index" : 0
+ },
+ "connections" : {
+ "related" : [ "e2c896ea-a7ea-11e4-bebf-77bfb1f0c5f4" ]
+ }
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10481ce3/stack/rest/src/test/resources/testimport-test-app.2.json
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/testimport-test-app.2.json b/stack/rest/src/test/resources/testimport-test-app.2.json
new file mode 100644
index 0000000..f45d129
--- /dev/null
+++ b/stack/rest/src/test/resources/testimport-test-app.2.json
@@ -0,0 +1,56 @@
+[ {
+ "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/10481ce3/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 34a3f5f..d8fc0f5 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -1638,24 +1638,22 @@ public class ManagementServiceImpl implements ManagementService {
properties = new HashMap<>();
}
- OrganizationInfo organizationInfo = getOrganizationByUuid( organizationId );
- UUID applicationId = emf.createApplication( organizationInfo.getName(), applicationName, properties );
-
EntityManager em = emf.getEntityManager( smf.getManagementAppId() );
- em.refreshIndex();
- // TODO: move this logic into the EntityManagerFactory implementation
+ OrganizationInfo organizationInfo = getOrganizationByUuid( organizationId );
+ UUID applicationId = emf.createApplication(
+ organizationInfo.getName(), applicationName, properties );
+ em.refreshIndex();
- String appName = buildAppName( applicationName, organizationInfo );
- Query q = Query.fromQL(PROPERTY_NAME + " = '" + appName + "'");
- Results results = em.searchCollection( em.getApplicationRef(), CpNamingUtils.APPLICATION_INFOS, q);
- Entity appInfo = results.iterator().next();
+ Entity appInfo = em.get(
+ new SimpleEntityRef( CpNamingUtils.APPLICATION_INFO, applicationId ));
writeUserToken( smf.getManagementAppId(), appInfo,
- encryptionService.plainTextCredentials( generateOAuthSecretKey( AuthPrincipalType.APPLICATION ),
- null, smf.getManagementAppId() ) );
+ encryptionService.plainTextCredentials(
+ generateOAuthSecretKey( AuthPrincipalType.APPLICATION ),
+ null,
+ smf.getManagementAppId() ) );
- // TODO: migration needed to make sure this gets called for all existing apps
addApplicationToOrganization( organizationId, applicationId, appInfo );
UserInfo user = null;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10481ce3/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportJob.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportJob.java
index a77bb99..bdfcb61 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportJob.java
@@ -82,7 +82,7 @@ public class FileImportJob extends OnlyOnceJob {
throw t;
}
- logger.error("File Import Service completed job");
+ logger.info("File Import Service completed job: " + jobExecution.getJobName() );
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10481ce3/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 35155c0..120e76e 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
@@ -126,10 +126,10 @@ public class ImportServiceImpl implements ImportService {
importEntity.setState(Import.State.SCHEDULED);
rootEM.update(importEntity);
- final EntityRef source = getApplicationEntity( rootEM, application );
+ final EntityRef appInfo = getApplicationInfoEntity(rootEM, application);
//now link it to the application
- rootEM.createConnection(source, APP_IMPORT_CONNECTION, importEntity);
+ rootEM.createConnection(appInfo, APP_IMPORT_CONNECTION, importEntity);
return importEntity;
}
@@ -141,9 +141,7 @@ public class ImportServiceImpl implements ImportService {
try {
final EntityManager rootEm = emf.getEntityManager( emf.getManagementAppId() );
-
-
- final Entity applicationEntity = getApplicationEntity( rootEm, applicationId );
+ final Entity appInfo = getApplicationInfoEntity(rootEm, applicationId);
Query query = Query.fromQLNullSafe( ql );
query.setCursor( cursor );
@@ -151,7 +149,7 @@ public class ImportServiceImpl implements ImportService {
//set our entity type
query.setEntityType( Schema.getDefaultSchema().getEntityType( Import.class ) );
- return rootEm.searchCollection( applicationEntity, APP_IMPORT_CONNECTION, query );
+ return rootEm.searchCollection( appInfo, APP_IMPORT_CONNECTION, query );
}
catch ( Exception e ) {
throw new RuntimeException( "Unable to get import entity", e );
@@ -167,11 +165,11 @@ public class ImportServiceImpl implements ImportService {
try {
final EntityManager rootEm = emf.getEntityManager( emf.getManagementAppId() );
- final Entity applicationEntity = getApplicationEntity( rootEm, applicationId );
+ final Entity appInfo = getApplicationInfoEntity(rootEm, applicationId);
final Import importEntity = rootEm.get( importId, Import.class );
// check if it's on the path
- if ( !rootEm.isConnectionMember( applicationEntity, APP_IMPORT_CONNECTION, importEntity ) ) {
+ if ( !rootEm.isConnectionMember( appInfo, APP_IMPORT_CONNECTION, importEntity ) ) {
return null;
}
@@ -183,7 +181,7 @@ public class ImportServiceImpl implements ImportService {
}
- private Entity getApplicationEntity(final EntityManager rootEm, final UUID applicationId) throws Exception {
+ private Entity getApplicationInfoEntity(final EntityManager rootEm, final UUID applicationId) throws Exception {
final Entity entity = rootEm.get( new SimpleEntityRef( CpNamingUtils.APPLICATION_INFO, applicationId ) );
if(entity == null){
@@ -252,7 +250,8 @@ public class ImportServiceImpl implements ImportService {
@Override
- public Results getFailedImportEntities(final UUID applicationId, final UUID importId, final UUID fileImportId, @Nullable final String ql, @Nullable final String cursor ) {
+ public Results getFailedImportEntities(final UUID applicationId, final UUID importId, final UUID fileImportId,
+ @Nullable final String ql, @Nullable final String cursor ) {
Preconditions.checkNotNull( applicationId, "applicationId must be specified" );
Preconditions.checkNotNull( importId, "importId must be specified" );
@@ -282,8 +281,8 @@ public class ImportServiceImpl implements ImportService {
@Override
- public FailedImportEntity getFailedImportEntity(final UUID applicationId, final UUID importId, final UUID fileImportId,
- final UUID failedImportId ) {
+ public FailedImportEntity getFailedImportEntity(final UUID applicationId, final UUID importId,
+ final UUID fileImportId, final UUID failedImportId ) {
try {
final EntityManager rootEm = emf.getEntityManager( emf.getManagementAppId() );
@@ -588,7 +587,6 @@ public class ImportServiceImpl implements ImportService {
} else {
-
if (config.get("applicationId") == null) {
throw new UnsupportedOperationException("Import applications not supported");
@@ -855,6 +853,8 @@ public class ImportServiceImpl implements ImportService {
try {
rootEM.update( importEntity );
+ logger.debug("Updated import entity {}:{} with state {}",
+ new Object[] { importEntity.getType(), importEntity.getUuid(), importEntity.getState() } );
}
catch ( Exception e ) {
logger.error( "Error updating import entity", e );