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/11 06:31:00 UTC

[1/2] incubator-usergrid git commit: Added resource for getting Import

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-import a4270d8a1 -> e9f48ec58


Added resource for getting Import

Updated importService methods to support queries

Scheduler appears broken


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

Branch: refs/heads/two-dot-o-import
Commit: 728ca951d3cd547157b13abd8122b2e73305cd33
Parents: 58f4828
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Feb 10 22:30:13 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Feb 10 22:30:13 2015 -0700

----------------------------------------------------------------------
 .../usergrid/rest/AbstractContextResource.java  | 40 +++++++--
 .../rest/applications/ServiceResource.java      | 23 +----
 .../applications/imports/ImportsResource.java   | 59 +++++-------
 .../rest/management/ImportResourceIT.java       |  9 +-
 .../management/importer/FileImportTracker.java  |  2 +-
 .../management/importer/ImportService.java      | 38 ++++----
 .../management/importer/ImportServiceImpl.java  | 94 ++++++++++++++------
 .../management/importer/ImportCollectionIT.java |  3 +-
 .../management/importer/ImportServiceIT.java    | 14 +--
 9 files changed, 161 insertions(+), 121 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
index 6595d5e..422eedd 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
@@ -17,7 +17,9 @@
 package org.apache.usergrid.rest;
 
 
+import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Context;
@@ -34,6 +36,9 @@ import org.apache.usergrid.rest.exceptions.RedirectionException;
 import org.apache.usergrid.security.tokens.TokenService;
 import org.apache.usergrid.services.ServiceManagerFactory;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.jersey.api.core.HttpContext;
 import com.sun.jersey.api.core.ResourceContext;
 import com.sun.jersey.api.view.Viewable;
@@ -49,6 +54,11 @@ import org.slf4j.LoggerFactory;
 
 public abstract class AbstractContextResource {
 
+    protected static final TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {};
+    protected static final TypeReference<List<Object>> listTypeReference = new TypeReference<List<Object>>() {};
+    protected static final   ObjectMapper mapper = new ObjectMapper();
+
+
     protected AbstractContextResource parent;
 
     @Context
@@ -130,7 +140,7 @@ public abstract class AbstractContextResource {
 
 
     public boolean useReCaptcha() {
-        return StringUtils.isNotBlank( properties.getRecaptchaPublic() ) 
+        return StringUtils.isNotBlank( properties.getRecaptchaPublic() )
                 && StringUtils.isNotBlank( properties.getRecaptchaPrivate() );
     }
 
@@ -139,7 +149,7 @@ public abstract class AbstractContextResource {
         if ( !useReCaptcha() ) {
             return "";
         }
-        ReCaptcha c = ReCaptchaFactory.newSecureReCaptcha( 
+        ReCaptcha c = ReCaptchaFactory.newSecureReCaptcha(
                 properties.getRecaptchaPublic(), properties.getRecaptchaPrivate(), false );
         return c.createRecaptchaHtml( null, null );
     }
@@ -152,22 +162,22 @@ public abstract class AbstractContextResource {
     }
 
 
-    public Viewable handleViewable( String template, Object model ) { 
+    public Viewable handleViewable( String template, Object model ) {
 
         String className = this.getClass().getName().toLowerCase();
         String packageName = AbstractContextResource.class.getPackage().getName();
 
-        String template_property = "usergrid.view" + 
+        String template_property = "usergrid.view" +
             StringUtils.removeEnd( className.toLowerCase(), "resource" )
                 .substring( packageName.length() ) + "." + template.toLowerCase();
 
         String redirect_url = properties.getProperty( template_property );
-        
+
         if ( StringUtils.isNotBlank( redirect_url ) ) {
             logger.debug("Redirecting to URL: ", redirect_url);
             sendRedirect( redirect_url );
         }
-        logger.debug("Dispatching to viewable with template: {}", 
+        logger.debug("Dispatching to viewable with template: {}",
                 template, template_property );
 
         Viewable viewable = new Viewable( template, model, this.getClass() );
@@ -175,7 +185,25 @@ public abstract class AbstractContextResource {
     }
 
 
+
     protected ApiResponse createApiResponse() {
         return new ApiResponse( properties );
     }
+
+    /**
+          * Next three new methods necessary to work around inexplicable problems with EntityHolder.
+          * This problem happens consistently when you deploy "two-dot-o" to Tomcat:
+          * https://groups.google.com/forum/#!topic/usergrid/yyAJdmsBfig
+          */
+         protected Object readJsonToObject( String content ) throws IOException {
+
+             JsonNode jsonNode = mapper.readTree( content );
+             Object jsonObject;
+             if ( jsonNode.isArray() ) {
+                 jsonObject = mapper.readValue( content, listTypeReference );
+             } else {
+                 jsonObject = mapper.readValue( content, mapTypeReference );
+             }
+             return jsonObject;
+         }
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
index 1595042..bb02f8b 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
@@ -90,8 +90,6 @@ public class ServiceResource extends AbstractContextResource {
     protected static final Logger LOG = LoggerFactory.getLogger( ServiceResource.class );
     private static final String FILE_FIELD_NAME = "file";
 
-    protected static TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {};
-    protected static TypeReference<List<Object>> listTypeReference = new TypeReference<List<Object>>() {};
 
     @Autowired
     private BinaryStore binaryStore;
@@ -328,28 +326,13 @@ public class ServiceResource extends AbstractContextResource {
     }
 
 
-    /**
-     * Next three new methods necessary to work around inexplicable problems with EntityHolder.
-     * This problem happens consistently when you deploy "two-dot-o" to Tomcat:
-     * https://groups.google.com/forum/#!topic/usergrid/yyAJdmsBfig
-     */
-    protected Object readJsonToObject( String content ) throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        JsonNode jsonNode = mapper.readTree( content );
-        Object jsonObject;
-        if ( jsonNode.isArray() ) {
-            jsonObject = mapper.readValue( content, listTypeReference );
-        } else {
-            jsonObject = mapper.readValue( content, mapTypeReference );
-        }
-        return jsonObject;
-    }
+
 
     /**
      * Necessary to work around inexplicable problems with EntityHolder.
      * See above.
      */
-    public JSONWithPadding executePostWithObject( @Context UriInfo ui, Object json, 
+    public JSONWithPadding executePostWithObject( @Context UriInfo ui, Object json,
             @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
 
         LOG.debug( "ServiceResource.executePostWithMap" );
@@ -394,7 +377,7 @@ public class ServiceResource extends AbstractContextResource {
     @POST
     @RequireApplicationAccess
     @Consumes(MediaType.APPLICATION_JSON)
-    public JSONWithPadding executePost( @Context UriInfo ui, String body, 
+    public JSONWithPadding executePost( @Context UriInfo ui, String body,
             @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
 
         LOG.debug( "ServiceResource.executePost: body = " + body );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/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 e54cc5e..72ffa1c 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
@@ -52,6 +52,7 @@ import org.apache.usergrid.management.OrganizationInfo;
 import org.apache.usergrid.management.importer.ImportService;
 import org.apache.usergrid.persistence.Entity;
 import org.apache.usergrid.persistence.entities.Import;
+import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
 import org.apache.usergrid.persistence.index.query.Identifier;
 import org.apache.usergrid.persistence.queue.impl.UsergridAwsCredentials;
 import org.apache.usergrid.rest.AbstractContextResource;
@@ -79,7 +80,7 @@ import static org.apache.usergrid.services.ServiceParameter.addParameter;
 @Component("org.apache.usergrid.rest.management.organizations.applications.ImportsResource")
 @Scope("prototype")
 @Produces(MediaType.APPLICATION_JSON)
-public class ImportsResource extends ServiceResource {
+public class ImportsResource extends AbstractContextResource {
 
 
     @Autowired
@@ -100,7 +101,6 @@ public class ImportsResource extends ServiceResource {
     public ImportsResource init( final OrganizationInfo organization, final ApplicationInfo application ){
         this.organization = organization;
         this.application = application;
-        services = smf.getServiceManager( application.getId() );
         return this;
     }
 
@@ -112,13 +112,12 @@ public class ImportsResource extends ServiceResource {
                                         @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
         throws Exception {
 
-        LOG.debug( "ServiceResource.executePost: body = " + body );
 
         ApiResponse response = createApiResponse();
 
 
         response.setAction( "post" );
-        response.setApplication( services.getApplication() );
+        response.setApplication( emf.getEntityManager( application.getId() ).getApplication()  );
         response.setParams( ui.getQueryParameters() );
 
         final Map<String, Object> json = ( Map<String, Object> ) readJsonToObject( body );
@@ -159,56 +158,38 @@ public class ImportsResource extends ServiceResource {
         json.put( "organizationId", organization.getUuid() );
         json.put( "applicationId", application.getId() );
 
-        Import importEntity = importService.schedule( json );
+        Import importEntity = importService.schedule( application.getId(), json );
 
         response.setEntities( Collections.<Entity>singletonList( importEntity ) );
-        //             }
-        //             catch ( NullPointerException e ) {
-        //
-        //                 response.set
-        //                 return Response.status( SC_BAD_REQUEST ).type( JSONPUtils.jsonMediaType( callback ) )
-        //                                .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback ) )
-        // .build();
-        //             }
-        //             catch ( AmazonClientException e ) {
-        //                 return Response.status( SC_BAD_REQUEST ).type( JSONPUtils.jsonMediaType( callback ) )
-        //                                .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback ) )
-        // .build();
-        //             }
-        //             catch ( Exception e ) {
-        //                 //TODO:throw descriptive error message and or include on in the response
-        //                 //TODO:fix below, it doesn't work if there is an exception. Make it look like the
-        // OauthResponse.
-        //                 OAuthResponse errorMsg = OAuthResponse.errorResponse( SC_INTERNAL_SERVER_ERROR )
-        // .setErrorDescription( e.getMessage() )
-        //                                                       .buildJSONMessage();
-        //                 return Response.status( errorMsg.getResponseStatus() ).type( JSONPUtils.jsonMediaType(
-        // callback ) )
-        //                                .entity( ServiceResource.wrapWithCallback( errorMsg.getBody(), callback ) )
-        // .build();
-        //             }
-
-        //             return Response.status( SC_ACCEPTED ).entity( uuidRet ).build();
-
 
         return new JSONWithPadding( response, callback );
     }
 
 
-    @Override
+    @GET
     @Path( RootResource.ENTITY_ID_PATH )
-    public AbstractContextResource addIdParameter( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
+    public JSONWithPadding addIdParameter( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
         throws Exception {
 
+        final UUID importId = UUID.fromString( entityId.getPath() );
+        final Import importEntity = importService.getImport( application.getId(), importId);
+
+        if(importEntity == null){
+            throw new EntityNotFoundException( "could not find import with uuid " + importId );
+        }
+
+        ApiResponse response = createApiResponse();
+
 
-        UUID itemId = UUID.fromString( entityId.getPath() );
+        response.setAction( "get" );
+        response.setApplication( emf.getEntityManager( application.getId() ).getApplication()  );
+        response.setParams( ui.getQueryParameters() );
 
-        addParameter( getServiceParameters(), itemId );
 
-        addMatrixParams( getServiceParameters(), ui, entityId );
+        response.setEntities( Collections.<Entity>singletonList( importEntity ) );
 
+        return new JSONWithPadding( response );
 
-        return getSubResource( ImportResource.class ).init(  itemId  );
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/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 425834e..8744227 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
@@ -630,12 +630,17 @@ public class ImportResourceIT extends AbstractRestIT {
         Entity importEntity = this.management().orgs().organization( org ).app().addToPath( app ).addToPath( "import" ).post( importPayload );
 
 
-        Entity importGet = this.management().orgs().organization( org ).app().addToPath( app ).addToPath( "import" ).addToPath( importEntity.getUuid().toString() ).get();
 
         int maxRetries = 120;
         int retries = 0;
 
-        while ( !importGet.get( "state" ).equals( "FINISHED" ) && retries++ < maxRetries ) {
+        while (  retries++ < maxRetries ) {
+
+            Entity importGet = this.management().orgs().organization( org ).app().addToPath( app ).addToPath( "import" ).addToPath( importEntity.getUuid().toString() ).get();
+            if(importGet.get( "state" ).equals( "FINISHED" )){
+                break;
+            }
+
             logger.debug("Waiting for import...");
             Thread.sleep(1000);
         }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportTracker.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportTracker.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportTracker.java
index e52d850..be2f72b 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportTracker.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/FileImportTracker.java
@@ -43,7 +43,7 @@ public class FileImportTracker {
     private static final String ERROR_MESSAGE =
         "Failed to import some data.  See the import counters and errors.";
 
-    private static final String ERRORS_CONNECTION_NAME = "errors";
+    public static final String ERRORS_CONNECTION_NAME = "errors";
 
     private final AtomicLong entitiesWritten = new AtomicLong( 0 );
     private final AtomicLong entitiesFailed = new AtomicLong( 0 );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportService.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportService.java
index 12d2726..ac2b20e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportService.java
@@ -17,31 +17,38 @@
 
 package org.apache.usergrid.management.importer;
 
+
+import java.util.Map;
+import java.util.UUID;
+
 import org.apache.usergrid.batch.JobExecution;
+import org.apache.usergrid.management.ApplicationInfo;
 import org.apache.usergrid.persistence.Results;
 import org.apache.usergrid.persistence.entities.FailedImportEntity;
 import org.apache.usergrid.persistence.entities.FileImport;
 import org.apache.usergrid.persistence.entities.Import;
-import org.apache.usergrid.persistence.index.query.Query;
 import org.apache.usergrid.services.queues.ImportQueueMessage;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.UUID;
-
 
 /**
  * Performs all functions related to importing.
  */
 public interface ImportService {
 
-    enum ImportType { COLLECTION, APPLICATION, ORGANIZATION }
-
     /**
      * Schedules the import to execute
      */
-    Import schedule( Map<String, Object> json ) throws Exception;
+    Import schedule( final UUID applicationId, Map<String, Object> json ) throws Exception;
+
+    Results getImports(final UUID applicationId, final String cursor);
+
+    /**
+     * Get the import
+     * @param applicationId
+     * @param importId
+     * @return
+     */
+    Import getImport(final UUID applicationId, final UUID importId);
 
     /**
      * Get the results
@@ -50,7 +57,7 @@ public interface ImportService {
      * @param cursor The cursor used in parsing
      * @return
      */
-    Results getFileImports( final UUID importId, final String cursor);
+    Results getFileImports(final UUID applicationId, final UUID importId, final String cursor);
 
     /**
      * Get the file import
@@ -58,7 +65,7 @@ public interface ImportService {
      * @param fileImportId
      * @return
      */
-    FileImport getFileImport(final UUID importId, final UUID fileImportId);
+    FileImport getFileImport(final UUID applicationId, final UUID importId, final UUID fileImportId);
 
 
 
@@ -70,7 +77,7 @@ public interface ImportService {
      * @param cursor The cursor used in parsing
      * @return
      */
-    Results getFailedImports( final UUID importId, final UUID fileImportId, final String cursor);
+    Results getFailedImports(final UUID applicationId,  final UUID importId, final UUID fileImportId, final String cursor);
 
     /**
      * Get the failedimport entity from it's parentId
@@ -79,7 +86,7 @@ public interface ImportService {
      * @param failedImportId
      * @return
      */
-    FailedImportEntity getFailedImportEntity(final UUID importId, final UUID fileImportId, final UUID failedImportId);
+    FailedImportEntity getFailedImportEntity(final UUID applicationId, final UUID importId, final UUID fileImportId, final UUID failedImportId);
 
     /**
      * Perform the import from the external resource
@@ -108,11 +115,6 @@ public interface ImportService {
     /**
      * @return FileImportEntity
      */
-    FileImport getFileImportEntity(final ImportQueueMessage importQueueMessage) throws Exception;
-
-    /**
-     * @return FileImportEntity
-     */
     FileImport getFileImportEntity(final JobExecution jobExecution) throws Exception;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/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 2d54f28..bd0dfe0 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
@@ -18,16 +18,21 @@
 package org.apache.usergrid.management.importer;
 
 import com.amazonaws.SDKGlobalConfiguration;
+import com.google.common.base.Preconditions;
+
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.usergrid.batch.JobExecution;
 import org.apache.usergrid.batch.service.SchedulerService;
 import org.apache.usergrid.corepersistence.util.CpNamingUtils;
+import org.apache.usergrid.management.ApplicationInfo;
 import org.apache.usergrid.management.ManagementService;
 import org.apache.usergrid.persistence.*;
+import org.apache.usergrid.persistence.entities.Application;
 import org.apache.usergrid.persistence.entities.FailedImportEntity;
 import org.apache.usergrid.persistence.entities.FileImport;
 import org.apache.usergrid.persistence.entities.Import;
 import org.apache.usergrid.persistence.entities.JobData;
+import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
 import org.apache.usergrid.persistence.index.query.Query;
 import org.apache.usergrid.persistence.index.query.Query.Level;
 import org.apache.usergrid.services.queues.ImportQueueMessage;
@@ -58,7 +63,10 @@ public class ImportServiceImpl implements ImportService {
     public static final String FILE_IMPORT_JOB_NAME = "fileImportJob";
     public static final int HEARTBEAT_COUNT = 50;
 
+    public static final String APP_IMPORT_CONNECTION ="imports";
+
     private static final Logger logger = LoggerFactory.getLogger(ImportServiceImpl.class);
+    public static final String IMPORT_FILE_INCLUDES = "includes";
 
     int MAX_FILE_IMPORTS = 1000; // max number of file import jobs / import job
 
@@ -83,14 +91,12 @@ public class ImportServiceImpl implements ImportService {
      * @return it returns the UUID of the scheduled job
      */
     @Override
-    public Import schedule( Map<String, Object> config ) throws Exception {
+    public Import schedule(final UUID application,  Map<String, Object> config ) throws Exception {
 
-        if (config == null) {
-            logger.error("import information cannot be null");
-            return null;
-        }
+        Preconditions.checkNotNull(config, "import information cannot be null");
+        Preconditions.checkNotNull( application, "application cannot be null" );
 
-        EntityManager rootEm = null;
+        final EntityManager rootEm;
         try {
             rootEm = emf.getEntityManager(emf.getManagementAppId());
         } catch (Exception e) {
@@ -99,18 +105,17 @@ public class ImportServiceImpl implements ImportService {
         }
 
         Import importUG = new Import();
+        importUG.setState(Import.State.CREATED);
 
         // create the import entity to store all metadata about the import job
         try {
-            importUG = rootEm.create(importUG);
+            importUG = rootEm.create( importUG );
         } catch (Exception e) {
             logger.error("Import entity creation failed");
             return null;
         }
 
         // update state for import job to created
-        importUG.setState(Import.State.CREATED);
-        rootEm.update(importUG);
 
         // set data to be transferred to importInfo
         JobData jobData = new JobData();
@@ -126,30 +131,75 @@ public class ImportServiceImpl implements ImportService {
         importUG.setState(Import.State.SCHEDULED);
         rootEm.update(importUG);
 
+        final EntityRef source = getApplicationEntity( rootEm, application );
+
+
+        //now link it to the application
+        rootEm.createConnection( source, APP_IMPORT_CONNECTION, importUG );
+
         return importUG;
     }
 
 
     @Override
-    public Results getFileImports( final UUID importId, final String cursor ) {
+    public Results getImports( final UUID applicationId, final String cursor ) {
+        return null;
+    }
+
+
+    @Override
+    public Import getImport( final UUID applicationId, final UUID importId ) {
+        try {
+            final EntityManager rootEm = emf.getEntityManager( emf.getManagementAppId() );
+
+
+            final Entity applicationEntity = getApplicationEntity( 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 ) ) {
+                return null;
+            }
+
+            return importEntity;
+        }catch(Exception e){
+            throw new RuntimeException("Unable to get import entity", e );
+        }
+
+    }
+
+
+
+    private Entity getApplicationEntity(final EntityManager rootEm, final UUID applicationId) throws Exception {
+        final Entity entity = rootEm.get( new SimpleEntityRef( "application_info", applicationId ) );
+
+        if(entity == null){
+            throw new EntityNotFoundException( "Cound not find application with id "  + applicationId);
+        }
+
+        return entity;
+    }
+
+    @Override
+    public Results getFileImports(final UUID applicationId,  final UUID importId, final String cursor ) {
         return null;
     }
 
 
     @Override
-    public FileImport getFileImport( final UUID importId, final UUID fileImportId ) {
+    public FileImport getFileImport(final UUID applicationId,  final UUID importId, final UUID fileImportId ) {
         return null;
     }
 
 
     @Override
-    public Results getFailedImports( final UUID importId, final UUID fileImportId, final String cursor ) {
+    public Results getFailedImports(final UUID applicationId,  final UUID importId, final UUID fileImportId, final String cursor ) {
         return null;
     }
 
 
     @Override
-    public FailedImportEntity getFailedImportEntity( final UUID importId, final UUID fileImportId,
+    public FailedImportEntity getFailedImportEntity(final UUID applicationId, final UUID importId, final UUID fileImportId,
                                                      final UUID failedImportId ) {
         return null;
     }
@@ -185,7 +235,7 @@ public class ImportServiceImpl implements ImportService {
 
         try {
             // create a connection between the main import job and the sub FileImport Job
-            emManagementApp.createConnection(importEntity, "includes", fileImport);
+            emManagementApp.createConnection(importEntity, IMPORT_FILE_INCLUDES, fileImport);
 
             logger.debug("Created connection from {}:{} to {}:{}",
                 new Object[] {
@@ -223,7 +273,7 @@ public class ImportServiceImpl implements ImportService {
             EntityManager emMgmtApp = emf.getEntityManager( CpNamingUtils.MANAGEMENT_APPLICATION_ID );
             Query query = Query.fromQL("select *");
             query.setEntityType("file_import");
-            query.setConnectionType("includes");
+            query.setConnectionType( IMPORT_FILE_INCLUDES );
             query.setLimit(MAX_FILE_IMPORTS);
 
             Results entities = emMgmtApp.searchConnectedEntities( importRoot, query );
@@ -320,17 +370,7 @@ public class ImportServiceImpl implements ImportService {
     }
 
 
-    /**
-     * Returns the File Import Entity that stores all meta-data for the particular sub File import Job
-     * @return File Import Entity
-     */
-    @Override
-    public FileImport getFileImportEntity(final ImportQueueMessage queueMessage) throws Exception {
-
-        EntityManager em = emf.getEntityManager(CpNamingUtils.MANAGEMENT_APPLICATION_ID);
 
-        return em.get(queueMessage.getFileId(), FileImport.class);
-    }
 
 
     /**
@@ -593,7 +633,7 @@ public class ImportServiceImpl implements ImportService {
         // get parent import job of this file import job
 
         Results importJobResults =
-            emManagementApp.getConnectingEntities( fileImport, "includes", null, Level.ALL_PROPERTIES );
+            emManagementApp.getConnectingEntities( fileImport, IMPORT_FILE_INCLUDES, null, Level.ALL_PROPERTIES );
         List<Entity> importEntities = importJobResults.getEntities();
         UUID importId = importEntities.get( 0 ).getUuid();
         Import importEntity = emManagementApp.get( importId, Import.class );
@@ -604,7 +644,7 @@ public class ImportServiceImpl implements ImportService {
         EntityManager emMgmtApp = emf.getEntityManager( CpNamingUtils.MANAGEMENT_APPLICATION_ID );
         Query query = Query.fromQL("select *");
         query.setEntityType("file_import");
-        query.setConnectionType("includes");
+        query.setConnectionType( IMPORT_FILE_INCLUDES );
         query.setLimit(MAX_FILE_IMPORTS);
         Results entities = emMgmtApp.searchConnectedEntities(importEntity, query);
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
index 4b6b1dd..f0a3510 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
@@ -415,7 +415,8 @@ public class ImportCollectionIT {
         logger.debug("\n\nImport into new app {}\n", em.getApplication().getName() );
 
         ImportService importService = setup.getImportService();
-        Import importEntity = importService.schedule( new HashMap<String, Object>() {{
+
+        Import importEntity = importService.schedule(em.getApplication().getUuid(),  new HashMap<String, Object>() {{
             put( "path", organization.getName() + em.getApplication().getName() );
             put( "organizationId", organization.getUuid() );
             put( "applicationId", em.getApplication().getUuid() );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/728ca951/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
index 201e636..cbd1d1b 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
@@ -188,7 +188,7 @@ public class ImportServiceIT {
         ImportService importService = setup.getImportService();
 
         // scheduele the import job
-        final Import importEntity = importService.schedule( payload );
+        final Import importEntity = importService.schedule( null,  payload );
         final UUID importUUID = importEntity.getUuid();
 
         //create and initialize jobData returned in JobExecution.
@@ -315,7 +315,7 @@ public class ImportServiceIT {
         ImportService importService = setup.getImportService();
 
         //schedule the import job
-        final Import importEntity = importService.schedule( payload );
+        final Import importEntity = importService.schedule(  null, payload );
         final UUID importUUID = importEntity.getUuid();
 
         //create and initialize jobData returned in JobExecution.
@@ -396,7 +396,7 @@ public class ImportServiceIT {
         HashMap<String, Object> payload = null;
 
         ImportService importService = setup.getImportService();
-        final Import importEntity = importService.schedule( payload );
+        final Import importEntity = importService.schedule( null,  payload );
 
 
         assertNull(importEntity);
@@ -466,7 +466,7 @@ public class ImportServiceIT {
         HashMap<String, Object> payload = payloadBuilder();
 
         //schedule the import job
-        final Import importEntity = importService.schedule( payload );
+        final Import importEntity = importService.schedule( null,  payload );
         final UUID importUUID = importEntity.getUuid();
 
         //create and initialize jobData returned in JobExecution.
@@ -495,7 +495,7 @@ public class ImportServiceIT {
 
         payload.put("organizationId",fakeOrgId);
         //schedule the import job
-        final Import importEntity = importService.schedule( payload );
+        final Import importEntity = importService.schedule( null,  payload );
         final UUID importUUID = importEntity.getUuid();
 
         //create and initialize jobData returned in JobExecution.
@@ -527,7 +527,7 @@ public class ImportServiceIT {
         payload.put("applicationId",fakeappId);
 
         //schedule the import job
-        final Import importEntity = importService.schedule( payload );
+        final Import importEntity = importService.schedule(  null, payload );
         final UUID importUUID = importEntity.getUuid();
 
         //create and initialize jobData returned in JobExecution.
@@ -560,7 +560,7 @@ public class ImportServiceIT {
         payload.put("collectionName","custom-test");
 
         //schedule the import job
-        final Import importEntity = importService.schedule( payload );
+        final Import importEntity = importService.schedule( null,  payload );
         final UUID importUUID = importEntity.getUuid();
 
         //create and initialize jobData returned in JobExecution.


[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


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

Branch: refs/heads/two-dot-o-import
Commit: e9f48ec58c7e0af7bdb42e15ae9dc11dee3ea7a2
Parents: 728ca95 a4270d8
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Feb 10 22:30:32 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Feb 10 22:30:32 2015 -0700

----------------------------------------------------------------------
 .../queue/impl/UsergridAwsCredentials.java          | 16 ++++++++++++++++
 .../management/importer/ImportServiceImpl.java      |  8 ++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e9f48ec5/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------