You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/10/24 13:06:44 UTC
[59/83] [abbrv] usergrid git commit: Load properties into Guice by
using the getProperty method instead of generic putAll from Map superclass as
it getProperty could be overridden
Load properties into Guice by using the getProperty method instead of generic putAll from Map superclass as it getProperty could be overridden
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4c0c1763
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4c0c1763
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4c0c1763
Branch: refs/heads/asf-site
Commit: 4c0c17638bb5e3d1d64dfadb665d2e54beea88ee
Parents: 09c8103
Author: Michael Russo <mr...@apigee.com>
Authored: Fri Aug 19 10:03:13 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Mon Sep 12 21:55:59 2016 -0700
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/GuiceFactory.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/4c0c1763/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
index 1e7d9df..a17ac48 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
@@ -26,9 +26,7 @@ import java.util.Properties;
import javax.inject.Named;
-import com.google.inject.AbstractModule;
import com.google.inject.Module;
-import org.apache.usergrid.persistence.collection.service.impl.ServiceModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.FactoryBean;
@@ -124,10 +122,13 @@ public class GuiceFactory implements FactoryBean<Injector> {
logger.debug("Set Cassandra properties for Core Persistence: {}", cpProps.toString());
}
- // Make all Usergrid properties into Core Persistence config
- cpProps.putAll( systemProperties );
- //logger.debug("All properties fed to Core Persistence: " + cpProps.toString() );
+ // Load the properties into the new CP Props Map by calling getProperty as the methods may be overridden
+ for( Object propKey : systemProperties.keySet()){
+
+ cpProps.setProperty((String)propKey, systemProperties.getProperty((String)propKey));
+ }
+ //logger.debug("All properties fed to Core Persistence: " + cpProps.toString() );
ConfigurationManager.loadProperties( cpProps );
}
catch ( Exception e ) {