diff --git a/libraries-data-db/pom.xml b/libraries-data-db/pom.xml index 6c72a4902c..55fd990a80 100644 --- a/libraries-data-db/pom.xml +++ b/libraries-data-db/pom.xml @@ -43,7 +43,7 @@ org.datanucleus datanucleus-api-jdo - ${datanucleus.version} + ${datanucleus-api.version} org.datanucleus @@ -135,6 +135,11 @@ org.projectlombok lombok + + io.ebean + ebean-api + ${ebean.version} + @@ -270,15 +275,16 @@ 18.1.0 3.0.0 1.8 - 5.0 - 5.1.1 - 5.0.2 - 5.0.4 - 3.2.0-m7 - 3.4.5 - 11.22.4 - 1.4.2.Final - 1.15.3 + 6.1 + 6.0.3 + 6.0.1 + 6.0.0-release + 6.0.1 + 3.2.1 + 5.0.1 + 13.15.2 + 2.1.3.Final + 1.17.6 \ No newline at end of file diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java index 9c59cbb8c0..e26f01c2f8 100644 --- a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java @@ -1,12 +1,13 @@ package com.baeldung.libraries.ebean.app; +import java.util.Arrays; + import com.baeldung.libraries.ebean.model.Address; import com.baeldung.libraries.ebean.model.Customer; -import io.ebean.Ebean; -import io.ebean.EbeanServer; -import io.ebean.annotation.Transactional; -import java.util.Arrays; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.annotation.Transactional; public class App { @@ -20,7 +21,7 @@ public class App { public static void insertAndDeleteInsideTransaction() { Customer c1 = getCustomer(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.save(c1); Customer foundC1 = server.find(Customer.class, c1.getId()); server.delete(foundC1); @@ -31,16 +32,16 @@ public class App { Address a1 = new Address("5, Wide Street", null, "New York"); Customer c1 = new Customer("John Wide", a1); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); server.save(c1); c1.setName("Jane Wide"); c1.setAddress(null); server.save(c1); - Customer foundC1 = Ebean.find(Customer.class, c1.getId()); + Customer foundC1 = DB.find(Customer.class, c1.getId()); - Ebean.delete(foundC1); + DB.delete(foundC1); } public static void queryCustomers() { @@ -53,16 +54,16 @@ public class App { Address a3 = new Address("3, Big Street", null, "San Jose"); Customer c3 = new Customer("Big Bob", a3); - Ebean.saveAll(Arrays.asList(c1, c2, c3)); + DB.saveAll(Arrays.asList(c1, c2, c3)); - Customer customer = Ebean.find(Customer.class) + Customer customer = DB.find(Customer.class) .select("name") .fetch("address", "city") .where() .eq("city", "San Jose") .findOne(); - Ebean.deleteAll(Arrays.asList(c1, c2, c3)); + DB.deleteAll(Arrays.asList(c1, c2, c3)); } private static Customer getCustomer() { diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java index c604f2cc25..4018c3c4ff 100644 --- a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java @@ -1,15 +1,15 @@ package com.baeldung.libraries.ebean.app; -import io.ebean.EbeanServer; -import io.ebean.EbeanServerFactory; -import io.ebean.config.ServerConfig; - import java.util.Properties; +import io.ebean.Database; +import io.ebean.DatabaseFactory; +import io.ebean.config.DatabaseConfig; + public class App2 { public static void main(String[] args) { - ServerConfig cfg = new ServerConfig(); + DatabaseConfig cfg = new DatabaseConfig(); cfg.setDefaultServer(true); Properties properties = new Properties(); properties.put("ebean.db.ddl.generate", "true"); @@ -19,8 +19,6 @@ public class App2 { properties.put("datasource.db.databaseUrl", "jdbc:h2:mem:app2"); properties.put("datasource.db.databaseDriver", "org.h2.Driver"); cfg.loadFromProperties(properties); - EbeanServer server = EbeanServerFactory.create(cfg); - + Database server = DatabaseFactory.create(cfg); } - } diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java index 99b0a4bef7..2385c16e47 100644 --- a/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java @@ -45,7 +45,7 @@ public class GuideToJDO { pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); pumd.addClassName("com.baeldung.libraries.jdo.Product"); - pumd.setExcludeUnlistedClasses(); + pumd.setExcludeUnlistedClasses(true); pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver"); pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence"); pumd.addProperty("javax.jdo.option.ConnectionUserName", "sa"); @@ -57,7 +57,7 @@ public class GuideToJDO { public void CreateXMLProperties() { pumdXML = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); pumdXML.addClassName("com.baeldung.libraries.jdo.ProductXML"); - pumdXML.setExcludeUnlistedClasses(); + pumdXML.setExcludeUnlistedClasses(true); pumdXML.addProperty("javax.jdo.option.ConnectionURL", "xml:file:myPersistence.xml"); pumdXML.addProperty("datanucleus.autoCreateSchema", "true"); } diff --git a/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java index 1c15a4f087..5872eba537 100644 --- a/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java +++ b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java @@ -18,7 +18,7 @@ public class GuideToJDOIntegrationTest { public void givenProduct_WhenNewThenPerformTransaction() { PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); pumd.addClassName("com.baeldung.libraries.jdo.Product"); - pumd.setExcludeUnlistedClasses(); + pumd.setExcludeUnlistedClasses(true); pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver"); pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence"); pumd.addProperty("javax.jdo.option.ConnectionUserName", "sa"); @@ -53,7 +53,7 @@ public class GuideToJDOIntegrationTest { public void givenProduct_WhenQueryThenExist() { PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); pumd.addClassName("com.baeldung.libraries.jdo.Product"); - pumd.setExcludeUnlistedClasses(); + pumd.setExcludeUnlistedClasses(true); pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver"); pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence"); pumd.addProperty("javax.jdo.option.ConnectionUserName", "sa"); diff --git a/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java index 139e52632a..58c757d8a5 100644 --- a/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java +++ b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java @@ -80,6 +80,8 @@ public class ORMLiteIntegrationTest { wrappedIterable.forEach(lib -> { System.out.println(lib.getName()); }); + } catch (Exception e) { + throw new RuntimeException(e); } } @@ -162,7 +164,7 @@ public class ORMLiteIntegrationTest { } @AfterClass - public static void tearDown() throws SQLException, IOException { + public static void tearDown() throws Exception { connectionSource.close(); } } diff --git a/pom.xml b/pom.xml index 411a298c61..b790e64046 100644 --- a/pom.xml +++ b/pom.xml @@ -348,7 +348,6 @@ language-interop libraries-3 - libraries-data-db lombok-modules @@ -537,7 +536,6 @@ language-interop libraries-3 - libraries-data-db lombok-modules muleesb @@ -751,6 +749,7 @@ spring-integration spring-remoting-modules libraries-security + libraries-data-db performance-tests security-modules @@ -1025,6 +1024,7 @@ spring-integration spring-remoting-modules libraries-security + libraries-data-db performance-tests security-modules