iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[JAVA-30682] Upgrade Spring rest testing to Spring Boot 3 and to latest Hibernate core latest (#15740)

This commit is contained in:
Amit Pandey 2024-01-30 05:10:58 +05:30 committed by GitHub
parent 4dcebecdb5
commit 5ce49b5ce9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-web-modules/spring-rest-testing/pom.xml
View File

@ -10,9 +10,9 @@
<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId>
<artifactId>parent-boot-3</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2</relativePath>
<relativePath>../../parent-boot-3</relativePath>
</parent>
<dependencies>
@ -74,6 +74,7 @@
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@ -91,6 +92,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
@ -132,6 +134,14 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@ -238,6 +248,10 @@
<!-- Maven plugins -->
<cargo-maven3-plugin.version>1.9.9</cargo-maven3-plugin.version>
<apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
<hibernate-core.version>6.4.2.Final</hibernate-core.version>
<httpclient.version>4.5.8</httpclient.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<start-class>com.baeldung.spring.Application</start-class>
</properties>
</project>

10
spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
View File

@ -2,11 +2,11 @@ package com.baeldung.persistence.model;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
@Entity
public class Foo implements Serializable {

8
spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
View File

@ -1,9 +1,9 @@
package com.baeldung.persistence.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
@Entity
public class User {

3
spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.List;
import com.baeldung.persistence.IOperations;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
@ -40,6 +41,6 @@ public abstract class AbstractService<T extends Serializable> implements IOperat
return getDao().save(entity);
}
protected abstract PagingAndSortingRepository<T, Long> getDao();
protected abstract JpaRepository<T, Long> getDao();
}

3
spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
View File

@ -5,6 +5,7 @@ import com.baeldung.persistence.model.Foo;
import com.baeldung.persistence.service.IFooService;
import com.baeldung.persistence.service.common.AbstractService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -23,7 +24,7 @@ public class FooService extends AbstractService<Foo> implements IFooService {
// API
@Override
protected PagingAndSortingRepository<Foo, Long> getDao() {
protected JpaRepository<Foo, Long> getDao() {
return dao;
}

2
spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
View File

@ -2,7 +2,7 @@ package com.baeldung.web.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import com.baeldung.persistence.model.Foo;
import com.baeldung.persistence.service.IFooService;

2
spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
View File

@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.Serializable;
import java.util.List;