Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-15 00:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-395 - Downgrade to CDI 1.0.

Browse Source
This commit is contained in:
Mark Paluch 2017-09-21 14:39:22 +02:00
parent e0d85f0c2a
commit a30a13dced
3 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pom.xml
View File

@ -130,16 +130,34 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.annotation</groupId> <groupId>org.apache.openwebbeans.test</groupId>
<artifactId>javax.annotation-api</artifactId> <artifactId>cditest-owb</artifactId>
<version>${javax-annotation-api}</version> <version>1.2.8</version>
<scope>test</scope>
<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>
<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<version>4.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openwebbeans</groupId> <groupId>javax.servlet</groupId>
<artifactId>openwebbeans-se</artifactId> <artifactId>servlet-api</artifactId>
<version>${webbeans}</version> <version>3.0-alpha-1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

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

@ -20,9 +20,8 @@ import static org.junit.Assert.*;
import java.util.Optional; import java.util.Optional;
import javax.enterprise.inject.se.SeContainer; import org.apache.webbeans.cditest.CdiTestContainer;
import javax.enterprise.inject.se.SeContainerInitializer; 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;
@ -36,29 +35,30 @@ import org.springframework.data.elasticsearch.entities.Product;
*/ */
public class CdiRepositoryTests { public class CdiRepositoryTests {
private static SeContainer cdiContainer; private static CdiTestContainer cdiContainer;
private CdiProductRepository repository; private CdiProductRepository repository;
private SamplePersonRepository personRepository; private SamplePersonRepository personRepository;
private QualifiedProductRepository qualifiedProductRepository; private QualifiedProductRepository qualifiedProductRepository;
@BeforeClass @BeforeClass
public static void init() { public static void init() throws Exception {
cdiContainer = SeContainerInitializer.newInstance() // cdiContainer = CdiTestContainerLoader.getCdiContainer();
.disableDiscovery() // cdiContainer.startApplicationScope();
.addPackages(CdiRepositoryClient.class) // cdiContainer.bootContainer();
.initialize();
} }
@AfterClass @AfterClass
public static void shutdown() { public static void shutdown() throws Exception {
cdiContainer.close();
cdiContainer.stopContexts();
cdiContainer.shutdownContainer();
} }
@Before @Before
public void setUp() { public void setUp() {
CdiRepositoryClient client = cdiContainer.select(CdiRepositoryClient.class).get(); CdiRepositoryClient client = cdiContainer.getInstance(CdiRepositoryClient.class);
repository = client.getRepository(); repository = client.getRepository();
personRepository = client.getSamplePersonRepository(); personRepository = client.getSamplePersonRepository();
repository.deleteAll(); repository.deleteAll();

5
src/test/resources/META-INF/beans.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
</beans>