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/05/13 01:44:08 UTC
incubator-usergrid git commit: fix app info name,
issue with doc id parsing by _
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 9636aead6 -> 0d2864a3e
fix app info name, issue with doc id parsing by _
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0d2864a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0d2864a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0d2864a3
Branch: refs/heads/two-dot-o-dev
Commit: 0d2864a3eb6cb212a2fd4657cd092f413acd06e3
Parents: 9636aea
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue May 12 16:43:57 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue May 12 16:43:57 2015 -0700
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/util/CpNamingUtils.java | 8 ++++----
.../management/cassandra/ManagementServiceImpl.java | 7 +------
.../java/org/apache/usergrid/management/EmailFlowIT.java | 9 +++++++--
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d2864a3/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
index b8d410d..e15efe1 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
@@ -60,11 +60,11 @@ public class CpNamingUtils {
/**
* Information about applications is stored in the management app using these types
*/
- public static final String APPLICATION_INFO = "application_info";
- public static final String APPLICATION_INFOS = "application_infos";
+ public static final String APPLICATION_INFO = "application-info";
+ public static final String APPLICATION_INFOS = "application-infos";
- public static final String DELETED_APPLICATION_INFO = "deleted_application_info";
- public static final String DELETED_APPLICATION_INFOS = "deleted_application_infos";
+ public static final String DELETED_APPLICATION_INFO = "deleted-application-info";
+ public static final String DELETED_APPLICATION_INFOS = "deleted-application-infos";
/**
* The name of the map that holds our entity id->type mapping
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d2864a3/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index c520aac..adb8365 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -1849,12 +1849,7 @@ public class ManagementServiceImpl implements ManagementService {
return null;
}
EntityManager em = emf.getEntityManager( smf.getManagementAppId() );
- EntityRef mgmtAppRef = new SimpleEntityRef( Schema.TYPE_APPLICATION, smf.getManagementAppId() );
-
- final Results results = em.searchCollection(mgmtAppRef, CpNamingUtils.APPLICATION_INFOS,
- Query.fromQL("select * where " + PROPERTY_APPLICATION_ID + " = " + applicationId.toString()));
-
- Entity entity = results.getEntity();
+ Entity entity = em.get( new SimpleEntityRef(CpNamingUtils.APPLICATION_INFO, applicationId) );
if ( entity != null ) {
return new ApplicationInfo( applicationId, entity.getName() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d2864a3/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
index 9268d29..b158568 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
@@ -28,6 +28,7 @@ import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
+import org.apache.usergrid.CoreApplication;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -93,6 +94,8 @@ import static org.junit.Assert.assertTrue;
public class EmailFlowIT {
private static final Logger LOG = LoggerFactory.getLogger( EmailFlowIT.class );
+ @Rule
+ public org.apache.usergrid.Application app = new CoreApplication( setup );
@Rule
public ClearShiroSubject clearShiroSubject = new ClearShiroSubject();
@@ -264,13 +267,14 @@ public class EmailFlowIT {
final String adminEmail = uniqueEmail();
final String adminPasswd = "testpassword";
- OrganizationOwnerInfo orgOwner = createOwnerAndOrganization( orgName, appName, adminUserName, adminEmail, adminPasswd, false, false );
+ OrganizationOwnerInfo orgOwner = createOwnerAndOrganization(orgName, appName, adminUserName, adminEmail, adminPasswd, false, false);
assertNotNull( orgOwner );
ApplicationInfo app = setup.getMgmtSvc().createApplication( orgOwner.getOrganization().getUuid(), appName );
+ this.app.refreshIndex();
//turn on app admin approval for app users
- enableAdminApproval( app.getId() );
+ enableAdminApproval(app.getId());
final String appUserUsername = uniqueUsername();
final String appUserEmail = uniqueEmail();
@@ -362,6 +366,7 @@ public class EmailFlowIT {
enableEmailConfirmation( app.getId() );
enableAdminApproval( app.getId() );
+ setup.getEntityIndex().refresh();
final String appUserEmail = uniqueEmail();
final String appUserUsername = uniqueUsername();