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/16 20:06:17 UTC
[26/50] incubator-usergrid git commit: Fixes short circuit on file
error
Fixes short circuit on file error
Fixes test key
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fcc17399
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fcc17399
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fcc17399
Branch: refs/heads/USERGRID-273
Commit: fcc1739973f3ffe4463463099f13f3f7f4bbfa8e
Parents: a00af86
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Feb 11 20:02:22 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Feb 11 20:02:22 2015 -0700
----------------------------------------------------------------------
.../rest/management/ImportResourceIT.java | 41 ++++++++++++--------
.../management/importer/ImportServiceImpl.java | 4 ++
2 files changed, 28 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fcc17399/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 4427fe8..9b81b40 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
@@ -17,6 +17,7 @@
package org.apache.usergrid.rest.management;
+import com.amazonaws.SDKGlobalConfiguration;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.Service;
import com.google.inject.Module;
@@ -96,10 +97,9 @@ public class ImportResourceIT extends AbstractRestIT {
@Before
public void before() {
-
configured =
- !StringUtils.isEmpty(System.getProperty("s3_key"))
- && !StringUtils.isEmpty(System.getProperty("s3_access_id"))
+ !StringUtils.isEmpty(System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ))
+ && !StringUtils.isEmpty(System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ))
&& !StringUtils.isEmpty(System.getProperty("bucketName"));
@@ -424,8 +424,8 @@ public class ImportResourceIT extends AbstractRestIT {
// create 10 applications each with collection of 10 things, export all to S3
S3Upload s3Upload = new S3Upload();
s3Upload.copyToS3(
- System.getProperty("s3_access_id"),
- System.getProperty("s3_key"),
+ System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ),
+ System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ),
bucketName, filenames);
// import all those exports from S3 into the default test application
@@ -448,6 +448,13 @@ public class ImportResourceIT extends AbstractRestIT {
assertNotNull( importGetIncludes );
assertEquals( 1,importGetIncludesResponse.getEntityCount());
+
+ final Entity includesEntity = importGetIncludesResponse.getEntities().get( 0 );
+
+ assertEquals( "testimport-bad-connection.json", includesEntity.getString( "fileName" ) );
+ assertEquals(1, includesEntity.get( "importedConnectionCount" ));
+ assertEquals(1, includesEntity.getString( "importedEntityCount" ));
+
assertEquals("FINISHED", importGet.get("state"));
assertEquals(1, importGet.get("fileCount"));
@@ -482,8 +489,8 @@ public class ImportResourceIT extends AbstractRestIT {
// create 10 applications each with collection of 10 things, export all to S3
S3Upload s3Upload = new S3Upload();
s3Upload.copyToS3(
- System.getProperty("s3_access_id"),
- System.getProperty("s3_key"),
+ System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ),
+ System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ),
bucketName, filenames);
// import all those exports from S3 into the default test application
@@ -527,8 +534,8 @@ public class ImportResourceIT extends AbstractRestIT {
// create 10 applications each with collection of 10 things, export all to S3
S3Upload s3Upload = new S3Upload();
s3Upload.copyToS3(
- System.getProperty("s3_access_id"),
- System.getProperty("s3_key"),
+ System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ),
+ System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ),
bucketName, filenames);
// import all those exports from S3 into the default test application
@@ -571,8 +578,8 @@ public class ImportResourceIT extends AbstractRestIT {
filenames.add("testImportInvalidJson.testApplication.3.json");
// create 10 applications each with collection of 10 things, export all to S3
S3Upload s3Upload = new S3Upload();
- s3Upload.copyToS3(System.getProperty("s3_access_id"),
- System.getProperty("s3_key"),
+ s3Upload.copyToS3(System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ),
+ System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ),
bucketName, filenames);
// import all those exports from S3 into the default test application
@@ -610,9 +617,9 @@ public class ImportResourceIT extends AbstractRestIT {
put("storage_provider", "s3");
put("storage_info", new HashMap<String, Object>() {{
put("s3_key",
- System.getProperty("s3_key"));
+ System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ));
put("s3_access_id",
- System.getProperty("s3_access_id"));
+ System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ));
put("bucket_location", bucketName);
}});
}});
@@ -687,8 +694,8 @@ public class ImportResourceIT extends AbstractRestIT {
logger.debug("\n\nDelete bucket\n");
- String accessId = System.getProperty("s3_access_id");
- String secretKey = System.getProperty("s3_key");
+ String accessId = System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR );
+ String secretKey = System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR );
Properties overrides = new Properties();
overrides.setProperty("s3" + ".identity", accessId);
@@ -710,8 +717,8 @@ public class ImportResourceIT extends AbstractRestIT {
logger.debug("\n\nDelete buckets with prefix {}\n", bucketPrefix);
- String accessId = System.getProperty("s3_access_id");
- String secretKey = System.getProperty("s3_key");
+ String accessId = System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR );
+ String secretKey = System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR );
Properties overrides = new Properties();
overrides.setProperty("s3" + ".identity", accessId);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fcc17399/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 434d62f..c517ce4 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
@@ -764,6 +764,8 @@ public class ImportServiceImpl implements ImportService {
} catch (Exception e1) {
logger.error("Error updating file import with error information", e1);
}
+
+ return;
}
// parse JSON data, create Entities and Connections from import data
@@ -781,6 +783,8 @@ public class ImportServiceImpl implements ImportService {
} catch (Exception e1) {
logger.error("Error updating file import with error information", e1);
}
+
+ return;
}
// mark ImportJob FINISHED but only if all other FileImportJobs are complete