diff --git a/pom.xml b/pom.xml index bf95c34fa..38fa33181 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,11 @@ multi spring-data-rest + + 6.0.0-SNAPSHOT + 2.0.0-SNAPSHOT + 3.0.0 + 3.0.0-SNAPSHOT 2.6.0-SNAPSHOT 3.3.0-SNAPSHOT @@ -35,9 +40,9 @@ 4.4.0-SNAPSHOT 3.3.0-SNAPSHOT 2.6.0-SNAPSHOT - 4.0.1 + 5.0.0 - 5.4.8.Final + 5.5.7.Final false @@ -119,8 +124,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${validation} true @@ -144,7 +149,7 @@ spring-libs-snapshot - https://repo.spring.io/libs-snapshot + https://repo.spring.io/snapshot diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index 029dd46d2..143773c2d 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -32,8 +32,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet.version} provided diff --git a/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorer.java b/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorer.java index 34608a8e5..ef50f9486 100644 --- a/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorer.java +++ b/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorer.java @@ -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; diff --git a/spring-data-rest-hal-explorer/src/test/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerUnitTests.java b/spring-data-rest-hal-explorer/src/test/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerUnitTests.java index 958a5e809..5075eea9b 100755 --- a/spring-data-rest-hal-explorer/src/test/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerUnitTests.java +++ b/spring-data-rest-hal-explorer/src/test/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerUnitTests.java @@ -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; diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 6b04b1b84..9140a7cfe 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -9,16 +9,16 @@ ../pom.xml - Spring Data REST Tests + Spring Data REST Tests spring-data-rest-tests pom spring-data-rest-tests-core spring-data-rest-tests-geode - spring-data-rest-tests-jpa + spring-data-rest-tests-mongodb - spring-data-rest-tests-security + spring-data-rest-tests-shop @@ -30,8 +30,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet.version} provided diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml index 6184837b8..ae7ce0d1d 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml @@ -24,13 +24,6 @@ 4.0.0-SNAPSHOT - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml index f579cc85a..06b6a767f 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml @@ -36,15 +36,8 @@ org.hibernate - hibernate-entitymanager + hibernate-core-jakarta ${hibernate.version} - test - - - net.bytebuddy - byte-buddy - - @@ -61,12 +54,6 @@ jackson-datatype-hibernate5 - - org.hibernate - hibernate-core - ${hibernate.version} - - diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Address.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Address.java index 8c4c4b566..ec738626e 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Address.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Address.java @@ -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 diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Author.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Author.java index b19e51af4..ebc9f6dc0 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Author.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Author.java @@ -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 books = new HashSet(); protected Author() {} diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Book.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Book.java index cfd096ab3..b11d5b28e 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Book.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Book.java @@ -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") // diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Category.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Category.java index 8af87216a..710829875 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Category.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Category.java @@ -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 */ diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/CreditCard.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/CreditCard.java index 499805a78..0d1bffb23 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/CreditCard.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/CreditCard.java @@ -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; /** diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Dinner.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Dinner.java index b26296fd0..7204802a4 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Dinner.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Dinner.java @@ -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 */ diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Guest.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Guest.java index 16858dc58..6e39a701d 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Guest.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Guest.java @@ -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 */ diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Item.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Item.java index 66e5170e8..242f1aab8 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Item.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Item.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/LineItem.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/LineItem.java index 0f9c41665..3c90e8e53 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/LineItem.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/LineItem.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Meal.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Meal.java index aaae2bc04..7caa117f4 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Meal.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Meal.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Order.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Order.java index d62315dc0..eb9f937b6 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Order.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Order.java @@ -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 lineItems = new ArrayList(); private Type type = Type.TAKE_AWAY; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Person.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Person.java index c5b4d5cf0..562a62531 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Person.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Person.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Receipt.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Receipt.java index 4fd4873aa..4aa546119 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Receipt.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Receipt.java @@ -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; + } } diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Room.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Room.java index 8a5cb33f0..d6705205b 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Room.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Room.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Suite.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Suite.java index 7ff64f221..18084d3e3 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Suite.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Suite.java @@ -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 */ diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/User.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/User.java index e5ccfb147..8c3ea139b 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/User.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/User.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/DataRest262Tests.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/DataRest262Tests.java index 21ca19576..242d16668 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/DataRest262Tests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/DataRest262Tests.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/groovy/SimulatedGroovyDomainClass.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/groovy/SimulatedGroovyDomainClass.java index 2b9f53f70..ac9ed50bd 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/groovy/SimulatedGroovyDomainClass.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/groovy/SimulatedGroovyDomainClass.java @@ -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}. diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java index b32d9a689..af9506859 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml index 576876ac4..fa269497f 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml @@ -33,9 +33,9 @@ - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + 2.0.0 test diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java b/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java index 4f12c0a30..5b17e250d 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java @@ -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; diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopIntegrationTests.java b/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopIntegrationTests.java index fa7d75c2a..d8d908d14 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopIntegrationTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopIntegrationTests.java @@ -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()); } diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml index dae14b713..bf75ac842 100644 --- a/spring-data-rest-webmvc/pom.xml +++ b/spring-data-rest-webmvc/pom.xml @@ -35,7 +35,7 @@ org.springframework spring-webmvc - + org.jmolecules.integrations jmolecules-spring @@ -44,8 +44,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet.version} provided @@ -116,9 +116,9 @@ - org.eclipse.persistence - javax.persistence - 2.0.0 + jakarta.persistence + jakarta.persistence-api + 3.0.0 true diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java index 0a5005791..1ff5026cf 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java @@ -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 getHeaders(String name) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BaseUri.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BaseUri.java index 75b59b6f5..e8e5f763d 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BaseUri.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BaseUri.java @@ -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; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java index ab84a8750..4a85be642 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java @@ -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 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) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java index cb4082a9a..f6d84ee10 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java @@ -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; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java index 2d633d11a..70c5f42db 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java @@ -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