From 0cade733ca1f44f2d726dff8290708820fbd3ccd Mon Sep 17 00:00:00 2001
From: Sampada <46674082+sampada07@users.noreply.github.com>
Date: Tue, 28 Jul 2020 17:34:46 +0530
Subject: [PATCH] JAVA-2154: Create guava-parent module and organize guava
modules (#9782)
* JAVA-2154: Removed module, now split into guava-utilities and guava-core
* JAVA-2154: Removed module, articles moved to new module guava-core
* JAVA-2154: Moved module inside guava-modules
* JAVA-2154: Moved module inside guava-modules
* JAVA-2154: Moved module inside guava-modules
* JAVA-2154: Moved module inside guava-modules
* JAVA-2154: Moved 1 article to guava-collections
* JAVA-2154: New module guava-collections-list
* JAVA-2154: New module guava-core
* JAVA-2154: New module guava-utilities
* JAVA-2154: Updated README, removed extra article reference
* JAVA-2154: parent module pom changes
* JAVA-2154: main pom changes - removed guava related modules as they have
been shifted inside guava-modules
* JAVA-2154: rearranged and moved module inside guava-modules folder
---
guava-2/README.md | 7 --
guava-modules/guava-18/README.md | 5 +-
guava-modules/guava-19/README.md | 2 -
guava-modules/guava-21/README.md | 4 +-
guava-modules/guava-21/pom.xml | 9 --
.../guava-collections-list/README.md | 8 ++
.../guava-collections-list}/pom.xml | 8 +-
.../src/main/resources/logback.xml | 0
.../guava/lists/GuavaListsUnitTest.java | 0
.../CollectionApachePartitionUnitTest.java | 0
.../CollectionGuavaPartitionUnitTest.java | 0
.../CollectionJavaPartitionUnitTest.java | 0
.../guava-collections-map}/README.md | 0
.../guava-collections-map}/pom.xml | 4 +-
.../com/baeldung/guava/mapmaker/Profile.java | 0
.../com/baeldung/guava/mapmaker/Session.java | 0
.../com/baeldung/guava/mapmaker/User.java | 0
.../ClassToInstanceMapUnitTest.java | 0
.../GuavaMapInitializeUnitTest.java | 0
.../guava/mapmaker/GuavaMapMakerUnitTest.java | 0
.../guava/maps/GuavaMapsUnitTest.java | 0
.../guava/multimap/GuavaMultiMapUnitTest.java | 0
.../guava/rangemap/GuavaRangeMapUnitTest.java | 0
.../guava-collections-set}/.gitignore | 0
.../guava-collections-set}/README.md | 0
.../guava-collections-set}/pom.xml | 4 +-
.../com/baeldung/guava/GuavaMapFromSet.java | 0
.../guava/GuavaMapFromSetUnitTest.java | 0
.../baeldung/guava/GuavaMultiSetUnitTest.java | 0
.../baeldung/guava/GuavaRangeSetUnitTest.java | 0
.../guava/GuavaSetOperationsUnitTest.java | 0
.../guava-collections}/README.md | 3 +-
guava-modules/guava-collections/pom.xml | 95 ++++++++++++++++++
.../src/main/resources/logback.xml | 0
.../GuavaCollectionsExamplesUnitTest.java | 0
...avaFilterTransformCollectionsUnitTest.java | 0
.../guava/joinsplit/GuavaStringUnitTest.java | 0
.../GuavaOrderingExamplesUnitTest.java | 0
.../guava/ordering/GuavaOrderingUnitTest.java | 0
.../guava/queues/EvictingQueueUnitTest.java | 0
.../queues/MinMaxPriorityQueueUnitTest.java | 0
.../guava/table/GuavaTableUnitTest.java | 0
.../guava/zip/ZipCollectionUnitTest.java | 0
.../hamcrest/HamcrestExamplesUnitTest.java | 0
.../src/test/resources/test.out | 0
.../src/test/resources/test1.in | 0
.../src/test/resources/test1_1.in | 0
.../src/test/resources/test2.in | 0
.../src/test/resources/test_copy.in | 0
.../src/test/resources/test_le.txt | Bin
guava-modules/guava-core/README.md | 10 ++
{guava-2 => guava-modules/guava-core}/pom.xml | 8 +-
.../guava/memoizer/CostlySupplier.java | 0
.../baeldung/guava/memoizer/Factorial.java | 0
.../guava/memoizer/FibonacciSequence.java | 0
.../charmatcher/GuavaCharMatcherUnitTest.java | 0
.../GuavaFunctionalExamplesUnitTest.java | 2 +-
.../memoizer}/GuavaMemoizerUnitTest.java | 2 +-
.../GuavaPreConditionsUnitTest.java | 2 +-
.../guava/throwables/ThrowablesUnitTest.java | 0
.../guava-core/src/test/resources}/.gitignore | 0
.../guava-core}/src/test/resources/test.out | 0
.../guava-core}/src/test/resources/test1.in | 0
.../guava-core}/src/test/resources/test1_1.in | 0
.../guava-core}/src/test/resources/test2.in | 0
.../src/test/resources/test_copy.in | 0
.../src/test/resources/test_le.txt | Bin
.../guava-io}/README.md | 0
{guava-io => guava-modules/guava-io}/pom.xml | 4 +-
.../GuavaCountingOutputStreamUnitTest.java | 0
.../com/baeldung/guava/GuavaIOUnitTest.java | 0
.../guava-io}/src/test/resources/test1.in | 0
.../guava-io}/src/test/resources/test1_1.in | 0
.../guava-io}/src/test/resources/test2.in | 0
.../guava-utilities}/.gitignore | 0
.../guava-utilities}/README.md | 9 +-
.../guava-utilities}/pom.xml | 8 +-
.../baeldung/guava/eventbus}/CustomEvent.java | 2 +-
.../guava/eventbus}/EventListener.java | 2 +-
.../src/main/resources/logback.xml | 19 ++++
.../bloomfilter}/BloomFilterUnitTest.java | 2 +-
.../guava/cache}/GuavaCacheUnitTest.java | 2 +-
.../GuavaCacheLoaderUnitTest.java | 2 +-
.../eventbus}/GuavaEventBusUnitTest.java | 4 +-
.../GuavaBigIntegerMathUnitTest.java | 2 +-
.../mathutils}/GuavaDoubleMathUnitTest.java | 2 +-
.../mathutils}/GuavaIntMathUnitTest.java | 2 +-
.../mathutils}/GuavaLongMathUnitTest.java | 2 +-
.../guava/mathutils}/GuavaMathUnitTest.java | 2 +-
.../RateLimiterLongRunningUnitTest.java | 2 +-
.../GuavaReflectionUtilsUnitTest.java | 2 +-
.../src/test/resources/.gitignore | 0
.../src/test/resources/test.out | 0
.../src/test/resources/test1.in | 0
.../src/test/resources/test1_1.in | 0
.../src/test/resources/test2.in | 0
.../src/test/resources/test_copy.in | 0
.../src/test/resources/test_le.txt | Bin
guava-modules/pom.xml | 7 ++
pom.xml | 15 +--
100 files changed, 184 insertions(+), 79 deletions(-)
delete mode 100644 guava-2/README.md
create mode 100644 guava-modules/guava-collections-list/README.md
rename {guava-collections => guava-modules/guava-collections-list}/pom.xml (93%)
rename {guava-collections => guava-modules/guava-collections-list}/src/main/resources/logback.xml (100%)
rename {guava-collections => guava-modules/guava-collections-list}/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections-list}/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections-list}/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections-list}/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/README.md (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/pom.xml (94%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/main/java/com/baeldung/guava/mapmaker/Profile.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/main/java/com/baeldung/guava/mapmaker/Session.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/main/java/com/baeldung/guava/mapmaker/User.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java (100%)
rename {guava-collections-map => guava-modules/guava-collections-map}/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java (100%)
rename {guava-2/src/test/resources => guava-modules/guava-collections-set}/.gitignore (100%)
rename {guava-collections-set => guava-modules/guava-collections-set}/README.md (100%)
rename {guava-collections-set => guava-modules/guava-collections-set}/pom.xml (94%)
rename {guava-collections-set => guava-modules/guava-collections-set}/src/test/java/com/baeldung/guava/GuavaMapFromSet.java (100%)
rename {guava-collections-set => guava-modules/guava-collections-set}/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java (100%)
rename {guava-collections-set => guava-modules/guava-collections-set}/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java (100%)
rename {guava-collections-set => guava-modules/guava-collections-set}/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java (100%)
rename {guava-collections-set => guava-modules/guava-collections-set}/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/README.md (86%)
create mode 100644 guava-modules/guava-collections/pom.xml
rename {guava => guava-modules/guava-collections}/src/main/resources/logback.xml (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java (100%)
rename guava-modules/{guava-21 => guava-collections}/src/test/java/com/baeldung/guava/zip/ZipCollectionUnitTest.java (100%)
rename {guava-collections => guava-modules/guava-collections}/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java (100%)
rename {guava-2 => guava-modules/guava-collections}/src/test/resources/test.out (100%)
rename {guava-2 => guava-modules/guava-collections}/src/test/resources/test1.in (100%)
rename {guava-2 => guava-modules/guava-collections}/src/test/resources/test1_1.in (100%)
rename {guava-2 => guava-modules/guava-collections}/src/test/resources/test2.in (100%)
rename {guava-2 => guava-modules/guava-collections}/src/test/resources/test_copy.in (100%)
rename {guava-2 => guava-modules/guava-collections}/src/test/resources/test_le.txt (100%)
create mode 100644 guava-modules/guava-core/README.md
rename {guava-2 => guava-modules/guava-core}/pom.xml (89%)
rename {guava => guava-modules/guava-core}/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java (100%)
rename {guava => guava-modules/guava-core}/src/main/java/com/baeldung/guava/memoizer/Factorial.java (100%)
rename {guava => guava-modules/guava-core}/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java (100%)
rename {guava-2 => guava-modules/guava-core}/src/test/java/com/baeldung/guava/charmatcher/GuavaCharMatcherUnitTest.java (100%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-core/src/test/java/com/baeldung/guava/functional}/GuavaFunctionalExamplesUnitTest.java (99%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-core/src/test/java/com/baeldung/guava/memoizer}/GuavaMemoizerUnitTest.java (98%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-core/src/test/java/com/baeldung/guava/preconditions}/GuavaPreConditionsUnitTest.java (99%)
rename {guava-2 => guava-modules/guava-core}/src/test/java/com/baeldung/guava/throwables/ThrowablesUnitTest.java (100%)
rename {guava-collections-set => guava-modules/guava-core/src/test/resources}/.gitignore (100%)
rename {guava-collections => guava-modules/guava-core}/src/test/resources/test.out (100%)
rename {guava-collections => guava-modules/guava-core}/src/test/resources/test1.in (100%)
rename {guava-collections => guava-modules/guava-core}/src/test/resources/test1_1.in (100%)
rename {guava-collections => guava-modules/guava-core}/src/test/resources/test2.in (100%)
rename {guava-collections => guava-modules/guava-core}/src/test/resources/test_copy.in (100%)
rename {guava-collections => guava-modules/guava-core}/src/test/resources/test_le.txt (100%)
rename {guava-io => guava-modules/guava-io}/README.md (100%)
rename {guava-io => guava-modules/guava-io}/pom.xml (94%)
rename {guava-io => guava-modules/guava-io}/src/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java (100%)
rename {guava-io => guava-modules/guava-io}/src/test/java/com/baeldung/guava/GuavaIOUnitTest.java (100%)
rename {guava-io => guava-modules/guava-io}/src/test/resources/test1.in (100%)
rename {guava-io => guava-modules/guava-io}/src/test/resources/test1_1.in (100%)
rename {guava-io => guava-modules/guava-io}/src/test/resources/test2.in (100%)
rename {guava => guava-modules/guava-utilities}/.gitignore (100%)
rename {guava => guava-modules/guava-utilities}/README.md (60%)
rename {guava => guava-modules/guava-utilities}/pom.xml (92%)
rename {guava/src/main/java/com/baeldung/guava => guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus}/CustomEvent.java (87%)
rename {guava/src/main/java/com/baeldung/guava => guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus}/EventListener.java (96%)
create mode 100644 guava-modules/guava-utilities/src/main/resources/logback.xml
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/bloomfilter}/BloomFilterUnitTest.java (97%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cache}/GuavaCacheUnitTest.java (99%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cacheloader}/GuavaCacheLoaderUnitTest.java (98%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/eventbus}/GuavaEventBusUnitTest.java (90%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils}/GuavaBigIntegerMathUnitTest.java (99%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils}/GuavaDoubleMathUnitTest.java (98%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils}/GuavaIntMathUnitTest.java (99%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils}/GuavaLongMathUnitTest.java (99%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils}/GuavaMathUnitTest.java (99%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/ratelimiter}/RateLimiterLongRunningUnitTest.java (98%)
rename {guava/src/test/java/com/baeldung/guava => guava-modules/guava-utilities/src/test/java/com/baeldung/guava/reflectionutils}/GuavaReflectionUtilsUnitTest.java (99%)
rename {guava => guava-modules/guava-utilities}/src/test/resources/.gitignore (100%)
rename {guava => guava-modules/guava-utilities}/src/test/resources/test.out (100%)
rename {guava => guava-modules/guava-utilities}/src/test/resources/test1.in (100%)
rename {guava => guava-modules/guava-utilities}/src/test/resources/test1_1.in (100%)
rename {guava => guava-modules/guava-utilities}/src/test/resources/test2.in (100%)
rename {guava => guava-modules/guava-utilities}/src/test/resources/test_copy.in (100%)
rename {guava => guava-modules/guava-utilities}/src/test/resources/test_le.txt (100%)
diff --git a/guava-2/README.md b/guava-2/README.md
deleted file mode 100644
index 32afc10916..0000000000
--- a/guava-2/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Guava
-
-This module contains articles a Google Guava
-
-### Relevant Articles:
-
-- [Guava CharMatcher](https://www.baeldung.com/guava-string-charmatcher)
diff --git a/guava-modules/guava-18/README.md b/guava-modules/guava-18/README.md
index fd5de4170a..bdd289b86f 100644
--- a/guava-modules/guava-18/README.md
+++ b/guava-modules/guava-18/README.md
@@ -1,8 +1,5 @@
-=========
-
-## Guava and Hamcrest Cookbooks and Examples
+## Guava 18
### Relevant Articles:
-- [Guava Functional Cookbook](http://www.baeldung.com/guava-functions-predicates)
- [Guava 18: What’s New?](http://www.baeldung.com/whats-new-in-guava-18)
diff --git a/guava-modules/guava-19/README.md b/guava-modules/guava-19/README.md
index be9f2d72a4..6508410ba2 100644
--- a/guava-modules/guava-19/README.md
+++ b/guava-modules/guava-19/README.md
@@ -1,5 +1,3 @@
-=========
-
## Guava 19
diff --git a/guava-modules/guava-21/README.md b/guava-modules/guava-21/README.md
index 4e897325b6..ad70a180b0 100644
--- a/guava-modules/guava-21/README.md
+++ b/guava-modules/guava-21/README.md
@@ -1,4 +1,6 @@
+## Guava 21
+
### Relevant articles:
+
- [New Stream, Comparator and Collector in Guava 21](http://www.baeldung.com/guava-21-new)
- [New in Guava 21 common.util.concurrent](http://www.baeldung.com/guava-21-util-concurrent)
-- [Zipping Collections in Java](http://www.baeldung.com/java-collections-zip)
diff --git a/guava-modules/guava-21/pom.xml b/guava-modules/guava-21/pom.xml
index b126df99cb..b793f11a7f 100644
--- a/guava-modules/guava-21/pom.xml
+++ b/guava-modules/guava-21/pom.xml
@@ -13,17 +13,8 @@
../
-
-
- org.jooq
- jool
- ${jool.version}
-
-
-
21.0
- 0.9.12
\ No newline at end of file
diff --git a/guava-modules/guava-collections-list/README.md b/guava-modules/guava-collections-list/README.md
new file mode 100644
index 0000000000..d7f9ce2e32
--- /dev/null
+++ b/guava-modules/guava-collections-list/README.md
@@ -0,0 +1,8 @@
+## Guava Collections List examples
+
+This module contains articles about list collections in Guava
+
+### Relevant Articles:
+
+- [Partition a List in Java](https://www.baeldung.com/java-list-split)
+- [Guava – Lists](https://www.baeldung.com/guava-lists)
\ No newline at end of file
diff --git a/guava-collections/pom.xml b/guava-modules/guava-collections-list/pom.xml
similarity index 93%
rename from guava-collections/pom.xml
rename to guava-modules/guava-collections-list/pom.xml
index 238ab60f84..cc52a5d48b 100644
--- a/guava-collections/pom.xml
+++ b/guava-modules/guava-collections-list/pom.xml
@@ -4,15 +4,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- guava-collections
+ guava-collections-list
0.1.0-SNAPSHOT
- guava-collections
+ guava-collections-list
com.baeldung
- parent-java
+ guava-modules
0.0.1-SNAPSHOT
- ../parent-java
+ ../
diff --git a/guava-collections/src/main/resources/logback.xml b/guava-modules/guava-collections-list/src/main/resources/logback.xml
similarity index 100%
rename from guava-collections/src/main/resources/logback.xml
rename to guava-modules/guava-collections-list/src/main/resources/logback.xml
diff --git a/guava-collections/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java b/guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java
rename to guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java b/guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java
rename to guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java b/guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java
rename to guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java b/guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java
rename to guava-modules/guava-collections-list/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java
diff --git a/guava-collections-map/README.md b/guava-modules/guava-collections-map/README.md
similarity index 100%
rename from guava-collections-map/README.md
rename to guava-modules/guava-collections-map/README.md
diff --git a/guava-collections-map/pom.xml b/guava-modules/guava-collections-map/pom.xml
similarity index 94%
rename from guava-collections-map/pom.xml
rename to guava-modules/guava-collections-map/pom.xml
index 4a95234d5c..82d634265b 100644
--- a/guava-collections-map/pom.xml
+++ b/guava-modules/guava-collections-map/pom.xml
@@ -9,9 +9,9 @@
com.baeldung
- parent-java
+ guava-modules
0.0.1-SNAPSHOT
- ../parent-java
+ ../
diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java b/guava-modules/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
similarity index 100%
rename from guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
rename to guava-modules/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java b/guava-modules/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
similarity index 100%
rename from guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
rename to guava-modules/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java b/guava-modules/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
similarity index 100%
rename from guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
rename to guava-modules/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java b/guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java
similarity index 100%
rename from guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java
rename to guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java b/guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java
similarity index 100%
rename from guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java
rename to guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java b/guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
similarity index 100%
rename from guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
rename to guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java b/guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java
similarity index 100%
rename from guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java
rename to guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java b/guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java
similarity index 100%
rename from guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java
rename to guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java b/guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java
similarity index 100%
rename from guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java
rename to guava-modules/guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java
diff --git a/guava-2/src/test/resources/.gitignore b/guava-modules/guava-collections-set/.gitignore
similarity index 100%
rename from guava-2/src/test/resources/.gitignore
rename to guava-modules/guava-collections-set/.gitignore
diff --git a/guava-collections-set/README.md b/guava-modules/guava-collections-set/README.md
similarity index 100%
rename from guava-collections-set/README.md
rename to guava-modules/guava-collections-set/README.md
diff --git a/guava-collections-set/pom.xml b/guava-modules/guava-collections-set/pom.xml
similarity index 94%
rename from guava-collections-set/pom.xml
rename to guava-modules/guava-collections-set/pom.xml
index af46400555..8f58148e41 100644
--- a/guava-collections-set/pom.xml
+++ b/guava-modules/guava-collections-set/pom.xml
@@ -8,9 +8,9 @@
com.baeldung
- parent-java
+ guava-modules
0.0.1-SNAPSHOT
- ../parent-java
+ ../
diff --git a/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java b/guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java
similarity index 100%
rename from guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java
rename to guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java
diff --git a/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java b/guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java
similarity index 100%
rename from guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java
rename to guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java
diff --git a/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java b/guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java
similarity index 100%
rename from guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java
rename to guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java
diff --git a/guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java b/guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java
similarity index 100%
rename from guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java
rename to guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java
diff --git a/guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java b/guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java
similarity index 100%
rename from guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java
rename to guava-modules/guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java
diff --git a/guava-collections/README.md b/guava-modules/guava-collections/README.md
similarity index 86%
rename from guava-collections/README.md
rename to guava-modules/guava-collections/README.md
index 51731d7db7..474ded6f33 100644
--- a/guava-collections/README.md
+++ b/guava-modules/guava-collections/README.md
@@ -8,9 +8,8 @@ This module contains articles about Google Guava collections
- [Guava Ordering Cookbook](https://www.baeldung.com/guava-order)
- [Guide to Guava’s Ordering](https://www.baeldung.com/guava-ordering)
- [Hamcrest Collections Cookbook](https://www.baeldung.com/hamcrest-collections-arrays)
-- [Partition a List in Java](https://www.baeldung.com/java-list-split)
- [Filtering and Transforming Collections in Guava](https://www.baeldung.com/guava-filter-and-transform-a-collection)
- [Guava – Join and Split Collections](https://www.baeldung.com/guava-joiner-and-splitter-tutorial)
-- [Guava – Lists](https://www.baeldung.com/guava-lists)
- [Guide to Guava MinMaxPriorityQueue and EvictingQueue](https://www.baeldung.com/guava-minmax-priority-queue-and-evicting-queue)
- [Guide to Guava Table](https://www.baeldung.com/guava-table)
+- [Zipping Collections in Java](http://www.baeldung.com/java-collections-zip)
diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml
new file mode 100644
index 0000000000..53c55dc655
--- /dev/null
+++ b/guava-modules/guava-collections/pom.xml
@@ -0,0 +1,95 @@
+
+
+ 4.0.0
+ guava-collections
+ 0.1.0-SNAPSHOT
+ guava-collections
+
+
+ com.baeldung
+ guava-modules
+ 0.0.1-SNAPSHOT
+ ../
+
+
+
+
+
+ org.apache.commons
+ commons-collections4
+ ${commons-collections4.version}
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.version}
+
+
+ org.jooq
+ jool
+ ${jool.version}
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter
+ ${junit-jupiter.version}
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit-jupiter.version}
+ test
+
+
+ org.assertj
+ assertj-core
+ ${assertj.version}
+ test
+
+
+
+
+ org.hamcrest
+ java-hamcrest
+ ${java-hamcrest.version}
+ test
+
+
+
+
+ guava-collections
+
+
+
+ src/main/resources
+ true
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.22.2
+
+
+
+
+
+
+ 4.1
+ 0.9.12
+
+
+ 3.6.1
+ 2.0.0.0
+ 5.6.2
+
+
+
\ No newline at end of file
diff --git a/guava/src/main/resources/logback.xml b/guava-modules/guava-collections/src/main/resources/logback.xml
similarity index 100%
rename from guava/src/main/resources/logback.xml
rename to guava-modules/guava-collections/src/main/resources/logback.xml
diff --git a/guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java
diff --git a/guava-modules/guava-21/src/test/java/com/baeldung/guava/zip/ZipCollectionUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/guava/zip/ZipCollectionUnitTest.java
similarity index 100%
rename from guava-modules/guava-21/src/test/java/com/baeldung/guava/zip/ZipCollectionUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/guava/zip/ZipCollectionUnitTest.java
diff --git a/guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java b/guava-modules/guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java
similarity index 100%
rename from guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java
rename to guava-modules/guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java
diff --git a/guava-2/src/test/resources/test.out b/guava-modules/guava-collections/src/test/resources/test.out
similarity index 100%
rename from guava-2/src/test/resources/test.out
rename to guava-modules/guava-collections/src/test/resources/test.out
diff --git a/guava-2/src/test/resources/test1.in b/guava-modules/guava-collections/src/test/resources/test1.in
similarity index 100%
rename from guava-2/src/test/resources/test1.in
rename to guava-modules/guava-collections/src/test/resources/test1.in
diff --git a/guava-2/src/test/resources/test1_1.in b/guava-modules/guava-collections/src/test/resources/test1_1.in
similarity index 100%
rename from guava-2/src/test/resources/test1_1.in
rename to guava-modules/guava-collections/src/test/resources/test1_1.in
diff --git a/guava-2/src/test/resources/test2.in b/guava-modules/guava-collections/src/test/resources/test2.in
similarity index 100%
rename from guava-2/src/test/resources/test2.in
rename to guava-modules/guava-collections/src/test/resources/test2.in
diff --git a/guava-2/src/test/resources/test_copy.in b/guava-modules/guava-collections/src/test/resources/test_copy.in
similarity index 100%
rename from guava-2/src/test/resources/test_copy.in
rename to guava-modules/guava-collections/src/test/resources/test_copy.in
diff --git a/guava-2/src/test/resources/test_le.txt b/guava-modules/guava-collections/src/test/resources/test_le.txt
similarity index 100%
rename from guava-2/src/test/resources/test_le.txt
rename to guava-modules/guava-collections/src/test/resources/test_le.txt
diff --git a/guava-modules/guava-core/README.md b/guava-modules/guava-core/README.md
new file mode 100644
index 0000000000..59391ca076
--- /dev/null
+++ b/guava-modules/guava-core/README.md
@@ -0,0 +1,10 @@
+## Guava Core
+
+This module contains articles about core or base functionality provided by Google Guava
+
+### Relevant Articles:
+- [Introduction to Guava Throwables](https://www.baeldung.com/guava-throwables)
+- [Guava CharMatcher](https://www.baeldung.com/guava-string-charmatcher)
+- [Guide to Guava’s PreConditions](https://www.baeldung.com/guava-preconditions)
+- [Introduction to Guava Memoizer](https://www.baeldung.com/guava-memoizer)
+- [Guava Functional Cookbook](https://www.baeldung.com/guava-functions-predicates)
diff --git a/guava-2/pom.xml b/guava-modules/guava-core/pom.xml
similarity index 89%
rename from guava-2/pom.xml
rename to guava-modules/guava-core/pom.xml
index b19f59a9b4..5224148cb8 100644
--- a/guava-2/pom.xml
+++ b/guava-modules/guava-core/pom.xml
@@ -4,15 +4,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- guava-2
+ guava-core
0.1.0-SNAPSHOT
- guava-2
+ guava-core
com.baeldung
- parent-java
+ guava-modules
0.0.1-SNAPSHOT
- ../parent-java
+ ../
diff --git a/guava/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java b/guava-modules/guava-core/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java
similarity index 100%
rename from guava/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java
rename to guava-modules/guava-core/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java
diff --git a/guava/src/main/java/com/baeldung/guava/memoizer/Factorial.java b/guava-modules/guava-core/src/main/java/com/baeldung/guava/memoizer/Factorial.java
similarity index 100%
rename from guava/src/main/java/com/baeldung/guava/memoizer/Factorial.java
rename to guava-modules/guava-core/src/main/java/com/baeldung/guava/memoizer/Factorial.java
diff --git a/guava/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java b/guava-modules/guava-core/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java
similarity index 100%
rename from guava/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java
rename to guava-modules/guava-core/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java
diff --git a/guava-2/src/test/java/com/baeldung/guava/charmatcher/GuavaCharMatcherUnitTest.java b/guava-modules/guava-core/src/test/java/com/baeldung/guava/charmatcher/GuavaCharMatcherUnitTest.java
similarity index 100%
rename from guava-2/src/test/java/com/baeldung/guava/charmatcher/GuavaCharMatcherUnitTest.java
rename to guava-modules/guava-core/src/test/java/com/baeldung/guava/charmatcher/GuavaCharMatcherUnitTest.java
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaFunctionalExamplesUnitTest.java b/guava-modules/guava-core/src/test/java/com/baeldung/guava/functional/GuavaFunctionalExamplesUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaFunctionalExamplesUnitTest.java
rename to guava-modules/guava-core/src/test/java/com/baeldung/guava/functional/GuavaFunctionalExamplesUnitTest.java
index b54a7c951a..0177f4f13e 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaFunctionalExamplesUnitTest.java
+++ b/guava-modules/guava-core/src/test/java/com/baeldung/guava/functional/GuavaFunctionalExamplesUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.functional;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaMemoizerUnitTest.java b/guava-modules/guava-core/src/test/java/com/baeldung/guava/memoizer/GuavaMemoizerUnitTest.java
similarity index 98%
rename from guava/src/test/java/com/baeldung/guava/GuavaMemoizerUnitTest.java
rename to guava-modules/guava-core/src/test/java/com/baeldung/guava/memoizer/GuavaMemoizerUnitTest.java
index 9bafb7ad3f..9af9462e56 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaMemoizerUnitTest.java
+++ b/guava-modules/guava-core/src/test/java/com/baeldung/guava/memoizer/GuavaMemoizerUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.memoizer;
import com.google.common.base.Suppliers;
import com.baeldung.guava.memoizer.CostlySupplier;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaPreConditionsUnitTest.java b/guava-modules/guava-core/src/test/java/com/baeldung/guava/preconditions/GuavaPreConditionsUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaPreConditionsUnitTest.java
rename to guava-modules/guava-core/src/test/java/com/baeldung/guava/preconditions/GuavaPreConditionsUnitTest.java
index fe3be9abf0..1f7111b12f 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaPreConditionsUnitTest.java
+++ b/guava-modules/guava-core/src/test/java/com/baeldung/guava/preconditions/GuavaPreConditionsUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.preconditions;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Arrays;
diff --git a/guava-2/src/test/java/com/baeldung/guava/throwables/ThrowablesUnitTest.java b/guava-modules/guava-core/src/test/java/com/baeldung/guava/throwables/ThrowablesUnitTest.java
similarity index 100%
rename from guava-2/src/test/java/com/baeldung/guava/throwables/ThrowablesUnitTest.java
rename to guava-modules/guava-core/src/test/java/com/baeldung/guava/throwables/ThrowablesUnitTest.java
diff --git a/guava-collections-set/.gitignore b/guava-modules/guava-core/src/test/resources/.gitignore
similarity index 100%
rename from guava-collections-set/.gitignore
rename to guava-modules/guava-core/src/test/resources/.gitignore
diff --git a/guava-collections/src/test/resources/test.out b/guava-modules/guava-core/src/test/resources/test.out
similarity index 100%
rename from guava-collections/src/test/resources/test.out
rename to guava-modules/guava-core/src/test/resources/test.out
diff --git a/guava-collections/src/test/resources/test1.in b/guava-modules/guava-core/src/test/resources/test1.in
similarity index 100%
rename from guava-collections/src/test/resources/test1.in
rename to guava-modules/guava-core/src/test/resources/test1.in
diff --git a/guava-collections/src/test/resources/test1_1.in b/guava-modules/guava-core/src/test/resources/test1_1.in
similarity index 100%
rename from guava-collections/src/test/resources/test1_1.in
rename to guava-modules/guava-core/src/test/resources/test1_1.in
diff --git a/guava-collections/src/test/resources/test2.in b/guava-modules/guava-core/src/test/resources/test2.in
similarity index 100%
rename from guava-collections/src/test/resources/test2.in
rename to guava-modules/guava-core/src/test/resources/test2.in
diff --git a/guava-collections/src/test/resources/test_copy.in b/guava-modules/guava-core/src/test/resources/test_copy.in
similarity index 100%
rename from guava-collections/src/test/resources/test_copy.in
rename to guava-modules/guava-core/src/test/resources/test_copy.in
diff --git a/guava-collections/src/test/resources/test_le.txt b/guava-modules/guava-core/src/test/resources/test_le.txt
similarity index 100%
rename from guava-collections/src/test/resources/test_le.txt
rename to guava-modules/guava-core/src/test/resources/test_le.txt
diff --git a/guava-io/README.md b/guava-modules/guava-io/README.md
similarity index 100%
rename from guava-io/README.md
rename to guava-modules/guava-io/README.md
diff --git a/guava-io/pom.xml b/guava-modules/guava-io/pom.xml
similarity index 94%
rename from guava-io/pom.xml
rename to guava-modules/guava-io/pom.xml
index e01f76e2e3..6b3280755c 100644
--- a/guava-io/pom.xml
+++ b/guava-modules/guava-io/pom.xml
@@ -11,9 +11,9 @@
com.baeldung
- parent-java
+ guava-modules
0.0.1-SNAPSHOT
- ../parent-java
+ ../
diff --git a/guava-io/src/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java b/guava-modules/guava-io/src/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
similarity index 100%
rename from guava-io/src/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
rename to guava-modules/guava-io/src/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java
diff --git a/guava-io/src/test/java/com/baeldung/guava/GuavaIOUnitTest.java b/guava-modules/guava-io/src/test/java/com/baeldung/guava/GuavaIOUnitTest.java
similarity index 100%
rename from guava-io/src/test/java/com/baeldung/guava/GuavaIOUnitTest.java
rename to guava-modules/guava-io/src/test/java/com/baeldung/guava/GuavaIOUnitTest.java
diff --git a/guava-io/src/test/resources/test1.in b/guava-modules/guava-io/src/test/resources/test1.in
similarity index 100%
rename from guava-io/src/test/resources/test1.in
rename to guava-modules/guava-io/src/test/resources/test1.in
diff --git a/guava-io/src/test/resources/test1_1.in b/guava-modules/guava-io/src/test/resources/test1_1.in
similarity index 100%
rename from guava-io/src/test/resources/test1_1.in
rename to guava-modules/guava-io/src/test/resources/test1_1.in
diff --git a/guava-io/src/test/resources/test2.in b/guava-modules/guava-io/src/test/resources/test2.in
similarity index 100%
rename from guava-io/src/test/resources/test2.in
rename to guava-modules/guava-io/src/test/resources/test2.in
diff --git a/guava/.gitignore b/guava-modules/guava-utilities/.gitignore
similarity index 100%
rename from guava/.gitignore
rename to guava-modules/guava-utilities/.gitignore
diff --git a/guava/README.md b/guava-modules/guava-utilities/README.md
similarity index 60%
rename from guava/README.md
rename to guava-modules/guava-utilities/README.md
index 24beca60c3..e2caa1a145 100644
--- a/guava/README.md
+++ b/guava-modules/guava-utilities/README.md
@@ -1,17 +1,12 @@
-## Guava
+## Guava Utilities
-This module contains articles a Google Guava
+This module contains articles about utilities provided by Google Guava
### Relevant Articles:
-
-- [Guava Functional Cookbook](https://www.baeldung.com/guava-functions-predicates)
-- [Guide to Guava’s PreConditions](https://www.baeldung.com/guava-preconditions)
- [Introduction to Guava CacheLoader](https://www.baeldung.com/guava-cacheloader)
-- [Introduction to Guava Memoizer](https://www.baeldung.com/guava-memoizer)
- [Guide to Guava’s EventBus](https://www.baeldung.com/guava-eventbus)
- [Guide to Guava’s Reflection Utilities](https://www.baeldung.com/guava-reflection)
- [Guide to Mathematical Utilities in Guava](https://www.baeldung.com/guava-math)
- [Bloom Filter in Java using Guava](https://www.baeldung.com/guava-bloom-filter)
- [Quick Guide to the Guava RateLimiter](https://www.baeldung.com/guava-rate-limiter)
- [Guava Cache](https://www.baeldung.com/guava-cache)
-- [Introduction to Guava Throwables](https://www.baeldung.com/guava-throwables)
diff --git a/guava/pom.xml b/guava-modules/guava-utilities/pom.xml
similarity index 92%
rename from guava/pom.xml
rename to guava-modules/guava-utilities/pom.xml
index 2c4ff07c84..0496f5b2e8 100644
--- a/guava/pom.xml
+++ b/guava-modules/guava-utilities/pom.xml
@@ -4,15 +4,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- guava
+ guava-utilities
0.1.0-SNAPSHOT
- guava
+ guava-utilities
com.baeldung
- parent-java
+ guava-modules
0.0.1-SNAPSHOT
- ../parent-java
+ ../
diff --git a/guava/src/main/java/com/baeldung/guava/CustomEvent.java b/guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus/CustomEvent.java
similarity index 87%
rename from guava/src/main/java/com/baeldung/guava/CustomEvent.java
rename to guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus/CustomEvent.java
index a154790374..55112b5cb3 100644
--- a/guava/src/main/java/com/baeldung/guava/CustomEvent.java
+++ b/guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus/CustomEvent.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.eventbus;
public class CustomEvent {
private String action;
diff --git a/guava/src/main/java/com/baeldung/guava/EventListener.java b/guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus/EventListener.java
similarity index 96%
rename from guava/src/main/java/com/baeldung/guava/EventListener.java
rename to guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus/EventListener.java
index 7bcfbcb8e9..404501b578 100644
--- a/guava/src/main/java/com/baeldung/guava/EventListener.java
+++ b/guava-modules/guava-utilities/src/main/java/com/baeldung/guava/eventbus/EventListener.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.eventbus;
import com.google.common.eventbus.DeadEvent;
import com.google.common.eventbus.Subscribe;
diff --git a/guava-modules/guava-utilities/src/main/resources/logback.xml b/guava-modules/guava-utilities/src/main/resources/logback.xml
new file mode 100644
index 0000000000..56af2d397e
--- /dev/null
+++ b/guava-modules/guava-utilities/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/guava/src/test/java/com/baeldung/guava/BloomFilterUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/bloomfilter/BloomFilterUnitTest.java
similarity index 97%
rename from guava/src/test/java/com/baeldung/guava/BloomFilterUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/bloomfilter/BloomFilterUnitTest.java
index c11bf27256..96cc8ac1d9 100644
--- a/guava/src/test/java/com/baeldung/guava/BloomFilterUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/bloomfilter/BloomFilterUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.bloomfilter;
import com.google.common.hash.BloomFilter;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaCacheUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cache/GuavaCacheUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaCacheUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cache/GuavaCacheUnitTest.java
index 8aa56c7c52..0129d661fc 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaCacheUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cache/GuavaCacheUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.cache;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaCacheLoaderUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cacheloader/GuavaCacheLoaderUnitTest.java
similarity index 98%
rename from guava/src/test/java/com/baeldung/guava/GuavaCacheLoaderUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cacheloader/GuavaCacheLoaderUnitTest.java
index bf9747ec18..7157c76494 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaCacheLoaderUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/cacheloader/GuavaCacheLoaderUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.cacheloader;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaEventBusUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/eventbus/GuavaEventBusUnitTest.java
similarity index 90%
rename from guava/src/test/java/com/baeldung/guava/GuavaEventBusUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/eventbus/GuavaEventBusUnitTest.java
index bb9d26fcce..a6967d18f7 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaEventBusUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/eventbus/GuavaEventBusUnitTest.java
@@ -1,5 +1,7 @@
-package com.baeldung.guava;
+package com.baeldung.guava.eventbus;
+import com.baeldung.guava.eventbus.CustomEvent;
+import com.baeldung.guava.eventbus.EventListener;
import com.google.common.eventbus.EventBus;
import org.junit.After;
import org.junit.Before;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaBigIntegerMathUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaBigIntegerMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaBigIntegerMathUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaBigIntegerMathUnitTest.java
index cca42a688f..d890ef0bf0 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaBigIntegerMathUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaBigIntegerMathUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.mathutils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaDoubleMathUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaDoubleMathUnitTest.java
similarity index 98%
rename from guava/src/test/java/com/baeldung/guava/GuavaDoubleMathUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaDoubleMathUnitTest.java
index 9c78fb36fa..05a70e3654 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaDoubleMathUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaDoubleMathUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.mathutils;
import static org.junit.Assert.*;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaIntMathUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaIntMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaIntMathUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaIntMathUnitTest.java
index 547f423396..4ac3c93518 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaIntMathUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaIntMathUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.mathutils;
import static org.junit.Assert.*;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaLongMathUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaLongMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaLongMathUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaLongMathUnitTest.java
index 33c28d4594..41358b081b 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaLongMathUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaLongMathUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.mathutils;
import static org.junit.Assert.*;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaMathUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaMathUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaMathUnitTest.java
index fce0fec13b..0d21a6f4ae 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaMathUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/mathutils/GuavaMathUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.mathutils;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
diff --git a/guava/src/test/java/com/baeldung/guava/RateLimiterLongRunningUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/ratelimiter/RateLimiterLongRunningUnitTest.java
similarity index 98%
rename from guava/src/test/java/com/baeldung/guava/RateLimiterLongRunningUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/ratelimiter/RateLimiterLongRunningUnitTest.java
index 7372e9f6e9..cb06e6ff85 100644
--- a/guava/src/test/java/com/baeldung/guava/RateLimiterLongRunningUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/ratelimiter/RateLimiterLongRunningUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.ratelimiter;
import com.google.common.util.concurrent.RateLimiter;
diff --git a/guava/src/test/java/com/baeldung/guava/GuavaReflectionUtilsUnitTest.java b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/reflectionutils/GuavaReflectionUtilsUnitTest.java
similarity index 99%
rename from guava/src/test/java/com/baeldung/guava/GuavaReflectionUtilsUnitTest.java
rename to guava-modules/guava-utilities/src/test/java/com/baeldung/guava/reflectionutils/GuavaReflectionUtilsUnitTest.java
index 36df241711..8060191bdc 100644
--- a/guava/src/test/java/com/baeldung/guava/GuavaReflectionUtilsUnitTest.java
+++ b/guava-modules/guava-utilities/src/test/java/com/baeldung/guava/reflectionutils/GuavaReflectionUtilsUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package com.baeldung.guava.reflectionutils;
import com.google.common.collect.Lists;
diff --git a/guava/src/test/resources/.gitignore b/guava-modules/guava-utilities/src/test/resources/.gitignore
similarity index 100%
rename from guava/src/test/resources/.gitignore
rename to guava-modules/guava-utilities/src/test/resources/.gitignore
diff --git a/guava/src/test/resources/test.out b/guava-modules/guava-utilities/src/test/resources/test.out
similarity index 100%
rename from guava/src/test/resources/test.out
rename to guava-modules/guava-utilities/src/test/resources/test.out
diff --git a/guava/src/test/resources/test1.in b/guava-modules/guava-utilities/src/test/resources/test1.in
similarity index 100%
rename from guava/src/test/resources/test1.in
rename to guava-modules/guava-utilities/src/test/resources/test1.in
diff --git a/guava/src/test/resources/test1_1.in b/guava-modules/guava-utilities/src/test/resources/test1_1.in
similarity index 100%
rename from guava/src/test/resources/test1_1.in
rename to guava-modules/guava-utilities/src/test/resources/test1_1.in
diff --git a/guava/src/test/resources/test2.in b/guava-modules/guava-utilities/src/test/resources/test2.in
similarity index 100%
rename from guava/src/test/resources/test2.in
rename to guava-modules/guava-utilities/src/test/resources/test2.in
diff --git a/guava/src/test/resources/test_copy.in b/guava-modules/guava-utilities/src/test/resources/test_copy.in
similarity index 100%
rename from guava/src/test/resources/test_copy.in
rename to guava-modules/guava-utilities/src/test/resources/test_copy.in
diff --git a/guava/src/test/resources/test_le.txt b/guava-modules/guava-utilities/src/test/resources/test_le.txt
similarity index 100%
rename from guava/src/test/resources/test_le.txt
rename to guava-modules/guava-utilities/src/test/resources/test_le.txt
diff --git a/guava-modules/pom.xml b/guava-modules/pom.xml
index d1a2bbc16e..2d0bf68183 100644
--- a/guava-modules/pom.xml
+++ b/guava-modules/pom.xml
@@ -17,9 +17,16 @@
+ guava-utilities
+ guava-core
guava-18
guava-19
guava-21
+ guava-collections
+ guava-collections-list
+ guava-collections-map
+ guava-collections-set
+ guava-io
diff --git a/pom.xml b/pom.xml
index 9d9c448887..5ed3791760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -415,13 +415,7 @@
graphql/graphql-java
grpc
- gson
- guava
- guava-2
- guava-collections
- guava-collections-map
- guava-collections-set
- guava-io
+ gson
guava-modules
guice
@@ -933,12 +927,7 @@
graphql/graphql-java
grpc
- gson
- guava
- guava-collections
- guava-collections-map
- guava-collections-set
- guava-io
+ gson
guava-modules
guice