You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/09 18:16:45 UTC
[5/6] incubator-usergrid git commit: rest passing
rest passing
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3e45e11c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e45e11c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e45e11c
Branch: refs/heads/USERGRID-652
Commit: 3e45e11c3f6faddbd6bc19e4923acfacfca003a2
Parents: ec3060b
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Jun 9 10:00:41 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Jun 9 10:00:41 2015 -0600
----------------------------------------------------------------------
.../org/apache/usergrid/rest/AbstractContextResource.java | 7 ++-----
.../org/apache/usergrid/rest/test/RefreshIndexResource.java | 8 +++++++-
.../usergrid/rest/test/resource2point0/ClientSetup.java | 2 +-
.../usergrid/rest/test/resource2point0/RestClient.java | 6 ++++--
4 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e45e11c/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 cd73991..1494814 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
@@ -62,8 +62,6 @@ public abstract class AbstractContextResource {
};
protected static final ObjectMapper mapper = new ObjectMapper();
- private EntityIndex entityIndex;
-
protected AbstractContextResource parent;
@@ -198,9 +196,8 @@ public abstract class AbstractContextResource {
return new ApiResponse(properties);
}
- protected EntityIndex getEntityIndex(){
- entityIndex = entityIndex == null ? injector.getInstance(EntityIndex.class) : entityIndex;
- return entityIndex;
+ protected EntityManagerFactory getEmf(){
+ return emf;
}
/**
* Next three new methods necessary to work around inexplicable problems with EntityHolder.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e45e11c/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
index 555d00c..1fdcee0 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import com.google.common.base.Optional;
import org.apache.usergrid.persistence.EntityManager;
+import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -65,8 +66,13 @@ public class RefreshIndexResource extends AbstractContextResource {
throw new UnsupportedOperationException();
}
+ UUID appid = UUIDUtils.tryExtractUUID(appIdString);
+ if(appid == null){
+ throw new IllegalArgumentException("app id is null");
+ }
// refresh the system apps or app lookup below may fail
- getEntityIndex().refreshAsync().toBlocking().first();
+ EntityManager em = this.getEmf().getEntityManager(appid);
+ em.refreshIndex();
} catch (Exception e) {
logger.error("Error in refresh", e);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e45e11c/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
index 6a0a781..4cf28e5 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
@@ -165,7 +165,7 @@ public class ClientSetup implements TestRule {
}
public void refreshIndex() {
- this.restClient.refreshIndex(getOrganizationName(),getAppName());
+ this.restClient.refreshIndex(getOrganizationName(),getAppName(),getAppUuid());
}
public RestClient getRestClient(){
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e45e11c/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
index 152e546..0d8f981 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
@@ -28,6 +28,7 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
import javax.ws.rs.core.MediaType;
+import java.util.UUID;
/**
@@ -97,12 +98,13 @@ public class RestClient implements UrlResource {
public TokenResource token(){
return new TokenResource(context,this);
}
- public void refreshIndex(String orgname, String appName) {
+ public void refreshIndex(String orgname, String appName, String appid) {
//TODO: add error checking and logging
this.getResource().path( "/refreshindex" )
.queryParam( "org_name", orgname )
.queryParam( "app_name",appName )
- .accept( MediaType.APPLICATION_JSON ).post();
+ .queryParam("app_id", appid)
+ .accept( MediaType.APPLICATION_JSON ).post();
}
public NamedResource pathResource(String path){