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;