You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/01/09 05:21:05 UTC
[4/5] usergrid git commit: USERGRID-933: code review changes
USERGRID-933: code review changes
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/35ff17f6
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/35ff17f6
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/35ff17f6
Branch: refs/heads/master
Commit: 35ff17f6549636ceb180a1a525b5c1b5c019b8f1
Parents: 21730cc
Author: Mike Dunker <md...@apigee.com>
Authored: Fri Jan 8 15:55:01 2016 -0800
Committer: Mike Dunker <md...@apigee.com>
Committed: Fri Jan 8 15:55:01 2016 -0800
----------------------------------------------------------------------
.../cassandra/ManagementServiceImpl.java | 3 ++-
.../cassandra/OrganizationConfigPropsImpl.java | 20 ++++++++++----------
.../tokens/cassandra/TokenServiceImpl.java | 1 -
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/35ff17f6/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 3f4bef5..6d79161 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
@@ -39,6 +39,7 @@ import org.apache.usergrid.persistence.Query.Level;
import org.apache.usergrid.persistence.cache.CacheFactory;
import org.apache.usergrid.persistence.cache.CacheScope;
import org.apache.usergrid.persistence.cache.ScopedCache;
+import org.apache.usergrid.persistence.cassandra.CassandraService;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.entities.Application;
import org.apache.usergrid.persistence.entities.Group;
@@ -3269,7 +3270,7 @@ public class ManagementServiceImpl implements ManagementService {
@Override
public OrganizationConfig getOrganizationConfigByName( String organizationName ) throws Exception {
- if ( organizationName == null || organizationName.equals("management")) {
+ if ( organizationName == null || organizationName.equals(CassandraService.MANAGEMENT_APPLICATION)) {
return getOrganizationConfigDefaultsOnly();
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/35ff17f6/stack/services/src/main/java/org/apache/usergrid/management/cassandra/OrganizationConfigPropsImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/OrganizationConfigPropsImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/OrganizationConfigPropsImpl.java
index 7063507..b276db4 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/OrganizationConfigPropsImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/OrganizationConfigPropsImpl.java
@@ -29,19 +29,19 @@ import static org.apache.commons.lang.StringUtils.isBlank;
public class OrganizationConfigPropsImpl implements OrganizationConfigProps {
private static final Logger logger = LoggerFactory.getLogger( OrganizationConfigPropsImpl.class );
- private static final String DEFAULT_CONNECTION_PARAM_DEFAULTVALUE = "all";
- private static final String ADMIN_SYSADMIN_EMAIL_DEFAULTVALUE = null; // null will fall back to system level admin
- private static final String ADMIN_ACTIVATION_URL_DEFAULTVALUE = ""; // should be configured in properties file
- private static final String ADMIN_CONFIRMATION_URL_DEFAULTVALUE = ""; // should be configured in properties file
- private static final String ADMIN_RESETPW_URL_DEFAULTVALUE = ""; // should be configured in properties file
+ private static final String DEFAULTVALUE_DEFAULT_CONNECTION_PARAM = "all";
+ private static final String DEFAULTVALUE_ADMIN_SYSADMIN_EMAIL = null; // null will fall back to system level admin
+ private static final String DEFAULTVALUE_ADMIN_ACTIVATION_URL = ""; // should be configured in properties file
+ private static final String DEFAULTVALUE_ADMIN_CONFIRMATION_URL = ""; // should be configured in properties file
+ private static final String DEFAULTVALUE_ADMIN_RESETPW_URL = ""; // should be configured in properties file
private static final Map<String, String> noConfigDefaults = new HashMap<>();
static {
- noConfigDefaults.put(PROPERTIES_DEFAULT_CONNECTION_PARAM, DEFAULT_CONNECTION_PARAM_DEFAULTVALUE);
- noConfigDefaults.put(PROPERTIES_ADMIN_SYSADMIN_EMAIL, ADMIN_SYSADMIN_EMAIL_DEFAULTVALUE);
- noConfigDefaults.put(PROPERTIES_ADMIN_ACTIVATION_URL, ADMIN_ACTIVATION_URL_DEFAULTVALUE);
- noConfigDefaults.put(PROPERTIES_ADMIN_CONFIRMATION_URL, ADMIN_CONFIRMATION_URL_DEFAULTVALUE);
- noConfigDefaults.put(PROPERTIES_ADMIN_RESETPW_URL, ADMIN_RESETPW_URL_DEFAULTVALUE);
+ noConfigDefaults.put(PROPERTIES_DEFAULT_CONNECTION_PARAM, DEFAULTVALUE_DEFAULT_CONNECTION_PARAM);
+ noConfigDefaults.put(PROPERTIES_ADMIN_SYSADMIN_EMAIL, DEFAULTVALUE_ADMIN_SYSADMIN_EMAIL);
+ noConfigDefaults.put(PROPERTIES_ADMIN_ACTIVATION_URL, DEFAULTVALUE_ADMIN_ACTIVATION_URL);
+ noConfigDefaults.put(PROPERTIES_ADMIN_CONFIRMATION_URL, DEFAULTVALUE_ADMIN_CONFIRMATION_URL);
+ noConfigDefaults.put(PROPERTIES_ADMIN_RESETPW_URL, DEFAULTVALUE_ADMIN_RESETPW_URL);
}
//protected final Properties properties;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/35ff17f6/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
index 6eb226f..c0729ff 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
@@ -288,7 +288,6 @@ public class TokenServiceImpl implements TokenService {
Assert.notNull( principal.getType() );
Assert.notNull( principal.getApplicationId() );
Assert.notNull( principal.getUuid() );
- // workflowOrgId would be taken from state
}
// except that we generate the UUID based on the token