Merge pull request #10 from jpmorganchase/fix_registry_loading

Properly load ContractRegistry address on startup (fixes #4)

Author: chetan

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/config/AppConfig.java

@@ -7,22 +7,16 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 
-import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.collections4.Predicate;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
-import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.Environment;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.jmx.export.annotation.AnnotationMBeanExporter;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
@@ -31,43 +25,19 @@
 
 @Configuration
 @EnableAsync
-public class AppConfig implements AsyncConfigurer, EnvironmentAware {
+public class AppConfig implements AsyncConfigurer {
 
     private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(AppConfig.class);
 
     public static final String CONFIG_FILE = "application.properties";
 
-    private Environment env;
-
-    @Override
-    public  void setEnvironment(Environment e) {
-        this.env = e;
-    }
-
-
     /**
-     * Return the configured environment name
+     * Return the configured environment name (via spring.profiles.active system prop)
      *
-     * Search order:
-     * - ETH_ENV environment variable
-     * - eth.environment system property (-Deth.environment param)
-     * - Default to 'local' if none found
-     *
-     * @return Environment name
+     * @return String Environment name
      */
-    public  String getEnv() {
-        //String env = getProp("ETH_ENV", "eth.environment");
-        if (null == env) {
-            // FIXME only default to local based on a flag passed down from maven build?
-            LOG.warn("spring.profiles.active is not set");
-        }
-        List <String> profiles = ListUtils.selectRejected(Arrays.asList(env.getActiveProfiles()), new Predicate <String>() {
-            @Override
-            public boolean evaluate(String profile) {
-                return profile.equalsIgnoreCase("container") || profile.equalsIgnoreCase("spring-boot");
-            }
-        });
-        return profiles.get(0);
+    public static String getEnv() {
+      return System.getProperty("spring.profiles.active");
     }
 
     /**
@@ -80,7 +50,7 @@ public boolean evaluate(String profile) {
      *
      * @return
      */
-    public  String getConfigPath() {
+    public static String getConfigPath() {
         String configPath = getProp("ETH_CONFIG", "eth.config.dir");
         if (!StringUtils.isBlank(configPath)) {
             return FileUtils.expandPath(configPath, getEnv());
@@ -108,20 +78,19 @@ private static String getProp(String env, String java) {
     }
 
     @Bean
-//    @Profile("container")
-    public  PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() throws IOException {
-        return createPropConfigurer(env, getConfigPath());
+    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() throws IOException {
+        return createPropConfigurer(getConfigPath());
     }
 
-    public  String getVendorConfigFile() {
+    public static String getVendorConfigFile() {
         return "config".concat(File.separator).concat("application.properties");
     }
 
-    public  String getVendorEnvConfigFile() {
+    public static String getVendorEnvConfigFile() {
         return "config".concat(File.separator).concat("application-").concat(getEnv()).concat(".properties");
     }
 
-    public  void initVendorConfig(File configFile) throws IOException {
+    public static void initVendorConfig(File configFile) throws IOException {
         // copy default file
         String path = FileUtils.getClasspathPath(getVendorEnvConfigFile()).toString();
         LOG.info("Initializing new config from " + path);
@@ -134,14 +103,13 @@ public  void initVendorConfig(File configFile) throws IOException {
         SortedProperties.store(mergedProps, new FileOutputStream(configFile));
     }
 
-    public  PropertySourcesPlaceholderConfigurer createPropConfigurer(Environment env,
-            String configDir) throws IOException {
+    public static PropertySourcesPlaceholderConfigurer createPropConfigurer(String configDir)
+        throws IOException {
 
-        if (null == env) {
-            throw new IOException("ENV var 'spring.profiles.active' not set; unable to load config");
+        if (StringUtils.isBlank(getEnv())) {
+            throw new IOException("System property 'spring.profiles.active' not set; unable to load config");
         }
 
-        LOG.info("eth.environment=" + env);
         LOG.info("eth.config.dir=" + configDir);
 
         File configPath = new File(configDir);
@@ -171,6 +139,9 @@ public  PropertySourcesPlaceholderConfigurer createPropConfigurer(Environment en
         PropertySourcesPlaceholderConfigurer propConfig = new PropertySourcesPlaceholderConfigurer();
         propConfig.setLocation(new FileSystemResource(configFile));
         propConfig.setProperties(localProps);
+        propConfig.setLocalOverride(true);
+
+        LOG.info("Loading config from " + configFile.toString());
 
         return propConfig;
     }

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/config/SpringBootApplication.java

@@ -39,6 +39,10 @@ public static void main(String[] args) {
             System.setProperty("spring.profiles.active", "local");
         }
 
+        if (StringUtils.isNotBlank(System.getProperty("spring.profiles.active"))) {
+          System.setProperty("spring.config.location", "file:" + FileUtils.expandPath(AppConfig.getConfigPath(), "application.properties"));
+        }
+
         // extract geth from WAR (if necessary)
         try {
             extractGeth(configDir);

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/service/task/BlockchainInitializerTask.java

@@ -5,7 +5,6 @@
 import com.jpmorgan.cakeshop.error.APIException;
 import com.jpmorgan.cakeshop.model.Account;
 import com.jpmorgan.cakeshop.model.TransactionResult;
-import com.jpmorgan.cakeshop.service.BlockService;
 import com.jpmorgan.cakeshop.service.ContractRegistryService;
 import com.jpmorgan.cakeshop.service.ContractService;
 import com.jpmorgan.cakeshop.service.ContractService.CodeType;
@@ -39,9 +38,6 @@ public class BlockchainInitializerTask implements Runnable {
 
     private static final Logger LOG = LoggerFactory.getLogger(BlockchainInitializerTask.class);
 
-    @Autowired
-    private BlockService blockService;
-
     @Autowired
     private GethHttpService geth;
 
@@ -89,7 +85,7 @@ private void syncWalletDb() {
             return;
         }
 
-        LOG.info("Storing existing wallet accounts");
+        LOG.info("Storing existing wallet account balances");
         try {
             List<Account> list = walletService.list();
             for (Account account : list) {
@@ -120,7 +116,12 @@ private void deployContractRegistry() {
             contractRegistryAddress = regAddr;
         }
 
-        if (StringUtils.isNotBlank(contractRegistryAddress)) {
+        if (StringUtils.isBlank(contractRegistryAddress)) {
+            LOG.info("Contract registry address not found");
+
+        } else {
+            // test stored address
+            LOG.info("Loaded contract registry address " + contractRegistryAddress);
             Map<String, Object> contractRes;
             try {
                 contractRes = geth.executeGethCall("eth_getCode", new Object[]{contractRegistryAddress, "latest"});
@@ -130,7 +131,11 @@ private void deployContractRegistry() {
             }
 
             String binaryCode = (String) contractRes.get("_result");
-            if (!binaryCode.contentEquals("0x")) {
+            if (binaryCode.contentEquals("0x")) {
+              LOG.warn("eth_getCode for " + contractRegistryAddress + " returned 0x");
+
+            } else {
+                // got code, contract exists
                 try {
                     contractRegistry.updateRegistryAddress(this.contractRegistryAddress);
                 } catch (APIException e) {
@@ -141,7 +146,8 @@ private void deployContractRegistry() {
             // continue to deploy
         }
 
-        LOG.info("Initializing empty blockchain");
+        LOG.info("ContractRegistry not found on chain");
+
         try {
             nodeService.update(null, null, null, true, null, null); // make sure mining is enabled
 

cakeshop-api/src/test/java/com/jpmorgan/cakeshop/test/config/TestAppConfig.java

@@ -56,8 +56,7 @@ public static void setUp() {
     @Profile("test")
     public  PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() throws IOException {
         AppConfig appConfig = new AppConfig();
-        appConfig.setEnvironment(env);
-        return appConfig.createPropConfigurer(env, TempFileManager.getTempPath());
+        return appConfig.createPropConfigurer(TempFileManager.getTempPath());
     }
 
     @Bean(name="asyncExecutor")