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/07/02 00:52:37 UTC
[8/8] incubator-usergrid git commit: variable name change
variable name change
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/03d05348
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/03d05348
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/03d05348
Branch: refs/heads/two-dot-o-dev
Commit: 03d05348dad0d6a35869a617edc959c3105d217b
Parents: c61d69f
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jul 1 16:51:16 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jul 1 16:51:16 2015 -0600
----------------------------------------------------------------------
.../management/cassandra/ManagementServiceImpl.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/03d05348/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 0693057..738710b 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
@@ -33,7 +33,6 @@ import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.exception.ConflictException;
import org.apache.usergrid.management.exceptions.*;
import org.apache.usergrid.persistence.*;
-import org.apache.usergrid.persistence.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -189,7 +188,7 @@ public class ManagementServiceImpl implements ManagementService {
private static final String TOKEN_TYPE_CONFIRM = "confirm";
- public static final String Org_App_Relationship = "applications";
+ public static final String ORG_APP_RELATIONSHIP = "applications";
public static final String OAUTH_SECRET_SALT = "super secret oauth value";
@@ -1763,7 +1762,7 @@ public class ManagementServiceImpl implements ManagementService {
Results r = em.getSourceEntities(
new SimpleEntityRef(CpNamingUtils.APPLICATION_INFO, applicationInfoId),
- Org_App_Relationship, Group.ENTITY_TYPE, Level.ALL_PROPERTIES);
+ ORG_APP_RELATIONSHIP, Group.ENTITY_TYPE, Level.ALL_PROPERTIES);
Entity entity = r.getEntity();
if ( entity != null ) {
@@ -1786,7 +1785,7 @@ public class ManagementServiceImpl implements ManagementService {
// query for application_info entities
final Results results = em.getTargetEntities(
new SimpleEntityRef(Group.ENTITY_TYPE, organizationGroupId),
- Org_App_Relationship, CpNamingUtils.APPLICATION_INFO, Level.ALL_PROPERTIES);
+ ORG_APP_RELATIONSHIP, CpNamingUtils.APPLICATION_INFO, Level.ALL_PROPERTIES);
final PagingResultsIterator itr = new PagingResultsIterator( results );
@@ -1840,7 +1839,7 @@ public class ManagementServiceImpl implements ManagementService {
}
EntityManager em = emf.getEntityManager( smf.getManagementAppId() );
- em.createConnection( new SimpleEntityRef( Group.ENTITY_TYPE, organizationId ), Org_App_Relationship, appInfo );
+ em.createConnection( new SimpleEntityRef( Group.ENTITY_TYPE, organizationId ), ORG_APP_RELATIONSHIP, appInfo );
return applicationId;
}