Bitcoin host, username and password can now be overridden in bitcoind-client-test.properties.

Author: Claus Nielsen

src/main/java/dk/clanie/bitcoin/client/BitcoindClientDefaultConfig.java

@@ -26,8 +26,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.context.annotation.ImportResource;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.ResponseErrorHandler;
@@ -36,8 +35,10 @@
 /**
  * Default BitcoindClient configuration.
  * <p>
- * Loads bitcoind-client.properties from the classpath. It must define the
- * following properties:
+ * Loads properties from bitcoind-client.properties and/or
+ * bitcoind-client-test.properties, one of which should be present on the
+ * classpath and define the following properties:
+ * 
  * <pre>
  * <code>
  * bitcoind.client.host = localhost
@@ -47,10 +48,13 @@
  * </code>
  * </pre>
  * 
+ * If both property files are present on the classpath, settings in
+ * bitcoind-client-test.properties takes precedence.
+ * 
  * @author Claus Nielsen
  */
 @Configuration
-@PropertySource("classpath:/bitcoind-client.properties")
+@ImportResource("classpath:/META-INF/spring/bitcoind-client-context.xml")
 public class BitcoindClientDefaultConfig {
 
 	@Value("${bitcoind.client.host}")
@@ -65,13 +69,15 @@ public class BitcoindClientDefaultConfig {
 	@Value("${bitcoind.client.password}")
 	private String password;
 
+
 	@Bean
 	public BitcoindClient bitcoindClient() {
 		BitcoindClient bitcoindClient = new BitcoindClient();
 		bitcoindClient.setUrl("http://" + host + ":" + port);
 		return bitcoindClient;
 	}
 
+
 	@Bean
 	public RestTemplate restTemplate() {
 		RestTemplate restTemplate = new RestTemplate();
@@ -80,20 +86,24 @@ public RestTemplate restTemplate() {
 		return restTemplate;
 	}
 
+
 	private ResponseErrorHandler errorHandler() {
 		return new BitcoindJsonRpcErrorHandler();
 	}
 
+
 	private ClientHttpRequestFactory requestFactory() {
 		return new HttpComponentsClientHttpRequestFactory(httpClient());
 	}
 
+
 	private HttpClient httpClient() {
 		DefaultHttpClient httpClient = new DefaultHttpClient();
 		httpClient.setCredentialsProvider(credentialsProvicer());
 		return httpClient;
 	}
 
+
 	private CredentialsProvider credentialsProvicer() {
 		CredentialsProvider credsProvider = new BasicCredentialsProvider();
 		credsProvider.setCredentials(
@@ -102,9 +112,5 @@ private CredentialsProvider credentialsProvicer() {
 		return credsProvider;
 	}
 
-	@Bean
-	public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
-		return new PropertySourcesPlaceholderConfigurer();
-	}
 
 }

src/main/resources/META-INF/spring/bitcoind-client-context.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+
+	<context:annotation-config />
+
+	<context:property-placeholder
+		location="classpath:/bitcoind-client.properties, classpath:/bitcoind-client-test.properties"
+		ignore-resource-not-found="true" />
+
+</beans>