DATAES-211 - Fix tests for CDI (jar hell)

pom.xml

@@ -108,12 +108,22 @@
             <version>${spring}</version>
             <scope>test</scope>
         </dependency>
-        <!--<dependency>-->
+        <dependency>
-            <!--<groupId>org.apache.openwebbeans.test</groupId>-->
+            <groupId>org.apache.openwebbeans.test</groupId>
-            <!--<artifactId>cditest-owb</artifactId>-->
+            <artifactId>cditest-owb</artifactId>
-            <!--<version>${webbeans}</version>-->
+            <version>${webbeans}</version>
-            <!--<scope>test</scope>-->
+            <scope>test</scope>
-        <!--</dependency>-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -128,20 +138,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.codehaus.groovy</groupId>-->
-            <!--<artifactId>groovy-all</artifactId>-->
-            <!--<version>2.4.4</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.elasticsearch.module</groupId>-->
-            <!--<artifactId>lang-groovy</artifactId>-->
-            <!--<version>${elasticsearch}</version>-->
-            <!--&lt;!&ndash;<scope>test</scope>&ndash;&gt;-->
-        <!--</dependency>-->
-
     </dependencies>
 
     <build>

src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java

@@ -76,9 +76,7 @@ public class NodeClientFactoryBean implements FactoryBean<NodeClient>, Initializ
 		nodeClient = (NodeClient) nodeBuilder().settings(Settings.builder().put(loadConfig())
 				.put("http.enabled", String.valueOf(this.enableHttp))
 				.put("path.home", this.pathHome)
-				.put("path.data", this.pathData)
+				.put("path.data", this.pathData))
-						.put("script.inline", "on")
-		)
 				.clusterName(this.clusterName).local(this.local).node()
 				.client();
 	}

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/CdiRepositoryTests.java

@@ -1,95 +1,95 @@
-///*
+/*
-// * Copyright 2014 the original author or authors.
+ * Copyright 2014 the original author or authors.
-// *
+ *
-// * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
-// * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
-// * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
-// *
+ *
-// * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
-// *
+ *
-// * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
-// * limitations under the License.
+ * limitations under the License.
-// */
+ */
-//package org.springframework.data.elasticsearch.repositories.cdi;
+package org.springframework.data.elasticsearch.repositories.cdi;
-//
+
-//import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.is;
-//import static org.junit.Assert.*;
+import static org.junit.Assert.*;
-//
+
-//import org.apache.webbeans.cditest.CdiTestContainer;
+import org.apache.webbeans.cditest.CdiTestContainer;
-//import org.apache.webbeans.cditest.CdiTestContainerLoader;
+import org.apache.webbeans.cditest.CdiTestContainerLoader;
-//import org.junit.AfterClass;
+import org.junit.AfterClass;
-//import org.junit.Before;
+import org.junit.Before;
-//import org.junit.BeforeClass;
+import org.junit.BeforeClass;
-//import org.junit.Test;
+import org.junit.Test;
-//import org.springframework.data.elasticsearch.entities.Product;
+import org.springframework.data.elasticsearch.entities.Product;
-//
+
-///**
+/**
-// * @author Mohsin Husen
+ * @author Mohsin Husen
-// */
+ */
-//TODO: ako cdi - jar hell
+
-//public class CdiRepositoryTests {
+public class CdiRepositoryTests {
-//
+
-//	private static CdiTestContainer cdiContainer;
+	private static CdiTestContainer cdiContainer;
-//	private CdiProductRepository repository;
+	private CdiProductRepository repository;
-//	private SamplePersonRepository personRepository;
+	private SamplePersonRepository personRepository;
-//
+
-//	@BeforeClass
+	@BeforeClass
-//	public static void init() throws Exception {
+	public static void init() throws Exception {
-//		cdiContainer = CdiTestContainerLoader.getCdiContainer();
+		cdiContainer = CdiTestContainerLoader.getCdiContainer();
-//		cdiContainer.startApplicationScope();
+		cdiContainer.startApplicationScope();
-//		cdiContainer.bootContainer();
+		cdiContainer.bootContainer();
-//	}
+	}
-//
+
-//	@AfterClass
+	@AfterClass
-//	public static void shutdown() throws Exception {
+	public static void shutdown() throws Exception {
-//		cdiContainer.stopContexts();
+		cdiContainer.stopContexts();
-//		cdiContainer.shutdownContainer();
+		cdiContainer.shutdownContainer();
-//	}
+	}
-//
+
-//	@Before
+	@Before
-//	public void setUp() {
+	public void setUp() {
-//		CdiRepositoryClient client = cdiContainer.getInstance(CdiRepositoryClient.class);
+		CdiRepositoryClient client = cdiContainer.getInstance(CdiRepositoryClient.class);
-//		repository = client.getRepository();
+		repository = client.getRepository();
-//		personRepository = client.getSamplePersonRepository();
+		personRepository = client.getSamplePersonRepository();
-//	}
+	}
-//
+
-//	@Test
+	@Test
-//	public void testCdiRepository() {
+	public void testCdiRepository() {
-//		assertNotNull(repository);
+		assertNotNull(repository);
-//
+
-//		Product bean = new Product();
+		Product bean = new Product();
-//		bean.setId("id-1");
+		bean.setId("id-1");
-//		bean.setName("cidContainerTest-1");
+		bean.setName("cidContainerTest-1");
-//
+
-//		repository.save(bean);
+		repository.save(bean);
-//
+
-//		assertTrue(repository.exists(bean.getId()));
+		assertTrue(repository.exists(bean.getId()));
-//
+
-//		Product retrieved = repository.findOne(bean.getId());
+		Product retrieved = repository.findOne(bean.getId());
-//		assertNotNull(retrieved);
+		assertNotNull(retrieved);
-//		assertEquals(bean.getId(), retrieved.getId());
+		assertEquals(bean.getId(), retrieved.getId());
-//		assertEquals(bean.getName(), retrieved.getName());
+		assertEquals(bean.getName(), retrieved.getName());
-//
+
-//		assertEquals(1, repository.count());
+		assertEquals(1, repository.count());
-//
+
-//		assertTrue(repository.exists(bean.getId()));
+		assertTrue(repository.exists(bean.getId()));
-//
+
-//		repository.delete(bean);
+		repository.delete(bean);
-//
+
-//		assertEquals(0, repository.count());
+		assertEquals(0, repository.count());
-//		retrieved = repository.findOne(bean.getId());
+		retrieved = repository.findOne(bean.getId());
-//		assertNull(retrieved);
+		assertNull(retrieved);
-//	}
+	}
-//
+
-//	/**
+	/**
-//	 * @see DATAES-113
+	 * @see DATAES-113
-//	 */
+	 */
-//	@Test
+	@Test
-//	public void returnOneFromCustomImpl() {
+	public void returnOneFromCustomImpl() {
-//
+
-//		assertThat(personRepository.returnOne(), is(1));
+		assertThat(personRepository.returnOne(), is(1));
-//	}
+	}
-//}
+}

src/test/resources/node-client-configuration.yml

@@ -1,20 +1,3 @@
 #enabled scripts - this require groovy
 script.inline: true
 script.indexed: true
-#script.groovy.sandbox.enabled: true
-#script.groovy.sandbox.enabled: true
-#script.engine.groovy.file.aggs: true
-#script.engine.groovy.file.mapping: true
-#script.engine.groovy.file.search: true
-#script.engine.groovy.file.update: true
-#script.engine.groovy.file.plugin: true
-#script.engine.groovy.indexed.aggs: true
-#script.engine.groovy.indexed.mapping: true
-#script.engine.groovy.indexed.search: true
-#script.engine.groovy.indexed.update: true
-#script.engine.groovy.indexed.plugin: true
-#script.engine.groovy.inline.aggs: true
-#script.engine.groovy.inline.mapping: true
-#script.engine.groovy.inline.search: true
-#script.engine.groovy.inline.update: true
-#script.engine.groovy.inline.plugin: true