Skip to content

Commit 2b97ffa

Browse files
authored
JAVA-48019 Simplify "Persistence with Spring" ebook (#18763)
1 parent 512dff7 commit 2b97ffa

File tree

56 files changed

+343
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+343
-112
lines changed

persistence-modules/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<module>spring-jdbc-2</module>
131131
<!--<module>spring-jooq</module>--><!--disabling the jooq modules, as the default build profile is failing due to bad mv files. Please refer: JAVA-31341-->
132132
<module>spring-mybatis</module>
133-
<!-- <module>spring-persistence-simple</module> --> <!-- failing after upgrade to jdk21 -->
133+
<!-- <module>spring-persistence</module> --> <!-- failing after upgrade to jdk21 -->
134134
<module>spring-data-yugabytedb</module>
135135
<module>fauna</module>
136136
<module>spring-data-rest</module>
@@ -146,6 +146,7 @@
146146
<module>hibernate-annotations-2</module>
147147
<module>hibernate-reactive</module>
148148
<module>spring-data-envers</module>
149+
<module>spring-persistence-simple</module>
149150
</modules>
150151

151152
<properties>

persistence-modules/spring-data-jpa-simple/src/main/java/com/baeldung/jpa/simple/service/IFooService.java

Lines changed: 0 additions & 7 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.baeldung.spring.jdbc.template.config;
2+
3+
import javax.sql.DataSource;
4+
5+
import org.springframework.context.annotation.Bean;
6+
import org.springframework.context.annotation.ComponentScan;
7+
import org.springframework.context.annotation.Configuration;
8+
import org.springframework.jdbc.datasource.DriverManagerDataSource;
9+
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
10+
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
11+
12+
@Configuration
13+
@ComponentScan("com.baeldung.spring.jdbc.template.guide")
14+
public class SpringJdbcConfig {
15+
16+
@Bean
17+
public DataSource dataSource() {
18+
return new EmbeddedDatabaseBuilder()
19+
.setType(EmbeddedDatabaseType.H2)
20+
.addScript("classpath:com/baeldung/spring/jdbc/template/guide/schema.sql")
21+
.addScript("classpath:com/baeldung/spring/jdbc/template/guide/test-data.sql")
22+
.build();
23+
}
24+
25+
// @Bean
26+
public DataSource mysqlDataSource() {
27+
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
28+
dataSource.setDriverClassName("com.mysql.jdbc.Driver");
29+
dataSource.setUrl("jdbc:mysql://localhost:3306/springjdbc");
30+
dataSource.setUsername("guest_user");
31+
dataSource.setPassword("guest_password");
32+
33+
return dataSource;
34+
}
35+
36+
}

persistence-modules/spring-persistence-simple/pom.xml

Lines changed: 23 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -9,101 +9,56 @@
99

1010
<parent>
1111
<groupId>com.baeldung</groupId>
12-
<artifactId>persistence-modules</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
12+
<artifactId>parent-boot-3</artifactId>
13+
<version>0.0.1-SNAPSHOT</version>
14+
<relativePath>../../parent-boot-3</relativePath>
1415
</parent>
1516

1617
<dependencies>
17-
<!-- Spring -->
18-
<dependency>
19-
<groupId>org.springframework</groupId>
20-
<artifactId>spring-orm</artifactId>
21-
<version>${org.springframework.version}</version>
22-
</dependency>
23-
<dependency>
24-
<groupId>org.springframework</groupId>
25-
<artifactId>spring-context</artifactId>
26-
<version>${org.springframework.version}</version>
27-
</dependency>
28-
<!-- persistence -->
29-
<dependency>
30-
<groupId>javax.persistence</groupId>
31-
<artifactId>javax.persistence-api</artifactId>
32-
<version>${persistence-api.version}</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.springframework.data</groupId>
36-
<artifactId>spring-data-jpa</artifactId>
37-
<version>${spring-data-jpa.version}</version>
38-
</dependency>
39-
<dependency>
40-
<!-- JAVA-37421 cannot upgrade to Jakarta namespace -->
41-
<groupId>javax.transaction</groupId>
42-
<artifactId>javax.transaction-api</artifactId>
43-
<version>${transaction-api.version}</version>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.springframework</groupId>
47-
<artifactId>spring-tx</artifactId>
48-
<version>${org.springframework.version}</version>
49-
</dependency>
5018
<dependency>
5119
<groupId>org.springframework.boot</groupId>
52-
<artifactId>spring-boot-starter</artifactId>
53-
<version>${spring-boot-starter.version}</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>org.springframework.boot</groupId>
57-
<artifactId>spring-boot-starter-jta-atomikos</artifactId>
58-
<version>${spring-boot-starter.version}</version>
20+
<artifactId>spring-boot-starter-data-jpa</artifactId>
5921
</dependency>
6022
<dependency>
6123
<groupId>org.springframework.boot</groupId>
6224
<artifactId>spring-boot-starter-jdbc</artifactId>
63-
<version>${spring-boot-starter.version}</version>
6425
</dependency>
6526
<dependency>
66-
<groupId>org.hsqldb</groupId>
67-
<artifactId>hsqldb</artifactId>
68-
<version>${hsqldb.version}</version>
27+
<groupId>org.springframework</groupId>
28+
<artifactId>spring-webmvc</artifactId>
29+
<version>${org.springframework.version}</version>
6930
</dependency>
7031
<dependency>
7132
<groupId>com.h2database</groupId>
7233
<artifactId>h2</artifactId>
73-
<version>${h2.version}</version>
74-
<scope>test</scope>
7534
</dependency>
76-
<!-- simple-jndi -->
7735
<dependency>
78-
<groupId>com.github.h-thurow</groupId>
79-
<artifactId>simple-jndi</artifactId>
80-
<version>${simple-jndi.version}</version>
36+
<groupId>com.mysql</groupId>
37+
<artifactId>mysql-connector-j</artifactId>
38+
<scope>runtime</scope>
8139
</dependency>
82-
<!-- test scoped -->
8340
<dependency>
8441
<groupId>org.springframework</groupId>
85-
<artifactId>spring-test</artifactId>
42+
<artifactId>spring-orm</artifactId>
8643
<version>${org.springframework.version}</version>
87-
<scope>test</scope>
44+
<exclusions>
45+
<exclusion>
46+
<artifactId>commons-logging</artifactId>
47+
<groupId>commons-logging</groupId>
48+
</exclusion>
49+
</exclusions>
8850
</dependency>
51+
<!-- utils -->
8952
<dependency>
90-
<groupId>org.springframework.boot</groupId>
91-
<artifactId>spring-boot-starter-test</artifactId>
92-
<scope>test</scope>
93-
<version>${spring-boot-starter.version}</version>
53+
<groupId>com.google.guava</groupId>
54+
<artifactId>guava</artifactId>
55+
<version>${guava.version}</version>
9456
</dependency>
9557
</dependencies>
9658

9759
<properties>
98-
<org.springframework.version>5.3.18</org.springframework.version>
99-
<spring-boot-starter.version>2.6.6</spring-boot-starter.version>
100-
<persistence-api.version>2.2</persistence-api.version>
101-
<transaction-api.version>1.3</transaction-api.version>
102-
<spring-data-jpa.version>2.2.7.RELEASE</spring-data-jpa.version>
103-
<simple-jndi.version>0.23.0</simple-jndi.version>
104-
<hsqldb.version>2.5.2</hsqldb.version>
105-
<org.slf4j.version>1.7.32</org.slf4j.version>
106-
<logback.version>1.2.7</logback.version>
60+
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
61+
<org.springframework.version>6.0.6</org.springframework.version>
10762
</properties>
10863

10964
</project>

persistence-modules/spring-jpa/src/main/java/com/baeldung/spring/jpa/guide/JpaGuideApp.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/spring/jpa/guide/JpaGuideApp.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.baeldung.spring.jpa.guide;
22

3-
import com.baeldung.spring.jpa.guide.model.Publishers;
4-
import com.baeldung.spring.jpa.guide.repository.PublisherRepository;
53
import org.springframework.boot.CommandLineRunner;
64
import org.springframework.boot.SpringApplication;
75
import org.springframework.boot.autoconfigure.SpringBootApplication;
86
import org.springframework.context.annotation.Bean;
97

8+
import com.baeldung.spring.jpa.guide.model.Publishers;
9+
import com.baeldung.spring.jpa.guide.repository.PublisherRepository;
10+
1011
@SpringBootApplication
1112
public class JpaGuideApp {
1213

0 commit comments

Comments
 (0)