mindol1004/spring-boot-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-18167 Upgrade persistence-modules to JDK 11 (activejdbc and core-java-persistence)

Browse Source
This commit is contained in:
timis1
2023-03-27 03:00:59 +03:00
committed by n
parent bde71a9dea
commit cd94613f1d
13 changed files with 52 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -89,6 +89,7 @@ spring-soap/src/main/java/com/baeldung/springsoap/gen/
/report-*.json
transaction.log
*-shell.log
customers.xml
apache-cxf/cxf-aegis/baeldung.xml
testing-modules/report-*.json

4
persistence-modules/activejdbc/pom.xml
View File

@@ -74,9 +74,9 @@
</build>
<properties>
<activejdbc.version>2.0</activejdbc.version>
<activejdbc.version>3.4-j11</activejdbc.version>
<environments>development.test,development</environments>
<mysql.connector.version>5.1.34</mysql.connector.version>
<mysql.connector.version>8.0.32</mysql.connector.version>
</properties>
</project>

4
persistence-modules/activejdbc/src/main/java/com/baeldung/ActiveJDBCApp.java
View File

@@ -4,6 +4,7 @@ package com.baeldung;
import com.baeldung.model.Employee;
import com.baeldung.model.Role;
import org.javalite.activejdbc.Base;
import org.javalite.activejdbc.DB;
import org.javalite.activejdbc.LazyList;
import org.javalite.activejdbc.Model;
@@ -11,8 +12,7 @@ public class ActiveJDBCApp
{
public static void main( String[] args )
{
try {
Base.open();
try(final DB open = Base.open()) {
ActiveJDBCApp app = new ActiveJDBCApp();
app.create();
app.update();

17
persistence-modules/core-java-persistence/pom.xml
View File

@@ -52,14 +52,21 @@
<artifactId>spring-boot-starter</artifactId>
<version>${springframework.boot.spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<properties>
<commons-dbcp2.version>2.4.0</commons-dbcp2.version>
<HikariCP.version>3.2.0</HikariCP.version>
<c3p0.version>0.9.5.2</c3p0.version>
<springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
<springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<HikariCP.version>5.0.1</HikariCP.version>
<c3p0.version>0.9.5.5</c3p0.version>
<springframework.boot.spring-boot-starter.version>3.0.4</springframework.boot.spring-boot-starter.version>
<springframework.spring-web.version>6.0.6</springframework.spring-web.version>
<mysql-connector.version>8.0.32</mysql-connector.version>
</properties>
</project>

13
persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/DatabaseConfig.java
View File

@@ -1,13 +1,14 @@
package com.baeldung.jdbcmetadata;
import org.apache.log4j.Logger;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DatabaseConfig {
private static final Logger LOG = Logger.getLogger(DatabaseConfig.class);
private static final Logger LOG = LoggerFactory.getLogger(DatabaseConfig.class);
private Connection connection;
@@ -17,7 +18,7 @@ public class DatabaseConfig {
String url = "jdbc:h2:mem:testdb";
connection = DriverManager.getConnection(url, "sa", "");
} catch (ClassNotFoundException | SQLException e) {
LOG.error(e);
LOG.error(e.getMessage());
}
}
@@ -35,7 +36,7 @@ public class DatabaseConfig {
connection.createStatement().executeUpdate("create table CUSTOMER (ID int primary key auto_increment, NAME VARCHAR(45))");
connection.createStatement().executeUpdate("create table CUST_ADDRESS (ID VARCHAR(36), CUST_ID int, ADDRESS VARCHAR(45), FOREIGN KEY (CUST_ID) REFERENCES CUSTOMER(ID))");
} catch (SQLException e) {
LOG.error(e);
LOG.error(e.getMessage());
}
}
@@ -43,7 +44,7 @@ public class DatabaseConfig {
try {
connection.createStatement().executeUpdate("CREATE VIEW CUSTOMER_VIEW AS SELECT * FROM CUSTOMER");
} catch (SQLException e) {
LOG.error(e);
LOG.error(e.getMessage());
}
}
}

7
persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/JdbcMetadataApplication.java
View File

@@ -1,12 +1,13 @@
package com.baeldung.jdbcmetadata;
import org.apache.log4j.Logger;
import java.sql.SQLException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JdbcMetadataApplication {
private static final Logger LOG = Logger.getLogger(JdbcMetadataApplication.class);
private static final Logger LOG = LoggerFactory.getLogger(JdbcMetadataApplication.class);
public static void main(String[] args) {
DatabaseConfig databaseConfig = new DatabaseConfig();

4
persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java
View File

@@ -5,10 +5,6 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import javax.sql.rowset.JdbcRowSet;
import javax.sql.rowset.RowSetFactory;
import javax.sql.rowset.RowSetProvider;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;

18
persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java
View File

@@ -7,8 +7,6 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import com.sun.rowset.*;
import javax.sql.rowset.CachedRowSet;
import javax.sql.rowset.FilteredRowSet;
import javax.sql.rowset.JdbcRowSet;
@@ -25,7 +23,7 @@ public class JdbcRowsetApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(JdbcRowsetApplication.class, args);
Statement stmt = null;
Statement stmt;
try {
Connection conn = DatabaseConfiguration.geth2Connection();
@@ -41,8 +39,7 @@ public class JdbcRowsetApplication {
DatabaseConfiguration.initDatabase(stmt);
// JdbcRowSet Example
String sql = "SELECT * FROM customers";
JdbcRowSet jdbcRS;
jdbcRS = new JdbcRowSetImpl(conn);
JdbcRowSet jdbcRS = RowSetProvider.newFactory().createJdbcRowSet();
jdbcRS.setType(ResultSet.TYPE_SCROLL_INSENSITIVE);
jdbcRS.setCommand(sql);
jdbcRS.execute();
@@ -58,7 +55,8 @@ public class JdbcRowsetApplication {
String username = "sa";
String password = "";
String url = "jdbc:h2:mem:testdb";
CachedRowSet crs = new CachedRowSetImpl();
RowSetFactory aFactory = RowSetProvider.newFactory();
CachedRowSet crs = aFactory.createCachedRowSet();
crs.setUsername(username);
crs.setPassword(password);
crs.setUrl(url);
@@ -74,7 +72,7 @@ public class JdbcRowsetApplication {
}
// WebRowSet example
WebRowSet wrs = new WebRowSetImpl();
WebRowSet wrs = RowSetProvider.newFactory().createWebRowSet();
wrs.setUsername(username);
wrs.setPassword(password);
wrs.setUrl(url);
@@ -84,14 +82,14 @@ public class JdbcRowsetApplication {
wrs.writeXml(ostream);
// JoinRowSet example
CachedRowSetImpl customers = new CachedRowSetImpl();
CachedRowSet customers = aFactory.createCachedRowSet();
customers.setUsername(username);
customers.setPassword(password);
customers.setUrl(url);
customers.setCommand(sql);
customers.execute();
CachedRowSetImpl associates = new CachedRowSetImpl();
CachedRowSet associates = aFactory.createCachedRowSet();
associates.setUsername(username);
associates.setPassword(password);
associates.setUrl(url);
@@ -99,7 +97,7 @@ public class JdbcRowsetApplication {
associates.setCommand(associatesSQL);
associates.execute();
JoinRowSet jrs = new JoinRowSetImpl();
JoinRowSet jrs = RowSetProvider.newFactory().createJoinRowSet();
final String ID = "id";
final String NAME = "name";
jrs.addRowSet(customers, ID);

22
persistence-modules/core-java-persistence/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java
View File

@@ -19,11 +19,6 @@ import javax.sql.rowset.WebRowSet;
import org.junit.Before;
import org.junit.Test;
import com.sun.rowset.CachedRowSetImpl;
import com.sun.rowset.JdbcRowSetImpl;
import com.sun.rowset.JoinRowSetImpl;
import com.sun.rowset.WebRowSetImpl;
public class JdbcRowSetLiveTest {
Statement stmt = null;
String username = "sa";
@@ -51,9 +46,10 @@ public class JdbcRowSetLiveTest {
public void createJdbcRowSet_SelectCustomers_ThenCorrect() throws Exception {
String sql = "SELECT * FROM customers";
JdbcRowSet jdbcRS;
Connection conn = DatabaseConfiguration.geth2Connection();
jdbcRS = new JdbcRowSetImpl(conn);
JdbcRowSet jdbcRS = RowSetProvider.newFactory().createJdbcRowSet();
jdbcRS.setUrl("jdbc:h2:mem:testdb");
jdbcRS.setUsername("sa");
jdbcRS.setPassword("");
jdbcRS.setType(ResultSet.TYPE_SCROLL_INSENSITIVE);
jdbcRS.setCommand(sql);
jdbcRS.execute();
@@ -71,7 +67,7 @@ public class JdbcRowSetLiveTest {
@Test
public void createCachedRowSet_DeleteRecord_ThenCorrect() throws Exception {
CachedRowSet crs = new CachedRowSetImpl();
CachedRowSet crs = RowSetProvider.newFactory().createCachedRowSet();
crs.setUsername(username);
crs.setPassword(password);
crs.setUrl(url);
@@ -91,7 +87,7 @@ public class JdbcRowSetLiveTest {
@Test
public void createWebRowSet_SelectCustomers_WritetoXML_ThenCorrect() throws SQLException, IOException {
WebRowSet wrs = new WebRowSetImpl();
WebRowSet wrs = RowSetProvider.newFactory().createWebRowSet();
wrs.setUsername(username);
wrs.setPassword(password);
wrs.setUrl(url);
@@ -105,14 +101,14 @@ public class JdbcRowSetLiveTest {
@Test
public void createCachedRowSets_DoJoinRowSet_ThenCorrect() throws Exception {
CachedRowSetImpl customers = new CachedRowSetImpl();
CachedRowSet customers = RowSetProvider.newFactory().createCachedRowSet();
customers.setUsername(username);
customers.setPassword(password);
customers.setUrl(url);
customers.setCommand(sql);
customers.execute();
CachedRowSetImpl associates = new CachedRowSetImpl();
CachedRowSet associates = RowSetProvider.newFactory().createCachedRowSet();
associates.setUsername(username);
associates.setPassword(password);
associates.setUrl(url);
@@ -120,7 +116,7 @@ public class JdbcRowSetLiveTest {
associates.setCommand(associatesSQL);
associates.execute();
JoinRowSet jrs = new JoinRowSetImpl();
JoinRowSet jrs = RowSetProvider.newFactory().createJoinRowSet();
final String ID = "id";
final String NAME = "name";
jrs.addRowSet(customers, ID);

5
persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/JdbcLiveTest.java
View File

@@ -1,9 +1,10 @@
package com.baeldung.spring.jdbc;
import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.CallableStatement;
import java.sql.Connection;
@@ -24,7 +25,7 @@ import static org.junit.Assert.assertTrue;
public class JdbcLiveTest {
private static final Logger LOG = Logger.getLogger(JdbcLiveTest.class);
private static final Logger LOG = LoggerFactory.getLogger(JdbcLiveTest.class);
private Connection con;

3
persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/ResultSetLiveTest.java
View File

@@ -13,7 +13,6 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
@@ -25,8 +24,6 @@ import junit.framework.Assert;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ResultSetLiveTest {
private static final Logger logger = Logger.getLogger(ResultSetLiveTest.class);
private final Employee expectedEmployee1 = new Employee(1, "John", 1000.0, "Developer");
private final Employee updatedEmployee1 = new Employee(1, "John", 1100.0, "Developer");

2
persistence-modules/pom.xml
View File

@@ -116,7 +116,7 @@
<properties>
<!-- persistence -->
<hibernate.version>5.2.17.Final</hibernate.version>
<postgresql.version>42.2.20</postgresql.version>
<postgresql.version>42.5.4</postgresql.version>
<hsqldb.version>2.3.4</hsqldb.version>
<testcontainers.version>1.16.3</testcontainers.version>
</properties>

22
pom.xml
View File

@@ -355,7 +355,6 @@
<module>muleesb</module>
<module>osgi</module>
<module>persistence-modules</module>
<module>web-modules</module>
</modules>
@@ -546,7 +545,6 @@
<module>muleesb</module>
<module>osgi</module>
<module>persistence-modules</module>
<module>web-modules</module>
</modules>
@@ -836,15 +834,11 @@
<module>libraries-testing</module>
<module>maven-modules</module>
<module>optaplanner</module>
<module>persistence-modules/sirix</module>
<module>persistence-modules/spring-data-cassandra-2</module>
<module>persistence-modules/spring-data-jpa-repo-3</module>
<module>persistence-modules</module>
<module>quarkus-modules</module>
<module>spring-reactive-modules</module>
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
<module>testing-modules/testing-assertions</module>
<module>persistence-modules/fauna</module>
<module>persistence-modules/spring-data-rest</module>
<module>rule-engines-modules</module>
@@ -960,11 +954,8 @@
<module>tensorflow-java</module>
<module>xstream</module>
<module>webrtc</module>
<module>persistence-modules/java-mongodb</module>
<module>messaging-modules</module>
<module>persistence-modules/questdb</module>
</modules>
<properties>
@@ -1106,15 +1097,11 @@
<module>libraries-testing</module>
<module>maven-modules</module>
<module>optaplanner</module>
<module>persistence-modules/sirix</module>
<module>persistence-modules/spring-data-cassandra-2</module>
<module>persistence-modules/spring-data-jpa-repo-3</module>
<module>persistence-modules</module>
<module>quarkus-modules</module>
<module>spring-reactive-modules</module>
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
<module>testing-modules/testing-assertions</module>
<module>persistence-modules/fauna</module>
<module>persistence-modules/spring-data-rest</module>
<module>rule-engines-modules</module>
@@ -1231,11 +1218,8 @@
<module>tensorflow-java</module>
<module>xstream</module>
<module>webrtc</module>
<module>persistence-modules/java-mongodb</module>
<module>libraries-2</module>
<module>libraries-2</module>
<module>messaging-modules</module>
<module>persistence-modules/questdb</module>
</modules>
<properties>