diff --git a/libraries-data-2/README.md b/libraries-data-2/README.md index 25d9fe177e..24618b5e37 100644 --- a/libraries-data-2/README.md +++ b/libraries-data-2/README.md @@ -7,10 +7,8 @@ This module contains articles about libraries for data processing in Java. - [Guide to the HyperLogLog Algorithm](https://www.baeldung.com/java-hyperloglog) - [Introduction to Conflict-Free Replicated Data Types](https://www.baeldung.com/java-conflict-free-replicated-data-types) - [Introduction to javax.measure](https://www.baeldung.com/javax-measure) -- [Introduction To Docx4J](https://www.baeldung.com/docx4j) -- [Interact with Google Sheets from Java](https://www.baeldung.com/google-sheets-java-client) -- [Introduction To OpenCSV](https://www.baeldung.com/opencsv) -- [Introduction to Smooks](https://www.baeldung.com/smooks) - [A Guide to Infinispan in Java](https://www.baeldung.com/infinispan) -- More articles: [[<-- prev>]](/libraries-data) - +- [Guide to JMapper](https://www.baeldung.com/jmapper) +- [An Introduction to SuanShu](https://www.baeldung.com/suanshu) +- [Intro to Derive4J](https://www.baeldung.com/derive4j) +More articles: [[<-- prev]](/../libraries-data) \ No newline at end of file diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml index 87c620f438..e79a2d98e0 100644 --- a/libraries-data-2/pom.xml +++ b/libraries-data-2/pom.xml @@ -67,43 +67,6 @@ unit-ri ${unit-ri.version} - - javax.xml.bind - jaxb-api - ${jaxb-api.version} - - - org.docx4j - docx4j - ${docx4j.version} - - - - com.google.api-client - google-api-client - ${google-api.version} - - - com.google.oauth-client - google-oauth-client-jetty - ${google-api.version} - - - com.google.apis - google-api-services-sheets - ${google-sheets.version} - - - - com.opencsv - opencsv - ${opencsv.version} - - - org.milyn - milyn-smooks-all - ${smooks.version} - org.infinispan infinispan-core @@ -124,22 +87,78 @@ spring-web ${spring.version} - + + com.google.api-client + google-api-client + ${google-api.version} + + + com.googlecode.jmapper-framework + jmapper-core + ${jmapper.version} + + + com.numericalmethod + suanshu + ${suanshu.version} + + + org.derive4j + derive4j + ${derive4j.version} + + + org.assertj + assertj-core + ${assertj.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + org.awaitility + awaitility + ${awaitility.version} + test + + + org.awaitility + awaitility-proxy + ${awaitility.version} + test + + + + nm-repo + Numerical Method's Maven Repository + http://repo.numericalmethod.com/maven/ + default + + + 1.5.0 1.6.0 0.1.0 1.0.3 - 3.3.5 - 2.1 - 1.23.0 - 4.1 - 1.7.0 9.1.5.Final - v4-rev493-1.21.0 2.9.8 4.3.8.RELEASE + 1.23.0 + 1.6.0.1 + 4.0.0 + 1.1.0 + 3.6.2 + 1.7.25 + 3.0.0 \ No newline at end of file diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/adt/Either.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/adt/Either.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/derive4j/adt/Either.java rename to libraries-data-2/src/main/java/com/baeldung/derive4j/adt/Either.java diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java similarity index 90% rename from libraries-data-3/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java rename to libraries-data-2/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java index bee947df12..143648d67a 100644 --- a/libraries-data-3/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java +++ b/libraries-data-2/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java @@ -16,6 +16,6 @@ public interface LazyRequest { R DELETE(String path); } - R match(LazyRequest.Cases method); + R match(Cases method); } diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java rename to libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java rename to libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java rename to libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/User.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/User.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/jmapper/User.java rename to libraries-data-2/src/main/java/com/baeldung/jmapper/User.java diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto.java rename to libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto.java index 326e8f3cd5..039e78b17d 100644 --- a/libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto.java +++ b/libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto.java @@ -1,11 +1,11 @@ package com.baeldung.jmapper; -import java.time.LocalDate; -import java.time.Period; - import com.googlecode.jmapper.annotations.JMap; import com.googlecode.jmapper.annotations.JMapConversion; +import java.time.LocalDate; +import java.time.Period; + public class UserDto { @JMap diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto1.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto1.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto1.java rename to libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto1.java diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/relational/User.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/relational/User.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/jmapper/relational/User.java rename to libraries-data-2/src/main/java/com/baeldung/jmapper/relational/User.java diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto1.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto1.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto1.java rename to libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto1.java diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto2.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto2.java similarity index 100% rename from libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto2.java rename to libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto2.java diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java deleted file mode 100644 index af9caaae12..0000000000 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.baeldung.opencsv.beans; - -public class CsvBean { } diff --git a/libraries-data-3/src/main/java/com/baeldung/suanshu/SuanShuMath.java b/libraries-data-2/src/main/java/com/baeldung/suanshu/SuanShuMath.java similarity index 99% rename from libraries-data-3/src/main/java/com/baeldung/suanshu/SuanShuMath.java rename to libraries-data-2/src/main/java/com/baeldung/suanshu/SuanShuMath.java index 46af24692d..ce7bc60a3a 100644 --- a/libraries-data-3/src/main/java/com/baeldung/suanshu/SuanShuMath.java +++ b/libraries-data-2/src/main/java/com/baeldung/suanshu/SuanShuMath.java @@ -1,19 +1,18 @@ package com.baeldung.suanshu; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.numericalmethod.suanshu.algebra.linear.matrix.doubles.Matrix; -import com.numericalmethod.suanshu.algebra.linear.vector.doubles.Vector; -import com.numericalmethod.suanshu.algebra.linear.vector.doubles.dense.DenseVector; import com.numericalmethod.suanshu.algebra.linear.matrix.doubles.matrixtype.dense.DenseMatrix; import com.numericalmethod.suanshu.algebra.linear.matrix.doubles.operation.Inverse; +import com.numericalmethod.suanshu.algebra.linear.vector.doubles.Vector; +import com.numericalmethod.suanshu.algebra.linear.vector.doubles.dense.DenseVector; import com.numericalmethod.suanshu.analysis.function.polynomial.Polynomial; import com.numericalmethod.suanshu.analysis.function.polynomial.root.PolyRoot; import com.numericalmethod.suanshu.analysis.function.polynomial.root.PolyRootSolver; import com.numericalmethod.suanshu.number.complex.Complex; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; class SuanShuMath { diff --git a/libraries-data-2/src/test/com/baeldung/crdt/CRDTUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/crdt/CRDTUnitTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/crdt/CRDTUnitTest.java rename to libraries-data-2/src/test/java/com/baeldung/crdt/CRDTUnitTest.java diff --git a/libraries-data-3/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java similarity index 99% rename from libraries-data-3/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java rename to libraries-data-2/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java index 511e24961f..4e68f09f6a 100644 --- a/libraries-data-3/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java +++ b/libraries-data-2/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java @@ -8,6 +8,7 @@ import org.mockito.junit.MockitoJUnitRunner; import java.util.Optional; import java.util.function.Function; + @RunWith(MockitoJUnitRunner.class) public class EitherUnitTest { @Test diff --git a/libraries-data-3/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java similarity index 100% rename from libraries-data-3/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java rename to libraries-data-2/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java diff --git a/libraries-data-3/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java similarity index 100% rename from libraries-data-3/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java rename to libraries-data-2/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java diff --git a/libraries-data-2/src/test/com/baeldung/flink/BackupCreatorIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/flink/BackupCreatorIntegrationTest.java rename to libraries-data-2/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java diff --git a/libraries-data-2/src/test/com/baeldung/flink/WordCapitalizerIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/flink/WordCapitalizerIntegrationTest.java rename to libraries-data-2/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java diff --git a/libraries-data-2/src/test/com/baeldung/flink/WordCountIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/flink/WordCountIntegrationTest.java rename to libraries-data-2/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java diff --git a/libraries-data-2/src/test/com/baeldung/hll/HLLLongRunningManualTest.java b/libraries-data-2/src/test/java/com/baeldung/hll/HLLLongRunningManualTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/hll/HLLLongRunningManualTest.java rename to libraries-data-2/src/test/java/com/baeldung/hll/HLLLongRunningManualTest.java diff --git a/libraries-data-2/src/test/com/baeldung/infinispan/AbstractIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/infinispan/AbstractIntegrationTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/infinispan/AbstractIntegrationTest.java rename to libraries-data-2/src/test/java/com/baeldung/infinispan/AbstractIntegrationTest.java diff --git a/libraries-data-2/src/test/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java b/libraries-data-2/src/test/java/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java rename to libraries-data-2/src/test/java/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java diff --git a/libraries-data-2/src/test/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java rename to libraries-data-2/src/test/java/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java diff --git a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java similarity index 95% rename from libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java rename to libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java index 9db7bdb4ac..177ef08d41 100644 --- a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java +++ b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java @@ -1,17 +1,14 @@ package com.baeldung.jmapper; -import static com.googlecode.jmapper.api.JMapperAPI.attribute; -import static com.googlecode.jmapper.api.JMapperAPI.global; -import static com.googlecode.jmapper.api.JMapperAPI.mappedClass; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.time.LocalDate; - -import org.junit.Test; - import com.googlecode.jmapper.JMapper; import com.googlecode.jmapper.api.JMapperAPI; +import org.junit.Test; + +import java.time.LocalDate; + +import static com.googlecode.jmapper.api.JMapperAPI.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class JMapperIntegrationTest { diff --git a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java similarity index 99% rename from libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java rename to libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java index 6af2865159..a44d608a0a 100644 --- a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java +++ b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java @@ -1,16 +1,15 @@ package com.baeldung.jmapper; -import static com.googlecode.jmapper.api.JMapperAPI.attribute; -import static com.googlecode.jmapper.api.JMapperAPI.mappedClass; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - import com.baeldung.jmapper.relational.User; import com.baeldung.jmapper.relational.UserDto1; import com.baeldung.jmapper.relational.UserDto2; import com.googlecode.jmapper.RelationalJMapper; import com.googlecode.jmapper.api.JMapperAPI; +import org.junit.Test; + +import static com.googlecode.jmapper.api.JMapperAPI.attribute; +import static com.googlecode.jmapper.api.JMapperAPI.mappedClass; +import static org.junit.Assert.assertEquals; public class JMapperRelationalIntegrationTest { diff --git a/libraries-data-2/src/test/com/baeldung/measurement/WaterTankUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/measurement/WaterTankUnitTest.java similarity index 100% rename from libraries-data-2/src/test/com/baeldung/measurement/WaterTankUnitTest.java rename to libraries-data-2/src/test/java/com/baeldung/measurement/WaterTankUnitTest.java diff --git a/libraries-data-3/src/main/resources/user_jmapper.xml b/libraries-data-2/src/test/resources/user_jmapper.xml similarity index 100% rename from libraries-data-3/src/main/resources/user_jmapper.xml rename to libraries-data-2/src/test/resources/user_jmapper.xml diff --git a/libraries-data-3/src/main/resources/user_jmapper1.xml b/libraries-data-2/src/test/resources/user_jmapper1.xml similarity index 100% rename from libraries-data-3/src/main/resources/user_jmapper1.xml rename to libraries-data-2/src/test/resources/user_jmapper1.xml diff --git a/libraries-data-3/src/main/resources/user_jmapper2.xml b/libraries-data-2/src/test/resources/user_jmapper2.xml similarity index 100% rename from libraries-data-3/src/main/resources/user_jmapper2.xml rename to libraries-data-2/src/test/resources/user_jmapper2.xml diff --git a/libraries-data-3/README.md b/libraries-data-3/README.md deleted file mode 100644 index 6be6eae4a8..0000000000 --- a/libraries-data-3/README.md +++ /dev/null @@ -1,5 +0,0 @@ -### Relevant articles -- [Parsing YAML with SnakeYAML](https://www.baeldung.com/java-snake-yaml) -- [Guide to JMapper](https://www.baeldung.com/jmapper) -- [An Introduction to SuanShu](https://www.baeldung.com/suanshu) -- [Intro to Derive4J](https://www.baeldung.com/derive4j) diff --git a/libraries-data-3/pom.xml b/libraries-data-3/pom.xml deleted file mode 100644 index f55701f51c..0000000000 --- a/libraries-data-3/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - 4.0.0 - libraries-data-3 - libraries-data-3 - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - org.yaml - snakeyaml - ${snakeyaml.version} - - - com.googlecode.jmapper-framework - jmapper-core - ${jmapper.version} - - - com.numericalmethod - suanshu - ${suanshu.version} - - - org.derive4j - derive4j - ${derive4j.version} - - - - - - - nm-repo - Numerical Method's Maven Repository - http://repo.numericalmethod.com/maven/ - default - - - - - 1.21 - 1.6.0.1 - 4.0.0 - 1.1.0 - - \ No newline at end of file diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_type.yaml b/libraries-data-3/src/test/resources/yaml/customer_with_type.yaml deleted file mode 100644 index 6e13c26cea..0000000000 --- a/libraries-data-3/src/test/resources/yaml/customer_with_type.yaml +++ /dev/null @@ -1,4 +0,0 @@ -!!com.baeldung.snakeyaml.Customer -firstName: "John" -lastName: "Doe" -age: 20 \ No newline at end of file diff --git a/libraries-data-db/README.md b/libraries-data-db/README.md new file mode 100644 index 0000000000..790a3eb318 --- /dev/null +++ b/libraries-data-db/README.md @@ -0,0 +1,11 @@ +## DB Data Libraries + +This module contains articles about database-related data processing libraries. + +### Relevant articles +- [Introduction to Reladomo](https://www.baeldung.com/reladomo) +- [Introduction to ORMLite](https://www.baeldung.com/ormlite) +- [Guide to Java Data Objects](https://www.baeldung.com/jdo) +- [Intro to JDO Queries 2/2](https://www.baeldung.com/jdo-queries) +- [Introduction to HikariCP](https://www.baeldung.com/hikaricp) +- [Guide to Ebean ORM](https://www.baeldung.com/ebean-orm) diff --git a/libraries-data-3/log4j.properties b/libraries-data-db/log4j.properties similarity index 100% rename from libraries-data-3/log4j.properties rename to libraries-data-db/log4j.properties diff --git a/libraries-data/myPersistence.xml b/libraries-data-db/myPersistence.xml similarity index 100% rename from libraries-data/myPersistence.xml rename to libraries-data-db/myPersistence.xml diff --git a/libraries-data-db/pom.xml b/libraries-data-db/pom.xml new file mode 100644 index 0000000000..185f23124d --- /dev/null +++ b/libraries-data-db/pom.xml @@ -0,0 +1,228 @@ + + + 4.0.0 + libraries-data-db + libraries-data-db + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + com.goldmansachs.reladomo + reladomo + ${reladomo.version} + + + com.goldmansachs.reladomo + reladomo-test-util + ${reladomo.version} + + + com.j256.ormlite + ormlite-jdbc + ${ormlite.version} + + + + org.datanucleus + javax.jdo + ${javax.jdo.version} + + + org.datanucleus + datanucleus-core + ${datanucleus.version} + + + org.datanucleus + datanucleus-api-jdo + ${datanucleus.version} + + + org.datanucleus + datanucleus-rdbms + ${datanucleus.version} + + + org.datanucleus + datanucleus-maven-plugin + ${datanucleus-maven-plugin.version} + + + org.datanucleus + datanucleus-xml + ${datanucleus-xml.version} + + + org.datanucleus + datanucleus-jdo-query + ${datanucleus-jdo-query.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + com.h2database + h2 + ${h2.version} + + + + com.zaxxer + HikariCP + ${HikariCP.version} + compile + + + + io.ebean + ebean + ${ebean.version} + + + + + libraries-data-db + + + + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + generateMithra + generate-sources + + run + + + + + + + + + + + + + + + + + + com.goldmansachs.reladomo + reladomogen + ${reladomo.version} + + + + com.goldmansachs.reladomo + reladomo-gen-util + ${reladomo.version} + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/reladomo + + + + + add-resource + generate-resources + + add-resource + + + + + ${project.build.directory}/generated-db/ + + + + + + + + + + + org.datanucleus + datanucleus-maven-plugin + ${datanucleus-maven-plugin.version} + + JDO + ${basedir}/datanucleus.properties + ${basedir}/log4j.properties + true + false + + + + + process-classes + + enhance + + + + + + io.ebean + ebean-maven-plugin + 11.11.2 + + + + main + process-classes + + debug=1 + + + enhance + + + + + + + + + 16.5.1 + 3.0.0 + 1.8 + 5.0 + 5.1.1 + 5.0.2 + 5.0.0-release + 5.0.4 + 3.2.0-m7 + 1.7.25 + 2.7.2 + 11.22.4 + + \ No newline at end of file diff --git a/libraries-data/src/main/java/com/baeldung/ebean/app/App.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java similarity index 93% rename from libraries-data/src/main/java/com/baeldung/ebean/app/App.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java index 44a4fa8562..9c59cbb8c0 100644 --- a/libraries-data/src/main/java/com/baeldung/ebean/app/App.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java @@ -1,14 +1,13 @@ -package com.baeldung.ebean.app; - -import java.util.Arrays; - -import com.baeldung.ebean.model.Address; -import com.baeldung.ebean.model.Customer; +package com.baeldung.libraries.ebean.app; +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; + public class App { public static void main(String[] args) { diff --git a/libraries-data/src/main/java/com/baeldung/ebean/app/App2.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java similarity index 95% rename from libraries-data/src/main/java/com/baeldung/ebean/app/App2.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java index fba77007c6..c604f2cc25 100644 --- a/libraries-data/src/main/java/com/baeldung/ebean/app/App2.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java @@ -1,11 +1,11 @@ -package com.baeldung.ebean.app; - -import java.util.Properties; +package com.baeldung.libraries.ebean.app; import io.ebean.EbeanServer; import io.ebean.EbeanServerFactory; import io.ebean.config.ServerConfig; +import java.util.Properties; + public class App2 { public static void main(String[] args) { diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Address.java similarity index 96% rename from libraries-data/src/main/java/com/baeldung/ebean/model/Address.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Address.java index dfcd90ffa7..a5c97b9c1d 100644 --- a/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Address.java @@ -1,4 +1,4 @@ -package com.baeldung.ebean.model; +package com.baeldung.libraries.ebean.model; import javax.persistence.Entity; diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/BaseModel.java similarity index 95% rename from libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/BaseModel.java index 547d5bf075..7abd425470 100644 --- a/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/BaseModel.java @@ -1,13 +1,12 @@ -package com.baeldung.ebean.model; +package com.baeldung.libraries.ebean.model; -import java.time.Instant; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import javax.persistence.Id; import javax.persistence.MappedSuperclass; import javax.persistence.Version; - -import io.ebean.annotation.WhenCreated; -import io.ebean.annotation.WhenModified; +import java.time.Instant; @MappedSuperclass public abstract class BaseModel { diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Customer.java similarity index 94% rename from libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Customer.java index 4dd629245a..f8fa9e505e 100644 --- a/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Customer.java @@ -1,4 +1,4 @@ -package com.baeldung.ebean.model; +package com.baeldung.libraries.ebean.model; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/libraries-data/src/main/java/com/baeldung/hikaricp/DataSource.java b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/DataSource.java similarity index 97% rename from libraries-data/src/main/java/com/baeldung/hikaricp/DataSource.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/DataSource.java index e8d3b4ff96..868d4b90b0 100644 --- a/libraries-data/src/main/java/com/baeldung/hikaricp/DataSource.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/DataSource.java @@ -1,11 +1,11 @@ -package com.baeldung.hikaricp; - -import java.sql.Connection; -import java.sql.SQLException; +package com.baeldung.libraries.hikaricp; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; +import java.sql.Connection; +import java.sql.SQLException; + public class DataSource { private static HikariConfig config = new HikariConfig(); diff --git a/libraries-data/src/main/java/com/baeldung/hikaricp/Employee.java b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/Employee.java similarity index 97% rename from libraries-data/src/main/java/com/baeldung/hikaricp/Employee.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/Employee.java index 1ea3c13a48..338599c969 100644 --- a/libraries-data/src/main/java/com/baeldung/hikaricp/Employee.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/Employee.java @@ -1,4 +1,4 @@ -package com.baeldung.hikaricp; +package com.baeldung.libraries.hikaricp; import java.sql.Date; diff --git a/libraries-data/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/HikariCPDemo.java similarity index 97% rename from libraries-data/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/HikariCPDemo.java index 57d124fd5d..e23b583d98 100644 --- a/libraries-data/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/HikariCPDemo.java @@ -1,4 +1,4 @@ -package com.baeldung.hikaricp; +package com.baeldung.libraries.hikaricp; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/libraries-data/src/main/java/com/baeldung/jdo/GuideToJDO.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java similarity index 98% rename from libraries-data/src/main/java/com/baeldung/jdo/GuideToJDO.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java index bd459f963c..99b0a4bef7 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/GuideToJDO.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java @@ -1,5 +1,12 @@ -package com.baeldung.jdo; +package com.baeldung.libraries.jdo; +import org.datanucleus.api.jdo.JDOPersistenceManagerFactory; +import org.datanucleus.metadata.PersistenceUnitMetaData; + +import javax.jdo.PersistenceManager; +import javax.jdo.PersistenceManagerFactory; +import javax.jdo.Query; +import javax.jdo.Transaction; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -7,14 +14,6 @@ import java.util.Random; import java.util.logging.Level; import java.util.logging.Logger; -import javax.jdo.PersistenceManager; -import javax.jdo.PersistenceManagerFactory; -import javax.jdo.Query; -import javax.jdo.Transaction; - -import org.datanucleus.api.jdo.JDOPersistenceManagerFactory; -import org.datanucleus.metadata.PersistenceUnitMetaData; - public class GuideToJDO { private static final Logger LOGGER = Logger.getLogger(GuideToJDO.class.getName()); @@ -45,7 +44,7 @@ public class GuideToJDO { public void CreateH2Properties() { pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); - pumd.addClassName("com.baeldung.jdo.Product"); + pumd.addClassName("com.baeldung.libraries.jdo.Product"); pumd.setExcludeUnlistedClasses(); pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver"); pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence"); @@ -57,7 +56,7 @@ public class GuideToJDO { public void CreateXMLProperties() { pumdXML = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); - pumdXML.addClassName("com.baeldung.jdo.ProductXML"); + pumdXML.addClassName("com.baeldung.libraries.jdo.ProductXML"); pumdXML.setExcludeUnlistedClasses(); pumdXML.addProperty("javax.jdo.option.ConnectionURL", "xml:file:myPersistence.xml"); pumdXML.addProperty("datanucleus.autoCreateSchema", "true"); diff --git a/libraries-data/src/main/java/com/baeldung/jdo/Product.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/Product.java similarity index 95% rename from libraries-data/src/main/java/com/baeldung/jdo/Product.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/Product.java index 124428d671..3ff27732a9 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/Product.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/Product.java @@ -1,4 +1,4 @@ -package com.baeldung.jdo; +package com.baeldung.libraries.jdo; import javax.jdo.annotations.IdGeneratorStrategy; import javax.jdo.annotations.PersistenceCapable; diff --git a/libraries-data/src/main/java/com/baeldung/jdo/ProductXML.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/ProductXML.java similarity index 96% rename from libraries-data/src/main/java/com/baeldung/jdo/ProductXML.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/ProductXML.java index d702a8ac90..2679b049bb 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/ProductXML.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/ProductXML.java @@ -1,4 +1,4 @@ -package com.baeldung.jdo; +package com.baeldung.libraries.jdo; import javax.jdo.annotations.PersistenceCapable; import javax.jdo.annotations.PrimaryKey; diff --git a/libraries-data/src/main/java/com/baeldung/jdo/query/MyApp.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/MyApp.java similarity index 85% rename from libraries-data/src/main/java/com/baeldung/jdo/query/MyApp.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/MyApp.java index 30f019a79d..61f983c727 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/query/MyApp.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/MyApp.java @@ -1,14 +1,13 @@ -package com.baeldung.jdo.query; +package com.baeldung.libraries.jdo.query; -import java.util.List; +import org.datanucleus.api.jdo.JDOPersistenceManagerFactory; +import org.datanucleus.metadata.PersistenceUnitMetaData; import javax.jdo.JDOQLTypedQuery; import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManagerFactory; import javax.jdo.Query; - -import org.datanucleus.api.jdo.JDOPersistenceManagerFactory; -import org.datanucleus.metadata.PersistenceUnitMetaData; +import java.util.List; public class MyApp { @@ -53,14 +52,14 @@ public class MyApp { public static void queryUsingJDOQL() { - Query query = pm.newQuery("SELECT FROM com.baeldung.jdo.query.ProductItem " + "WHERE price < threshold PARAMETERS double threshold"); + Query query = pm.newQuery("SELECT FROM com.baeldung.libraries.jdo.query.ProductItem " + "WHERE price < threshold PARAMETERS double threshold"); List explicitParamResults = (List) query.execute(10); - query = pm.newQuery("SELECT FROM " + "com.baeldung.jdo.query.ProductItem WHERE price < :threshold"); + query = pm.newQuery("SELECT FROM " + "com.baeldung.libraries.jdo.query.ProductItem WHERE price < :threshold"); query.setParameters("double threshold"); List explicitParamResults2 = (List) query.execute(10); - query = pm.newQuery("SELECT FROM " + "com.baeldung.jdo.query.ProductItem WHERE price < :threshold"); + query = pm.newQuery("SELECT FROM " + "com.baeldung.libraries.jdo.query.ProductItem WHERE price < :threshold"); List implicitParamResults = (List) query.execute(10); } @@ -83,7 +82,7 @@ public class MyApp { } public static void queryUsingJPQL() { - Query query = pm.newQuery("JPQL", "select i from " + "com.baeldung.jdo.query.ProductItem i where i.price < 10" + " and i.status = 'InStock'"); + Query query = pm.newQuery("JPQL", "select i from " + "com.baeldung.libraries.jdo.query.ProductItem i where i.price < 10" + " and i.status = 'InStock'"); List results = (List) query.execute(); } diff --git a/libraries-data/src/main/java/com/baeldung/jdo/query/ProductItem.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/ProductItem.java similarity index 97% rename from libraries-data/src/main/java/com/baeldung/jdo/query/ProductItem.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/ProductItem.java index 25dd8bdb98..9cefeeb44f 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/query/ProductItem.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/ProductItem.java @@ -1,4 +1,4 @@ -package com.baeldung.jdo.query; +package com.baeldung.libraries.jdo.query; import javax.jdo.annotations.IdGeneratorStrategy; import javax.jdo.annotations.PersistenceCapable; diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/AnnotadedPerson.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/AnnotadedPerson.java similarity index 97% rename from libraries-data/src/main/java/com/baeldung/jdo/xml/AnnotadedPerson.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/AnnotadedPerson.java index 0673ff341c..0520bf1d09 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/xml/AnnotadedPerson.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/AnnotadedPerson.java @@ -1,7 +1,4 @@ -package com.baeldung.jdo.xml; - -import java.util.ArrayList; -import java.util.List; +package com.baeldung.libraries.jdo.xml; import javax.jdo.annotations.Element; import javax.jdo.annotations.PersistenceCapable; @@ -9,6 +6,8 @@ import javax.jdo.annotations.PrimaryKey; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; +import java.util.ArrayList; +import java.util.List; @PersistenceCapable(schema = "/myproduct/people", table = "person") public class AnnotadedPerson { diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/MyApp.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/MyApp.java similarity index 94% rename from libraries-data/src/main/java/com/baeldung/jdo/xml/MyApp.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/MyApp.java index b43b45f415..513481956d 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/xml/MyApp.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/MyApp.java @@ -1,16 +1,11 @@ -package com.baeldung.jdo.xml; - -import java.util.List; - -import javax.jdo.JDOHelper; -import javax.jdo.PersistenceManager; -import javax.jdo.PersistenceManagerFactory; -import javax.jdo.Query; -import javax.jdo.Transaction; +package com.baeldung.libraries.jdo.xml; import org.datanucleus.api.jdo.JDOPersistenceManagerFactory; import org.datanucleus.metadata.PersistenceUnitMetaData; +import javax.jdo.*; +import java.util.List; + public class MyApp { private static PersistenceUnitMetaData pumd; diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/Person.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Person.java similarity index 96% rename from libraries-data/src/main/java/com/baeldung/jdo/xml/Person.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Person.java index 4fbc81ee03..0cc3dff316 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/xml/Person.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Person.java @@ -1,10 +1,9 @@ -package com.baeldung.jdo.xml; - -import java.util.ArrayList; -import java.util.List; +package com.baeldung.libraries.jdo.xml; import javax.jdo.annotations.PersistenceCapable; import javax.jdo.annotations.PrimaryKey; +import java.util.ArrayList; +import java.util.List; @PersistenceCapable public class Person { diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/Product.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Product.java similarity index 96% rename from libraries-data/src/main/java/com/baeldung/jdo/xml/Product.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Product.java index 5aac05834d..04b81ea356 100644 --- a/libraries-data/src/main/java/com/baeldung/jdo/xml/Product.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Product.java @@ -1,4 +1,4 @@ -package com.baeldung.jdo.xml; +package com.baeldung.libraries.jdo.xml; import javax.jdo.annotations.PersistenceCapable; import javax.jdo.annotations.PrimaryKey; diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Address.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Address.java similarity index 94% rename from libraries-data/src/main/java/com/baeldung/ormlite/Address.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Address.java index 747b0b0b12..d433eba13f 100644 --- a/libraries-data/src/main/java/com/baeldung/ormlite/Address.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Address.java @@ -1,4 +1,4 @@ -package com.baeldung.ormlite; +package com.baeldung.libraries.ormlite; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Book.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Book.java similarity index 95% rename from libraries-data/src/main/java/com/baeldung/ormlite/Book.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Book.java index ed7b813b8d..b55390058b 100644 --- a/libraries-data/src/main/java/com/baeldung/ormlite/Book.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Book.java @@ -1,4 +1,4 @@ -package com.baeldung.ormlite; +package com.baeldung.libraries.ormlite; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Library.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Library.java similarity index 96% rename from libraries-data/src/main/java/com/baeldung/ormlite/Library.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Library.java index 994b4c6575..c7d0d91b46 100644 --- a/libraries-data/src/main/java/com/baeldung/ormlite/Library.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Library.java @@ -1,4 +1,4 @@ -package com.baeldung.ormlite; +package com.baeldung.libraries.ormlite; import com.j256.ormlite.dao.ForeignCollection; import com.j256.ormlite.field.DatabaseField; diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDao.java similarity index 84% rename from libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDao.java index fd8f5f40d6..12cefe0358 100644 --- a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDao.java @@ -1,10 +1,10 @@ -package com.baeldung.ormlite; +package com.baeldung.libraries.ormlite; + +import com.j256.ormlite.dao.Dao; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.dao.Dao; - public interface LibraryDao extends Dao { public List findByName(String name) throws SQLException; } diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDaoImpl.java similarity index 92% rename from libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDaoImpl.java index af313101e2..fe43bf85c1 100644 --- a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDaoImpl.java @@ -1,11 +1,11 @@ -package com.baeldung.ormlite; - -import java.sql.SQLException; -import java.util.List; +package com.baeldung.libraries.ormlite; import com.j256.ormlite.dao.BaseDaoImpl; import com.j256.ormlite.support.ConnectionSource; +import java.sql.SQLException; +import java.util.List; + public class LibraryDaoImpl extends BaseDaoImpl implements LibraryDao { public LibraryDaoImpl(ConnectionSource connectionSource) throws SQLException { diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/Department.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Department.java similarity index 90% rename from libraries-data/src/main/java/com/baeldung/reladomo/Department.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Department.java index d26ddafbf4..bc57fa6000 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/Department.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Department.java @@ -1,4 +1,4 @@ -package com.baeldung.reladomo; +package com.baeldung.libraries.reladomo; public class Department extends DepartmentAbstract { public Department() { diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentDatabaseObject.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentDatabaseObject.java similarity index 66% rename from libraries-data/src/main/java/com/baeldung/reladomo/DepartmentDatabaseObject.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentDatabaseObject.java index 4cfb5cb055..23bd584914 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentDatabaseObject.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentDatabaseObject.java @@ -1,4 +1,4 @@ -package com.baeldung.reladomo; +package com.baeldung.libraries.reladomo; public class DepartmentDatabaseObject extends DepartmentDatabaseObjectAbstract { } diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentList.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentList.java similarity index 82% rename from libraries-data/src/main/java/com/baeldung/reladomo/DepartmentList.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentList.java index edad6bc1f4..278a840553 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentList.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentList.java @@ -1,6 +1,9 @@ -package com.baeldung.reladomo; +package com.baeldung.libraries.reladomo; + import com.gs.fw.finder.Operation; -import java.util.*; + +import java.util.Collection; + public class DepartmentList extends DepartmentListAbstract { public DepartmentList() diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/Employee.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Employee.java similarity index 89% rename from libraries-data/src/main/java/com/baeldung/reladomo/Employee.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Employee.java index 519e841282..023dc4a3c7 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/Employee.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Employee.java @@ -1,4 +1,4 @@ -package com.baeldung.reladomo; +package com.baeldung.libraries.reladomo; public class Employee extends EmployeeAbstract { public Employee() diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeDatabaseObject.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeDatabaseObject.java similarity index 65% rename from libraries-data/src/main/java/com/baeldung/reladomo/EmployeeDatabaseObject.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeDatabaseObject.java index 407049f342..e0faced1c6 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeDatabaseObject.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeDatabaseObject.java @@ -1,4 +1,4 @@ -package com.baeldung.reladomo; +package com.baeldung.libraries.reladomo; public class EmployeeDatabaseObject extends EmployeeDatabaseObjectAbstract { } diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeList.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeList.java similarity index 81% rename from libraries-data/src/main/java/com/baeldung/reladomo/EmployeeList.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeList.java index 4e759898c3..192356f4c9 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeList.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeList.java @@ -1,6 +1,9 @@ -package com.baeldung.reladomo; +package com.baeldung.libraries.reladomo; + import com.gs.fw.finder.Operation; -import java.util.*; + +import java.util.Collection; + public class EmployeeList extends EmployeeListAbstract { public EmployeeList() diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoApplication.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoApplication.java similarity index 95% rename from libraries-data/src/main/java/com/baeldung/reladomo/ReladomoApplication.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoApplication.java index c6b242d3ae..1ccae8c59d 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoApplication.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoApplication.java @@ -1,13 +1,10 @@ -package com.baeldung.reladomo; - -import java.io.InputStream; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +package com.baeldung.libraries.reladomo; import com.gs.fw.common.mithra.MithraManager; import com.gs.fw.common.mithra.MithraManagerProvider; +import java.io.InputStream; + public class ReladomoApplication { public static void main(String[] args) { diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoConnectionManager.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoConnectionManager.java similarity index 98% rename from libraries-data/src/main/java/com/baeldung/reladomo/ReladomoConnectionManager.java rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoConnectionManager.java index 66a8f9ff99..15f6ec5601 100644 --- a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoConnectionManager.java +++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoConnectionManager.java @@ -1,4 +1,12 @@ -package com.baeldung.reladomo; +package com.baeldung.libraries.reladomo; + +import com.gs.fw.common.mithra.bulkloader.BulkLoader; +import com.gs.fw.common.mithra.bulkloader.BulkLoaderException; +import com.gs.fw.common.mithra.connectionmanager.SourcelessConnectionManager; +import com.gs.fw.common.mithra.connectionmanager.XAConnectionManager; +import com.gs.fw.common.mithra.databasetype.DatabaseType; +import com.gs.fw.common.mithra.databasetype.H2DatabaseType; +import org.h2.tools.RunScript; import java.io.IOException; import java.nio.file.Files; @@ -9,15 +17,6 @@ import java.sql.SQLException; import java.util.TimeZone; import java.util.stream.Stream; -import org.h2.tools.RunScript; - -import com.gs.fw.common.mithra.bulkloader.BulkLoader; -import com.gs.fw.common.mithra.bulkloader.BulkLoaderException; -import com.gs.fw.common.mithra.connectionmanager.SourcelessConnectionManager; -import com.gs.fw.common.mithra.connectionmanager.XAConnectionManager; -import com.gs.fw.common.mithra.databasetype.DatabaseType; -import com.gs.fw.common.mithra.databasetype.H2DatabaseType; - public class ReladomoConnectionManager implements SourcelessConnectionManager { private static ReladomoConnectionManager instance; diff --git a/libraries-data/src/main/resources/META-INF/BenchmarkList b/libraries-data-db/src/main/resources/META-INF/BenchmarkList similarity index 100% rename from libraries-data/src/main/resources/META-INF/BenchmarkList rename to libraries-data-db/src/main/resources/META-INF/BenchmarkList diff --git a/libraries-data/src/main/resources/META-INF/datanucleus.properties b/libraries-data-db/src/main/resources/META-INF/datanucleus.properties similarity index 100% rename from libraries-data/src/main/resources/META-INF/datanucleus.properties rename to libraries-data-db/src/main/resources/META-INF/datanucleus.properties diff --git a/libraries-data/src/main/resources/META-INF/jdoconfig.xml b/libraries-data-db/src/main/resources/META-INF/jdoconfig.xml similarity index 100% rename from libraries-data/src/main/resources/META-INF/jdoconfig.xml rename to libraries-data-db/src/main/resources/META-INF/jdoconfig.xml diff --git a/libraries-data/src/main/resources/META-INF/package.jdo b/libraries-data-db/src/main/resources/META-INF/package.jdo similarity index 91% rename from libraries-data/src/main/resources/META-INF/package.jdo rename to libraries-data-db/src/main/resources/META-INF/package.jdo index 7f85bbbd58..afe505401b 100644 --- a/libraries-data/src/main/resources/META-INF/package.jdo +++ b/libraries-data-db/src/main/resources/META-INF/package.jdo @@ -1,7 +1,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/libraries-data/src/main/resources/db.sql b/libraries-data-db/src/main/resources/db.sql similarity index 100% rename from libraries-data/src/main/resources/db.sql rename to libraries-data-db/src/main/resources/db.sql diff --git a/libraries-data-db/src/main/resources/ebean.mf b/libraries-data-db/src/main/resources/ebean.mf new file mode 100644 index 0000000000..c3484f8f57 --- /dev/null +++ b/libraries-data-db/src/main/resources/ebean.mf @@ -0,0 +1,3 @@ +entity-packages: com.baeldung.libraries.ebean.model +transactional-packages: com.baeldung.libraries.ebean.app +querybean-packages: com.baeldung.libraries.ebean.app diff --git a/libraries-data/src/main/resources/ebean.properties b/libraries-data-db/src/main/resources/ebean.properties similarity index 100% rename from libraries-data/src/main/resources/ebean.properties rename to libraries-data-db/src/main/resources/ebean.properties diff --git a/libraries-data-db/src/main/resources/logback.xml b/libraries-data-db/src/main/resources/logback.xml new file mode 100644 index 0000000000..3d2ec51566 --- /dev/null +++ b/libraries-data-db/src/main/resources/logback.xml @@ -0,0 +1,15 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + \ No newline at end of file diff --git a/libraries-data/src/main/resources/reladomo/Department.xml b/libraries-data-db/src/main/resources/reladomo/Department.xml similarity index 89% rename from libraries-data/src/main/resources/reladomo/Department.xml rename to libraries-data-db/src/main/resources/reladomo/Department.xml index a284965cd6..2392ff74ec 100644 --- a/libraries-data/src/main/resources/reladomo/Department.xml +++ b/libraries-data-db/src/main/resources/reladomo/Department.xml @@ -1,5 +1,5 @@ - com.baeldung.reladomo + com.baeldung.libraries.reladomo Department departments diff --git a/libraries-data/src/main/resources/reladomo/Employee.xml b/libraries-data-db/src/main/resources/reladomo/Employee.xml similarity index 86% rename from libraries-data/src/main/resources/reladomo/Employee.xml rename to libraries-data-db/src/main/resources/reladomo/Employee.xml index 00e360bc67..676cd5d1d1 100644 --- a/libraries-data/src/main/resources/reladomo/Employee.xml +++ b/libraries-data-db/src/main/resources/reladomo/Employee.xml @@ -1,5 +1,5 @@ - com.baeldung.reladomo + com.baeldung.libraries.reladomo Employee employees diff --git a/libraries-data/src/main/resources/reladomo/ReladomoClassList.xml b/libraries-data-db/src/main/resources/reladomo/ReladomoClassList.xml similarity index 100% rename from libraries-data/src/main/resources/reladomo/ReladomoClassList.xml rename to libraries-data-db/src/main/resources/reladomo/ReladomoClassList.xml diff --git a/libraries-data-db/src/main/resources/reladomo/ReladomoRuntimeConfig.xml b/libraries-data-db/src/main/resources/reladomo/ReladomoRuntimeConfig.xml new file mode 100644 index 0000000000..e4800e31f8 --- /dev/null +++ b/libraries-data-db/src/main/resources/reladomo/ReladomoRuntimeConfig.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/libraries-data/src/test/java/com/baeldung/hikaricp/HikariCPIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/hikaricp/HikariCPIntegrationTest.java similarity index 88% rename from libraries-data/src/test/java/com/baeldung/hikaricp/HikariCPIntegrationTest.java rename to libraries-data-db/src/test/java/com/baeldung/libraries/hikaricp/HikariCPIntegrationTest.java index 80588ecc03..fe5bd85736 100644 --- a/libraries-data/src/test/java/com/baeldung/hikaricp/HikariCPIntegrationTest.java +++ b/libraries-data-db/src/test/java/com/baeldung/libraries/hikaricp/HikariCPIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.hikaricp; +package com.baeldung.libraries.hikaricp; import org.junit.Test; diff --git a/libraries-data/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java similarity index 96% rename from libraries-data/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java rename to libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java index e8c69d67b7..1c15a4f087 100644 --- a/libraries-data/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java +++ b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java @@ -1,24 +1,23 @@ -package com.baeldung.jdo; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.util.List; - -import javax.jdo.PersistenceManager; -import javax.jdo.PersistenceManagerFactory; -import javax.jdo.Query; -import javax.jdo.Transaction; +package com.baeldung.libraries.jdo; import org.datanucleus.api.jdo.JDOPersistenceManagerFactory; import org.datanucleus.metadata.PersistenceUnitMetaData; import org.junit.Test; +import javax.jdo.PersistenceManager; +import javax.jdo.PersistenceManagerFactory; +import javax.jdo.Query; +import javax.jdo.Transaction; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class GuideToJDOIntegrationTest { @Test public void givenProduct_WhenNewThenPerformTransaction() { PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); - pumd.addClassName("com.baeldung.jdo.Product"); + pumd.addClassName("com.baeldung.libraries.jdo.Product"); pumd.setExcludeUnlistedClasses(); pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver"); pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence"); @@ -53,7 +52,7 @@ public class GuideToJDOIntegrationTest { @Test public void givenProduct_WhenQueryThenExist() { PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); - pumd.addClassName("com.baeldung.jdo.Product"); + pumd.addClassName("com.baeldung.libraries.jdo.Product"); pumd.setExcludeUnlistedClasses(); pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver"); pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence"); diff --git a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java similarity index 99% rename from libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java rename to libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java index 5a713902b4..139e52632a 100644 --- a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java +++ b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java @@ -1,20 +1,20 @@ -package com.baeldung.ormlite; +package com.baeldung.libraries.ormlite; -import static org.junit.Assert.*; - -import java.io.IOException; -import java.sql.SQLException; -import java.util.List; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; import com.j256.ormlite.dao.CloseableWrappedIterable; import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.jdbc.JdbcPooledConnectionSource; import com.j256.ormlite.table.TableUtils; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.IOException; +import java.sql.SQLException; +import java.util.List; + +import static org.junit.Assert.*; public class ORMLiteIntegrationTest { private static JdbcPooledConnectionSource connectionSource; diff --git a/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/reladomo/ReladomoIntegrationTest.java similarity index 96% rename from libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java rename to libraries-data-db/src/test/java/com/baeldung/libraries/reladomo/ReladomoIntegrationTest.java index 3660d9a8e1..b2abb587a9 100644 --- a/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java +++ b/libraries-data-db/src/test/java/com/baeldung/libraries/reladomo/ReladomoIntegrationTest.java @@ -1,13 +1,12 @@ -package com.baeldung.reladomo; - -import static org.junit.Assert.*; +package com.baeldung.libraries.reladomo; +import com.gs.fw.common.mithra.test.ConnectionManagerForTests; +import com.gs.fw.common.mithra.test.MithraTestResource; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.gs.fw.common.mithra.test.ConnectionManagerForTests; -import com.gs.fw.common.mithra.test.MithraTestResource; +import static org.junit.Assert.*; public class ReladomoIntegrationTest { private MithraTestResource mithraTestResource; diff --git a/libraries-data-db/src/test/resources/reladomo/ReladomoTestConfig.xml b/libraries-data-db/src/test/resources/reladomo/ReladomoTestConfig.xml new file mode 100644 index 0000000000..4e1b791efc --- /dev/null +++ b/libraries-data-db/src/test/resources/reladomo/ReladomoTestConfig.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/libraries-data-db/src/test/resources/reladomo/test-data.txt b/libraries-data-db/src/test/resources/reladomo/test-data.txt new file mode 100644 index 0000000000..0e8a36a0b2 --- /dev/null +++ b/libraries-data-db/src/test/resources/reladomo/test-data.txt @@ -0,0 +1,7 @@ +class com.baeldung.libraries.reladomo.Department +id, name +1, "Marketing" + +class com.baeldung.libraries.reladomo.Employee +id, name +1, "Paul" \ No newline at end of file diff --git a/libraries-data-io/README.md b/libraries-data-io/README.md new file mode 100644 index 0000000000..550f353c97 --- /dev/null +++ b/libraries-data-io/README.md @@ -0,0 +1,11 @@ +## IO Data Libraries + +This module contains articles about IO data processing libraries. + +### Relevant articles +- [Introduction To Kryo](https://www.baeldung.com/kryo) +- [Parsing YAML with SnakeYAML](https://www.baeldung.com/java-snake-yaml) +- [Introduction to Smooks](https://www.baeldung.com/smooks) +- [Introduction To OpenCSV](https://www.baeldung.com/opencsv) +- [Interact with Google Sheets from Java](https://www.baeldung.com/google-sheets-java-client) +- [Introduction To Docx4J](https://www.baeldung.com/docx4j) diff --git a/libraries-data-io/pom.xml b/libraries-data-io/pom.xml new file mode 100644 index 0000000000..0e3029f565 --- /dev/null +++ b/libraries-data-io/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + libraries-data-io + libraries-data-io + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + com.esotericsoftware + kryo + ${kryo.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + org.milyn + milyn-smooks-all + ${smooks.version} + + + + com.opencsv + opencsv + ${opencsv.version} + + + + com.google.api-client + google-api-client + ${google-api.version} + + + com.google.oauth-client + google-oauth-client-jetty + ${google-api.version} + + + com.google.apis + google-api-services-sheets + ${google-sheets.version} + + + javax.xml.bind + jaxb-api + ${jaxb-api.version} + + + org.docx4j + docx4j + ${docx4j.version} + + + org.assertj + assertj-core + ${org.assertj.core.version} + test + + + + + 1.21 + 4.0.1 + 1.7.0 + 4.1 + 1.23.0 + v4-rev493-1.21.0 + 3.9.0 + 3.3.5 + 2.1 + + \ No newline at end of file diff --git a/libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java b/libraries-data-io/src/main/java/com/baeldung/libraries/docx/Docx4jExample.java similarity index 91% rename from libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/docx/Docx4jExample.java index 6fe29d26e3..5000f63020 100644 --- a/libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/docx/Docx4jExample.java @@ -1,4 +1,4 @@ -package com.baeldung.docx; +package com.baeldung.libraries.docx; import org.docx4j.dml.wordprocessingDrawing.Inline; import org.docx4j.jaxb.Context; @@ -7,17 +7,7 @@ import org.docx4j.openpackaging.exceptions.Docx4JException; import org.docx4j.openpackaging.packages.WordprocessingMLPackage; import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage; import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart; -import org.docx4j.wml.BooleanDefaultTrue; -import org.docx4j.wml.Color; -import org.docx4j.wml.Drawing; -import org.docx4j.wml.ObjectFactory; -import org.docx4j.wml.P; -import org.docx4j.wml.R; -import org.docx4j.wml.RPr; -import org.docx4j.wml.Tbl; -import org.docx4j.wml.Tc; -import org.docx4j.wml.Text; -import org.docx4j.wml.Tr; +import org.docx4j.wml.*; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; diff --git a/libraries-data/src/main/java/com/baeldung/kryo/ComplexClass.java b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/ComplexClass.java similarity index 89% rename from libraries-data/src/main/java/com/baeldung/kryo/ComplexClass.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/kryo/ComplexClass.java index 0e125e48a9..85355881f1 100644 --- a/libraries-data/src/main/java/com/baeldung/kryo/ComplexClass.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/ComplexClass.java @@ -1,4 +1,4 @@ -package com.baeldung.kryo; +package com.baeldung.libraries.kryo; import java.io.Serializable; diff --git a/libraries-data/src/main/java/com/baeldung/kryo/Person.java b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/Person.java similarity index 97% rename from libraries-data/src/main/java/com/baeldung/kryo/Person.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/kryo/Person.java index f9be5cfd62..1dbe0648ba 100644 --- a/libraries-data/src/main/java/com/baeldung/kryo/Person.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/Person.java @@ -1,10 +1,11 @@ -package com.baeldung.kryo; +package com.baeldung.libraries.kryo; import com.esotericsoftware.kryo.DefaultSerializer; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.KryoSerializable; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; + import java.util.Date; @DefaultSerializer(PersonSerializer.class) diff --git a/libraries-data/src/main/java/com/baeldung/kryo/PersonSerializer.java b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/PersonSerializer.java similarity index 95% rename from libraries-data/src/main/java/com/baeldung/kryo/PersonSerializer.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/kryo/PersonSerializer.java index f5d01509a6..20a061f4e8 100644 --- a/libraries-data/src/main/java/com/baeldung/kryo/PersonSerializer.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/PersonSerializer.java @@ -1,9 +1,10 @@ -package com.baeldung.kryo; +package com.baeldung.libraries.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; + import java.util.Date; public class PersonSerializer extends Serializer { diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Application.java similarity index 86% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Application.java index fd7e4d82d4..ee819b844b 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Application.java @@ -1,11 +1,11 @@ -package com.baeldung.opencsv; +package com.baeldung.libraries.opencsv; -import com.baeldung.opencsv.beans.NamedColumnBean; -import com.baeldung.opencsv.beans.SimplePositionBean; -import com.baeldung.opencsv.examples.sync.BeanExamples; -import com.baeldung.opencsv.examples.sync.CsvReaderExamples; -import com.baeldung.opencsv.examples.sync.CsvWriterExamples; -import com.baeldung.opencsv.helpers.Helpers; +import com.baeldung.libraries.opencsv.beans.NamedColumnBean; +import com.baeldung.libraries.opencsv.beans.SimplePositionBean; +import com.baeldung.libraries.opencsv.examples.sync.BeanExamples; +import com.baeldung.libraries.opencsv.examples.sync.CsvReaderExamples; +import com.baeldung.libraries.opencsv.examples.sync.CsvWriterExamples; +import com.baeldung.libraries.opencsv.helpers.Helpers; import java.io.Reader; import java.nio.file.Files; diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Constants.java similarity index 93% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Constants.java index f7978acf24..f1b3b71939 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Constants.java @@ -1,4 +1,4 @@ -package com.baeldung.opencsv; +package com.baeldung.libraries.opencsv; public class Constants { diff --git a/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/CsvBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/CsvBean.java new file mode 100644 index 0000000000..e0abab7129 --- /dev/null +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/CsvBean.java @@ -0,0 +1,3 @@ +package com.baeldung.libraries.opencsv.beans; + +public class CsvBean { } diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/NamedColumnBean.java similarity index 91% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/NamedColumnBean.java index d9e5f96333..0021584e4f 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/NamedColumnBean.java @@ -1,4 +1,4 @@ -package com.baeldung.opencsv.beans; +package com.baeldung.libraries.opencsv.beans; import com.opencsv.bean.CsvBindByName; diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/SimplePositionBean.java similarity index 93% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/SimplePositionBean.java index 799006e2f9..c1710d784a 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/SimplePositionBean.java @@ -1,4 +1,4 @@ -package com.baeldung.opencsv.beans; +package com.baeldung.libraries.opencsv.beans; import com.opencsv.bean.CsvBindByPosition; diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/WriteExampleBean.java similarity index 93% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/WriteExampleBean.java index f145f67f11..f5e6466512 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/WriteExampleBean.java @@ -1,4 +1,4 @@ -package com.baeldung.opencsv.beans; +package com.baeldung.libraries.opencsv.beans; public class WriteExampleBean extends CsvBean { diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/BeanExamples.java similarity index 85% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/BeanExamples.java index 086f32677e..f401c7c77c 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/BeanExamples.java @@ -1,9 +1,9 @@ -package com.baeldung.opencsv.examples.sync; +package com.baeldung.libraries.opencsv.examples.sync; -import com.baeldung.opencsv.beans.CsvBean; -import com.baeldung.opencsv.beans.WriteExampleBean; -import com.baeldung.opencsv.helpers.Helpers; -import com.baeldung.opencsv.pojos.CsvTransfer; +import com.baeldung.libraries.opencsv.beans.CsvBean; +import com.baeldung.libraries.opencsv.beans.WriteExampleBean; +import com.baeldung.libraries.opencsv.helpers.Helpers; +import com.baeldung.libraries.opencsv.pojos.CsvTransfer; import com.opencsv.CSVWriter; import com.opencsv.bean.*; diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvReaderExamples.java similarity index 93% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvReaderExamples.java index bacfdcff3d..2f7d979b2f 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvReaderExamples.java @@ -1,6 +1,6 @@ -package com.baeldung.opencsv.examples.sync; +package com.baeldung.libraries.opencsv.examples.sync; -import com.baeldung.opencsv.helpers.Helpers; +import com.baeldung.libraries.opencsv.helpers.Helpers; import com.opencsv.CSVParser; import com.opencsv.CSVParserBuilder; import com.opencsv.CSVReader; diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvWriterExamples.java similarity index 89% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvWriterExamples.java index 6f52160ba8..b5c23bd99d 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvWriterExamples.java @@ -1,6 +1,6 @@ -package com.baeldung.opencsv.examples.sync; +package com.baeldung.libraries.opencsv.examples.sync; -import com.baeldung.opencsv.helpers.Helpers; +import com.baeldung.libraries.opencsv.helpers.Helpers; import com.opencsv.CSVWriter; import java.io.FileWriter; diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/helpers/Helpers.java similarity index 96% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/helpers/Helpers.java index 9a46fbc495..b703d0e82d 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/helpers/Helpers.java @@ -1,6 +1,6 @@ -package com.baeldung.opencsv.helpers; +package com.baeldung.libraries.opencsv.helpers; -import com.baeldung.opencsv.Constants; +import com.baeldung.libraries.opencsv.Constants; import java.io.BufferedReader; import java.io.FileReader; diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/pojos/CsvTransfer.java similarity index 89% rename from libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/pojos/CsvTransfer.java index 79366e3d20..7572bf2e92 100644 --- a/libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/pojos/CsvTransfer.java @@ -1,6 +1,6 @@ -package com.baeldung.opencsv.pojos; +package com.baeldung.libraries.opencsv.pojos; -import com.baeldung.opencsv.beans.CsvBean; +import com.baeldung.libraries.opencsv.beans.CsvBean; import java.util.ArrayList; import java.util.List; diff --git a/libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/GoogleAuthorizeUtil.java similarity index 97% rename from libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/sheets/GoogleAuthorizeUtil.java index 641fae42dd..ddc6569678 100644 --- a/libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/GoogleAuthorizeUtil.java @@ -1,11 +1,4 @@ -package com.baeldung.google.sheets; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.security.GeneralSecurityException; -import java.util.Arrays; -import java.util.List; +package com.baeldung.libraries.sheets; import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp; @@ -17,6 +10,13 @@ import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.client.util.store.MemoryDataStoreFactory; import com.google.api.services.sheets.v4.SheetsScopes; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.security.GeneralSecurityException; +import java.util.Arrays; +import java.util.List; + public class GoogleAuthorizeUtil { public static Credential authorize() throws IOException, GeneralSecurityException { InputStream in = GoogleAuthorizeUtil.class.getResourceAsStream("/google-sheets-client-secret.json"); diff --git a/libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/SheetsServiceUtil.java similarity index 95% rename from libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/sheets/SheetsServiceUtil.java index 8a78d50551..db7de9986f 100644 --- a/libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/SheetsServiceUtil.java @@ -1,13 +1,13 @@ -package com.baeldung.google.sheets; - -import java.io.IOException; -import java.security.GeneralSecurityException; +package com.baeldung.libraries.sheets; import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.sheets.v4.Sheets; +import java.io.IOException; +import java.security.GeneralSecurityException; + public class SheetsServiceUtil { private static final String APPLICATION_NAME = "Google Sheets Example"; diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderConverter.java similarity index 94% rename from libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderConverter.java index fa317f93b7..bca47cb75a 100644 --- a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderConverter.java @@ -1,6 +1,6 @@ -package com.baeldung.smooks.converter; +package com.baeldung.libraries.smooks.converter; -import com.baeldung.smooks.model.Order; +import com.baeldung.libraries.smooks.model.Order; import org.milyn.Smooks; import org.milyn.payload.JavaResult; import org.milyn.payload.StringResult; diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderValidator.java similarity index 94% rename from libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderValidator.java index 3975921da0..f36d3a6835 100644 --- a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderValidator.java @@ -1,4 +1,4 @@ -package com.baeldung.smooks.converter; +package com.baeldung.libraries.smooks.converter; import org.milyn.Smooks; import org.milyn.payload.JavaResult; diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Item.java similarity index 97% rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Item.java index 3e1f4a7ef4..3c6322a357 100644 --- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Item.java @@ -1,4 +1,4 @@ -package com.baeldung.smooks.model; +package com.baeldung.libraries.smooks.model; public class Item { diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Order.java similarity index 95% rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Order.java index 047e1fe8a3..1900e6337f 100644 --- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Order.java @@ -1,4 +1,4 @@ -package com.baeldung.smooks.model; +package com.baeldung.libraries.smooks.model; import java.util.Date; import java.util.List; diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Status.java similarity index 55% rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Status.java index 53c50bdf46..8f22a439b2 100644 --- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Status.java @@ -1,4 +1,4 @@ -package com.baeldung.smooks.model; +package com.baeldung.libraries.smooks.model; public enum Status { NEW, IN_PROGRESS, FINISHED diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Supplier.java similarity index 96% rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Supplier.java index 827a0fc907..8dd70e83c8 100644 --- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Supplier.java @@ -1,4 +1,4 @@ -package com.baeldung.smooks.model; +package com.baeldung.libraries.smooks.model; public class Supplier { diff --git a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Address.java b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Address.java similarity index 93% rename from libraries-data-3/src/main/java/com/baeldung/snakeyaml/Address.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Address.java index 83c327a4ed..c0216ddcd7 100644 --- a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Address.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Address.java @@ -1,4 +1,4 @@ -package com.baeldung.snakeyaml; +package com.baeldung.libraries.snakeyaml; public class Address { private String line; diff --git a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Contact.java b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Contact.java similarity index 89% rename from libraries-data-3/src/main/java/com/baeldung/snakeyaml/Contact.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Contact.java index a808747786..54695315bc 100644 --- a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Contact.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Contact.java @@ -1,4 +1,4 @@ -package com.baeldung.snakeyaml; +package com.baeldung.libraries.snakeyaml; public class Contact { diff --git a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Customer.java b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Customer.java similarity index 96% rename from libraries-data-3/src/main/java/com/baeldung/snakeyaml/Customer.java rename to libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Customer.java index c741f6dc85..9cebaf0005 100644 --- a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Customer.java +++ b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Customer.java @@ -1,4 +1,4 @@ -package com.baeldung.snakeyaml; +package com.baeldung.libraries.snakeyaml; import java.util.List; diff --git a/libraries-data-2/src/main/resources/google-sheets-client-secret.json b/libraries-data-io/src/main/resources/google-sheets-client-secret.json similarity index 100% rename from libraries-data-2/src/main/resources/google-sheets-client-secret.json rename to libraries-data-io/src/main/resources/google-sheets-client-secret.json diff --git a/libraries-data-2/src/main/resources/image.jpg b/libraries-data-io/src/main/resources/image.jpg similarity index 100% rename from libraries-data-2/src/main/resources/image.jpg rename to libraries-data-io/src/main/resources/image.jpg diff --git a/libraries-data-2/src/main/resources/smooks/email.ftl b/libraries-data-io/src/main/resources/smooks/email.ftl similarity index 100% rename from libraries-data-2/src/main/resources/smooks/email.ftl rename to libraries-data-io/src/main/resources/smooks/email.ftl diff --git a/libraries-data-2/src/main/resources/smooks/item-rules.csv b/libraries-data-io/src/main/resources/smooks/item-rules.csv similarity index 100% rename from libraries-data-2/src/main/resources/smooks/item-rules.csv rename to libraries-data-io/src/main/resources/smooks/item-rules.csv diff --git a/libraries-data-2/src/main/resources/smooks/order.ftl b/libraries-data-io/src/main/resources/smooks/order.ftl similarity index 100% rename from libraries-data-2/src/main/resources/smooks/order.ftl rename to libraries-data-io/src/main/resources/smooks/order.ftl diff --git a/libraries-data-2/src/main/resources/smooks/order.json b/libraries-data-io/src/main/resources/smooks/order.json similarity index 100% rename from libraries-data-2/src/main/resources/smooks/order.json rename to libraries-data-io/src/main/resources/smooks/order.json diff --git a/libraries-data-2/src/main/resources/smooks/order.xml b/libraries-data-io/src/main/resources/smooks/order.xml similarity index 100% rename from libraries-data-2/src/main/resources/smooks/order.xml rename to libraries-data-io/src/main/resources/smooks/order.xml diff --git a/libraries-data-2/src/main/resources/smooks/smooks-mapping.xml b/libraries-data-io/src/main/resources/smooks/smooks-mapping.xml similarity index 78% rename from libraries-data-2/src/main/resources/smooks/smooks-mapping.xml rename to libraries-data-io/src/main/resources/smooks/smooks-mapping.xml index 7996834e38..6587ff170e 100644 --- a/libraries-data-2/src/main/resources/smooks/smooks-mapping.xml +++ b/libraries-data-io/src/main/resources/smooks/smooks-mapping.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/libraries-data-2/src/main/resources/smooks/smooks-transform-edi.xml b/libraries-data-io/src/main/resources/smooks/smooks-transform-edi.xml similarity index 100% rename from libraries-data-2/src/main/resources/smooks/smooks-transform-edi.xml rename to libraries-data-io/src/main/resources/smooks/smooks-transform-edi.xml diff --git a/libraries-data-2/src/main/resources/smooks/smooks-transform-email.xml b/libraries-data-io/src/main/resources/smooks/smooks-transform-email.xml similarity index 100% rename from libraries-data-2/src/main/resources/smooks/smooks-transform-email.xml rename to libraries-data-io/src/main/resources/smooks/smooks-transform-email.xml diff --git a/libraries-data-2/src/main/resources/smooks/smooks-validation.xml b/libraries-data-io/src/main/resources/smooks/smooks-validation.xml similarity index 100% rename from libraries-data-2/src/main/resources/smooks/smooks-validation.xml rename to libraries-data-io/src/main/resources/smooks/smooks-validation.xml diff --git a/libraries-data-2/src/main/resources/smooks/supplier.properties b/libraries-data-io/src/main/resources/smooks/supplier.properties similarity index 100% rename from libraries-data-2/src/main/resources/smooks/supplier.properties rename to libraries-data-io/src/main/resources/smooks/supplier.properties diff --git a/libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/docx/Docx4jReadAndWriteIntegrationTest.java similarity index 94% rename from libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java rename to libraries-data-io/src/test/java/com/baeldung/libraries/docx/Docx4jReadAndWriteIntegrationTest.java index 9a2691d3f0..231ee4e097 100644 --- a/libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java +++ b/libraries-data-io/src/test/java/com/baeldung/libraries/docx/Docx4jReadAndWriteIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.docx; +package com.baeldung.libraries.docx; import org.junit.Test; diff --git a/libraries-data/src/test/java/com/baeldung/kryo/KryoUnitTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/kryo/KryoUnitTest.java similarity index 94% rename from libraries-data/src/test/java/com/baeldung/kryo/KryoUnitTest.java rename to libraries-data-io/src/test/java/com/baeldung/libraries/kryo/KryoUnitTest.java index c124ca618d..0b15f178b6 100644 --- a/libraries-data/src/test/java/com/baeldung/kryo/KryoUnitTest.java +++ b/libraries-data-io/src/test/java/com/baeldung/libraries/kryo/KryoUnitTest.java @@ -1,6 +1,11 @@ -package com.baeldung.kryo; +package com.baeldung.libraries.kryo; -import static org.junit.Assert.assertEquals; +import com.esotericsoftware.kryo.Kryo; +import com.esotericsoftware.kryo.io.Input; +import com.esotericsoftware.kryo.io.Output; +import com.esotericsoftware.kryo.serializers.JavaSerializer; +import org.junit.Before; +import org.junit.Test; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -9,13 +14,7 @@ import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.io.Output; -import com.esotericsoftware.kryo.serializers.JavaSerializer; +import static org.junit.Assert.assertEquals; public class KryoUnitTest { @@ -27,8 +26,8 @@ public class KryoUnitTest { public void init() { kryo = new Kryo(); try { - output = new Output(new FileOutputStream("file.dat")); - input = new Input(new FileInputStream("file.dat")); + output = new Output(new FileOutputStream("src/test/resources/file.dat")); + input = new Input(new FileInputStream("src/test/resources/file.dat")); } catch (FileNotFoundException ex) { Logger.getLogger(KryoUnitTest.class.getName()) .log(Level.SEVERE, null, ex); diff --git a/libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/opencsv/OpenCsvIntegrationTest.java similarity index 93% rename from libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java rename to libraries-data-io/src/test/java/com/baeldung/libraries/opencsv/OpenCsvIntegrationTest.java index fca96684ad..b0db4309d9 100644 --- a/libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java +++ b/libraries-data-io/src/test/java/com/baeldung/libraries/opencsv/OpenCsvIntegrationTest.java @@ -1,6 +1,6 @@ -package com.baeldung.opencsv; +package com.baeldung.libraries.opencsv; -import com.baeldung.opencsv.helpers.Helpers; +import com.baeldung.libraries.opencsv.helpers.Helpers; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/sheets/GoogleSheetsLiveTest.java similarity index 99% rename from libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java rename to libraries-data-io/src/test/java/com/baeldung/libraries/sheets/GoogleSheetsLiveTest.java index 358b3390f9..31f769c11b 100644 --- a/libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java +++ b/libraries-data-io/src/test/java/com/baeldung/libraries/sheets/GoogleSheetsLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.google.sheets; +package com.baeldung.libraries.sheets; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/smooks/SmooksIntegrationTest.java similarity index 88% rename from libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java rename to libraries-data-io/src/test/java/com/baeldung/libraries/smooks/SmooksIntegrationTest.java index df7fea58f8..75444d2185 100644 --- a/libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java +++ b/libraries-data-io/src/test/java/com/baeldung/libraries/smooks/SmooksIntegrationTest.java @@ -1,9 +1,11 @@ -package com.baeldung.smooks.converter; +package com.baeldung.libraries.smooks; -import com.baeldung.smooks.model.Item; -import com.baeldung.smooks.model.Order; -import com.baeldung.smooks.model.Status; -import com.baeldung.smooks.model.Supplier; +import com.baeldung.libraries.smooks.converter.OrderConverter; +import com.baeldung.libraries.smooks.converter.OrderValidator; +import com.baeldung.libraries.smooks.model.Item; +import com.baeldung.libraries.smooks.model.Order; +import com.baeldung.libraries.smooks.model.Status; +import com.baeldung.libraries.smooks.model.Supplier; import org.junit.Test; import org.milyn.validation.ValidationResult; import java.text.SimpleDateFormat; diff --git a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/JavaToYAMLSerializationUnitTest.java similarity index 88% rename from libraries-data-3/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java rename to libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/JavaToYAMLSerializationUnitTest.java index f6836f6d56..f1a926c12b 100644 --- a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java +++ b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/JavaToYAMLSerializationUnitTest.java @@ -1,16 +1,14 @@ -package com.baeldung.snakeyaml; - -import static org.junit.Assert.assertEquals; - -import java.io.StringWriter; -import java.util.LinkedHashMap; -import java.util.Map; +package com.baeldung.libraries.snakeyaml; import org.junit.Test; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.nodes.Tag; -import com.baeldung.snakeyaml.Customer; +import java.io.StringWriter; +import java.util.LinkedHashMap; +import java.util.Map; + +import static org.junit.Assert.assertEquals; public class JavaToYAMLSerializationUnitTest { @@ -36,7 +34,7 @@ public class JavaToYAMLSerializationUnitTest { Yaml yaml = new Yaml(); StringWriter writer = new StringWriter(); yaml.dump(customer, writer); - String expectedYaml = "!!com.baeldung.snakeyaml.Customer {age: 45, contactDetails: null, firstName: Greg,\n homeAddress: null, lastName: McDowell}\n"; + String expectedYaml = "!!com.baeldung.libraries.snakeyaml.Customer {age: 45, contactDetails: null, firstName: Greg,\n homeAddress: null, lastName: McDowell}\n"; assertEquals(expectedYaml, writer.toString()); } diff --git a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/YAMLToJavaDeserialisationUnitTest.java similarity index 99% rename from libraries-data-3/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java rename to libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/YAMLToJavaDeserialisationUnitTest.java index 56cd3c2b2e..6f32f143a9 100644 --- a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java +++ b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/YAMLToJavaDeserialisationUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.snakeyaml; +package com.baeldung.libraries.snakeyaml; import org.junit.Test; import org.yaml.snakeyaml.TypeDescription; diff --git a/libraries-data-io/src/test/resources/file.dat b/libraries-data-io/src/test/resources/file.dat new file mode 100644 index 0000000000..c246a9f44b Binary files /dev/null and b/libraries-data-io/src/test/resources/file.dat differ diff --git a/libraries-data-3/src/test/resources/yaml/customer.yaml b/libraries-data-io/src/test/resources/yaml/customer.yaml similarity index 100% rename from libraries-data-3/src/test/resources/yaml/customer.yaml rename to libraries-data-io/src/test/resources/yaml/customer.yaml diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_contact_details.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_contact_details.yaml similarity index 100% rename from libraries-data-3/src/test/resources/yaml/customer_with_contact_details.yaml rename to libraries-data-io/src/test/resources/yaml/customer_with_contact_details.yaml diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_address.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_address.yaml similarity index 100% rename from libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_address.yaml rename to libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_address.yaml diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml similarity index 100% rename from libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml rename to libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml diff --git a/libraries-data-io/src/test/resources/yaml/customer_with_type.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_type.yaml new file mode 100644 index 0000000000..1454addc36 --- /dev/null +++ b/libraries-data-io/src/test/resources/yaml/customer_with_type.yaml @@ -0,0 +1,4 @@ +!!com.baeldung.libraries.snakeyaml.Customer +firstName: "John" +lastName: "Doe" +age: 20 \ No newline at end of file diff --git a/libraries-data-3/src/test/resources/yaml/customers.yaml b/libraries-data-io/src/test/resources/yaml/customers.yaml similarity index 100% rename from libraries-data-3/src/test/resources/yaml/customers.yaml rename to libraries-data-io/src/test/resources/yaml/customers.yaml diff --git a/libraries-data/README.md b/libraries-data/README.md index be8f2b2525..7614d11b16 100644 --- a/libraries-data/README.md +++ b/libraries-data/README.md @@ -3,20 +3,13 @@ This module contains articles about libraries for data processing in Java. ### Relevant articles -- [Introduction to Reladomo](https://www.baeldung.com/reladomo) -- [Introduction to ORMLite](https://www.baeldung.com/ormlite) -- [Introduction To Kryo](https://www.baeldung.com/kryo) - [Introduction to KafkaStreams in Java](https://www.baeldung.com/java-kafka-streams) -- [Guide to Java Data Objects](https://www.baeldung.com/jdo) -- [Intro to JDO Queries 2/2](https://www.baeldung.com/jdo-queries) -- [Introduction to HikariCP](https://www.baeldung.com/hikaricp) - [Introduction to JCache](https://www.baeldung.com/jcache) - [A Guide to Apache Ignite](https://www.baeldung.com/apache-ignite) - [Apache Ignite with Spring Data](https://www.baeldung.com/apache-ignite-spring-data) - [A Guide to Apache Crunch](https://www.baeldung.com/apache-crunch) - [Intro to Apache Storm](https://www.baeldung.com/apache-storm) -- [Guide to Ebean ORM](https://www.baeldung.com/ebean-orm) - [Introduction to Kafka Connectors](https://www.baeldung.com/kafka-connectors-guide) - [Kafka Connect Example with MQTT and MongoDB](https://www.baeldung.com/kafka-connect-mqtt-mongodb) - [Building a Data Pipeline with Flink and Kafka](https://www.baeldung.com/kafka-flink-data-pipeline) -- More articles: [[next -->]](/libraries-data-2) +More articles: [[next -->]](/../libraries-data-2) \ No newline at end of file diff --git a/libraries-data/file.dat b/libraries-data/file.dat deleted file mode 100644 index 70177cef97..0000000000 Binary files a/libraries-data/file.dat and /dev/null differ diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml index e255236480..8e5360dea3 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -13,11 +13,6 @@ - - com.esotericsoftware - kryo - ${kryo.version} - com.h2database h2 @@ -29,21 +24,6 @@ ${junit.version} test - - com.goldmansachs.reladomo - reladomo - ${reladomo.version} - - - com.goldmansachs.reladomo - reladomo-test-util - ${reladomo.version} - - - com.j256.ormlite - ormlite-jdbc - ${ormlite.version} - org.apache.kafka kafka-streams @@ -87,49 +67,6 @@ gson ${gson.version} - - - com.zaxxer - HikariCP - ${HikariCP.version} - compile - - - - org.datanucleus - javax.jdo - ${javax.jdo.version} - - - org.datanucleus - datanucleus-core - ${datanucleus.version} - - - org.datanucleus - datanucleus-api-jdo - ${datanucleus.version} - - - org.datanucleus - datanucleus-rdbms - ${datanucleus.version} - - - org.datanucleus - datanucleus-maven-plugin - ${datanucleus-maven-plugin.version} - - - org.datanucleus - datanucleus-xml - ${datanucleus-xml.version} - - - org.datanucleus - datanucleus-jdo-query - ${datanucleus-jdo-query.version} - javax.cache @@ -232,23 +169,6 @@ assertj-core ${assertj.version} - - org.awaitility - awaitility - ${awaitility.version} - test - - - org.awaitility - awaitility-proxy - ${awaitility.version} - test - - - io.ebean - ebean - ${ebean.version} - org.slf4j slf4j-api @@ -289,113 +209,13 @@ - - - - maven-antrun-plugin - ${maven-antrun-plugin.version} - - - generateMithra - generate-sources - - run - - - - - - - - - - - - - - - - - - com.goldmansachs.reladomo - reladomogen - ${reladomo.version} - - - - com.goldmansachs.reladomo - reladomo-gen-util - ${reladomo.version} - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper-maven-plugin.version} - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/reladomo - - - - - add-resource - generate-resources - - add-resource - - - - - ${project.build.directory}/generated-db/ - - - - - - - - - - - org.datanucleus - datanucleus-maven-plugin - ${datanucleus-maven-plugin.version} - - JDO - ${basedir}/datanucleus.properties - ${basedir}/log4j.properties - true - false - - - - - process-classes - - enhance - - - - - org.apache.maven.plugins maven-assembly-plugin 2.3 - src/main/assembly/hadoop-job.xml + src/main/resources/assembly/hadoop-job.xml @@ -413,51 +233,22 @@ - - io.ebean - ebean-maven-plugin - 11.11.2 - - - - main - process-classes - - debug=1 - - - enhance - - - - 1.2.2 - 4.0.1 - 16.5.1 - 5.0 1.0.0 2.4.0 2.8.2 1.1.0 1.5.0 - 3.0.0 3.6.2 3.8.4 1.8 3.0.0 - 2.7.2 - 3.2.0-m7 - 5.1.1 - 5.0.2 - 5.0.0-release - 5.0.4 0.15.0 2.2.0 - 11.22.4 1.7.25 1.0.1 diff --git a/libraries-data/src/main/resources/ReladomoRuntimeConfig.xml b/libraries-data/src/main/resources/ReladomoRuntimeConfig.xml deleted file mode 100644 index 7181e75406..0000000000 --- a/libraries-data/src/main/resources/ReladomoRuntimeConfig.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/libraries-data/src/main/assembly/hadoop-job.xml b/libraries-data/src/main/resources/assembly/hadoop-job.xml similarity index 100% rename from libraries-data/src/main/assembly/hadoop-job.xml rename to libraries-data/src/main/resources/assembly/hadoop-job.xml diff --git a/libraries-data/src/main/resources/ebean.mf b/libraries-data/src/main/resources/ebean.mf deleted file mode 100644 index f49fecc717..0000000000 --- a/libraries-data/src/main/resources/ebean.mf +++ /dev/null @@ -1,3 +0,0 @@ -entity-packages: com.baeldung.ebean.model -transactional-packages: com.baeldung.ebean.app -querybean-packages: com.baeldung.ebean.app diff --git a/libraries-data/src/main/resources/employee.txt b/libraries-data/src/main/resources/employee.txt deleted file mode 100644 index 6c476f39fa..0000000000 --- a/libraries-data/src/main/resources/employee.txt +++ /dev/null @@ -1,3 +0,0 @@ -{id:"1", name="John", isEmployed: "true"} -{id:"1", name="Anna", isEmployed: "false"} -{id:"1", name="George", isEmployed: "true"} \ No newline at end of file diff --git a/libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-sink.properties b/libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-sink.properties similarity index 100% rename from libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-sink.properties rename to libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-sink.properties diff --git a/libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-source.properties b/libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-source.properties similarity index 100% rename from libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-source.properties rename to libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-source.properties diff --git a/libraries-data/src/main/kafka-connect/01_Quick_Start/connect-standalone.properties b/libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-standalone.properties similarity index 100% rename from libraries-data/src/main/kafka-connect/01_Quick_Start/connect-standalone.properties rename to libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-standalone.properties diff --git a/libraries-data/src/main/kafka-connect/02_Distributed/connect-distributed.properties b/libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-distributed.properties similarity index 100% rename from libraries-data/src/main/kafka-connect/02_Distributed/connect-distributed.properties rename to libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-distributed.properties diff --git a/libraries-data/src/main/kafka-connect/02_Distributed/connect-file-sink.json b/libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-sink.json similarity index 100% rename from libraries-data/src/main/kafka-connect/02_Distributed/connect-file-sink.json rename to libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-sink.json diff --git a/libraries-data/src/main/kafka-connect/02_Distributed/connect-file-source.json b/libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-source.json similarity index 100% rename from libraries-data/src/main/kafka-connect/02_Distributed/connect-file-source.json rename to libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-source.json diff --git a/libraries-data/src/main/kafka-connect/03_Transform/connect-distributed.properties b/libraries-data/src/main/resources/kafka-connect/03_Transform/connect-distributed.properties similarity index 100% rename from libraries-data/src/main/kafka-connect/03_Transform/connect-distributed.properties rename to libraries-data/src/main/resources/kafka-connect/03_Transform/connect-distributed.properties diff --git a/libraries-data/src/main/kafka-connect/03_Transform/connect-file-source-transform.json b/libraries-data/src/main/resources/kafka-connect/03_Transform/connect-file-source-transform.json similarity index 100% rename from libraries-data/src/main/kafka-connect/03_Transform/connect-file-source-transform.json rename to libraries-data/src/main/resources/kafka-connect/03_Transform/connect-file-source-transform.json diff --git a/libraries-data/src/main/kafka-connect/04_Custom/connect-mongodb-sink.json b/libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mongodb-sink.json similarity index 100% rename from libraries-data/src/main/kafka-connect/04_Custom/connect-mongodb-sink.json rename to libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mongodb-sink.json diff --git a/libraries-data/src/main/kafka-connect/04_Custom/connect-mqtt-source.json b/libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mqtt-source.json similarity index 100% rename from libraries-data/src/main/kafka-connect/04_Custom/connect-mqtt-source.json rename to libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mqtt-source.json diff --git a/libraries-data/src/main/kafka-connect/04_Custom/docker-compose.yaml b/libraries-data/src/main/resources/kafka-connect/04_Custom/docker-compose.yaml similarity index 100% rename from libraries-data/src/main/kafka-connect/04_Custom/docker-compose.yaml rename to libraries-data/src/main/resources/kafka-connect/04_Custom/docker-compose.yaml diff --git a/libraries-data/src/main/resources/user_jmapper.xml b/libraries-data/src/main/resources/user_jmapper.xml deleted file mode 100644 index f007de9f0a..0000000000 --- a/libraries-data/src/main/resources/user_jmapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/libraries-data/src/main/resources/user_jmapper1.xml b/libraries-data/src/main/resources/user_jmapper1.xml deleted file mode 100644 index abcfd77e1c..0000000000 --- a/libraries-data/src/main/resources/user_jmapper1.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libraries-data/src/main/resources/user_jmapper2.xml b/libraries-data/src/main/resources/user_jmapper2.xml deleted file mode 100644 index 1e708e14bf..0000000000 --- a/libraries-data/src/main/resources/user_jmapper2.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries-data/src/test/resources/reladomo/ReladomoTestConfig.xml b/libraries-data/src/test/resources/reladomo/ReladomoTestConfig.xml deleted file mode 100644 index 6e5d212fb8..0000000000 --- a/libraries-data/src/test/resources/reladomo/ReladomoTestConfig.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/libraries-data/src/test/resources/reladomo/test-data.txt b/libraries-data/src/test/resources/reladomo/test-data.txt deleted file mode 100644 index 8e407278ac..0000000000 --- a/libraries-data/src/test/resources/reladomo/test-data.txt +++ /dev/null @@ -1,7 +0,0 @@ -class com.baeldung.reladomo.Department -id, name -1, "Marketing" - -class com.baeldung.reladomo.Employee -id, name -1, "Paul" \ No newline at end of file diff --git a/libraries/src/test/resources/yaml/customer.yaml b/libraries/src/test/resources/yaml/customer.yaml deleted file mode 100644 index aa76141c7d..0000000000 --- a/libraries/src/test/resources/yaml/customer.yaml +++ /dev/null @@ -1,3 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 20 \ No newline at end of file diff --git a/libraries/src/test/resources/yaml/customer_with_contact_details.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details.yaml deleted file mode 100644 index 34563cbd21..0000000000 --- a/libraries/src/test/resources/yaml/customer_with_contact_details.yaml +++ /dev/null @@ -1,7 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 31 -contactDetails: - - { type: "mobile", number: 123456789} - - { type: "landline", number: 456786868} - \ No newline at end of file diff --git a/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml deleted file mode 100644 index 664afe8594..0000000000 --- a/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml +++ /dev/null @@ -1,13 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 31 -contactDetails: - - type: "mobile" - number: 123456789 - - type: "landline" - number: 456786868 -homeAddress: - line: "Xyz, DEF Street" - city: "City Y" - state: "State Y" - zip: 345657 diff --git a/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml deleted file mode 100644 index 145da256d9..0000000000 --- a/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml +++ /dev/null @@ -1,6 +0,0 @@ -firstName: "John" -lastName: "Doe" -age: 31 -contactDetails: - - !contact { type: "mobile", number: 123456789} - - !contact { type: "landline", number: 456786868} diff --git a/libraries/src/test/resources/yaml/customer_with_type.yaml b/libraries/src/test/resources/yaml/customer_with_type.yaml deleted file mode 100644 index 6e13c26cea..0000000000 --- a/libraries/src/test/resources/yaml/customer_with_type.yaml +++ /dev/null @@ -1,4 +0,0 @@ -!!com.baeldung.snakeyaml.Customer -firstName: "John" -lastName: "Doe" -age: 20 \ No newline at end of file diff --git a/libraries/src/test/resources/yaml/customers.yaml b/libraries/src/test/resources/yaml/customers.yaml deleted file mode 100644 index 23b9039c2e..0000000000 --- a/libraries/src/test/resources/yaml/customers.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -firstName: "John" -lastName: "Doe" -age: 20 ---- -firstName: "Jack" -lastName: "Jones" -age: 25 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 196870800c..8664143802 100644 --- a/pom.xml +++ b/pom.xml @@ -531,6 +531,8 @@ libraries-2 libraries-data libraries-data-2 + libraries-data-db + libraries-data-io libraries-apache-commons libraries-apache-commons-collections libraries-apache-commons-io @@ -1286,6 +1288,8 @@ libraries libraries-data libraries-data-2 + libraries-data-db + libraries-data-io libraries-apache-commons libraries-apache-commons-collections libraries-apache-commons-io