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 02:39:32 UTC
[2/2] incubator-usergrid git commit: Temp commit
Temp commit
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/419a6768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/419a6768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/419a6768
Branch: refs/heads/two-dot-o-import
Commit: 419a6768004a618687fc87c2928b90b58843a78f
Parents: 860f2ad
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Feb 10 18:39:29 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Feb 10 18:39:29 2015 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/management/importer/ImportService.java | 2 +-
.../apache/usergrid/management/importer/ImportServiceImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/419a6768/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 57bd57b..12d2726 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
@@ -41,7 +41,7 @@ public interface ImportService {
/**
* Schedules the import to execute
*/
- UUID schedule(Map<String, Object> json) throws Exception;
+ Import schedule( Map<String, Object> json ) throws Exception;
/**
* Get the results
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/419a6768/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 b8acedf..2d54f28 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
@@ -83,7 +83,7 @@ public class ImportServiceImpl implements ImportService {
* @return it returns the UUID of the scheduled job
*/
@Override
- public UUID schedule(Map<String, Object> config) throws Exception {
+ public Import schedule( Map<String, Object> config ) throws Exception {
if (config == null) {
logger.error("import information cannot be null");
@@ -126,7 +126,7 @@ public class ImportServiceImpl implements ImportService {
importUG.setState(Import.State.SCHEDULED);
rootEm.update(importUG);
- return importUG.getUuid();
+ return importUG;
}