Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate to Jakarta EE 9.

Browse Source 
Rename javax imports to jakarta, switch to Jakarta API artifacts.

Closes #2464
This commit is contained in:
Mark Paluch
2021-09-27 11:08:55 +02:00
committed by Jens Schauder
parent 7cfc0c2a8c
commit 5a59e43745
25 changed files with 139 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
pom.xml
View File

@@ -72,23 +72,20 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api}</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation-api}</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-api}</version>
<optional>true</optional>
</dependency>
@@ -173,38 +170,6 @@
<optional>true</optional>
</dependency>
<!-- EJB Transactions -->
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<version>3.0</version>
<optional>true</optional>
</dependency>
<!-- CDI -->
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
<version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>${cdi}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -219,24 +184,33 @@
<optional>true</optional>
</dependency>
<!-- CDI -->
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>test</scope>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-se</artifactId>
<version>${webbeans}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm9-shaded</artifactId>
<version>${webbeans.xbean}</version>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>
@@ -256,7 +230,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.5</version>
<version>3.0.2</version>
<scope>test</scope>
</dependency>
@@ -329,9 +303,9 @@
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.3</version>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.0</version>
<scope>test</scope>
</dependency>

6
src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.domain.jaxb;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.domain.Sort.Order;
@@ -33,7 +33,7 @@ public class OrderAdapter extends XmlAdapter<OrderDto, Order> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
*/
@Nullable
@Override
@@ -51,7 +51,7 @@ public class OrderAdapter extends XmlAdapter<OrderDto, Order> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
*/
@Nullable
@Override

8
src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.data.domain.jaxb;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import java.util.Collections;
import java.util.List;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.jaxb.SpringDataJaxb.PageDto;
import org.springframework.hateoas.Link;
@@ -34,7 +34,7 @@ public class PageAdapter extends XmlAdapter<PageDto, Page<Object>> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
*/
@Nullable
@Override
@@ -53,7 +53,7 @@ public class PageAdapter extends XmlAdapter<PageDto, Page<Object>> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
*/
@Nullable
@Override

8
src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java
View File

@@ -15,9 +15,9 @@
*/
package org.springframework.data.domain.jaxb;
import java.util.Collections;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import java.util.Collections;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
@@ -36,7 +36,7 @@ class PageableAdapter extends XmlAdapter<PageRequestDto, Pageable> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
*/
@Nullable
@Override
@@ -58,7 +58,7 @@ class PageableAdapter extends XmlAdapter<PageRequestDto, Pageable> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
*/
@NonNull
@Override

6
src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.domain.jaxb;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.jaxb.SpringDataJaxb.SortDto;
@@ -33,7 +33,7 @@ public class SortAdapter extends XmlAdapter<SortDto, Sort> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
*/
@Nullable
@Override
@@ -51,7 +51,7 @@ public class SortAdapter extends XmlAdapter<SortDto, Sort> {
/*
* (non-Javadoc)
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
*/
@NonNull
@Override

18
src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java
View File

@@ -15,20 +15,20 @@
*/
package org.springframework.data.domain.jaxb;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAnyElement;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementWrapper;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;

8
src/main/java/org/springframework/data/domain/jaxb/package-info.java
View File

@@ -13,10 +13,10 @@
@org.springframework.lang.NonNullApi
package org.springframework.data.domain.jaxb;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import jakarta.xml.bind.annotation.XmlNs;
import jakarta.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

42
src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java
View File

@@ -15,6 +15,15 @@
*/
package org.springframework.data.repository.cdi;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.Alternative;
import jakarta.enterprise.inject.Stereotype;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.enterprise.inject.spi.PassivationCapable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -28,15 +37,6 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.PassivationCapable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -157,7 +157,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#getTypes()
* @see jakarta.enterprise.inject.spi.Bean#getTypes()
*/
@SuppressWarnings("rawtypes")
public Set<Type> getTypes() {
@@ -206,7 +206,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.context.spi.Contextual#create(javax.enterprise.context.spi.CreationalContext)
* @see jakarta.enterprise.context.spi.Contextual#create(jakarta.enterprise.context.spi.CreationalContext)
*/
public final T create(@SuppressWarnings("null") CreationalContext<T> creationalContext) {
@@ -226,7 +226,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.context.spi.Contextual#destroy(java.lang.Object, javax.enterprise.context.spi.CreationalContext)
* @see jakarta.enterprise.context.spi.Contextual#destroy(java.lang.Object, jakarta.enterprise.context.spi.CreationalContext)
*/
public void destroy(@SuppressWarnings("null") T instance,
@SuppressWarnings("null") CreationalContext<T> creationalContext) {
@@ -241,7 +241,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#getQualifiers()
* @see jakarta.enterprise.inject.spi.Bean#getQualifiers()
*/
public Set<Annotation> getQualifiers() {
return qualifiers;
@@ -249,7 +249,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#getName()
* @see jakarta.enterprise.inject.spi.Bean#getName()
*/
public String getName() {
return repositoryType.getName();
@@ -257,7 +257,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#getStereotypes()
* @see jakarta.enterprise.inject.spi.Bean#getStereotypes()
*/
public Set<Class<? extends Annotation>> getStereotypes() {
@@ -269,7 +269,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#getBeanClass()
* @see jakarta.enterprise.inject.spi.Bean#getBeanClass()
*/
public Class<?> getBeanClass() {
return repositoryType;
@@ -277,7 +277,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#isAlternative()
* @see jakarta.enterprise.inject.spi.Bean#isAlternative()
*/
public boolean isAlternative() {
return isAnnotatedWith(repositoryType, Alternative.class);
@@ -285,7 +285,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#isNullable()
* @see jakarta.enterprise.inject.spi.Bean#isNullable()
*/
public boolean isNullable() {
return false;
@@ -293,7 +293,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#getInjectionPoints()
* @see jakarta.enterprise.inject.spi.Bean#getInjectionPoints()
*/
public Set<InjectionPoint> getInjectionPoints() {
return Collections.emptySet();
@@ -301,7 +301,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.Bean#getScope()
* @see jakarta.enterprise.inject.spi.Bean#getScope()
*/
public Class<? extends Annotation> getScope() {
return ApplicationScoped.class;
@@ -309,7 +309,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
/*
* (non-Javadoc)
* @see javax.enterprise.inject.spi.PassivationCapable#getId()
* @see jakarta.enterprise.inject.spi.PassivationCapable#getId()
*/
public String getId() {
return passivationId;

4
src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.data.repository.cdi;
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
import java.util.Optional;
import java.util.stream.Stream;
import javax.enterprise.inject.UnsatisfiedResolutionException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.ResourceLoader;

23
src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java
View File

@@ -15,6 +15,17 @@
*/
package org.springframework.data.repository.cdi;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Any;
import jakarta.enterprise.inject.Default;
import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
import jakarta.enterprise.inject.spi.AnnotatedType;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.Extension;
import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.inject.Qualifier;
import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.HashSet;
@@ -22,19 +33,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessAnnotatedType;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Qualifier;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.log.LogMessage;
import org.springframework.data.repository.NoRepositoryBean;

21
src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java
View File

@@ -17,6 +17,16 @@ package org.springframework.data.domain.jaxb;
import static org.assertj.core.api.Assertions.*;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
@@ -24,19 +34,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Scanner;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.custommonkey.xmlunit.Diff;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.data.domain.Page;

5
src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java
View File

@@ -17,11 +17,12 @@ package org.springframework.data.mapping.context;
import static org.assertj.core.api.Assertions.*;
import jakarta.inject.Inject;
import java.util.List;
import javax.inject.Inject;
import org.junit.jupiter.api.Test;
import org.springframework.data.annotation.Reference;
import org.springframework.data.mapping.MappingException;
import org.springframework.data.mapping.PersistentPropertyPath;

4
src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java
View File

@@ -17,8 +17,8 @@ package org.springframework.data.repository.cdi;
import static org.assertj.core.api.Assertions.*;
import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer;
import jakarta.enterprise.inject.se.SeContainer;
import jakarta.enterprise.inject.se.SeContainerInitializer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;

14
src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java
View File

@@ -19,6 +19,12 @@ import static java.util.Collections.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -26,12 +32,6 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Named;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
@@ -67,7 +67,7 @@ import org.springframework.data.repository.query.RepositoryQuery;
@MockitoSettings(strictness = Strictness.LENIENT)
class CdiRepositoryBeanUnitTests {
static final String PASSIVATION_ID = "javax.enterprise.inject.Default:org.springframework.data.repository.cdi.CdiRepositoryBeanUnitTests$SampleRepository";
static final String PASSIVATION_ID = "jakarta.enterprise.inject.Default:org.springframework.data.repository.cdi.CdiRepositoryBeanUnitTests$SampleRepository";
static final Set<Annotation> NO_ANNOTATIONS = emptySet();
static final Set<Annotation> SINGLE_ANNOTATION = singleton(

13
src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java
View File

@@ -15,6 +15,12 @@
*/
package org.springframework.data.repository.cdi;
import jakarta.enterprise.context.NormalScope;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -23,14 +29,9 @@ import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import javax.enterprise.context.NormalScope;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.context.AbstractContext;
import org.mockito.Mockito;
import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
import org.springframework.data.repository.core.support.DummyRepositoryFactory;

2
src/test/java/org/springframework/data/repository/cdi/RepositoryClient.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.repository.cdi;
import javax.inject.Inject;
import jakarta.inject.Inject;
/**
*

7
src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java
View File

@@ -17,14 +17,15 @@ package org.springframework.data.repository.cdi;
import static org.assertj.core.api.Assertions.*;
import java.io.Serializable;
import jakarta.enterprise.inject.se.SeContainer;
import jakarta.enterprise.inject.se.SeContainerInitializer;
import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer;
import java.io.Serializable;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.data.repository.Repository;
/**

4
src/test/java/org/springframework/data/repository/cdi/StereotypeAnnotation.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.data.repository.cdi;
import jakarta.enterprise.inject.Stereotype;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import javax.enterprise.inject.Stereotype;
@Stereotype
@Retention(RetentionPolicy.RUNTIME)
@interface StereotypeAnnotation {

4
src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.repository.cdi;
import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer;
import jakarta.enterprise.inject.se.SeContainer;
import jakarta.enterprise.inject.se.SeContainerInitializer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;

5
src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java
View File

@@ -17,12 +17,13 @@ package org.springframework.data.repository.config;
import static org.assertj.core.api.Assertions.*;
import java.io.IOException;
import jakarta.inject.Named;
import javax.inject.Named;
import java.io.IOException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;

6
src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java
View File

@@ -84,7 +84,7 @@ class TransactionRepositoryProxyPostProcessorUnitTests {
@Test // DATACMNS-732
void considersJtaTransactional() throws Exception {
Method method = SampleRepository.class.getMethod("methodWithJtaOneDotTwoAtTransactional");
Method method = SampleRepository.class.getMethod("methodWithJakartaAtTransactional");
TransactionAttributeSource attributeSource = new RepositoryAnnotationTransactionAttributeSource(
repositoryInformation, true);
@@ -115,8 +115,8 @@ class TransactionRepositoryProxyPostProcessorUnitTests {
Sample save(Sample object);
@javax.transaction.Transactional
void methodWithJtaOneDotTwoAtTransactional();
@jakarta.transaction.Transactional
void methodWithJakartaAtTransactional();
}
static class SampleImplementation<T> {

2
src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.data.web;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.web.SortDefaultUnitTests.*;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.Test;

4
src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java
View File

@@ -18,9 +18,9 @@ package org.springframework.data.web;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.domain.Sort.Direction.*;
import java.util.stream.Stream;
import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import java.util.stream.Stream;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

2
src/test/java/org/springframework/data/web/WebTestUtils.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.web;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockServletContext;

0
src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension → src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
View File