DATACOUCH-57 - Allow for the configuration of CouchbaseClient to use properties

from property files or SPEL expressions.

src/test/java/org/springframework/data/couchbase/config/CouchbaseParserIntegrationTests.java

@@ -16,42 +16,28 @@
 
 package org.springframework.data.couchbase.config;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionReader;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.core.io.ClassPathResource;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * @author Michael Nitschinger
  */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath:namespace/couchbase-bean.xml")
 public class CouchbaseParserIntegrationTests {
-
-  DefaultListableBeanFactory factory;
-  BeanDefinitionReader reader;
-
-  @Before
-  public void setUp() {
-    factory = new DefaultListableBeanFactory();
-    reader = new XmlBeanDefinitionReader(factory);
-  }
+  @Autowired
+  ApplicationContext ctx;
 
   @Test
   public void readsCouchbaseAttributesCorrectly() {
-    reader.loadBeanDefinitions(new ClassPathResource("namespace/couchbase-bean.xml"));
-
-    BeanDefinition definition = factory.getBeanDefinition("couchbase");
-    assertEquals(3, definition.getConstructorArgumentValues().getArgumentCount());
-
-    definition = factory.getBeanDefinition("couchbase2");
-    assertEquals(3, definition.getConstructorArgumentValues().getArgumentCount());
-
-    factory.getBean("couchbase");
-    factory.getBean("couchbase2");
+    assertTrue(ctx.containsBean("couchbase"));
+    assertTrue(ctx.containsBean("couchbase2"));
+    assertTrue(ctx.containsBean("couchbase3"));
   }
-
 }

src/test/resources/namespace/couchbase-bean.xml

@@ -2,8 +2,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:couchbase="http://www.springframework.org/schema/data/couchbase"
+       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase http://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+                           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.xsd">
+
+    <context:property-placeholder location="classpath:/namespace/couchbase.properties"/>
 
     <couchbase:couchbase/>
 
@@ -13,4 +17,5 @@
 
     <bean id="myCustomObjectMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
 
-</beans>
+    <couchbase:couchbase id="couchbase3" host="${couchbase.host}" bucket="${couchbase.bucket}" password="${couchbase.password}" />
+</beans>

src/test/resources/namespace/couchbase.properties

@@ -0,0 +1,3 @@
+couchbase.host=127.0.0.1
+couchbase.bucket=default
+couchbase.password=