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

Upgrade to Spring Framework 6.

Browse Source
This commit is contained in:
Oliver Drotbohm
2021-09-21 14:59:09 +02:00
parent da9fcb41f8
commit ede294967f
45 changed files with 206 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pom.xml
View File

@@ -28,6 +28,11 @@
<project.type>multi</project.type>
<dist.id>spring-data-rest</dist.id>
<!-- Temporarily here -->
<spring>6.0.0-SNAPSHOT</spring>
<spring-hateoas>2.0.0-SNAPSHOT</spring-hateoas>
<validation>3.0.0</validation>
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
<springdata.jpa>2.6.0-SNAPSHOT</springdata.jpa>
<springdata.mongodb>3.3.0-SNAPSHOT</springdata.mongodb>
@@ -35,9 +40,9 @@
<springdata.solr>4.4.0-SNAPSHOT</springdata.solr>
<springdata.cassandra>3.3.0-SNAPSHOT</springdata.cassandra>
<springdata.keyvalue>2.6.0-SNAPSHOT</springdata.keyvalue>
<servlet.version>4.0.1</servlet.version>
<servlet.version>5.0.0</servlet.version>
<hibernate.version>5.4.8.Final</hibernate.version>
<hibernate.version>5.5.7.Final</hibernate.version>
<bundlor.enabled>false</bundlor.enabled>
</properties>
@@ -119,8 +124,8 @@
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${validation}</version>
<optional>true</optional>
</dependency>
@@ -144,7 +149,7 @@
<repositories>
<repository>
<id>spring-libs-snapshot</id>
<url>https://repo.spring.io/libs-snapshot</url>
<url>https://repo.spring.io/snapshot</url>
</repository>
</repositories>

4
spring-data-rest-hal-explorer/pom.xml
View File

@@ -32,8 +32,8 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>

2
spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorer.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.rest.webmvc.halexplorer;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.data.rest.webmvc.BasePathAwareController;
import org.springframework.http.MediaType;

6
spring-data-rest-hal-explorer/src/test/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerUnitTests.java
View File

@@ -17,12 +17,12 @@ package org.springframework.data.rest.webmvc.halexplorer;
import static org.assertj.core.api.Assertions.*;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.Collections;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpHeaders;
import org.springframework.mock.web.MockHttpServletRequest;

10
spring-data-rest-tests/pom.xml
View File

@@ -9,16 +9,16 @@
<relativePath>../pom.xml</relativePath>
</parent>
<name>Spring Data REST Tests</name>
<name>Spring Data REST Tests</name>
<artifactId>spring-data-rest-tests</artifactId>
<packaging>pom</packaging>
<modules>
<module>spring-data-rest-tests-core</module>
<module>spring-data-rest-tests-geode</module>
<module>spring-data-rest-tests-jpa</module>
<!--<module>spring-data-rest-tests-jpa</module>-->
<module>spring-data-rest-tests-mongodb</module>
<module>spring-data-rest-tests-security</module>
<!--<module>spring-data-rest-tests-security</module>-->
<module>spring-data-rest-tests-shop</module>
</modules>
@@ -30,8 +30,8 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>

7
spring-data-rest-tests/spring-data-rest-tests-core/pom.xml
View File

@@ -24,13 +24,6 @@
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

15
spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
View File

@@ -36,15 +36,8 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core-jakarta</artifactId>
<version>${hibernate.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -61,12 +54,6 @@
<artifactId>jackson-datatype-hibernate5</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
</dependency>
</dependencies>
</project>

8
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Address.java
View File

@@ -15,10 +15,10 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Version;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Version;
/**
* @author Oliver Gierke

14
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Author.java
View File

@@ -15,25 +15,25 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
/**
* @author Oliver Gierke
*/
@Entity
public class Author {
@Id @GeneratedValue//
@Id @GeneratedValue //
Long id;
public String name;
@ManyToMany(mappedBy = "authors")//
@ManyToMany(mappedBy = "authors") //
public Set<Book> books = new HashSet<Book>();
protected Author() {}

16
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Book.java
View File

@@ -15,6 +15,12 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -22,13 +28,6 @@ import lombok.NoArgsConstructor;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import org.springframework.data.rest.core.annotation.RestResource;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -43,8 +42,7 @@ public class Book {
public @Id @GeneratedValue Long id;
public String isbn, title;
@JsonProperty("sales")
public long soldUnits;
@JsonProperty("sales") public long soldUnits;
@ManyToMany(cascade = { CascadeType.MERGE }) //
@RestResource(path = "creators") //

9
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Category.java
View File

@@ -15,13 +15,12 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Version;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Version;
/**
* @author Dario Seidl
*/

7
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/CreditCard.java
View File

@@ -15,15 +15,14 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.Id;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
/**

5
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Dinner.java
View File

@@ -15,11 +15,10 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
import lombok.Data;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
/**
* @author Alex Leigh
*/

13
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Guest.java
View File

@@ -15,18 +15,17 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
/**
* @author Alex Leigh
*/

8
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Item.java
View File

@@ -15,10 +15,10 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.OneToOne;
import com.fasterxml.jackson.annotation.JsonIgnore;

8
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/LineItem.java
View File

@@ -15,9 +15,9 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
/**
* @author Oliver Gierke
@@ -25,7 +25,7 @@ import javax.persistence.Id;
@Entity
public class LineItem {
@Id @GeneratedValue//
@Id @GeneratedValue //
private Long id;
private String name;

9
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Meal.java
View File

@@ -15,13 +15,12 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;

24
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Order.java
View File

@@ -15,19 +15,19 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
/**
* @author Oliver Gierke
*/
@@ -35,11 +35,11 @@ import javax.persistence.Table;
@Table(name = "ORDERS")
public class Order {
@Id @GeneratedValue//
@Id @GeneratedValue //
private Long id;
@ManyToOne(fetch = FetchType.LAZY)//
@ManyToOne(fetch = FetchType.LAZY) //
private Person creator;
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)//
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) //
private List<LineItem> lineItems = new ArrayList<LineItem>();
private Type type = Type.TAKE_AWAY;

16
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Person.java
View File

@@ -15,20 +15,20 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.PrePersist;
import jakarta.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.PrePersist;
import javax.validation.constraints.NotNull;
import org.springframework.data.rest.core.annotation.Description;
import com.fasterxml.jackson.annotation.JsonIgnore;

77
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Receipt.java
View File

@@ -16,16 +16,16 @@
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.Version;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Version;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
/**
@@ -34,51 +34,46 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
* @author Pablo Lozano
*/
@Entity
@JsonIgnoreProperties({"version"})
@JsonIgnoreProperties({ "version" })
public class Receipt {
@Id
@GeneratedValue
private Long id;
@Id @GeneratedValue private Long id;
private String saleItem;
private String saleItem;
private BigDecimal amount;
private BigDecimal amount;
@Version
@Temporal(TemporalType.TIMESTAMP)
private Date version;
@Version @Temporal(TemporalType.TIMESTAMP) private Date version;
public Long getId() {
return id;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public void setId(Long id) {
this.id = id;
}
public String getSaleItem() {
return saleItem;
}
public String getSaleItem() {
return saleItem;
}
public void setSaleItem(String saleItem) {
this.saleItem = saleItem;
}
public void setSaleItem(String saleItem) {
this.saleItem = saleItem;
}
public BigDecimal getAmount() {
return amount;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public Date getVersion() {
return version;
}
public Date getVersion() {
return version;
}
public void setVersion(Date version) {
this.version = version;
}
public void setVersion(Date version) {
this.version = version;
}
}

10
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Room.java
View File

@@ -1,4 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +16,12 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;

5
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Suite.java
View File

@@ -15,11 +15,10 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
import lombok.Data;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
/**
* @author Alex Leigh
*/

6
spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/User.java
View File

@@ -15,9 +15,9 @@
*/
package org.springframework.data.rest.webmvc.jpa;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import com.fasterxml.jackson.annotation.JsonIgnore;

14
spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/DataRest262Tests.java
View File

@@ -17,13 +17,13 @@ package org.springframework.data.rest.webmvc.jpa;
import static org.assertj.core.api.Assertions.*;
import javax.persistence.Embeddable;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.validation.constraints.NotNull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

7
spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/groovy/SimulatedGroovyDomainClass.java
View File

@@ -17,10 +17,9 @@ package org.springframework.data.rest.webmvc.jpa.groovy;
import groovy.lang.GroovyObject;
import groovy.lang.MetaClass;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
/**
* Simulates a Groovy domain object by extending {@link GroovyObject}.

2
spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java
View File

@@ -17,7 +17,7 @@ package org.springframework.data.rest.webmvc.json;
import static org.assertj.core.api.Assertions.*;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

6
spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml
View File

@@ -33,9 +33,9 @@
<!-- Explicit declaration required on Java 11 and above-->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
<scope>test</scope>
</dependency>

4
spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java
View File

@@ -15,9 +15,9 @@
*/
package org.springframework.data.rest.tests.shop;
import java.math.BigDecimal;
import jakarta.annotation.PostConstruct;
import javax.annotation.PostConstruct;
import java.math.BigDecimal;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;

2
spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopIntegrationTests.java
View File

@@ -28,6 +28,7 @@ import org.springframework.hateoas.Link;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import com.jayway.jsonpath.JsonPath;
@@ -69,6 +70,7 @@ class ShopIntegrationTests extends AbstractWebIntegrationTests {
client.follow(client.discoverUnique("products").expand(arguments))//
.andExpect(status().isOk())//
.andDo(MockMvcResultHandlers.print()) //
.andExpect(jsonPath("$._embedded.products[0].name", notNullValue()))//
.andExpect(jsonPath("$._embedded.products[0].price").doesNotExist());
}

12
spring-data-rest-webmvc/pom.xml
View File

@@ -35,7 +35,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.jmolecules.integrations</groupId>
<artifactId>jmolecules-spring</artifactId>
@@ -44,8 +44,8 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
@@ -116,9 +116,9 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId>
<version>2.0.0</version>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>3.0.0</version>
<optional>true</optional>
</dependency>

13
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java
View File

@@ -15,6 +15,9 @@
*/
package org.springframework.data.rest.webmvc;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,8 +28,8 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
@@ -75,7 +78,7 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping {
/*
* (non-Javadoc)
* @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#lookupHandlerMethod(java.lang.String, javax.servlet.http.HttpServletRequest)
* @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#lookupHandlerMethod(java.lang.String, jakarta.servlet.http.HttpServletRequest)
*/
@Override
protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception {
@@ -214,7 +217,7 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping {
/*
* (non-Javadoc)
* @see javax.servlet.http.HttpServletRequestWrapper#getHeader(java.lang.String)
* @see jakarta.servlet.http.HttpServletRequestWrapper#getHeader(java.lang.String)
*/
@Override
public String getHeader(String name) {
@@ -226,7 +229,7 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping {
/*
* (non-Javadoc)
* @see javax.servlet.http.HttpServletRequestWrapper#getHeaders(java.lang.String)
* @see jakarta.servlet.http.HttpServletRequestWrapper#getHeaders(java.lang.String)
*/
@Override
public Enumeration<String> getHeaders(String name) {

4
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BaseUri.java
View File

@@ -17,12 +17,12 @@ package org.springframework.data.rest.webmvc;
import static org.springframework.util.StringUtils.*;
import jakarta.servlet.http.HttpServletRequest;
import java.net.URI;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.data.rest.core.Path;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

12
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java
View File

@@ -15,15 +15,15 @@
*/
package org.springframework.data.rest.webmvc;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.data.repository.support.Repositories;
import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
@@ -139,7 +139,7 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping {
/*
* (non-Javadoc)
* @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#lookupHandlerMethod(java.lang.String, javax.servlet.http.HttpServletRequest)
* @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#lookupHandlerMethod(java.lang.String, jakarta.servlet.http.HttpServletRequest)
*/
@Override
protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception {
@@ -170,7 +170,7 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping {
/*
* (non-Javadoc)
* @see org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping#handleNoMatch(java.util.Set, java.lang.String, javax.servlet.http.HttpServletRequest)
* @see org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping#handleNoMatch(java.util.Set, java.lang.String, jakarta.servlet.http.HttpServletRequest)
*/
@Override
protected HandlerMethod handleNoMatch(Set<RequestMappingInfo> requestMappingInfos, String lookupPath,
@@ -219,7 +219,7 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping {
}
/* (non-Javadoc)
* @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#getCorsConfiguration(java.lang.Object, javax.servlet.http.HttpServletRequest)
* @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#getCorsConfiguration(java.lang.Object, jakarta.servlet.http.HttpServletRequest)
*/
@Override
protected CorsConfiguration getCorsConfiguration(Object handler, HttpServletRequest request) {

2
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java
View File

@@ -1,6 +1,6 @@
package org.springframework.data.rest.webmvc;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.core.MethodParameter;
import org.springframework.http.server.ServletServerHttpRequest;

8
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java
View File

@@ -15,12 +15,12 @@
*/
package org.springframework.data.rest.webmvc.config;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import org.springframework.core.Ordered;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
@@ -107,7 +107,7 @@ class DelegatingHandlerMapping implements MatchableHandlerMapping, Iterable<Hand
/*
* (non-Javadoc)
* @see org.springframework.web.servlet.HandlerMapping#getHandler(javax.servlet.http.HttpServletRequest)
* @see org.springframework.web.servlet.HandlerMapping#getHandler(jakarta.servlet.http.HttpServletRequest)
*/
@Override
public HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception {
@@ -116,7 +116,7 @@ class DelegatingHandlerMapping implements MatchableHandlerMapping, Iterable<Hand
/*
* (non-Javadoc)
* @see org.springframework.web.servlet.handler.MatchableHandlerMapping#match(javax.servlet.http.HttpServletRequest, java.lang.String)
* @see org.springframework.web.servlet.handler.MatchableHandlerMapping#match(jakarta.servlet.http.HttpServletRequest, java.lang.String)
*/
@Override
public RequestMatchResult match(HttpServletRequest request, String pattern) {

4
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/PersistentEntityResourceHandlerMethodArgumentResolver.java
View File

@@ -15,13 +15,13 @@
*/
package org.springframework.data.rest.webmvc.config;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.Serializable;
import java.util.List;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import org.springframework.core.MethodParameter;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;

4
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.data.rest.webmvc.config;
import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -25,8 +27,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.ObjectFactory;

8
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ConstraintViolationExceptionMessage.java
View File

@@ -1,13 +1,15 @@
package org.springframework.data.rest.webmvc.support;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import org.springframework.context.MessageSource;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.context.MessageSource;
/**
* @author Jon Brisbin

11
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ConstraintViolationMessage.java
View File

@@ -2,15 +2,17 @@ package org.springframework.data.rest.webmvc.support;
import static java.lang.String.*;
import jakarta.validation.ConstraintViolation;
import java.util.Locale;
import javax.validation.ConstraintViolation;
import org.springframework.context.MessageSource;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.context.MessageSource;
/**
* A helper class to encapsulate {@link ConstraintViolation} errors.
*
*
* @author Jon Brisbin
*/
public class ConstraintViolationMessage {
@@ -22,7 +24,8 @@ public class ConstraintViolationMessage {
this.violation = violation;
this.message = msgSrc.getMessage(violation.getMessageTemplate(),
new Object[] { violation.getLeafBean().getClass().getSimpleName(), violation.getPropertyPath().toString(),
violation.getInvalidValue() }, violation.getMessage(), locale);
violation.getInvalidValue() },
violation.getMessage(), locale);
}
@JsonProperty("entity")

2
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/HttpMethodHandlerMethodArgumentResolver.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.rest.webmvc.support;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpMethod;

3
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/JpaHelper.java
View File

@@ -1,8 +1,9 @@
package org.springframework.data.rest.webmvc.support;
import jakarta.persistence.EntityManagerFactory;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.EntityManagerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;

4
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/CustomAcceptHeaderHttpServletRequestUnitTests.java
View File

@@ -17,12 +17,12 @@ package org.springframework.data.rest.webmvc;
import static org.assertj.core.api.Assertions.*;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.Test;
import org.springframework.data.rest.webmvc.BasePathAwareHandlerMapping.CustomAcceptHeaderHttpServletRequest;
import org.springframework.http.HttpHeaders;

6
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMappingUnitTests.java
View File

@@ -18,13 +18,13 @@ package org.springframework.data.rest.webmvc;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.net.URI;
import java.util.Collections;
import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -339,7 +339,7 @@ class RepositoryRestHandlerMappingUnitTests {
/*
* (non-Javadoc)
* @see org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping#getHandlerInternal(javax.servlet.http.HttpServletRequest)
* @see org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping#getHandlerInternal(jakarta.servlet.http.HttpServletRequest)
*/
@Override
public HandlerMethod getHandlerInternal(HttpServletRequest request) throws Exception {

4
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMappingUnitTests.java
View File

@@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

4
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/PersistentEntityResourceHandlerMethodArgumentResolverUnitTests.java
View File

@@ -19,11 +19,11 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;