Merge pull request #30 from babltiga/manual-config

Runtime Configurations and Asynchronous Execution

Author: diana-derose

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/IntuitInterceptorProvider.java

@@ -27,6 +27,7 @@
 import com.intuit.ipp.util.Config;
 import com.intuit.ipp.util.Logger;
 import com.intuit.ipp.util.StringUtils;
+import org.apache.commons.configuration.Configuration;
 
 /**
  * Class to provide the provision to add interceptors in the order those have to be executed. 
@@ -53,6 +54,11 @@ public class IntuitInterceptorProvider implements Callable<Void> {
 	 * variable intuitMessage
 	 */
 	private IntuitMessage intuitMessage = null;
+
+	/**
+	 * Manual configuration properties to be used while executing the interceptors in async mode.
+	 */
+	private Configuration configuration = null;
 
 	/**
 	 * Constructor IntuitInterceptorProvider
@@ -116,6 +122,7 @@ protected void executeResponseInterceptors(final IntuitMessage intuitMessage) th
 	 */
 	public void executeAsyncInterceptors(final IntuitMessage intuitMessage) {
 		this.intuitMessage = intuitMessage;
+		this.configuration = Config.cloneConfigurationOverrides();
 		ExecutorService executorService = Executors.newSingleThreadExecutor();
 		executorService.submit(this);
 	}
@@ -138,6 +145,8 @@ private Interceptor getConnectionInterceptor() {
 	public Void call() throws FMSException {
 		CallbackMessage callbackMessage = new CallbackMessage();
 		try {
+			// add configuration properties from the caller thread
+			Config.addConfigurationOverrides(configuration);
 			executeInterceptors(intuitMessage);
 		} catch (FMSException e) {
 			callbackMessage.setFMSException(e);

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/Config.java

@@ -16,6 +16,8 @@
 package com.intuit.ipp.util;
 
 import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationUtils;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.EnvironmentConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
@@ -273,4 +275,24 @@ public static Boolean getBooleanProperty(String key, Boolean defaultValue) {
         return Boolean.parseBoolean(value);
     }
 
+	/**
+	 * Returns a copy of manual configuration overrides. This implementation will create a deep
+	 * clone, i.e. all manual configurations contained in this composite will also be
+	 * cloned.
+	 *
+	 * @return the copy
+	 */
+    public static Configuration cloneConfigurationOverrides(){
+		return ConfigurationUtils
+				.cloneConfiguration(local.get().cc.getInMemoryConfiguration());
+	}
+
+	/**
+	 * Adds given manual configuration overrides to the {@link CompositeConfiguration} stored in ThreadLocal.
+	 * @param configuration The configuration to add.
+	 */
+	public static void addConfigurationOverrides(Configuration configuration){
+		ConfigurationUtils.copy(configuration, local.get().cc);
+	}
+
 }