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/08/22 16:16:06 UTC

[70/95] [abbrv] git commit: fixed creating connections

fixed creating connections


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b321f937
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b321f937
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b321f937

Branch: refs/heads/import-feature
Commit: b321f937ce4e72511097b85e830dcaa3c4665a24
Parents: 283bf7b
Author: Pooja Jain <pj...@apigee.com>
Authored: Thu Jul 31 12:44:51 2014 -0700
Committer: Pooja Jain <pj...@apigee.com>
Committed: Thu Jul 31 12:44:51 2014 -0700

----------------------------------------------------------------------
 .../usergrid/management/importUG/ImportServiceImpl.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b321f937/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 e247d94..fde115c 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
@@ -48,6 +48,9 @@ public class ImportServiceImpl implements ImportService {
     private static final Logger logger = LoggerFactory.getLogger(ImportServiceImpl.class);
     public static final String IMPORT_ID = "importId";
     public static final String IMPORT_JOB_NAME = "importJob";
+
+    public static final String FILE_IMPORT_ID = "fileImportId";
+    public static final String FILE_IMPORT_JOB_NAME = "fileImportJob";
     private ArrayList<File> files;
 
     //dependency injection
@@ -157,8 +160,11 @@ public class ImportServiceImpl implements ImportService {
         fileImport.setState(FileImport.State.CREATED);
         fileImport = em.create(fileImport);
 
+        Import importUG = em.get(importRef,Import.class);
+
         try {
-            em.createConnection(importRef,"includes",fileImport);
+            ConnectionRef test = em.createConnection(importUG,"includes",fileImport);
+            System.out.println();
         }
         catch ( Exception e ) {
             logger.error(e.getMessage());
@@ -171,12 +177,12 @@ public class ImportServiceImpl implements ImportService {
         JobData jobData = new JobData();
         jobData.setProperty( "File", file );
         jobData.setProperty( "fileImportId", fileImport.getUuid() );
-        jobData.setProperty("importUUID",importRef);
+        jobData.setProperty(FILE_IMPORT_ID,importRef);
 
         long soonestPossible = System.currentTimeMillis() + 250; //sch grace period
 
         //schedule job
-        sch.createJob("fileImportJob", soonestPossible, jobData );
+        sch.createJob(FILE_IMPORT_JOB_NAME, soonestPossible, jobData );
 
         //update state
         fileImport.setState( FileImport.State.SCHEDULED );