iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JAVA-20168 Migrating spring-jpa (#14257)

Browse Source 
* JAVA-20168 Migrating spring-jpa

* JAVA-20168 Migrate spring-jpa-2

* JAVA-20168 Remove unneeded annotation

---------

Co-authored-by: timis1 <[email protected]>
This commit is contained in:
timis1
2023-06-20 23:00:45 +05:30
committed by GitHub
co-authored by timis1
parent c0171ff7ce
commit 86932cba3d
56 changed files with 188 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
persistence-modules/pom.xml
+2 -3
View File
@@ -66,7 +66,6 @@
<module>spring-data-arangodb</module>
<module>spring-data-cassandra</module>
<module>spring-data-cassandra-test</module>
<!-- <module>spring-data-cassandra-reactive</module> FAILED -->
<module>spring-data-cosmosdb</module>
<module>spring-data-couchbase-2</module>
<module>spring-data-dynamodb</module>
@@ -99,8 +98,8 @@
<module>spring-data-solr</module>
<!-- <module>spring-hibernate-3</module> FAILED -->
<!-- <module>spring-hibernate-5</module> FAILED --> <!-- long running -->
<!-- <module>spring-jpa</module>
<module>spring-jpa-2</module> FAILED -->
<module>spring-jpa</module>
<module>spring-jpa-2</module>
<module>spring-jdbc</module>
<module>spring-jooq</module>
<module>spring-mybatis</module>
persistence-modules/spring-jpa-2/pom.xml
+16 -5
View File
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.4.0</version>
<version>${postgresql.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -97,15 +97,26 @@
<version>${org.springframework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jakson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jakson-core.version}</version>
</dependency>
</dependencies>
<properties>
<!-- Spring -->
<org.springframework.version>5.2.0.RELEASE</org.springframework.version>
<spring-boot.version>2.2.6.RELEASE</spring-boot.version>
<org.springframework.version>6.0.9</org.springframework.version>
<spring-boot.version>3.1.0</spring-boot.version>
<!-- persistence -->
<tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
<h2.version>2.1.214</h2.version>
<tomcat-dbcp.version>10.1.9</tomcat-dbcp.version>
<jakson-databind.version>2.15.1</jakson-databind.version>
<jakson-core.version>2.14.2</jakson-core.version>
</properties>
</project>
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
-12
View File
@@ -1,21 +1,9 @@
package com.baeldung.hibernate.bootstrap;
import com.google.common.base.Preconditions;
import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
import org.springframework.orm.hibernate5.HibernateTransactionManager;
import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.sql.DataSource;
import java.util.Properties;
@Configuration
@EnableTransactionManagement
@ImportResource({ "classpath:hibernate5Configuration.xml" })
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.baeldung.hibernate.bootstrap.model;
import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
@Entity
public class TestEntity {
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/Course.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.baeldung.manytomany.model;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRating.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.baeldung.manytomany.model;
import javax.persistence.*;
import jakarta.persistence.*;
@Entity
@Table(name = "course_rating")
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRatingKey.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.baeldung.manytomany.model;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import java.io.Serializable;
@Embeddable
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRegistration.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.baeldung.manytomany.model;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.LocalDateTime;
@Entity
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/Student.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.baeldung.manytomany.model;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Author.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.baeldung.manytomanyremoval;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Book.java
+1 -2
View File
@@ -1,7 +1,6 @@
package com.baeldung.manytomanyremoval;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Category.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.baeldung.manytomanyremoval;
import javax.persistence.*;
import jakarta.persistence.*;
@Entity
@Table(name = "category")
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Post.java
+1 -2
View File
@@ -1,7 +1,6 @@
package com.baeldung.manytomanyremoval;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/config/TenantFilter.java
+2 -2
View File
@@ -4,8 +4,8 @@ import com.baeldung.multitenant.security.AuthenticationService;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
@Component
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/domain/Employee.java
+6 -6
View File
@@ -1,11 +1,11 @@
package com.baeldung.multitenant.domain;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
@Entity
@Table(name = "employee")
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/AuthenticationFilter.java
+5 -5
View File
@@ -4,11 +4,11 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.filter.GenericFilterBean;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
public class AuthenticationFilter extends GenericFilterBean {
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/AuthenticationService.java
+2 -2
View File
@@ -5,8 +5,8 @@ import io.jsonwebtoken.SignatureAlgorithm;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Collections;
import java.util.Date;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/LoginFilter.java
+4 -4
View File
@@ -9,10 +9,10 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/SecurityConfiguration.java
+35 -31
View File
@@ -2,32 +2,39 @@ package com.baeldung.multitenant.security;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
@Configuration
@EnableWebSecurity
public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
public class SecurityConfiguration {
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication()
.passwordEncoder(passwordEncoder())
.withUser("user")
.password(passwordEncoder().encode("baeldung"))
.roles("tenant_1");
@Bean
public InMemoryUserDetailsManager userDetailsService() {
UserDetails user1 = User
.withUsername("user")
.password(passwordEncoder().encode("baeldung"))
.roles("tenant_1")
.build();
auth.inMemoryAuthentication()
.passwordEncoder(passwordEncoder())
.withUser("admin")
.password(passwordEncoder().encode("baeldung"))
.roles("tenant_2");
UserDetails user2 = User
.withUsername("admin")
.password(passwordEncoder().encode("baeldung"))
.roles("tenant_2")
.build();
return new InMemoryUserDetailsManager(user1, user2);
}
@Bean
@@ -35,22 +42,19 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
return new BCryptPasswordEncoder();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
final AuthenticationManager authenticationManager = http.getSharedObject(AuthenticationManager.class);
http
.authorizeRequests()
.antMatchers("/login").permitAll()
.anyRequest().authenticated()
.and()
.sessionManagement()
.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.and()
.addFilterBefore(new LoginFilter("/login", authenticationManager()),
UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(new AuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
.csrf().disable()
.headers().frameOptions().disable()
.and()
.httpBasic();
.authorizeHttpRequests(authorize ->
authorize.requestMatchers("/login").permitAll().anyRequest().authenticated())
.sessionManagement(securityContext -> securityContext.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.addFilterBefore(new LoginFilter("/login", authenticationManager), UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(new AuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
.csrf(AbstractHttpConfigurer::disable)
.headers(header -> header.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable))
.httpBasic(Customizer.withDefaults());
return http.build();
}
}
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/dao/generics/AbstractJpaDAO.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.baeldung.spring.dao.generics;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import java.io.Serializable;
import java.util.List;
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/dao/generics/Foo.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.baeldung.spring.dao.generics;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.*;
import jakarta.persistence.*;
import java.io.Serializable;
@Entity
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/hibernate/Foo.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.baeldung.spring.hibernate;
import javax.persistence.*;
import jakarta.persistence.*;
import java.io.Serializable;
@Entity
persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/transaction/Course.java
+4 -4
View File
@@ -2,10 +2,10 @@ package com.baeldung.spring.transaction;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "course")
persistence-modules/spring-jpa-2/src/main/resources/persistence-mysql.properties
+1 -1
View File
@@ -5,7 +5,7 @@ jdbc.user=tutorialuser
jdbc.pass=tutorialmy5ql
# hibernate.X
hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
hibernate.dialect=org.hibernate.dialect.MySQLDialect
hibernate.show_sql=false
hibernate.hbm2ddl.auto=create-drop
persistence-modules/spring-jpa-2/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
+7 -9
View File
@@ -4,14 +4,12 @@ import com.baeldung.hibernate.bootstrap.model.TestEntity;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import org.springframework.test.context.transaction.TestTransaction;
import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +31,7 @@ public class HibernateBootstrapIntegrationTest {
TestEntity newEntity = new TestEntity();
newEntity.setId(1);
session.save(newEntity);
session.persist(newEntity);
TestEntity searchEntity = session.find(TestEntity.class, 1);
@@ -49,7 +47,7 @@ public class HibernateBootstrapIntegrationTest {
TestEntity newEntity = new TestEntity();
newEntity.setId(1);
session.save(newEntity);
session.persist(newEntity);
TestEntity searchEntity = session.find(TestEntity.class, 1);
@@ -74,7 +72,7 @@ public class HibernateBootstrapIntegrationTest {
Assert.assertNotNull(searchEntity);
session.delete(searchEntity);
session.remove(searchEntity);
session.flush();
TestTransaction.end();
@@ -90,7 +88,7 @@ public class HibernateBootstrapIntegrationTest {
Assert.assertNotNull(searchEntity);
session.delete(searchEntity);
session.remove(searchEntity);
session.flush();
assertTrue(TestTransaction.isActive());
@@ -121,7 +119,7 @@ public class HibernateBootstrapIntegrationTest {
TestEntity newEntity = new TestEntity();
newEntity.setId(1);
session.save(newEntity);
session.persist(newEntity);
TestEntity searchEntity = session.find(TestEntity.class, 1);
@@ -145,7 +143,7 @@ public class HibernateBootstrapIntegrationTest {
Assert.assertNotNull(searchEntity);
session.delete(searchEntity);
session.remove(searchEntity);
session.flush();
TestTransaction.flagForRollback();
@@ -162,7 +160,7 @@ public class HibernateBootstrapIntegrationTest {
Assert.assertNotNull(searchEntity);
session.delete(searchEntity);
session.remove(searchEntity);
session.flush();
assertTrue(TestTransaction.isActive());
persistence-modules/spring-jpa-2/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class HibernateXMLBootstrapIntegrationTest {
TestEntity newEntity = new TestEntity();
newEntity.setId(1);
session.save(newEntity);
session.persist(newEntity);
TestEntity searchEntity = session.find(TestEntity.class, 1);
persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomany/ManyToManyIntegrationTest.java
+2 -2
View File
@@ -11,8 +11,8 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomany/ManyToManyTestConfiguration.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import javax.persistence.EntityManagerFactory;
import jakarta.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import java.util.HashMap;
import java.util.Map;
persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/BidirectionalRemovalUnitTest.java
+1 -1
View File
@@ -10,7 +10,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = TestContextConfig.class)
persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/UnidirectionalRemovalUnitTest.java
+1 -1
View File
@@ -10,7 +10,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = TestContextConfig.class)

Some files were not shown because too many files have changed in this diff Show More