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/09/11 03:28:08 UTC
[37/50] usergrid git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e525f7a3
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e525f7a3
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e525f7a3
Branch: refs/heads/USERGRID-909
Commit: e525f7a38032017a196437d11a7183cf5e79b9af
Parents: a1be2fd 740d0a4
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Sep 9 10:28:19 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Sep 9 10:28:19 2015 -0600
----------------------------------------------------------------------
.../service/StatusServiceImpl.java | 22 ++++--
.../usergrid/persistence/StatusServiceIT.java | 75 ++++++++++++++++++++
2 files changed, 92 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e525f7a3/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
index 88023ed,66ae254..93fe653
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
@@@ -54,11 -55,12 +56,14 @@@ public class StatusServiceImpl implemen
this.mapManagerFactory = mapManagerFactory;
}
+
@Override
- public Observable<UUID> setStatus(final UUID applicationId, final UUID jobId, final Status status, final Map<String, Object> data) {
+ public Observable<UUID> setStatus(
+ final UUID applicationId, final UUID jobId, final Status status, final Map<String, Object> data) {
-
+ Preconditions.checkNotNull(applicationId, "app id is null");
+ Preconditions.checkNotNull(jobId, "job id is null");
+ Preconditions.checkNotNull(status, "status is null");
+ final Map<String,Object> dataMap = data != null ? data : new HashMap<String,Object>();
return Observable.create(sub -> {
final String jobString = StringUtils.sanitizeUUID(jobId);
final Id appId = CpNamingUtils.generateApplicationId(applicationId);
@@@ -77,9 -79,10 +82,11 @@@
});
}
+
@Override
public Observable<JobStatus> getStatus(final UUID applicationId, UUID jobId) {
+ Preconditions.checkNotNull(applicationId, "app id is null");
+ Preconditions.checkNotNull(jobId, "job id is null");
return Observable.create(subscriber -> {
final String jobString = StringUtils.sanitizeUUID(jobId);
Id appId = CpNamingUtils.generateApplicationId(applicationId);