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

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;