From 4131d1ebbd6974b494a70471be3696b186c4626e Mon Sep 17 00:00:00 2001
From: Graham Cox <graham@grahamcox.co.uk>
Date: Tue, 17 Mar 2020 14:30:46 +0000
Subject: [PATCH] Moved the Moshi examples to json-2 (#8898)

---
 json-2/pom.xml                                  | 17 +++++++++++++++++
 .../moshi/AlternativeAdapterUnitTest.java       |  0
 .../java/com/baeldung/moshi/ArrayUnitTest.java  |  0
 .../baeldung/moshi/ComplexAdapterUnitTest.java  |  0
 .../com/baeldung/moshi/DefaultUnitTest.java     |  0
 .../com/baeldung/moshi/PrimitiveUnitTest.java   |  0
 .../java/com/baeldung/moshi/RenameUnitTest.java |  0
 .../baeldung/moshi/SimpleAdapterUnitTest.java   |  0
 .../com/baeldung/moshi/TransientUnitTest.java   |  0
 libraries-3/pom.xml                             | 11 -----------
 10 files changed, 17 insertions(+), 11 deletions(-)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java (100%)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/ArrayUnitTest.java (100%)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java (100%)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/DefaultUnitTest.java (100%)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java (100%)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/RenameUnitTest.java (100%)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java (100%)
 rename {libraries-3 => json-2}/src/test/java/com/baeldung/moshi/TransientUnitTest.java (100%)

diff --git a/json-2/pom.xml b/json-2/pom.xml
index 72b3295b2b..e0295af59b 100644
--- a/json-2/pom.xml
+++ b/json-2/pom.xml
@@ -33,9 +33,26 @@
             <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.squareup.moshi</groupId>
+            <artifactId>moshi</artifactId>
+            <version>${moshi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.moshi</groupId>
+            <artifactId>moshi-adapters</artifactId>
+            <version>${moshi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
     </dependencies>
     <properties>
         <jsoniter.version>0.9.23</jsoniter.version>
         <assertj-core.version>3.11.1</assertj-core.version>
+        <moshi.version>1.9.2</moshi.version>
     </properties>
 </project>
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/ArrayUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/ArrayUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/ArrayUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/ArrayUnitTest.java
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/DefaultUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/DefaultUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/DefaultUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/DefaultUnitTest.java
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/RenameUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/RenameUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/RenameUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/RenameUnitTest.java
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java
diff --git a/libraries-3/src/test/java/com/baeldung/moshi/TransientUnitTest.java b/json-2/src/test/java/com/baeldung/moshi/TransientUnitTest.java
similarity index 100%
rename from libraries-3/src/test/java/com/baeldung/moshi/TransientUnitTest.java
rename to json-2/src/test/java/com/baeldung/moshi/TransientUnitTest.java
diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml
index a438d423e2..68b5f2aa21 100644
--- a/libraries-3/pom.xml
+++ b/libraries-3/pom.xml
@@ -73,16 +73,6 @@
             <version>${cache2k.version}</version>
             <type>pom</type>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.moshi</groupId>
-            <artifactId>moshi</artifactId>
-            <version>${moshi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.moshi</groupId>
-            <artifactId>moshi-adapters</artifactId>
-            <version>${moshi.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.jcabi</groupId>
             <artifactId>jcabi-aspects</artifactId>
@@ -201,7 +191,6 @@
         <cactoos.version>0.43</cactoos.version>
         <airline.version>2.7.2</airline.version>
         <cache2k.version>1.2.3.Final</cache2k.version>
-        <moshi.version>1.9.2</moshi.version>
         <jcabi-aspects.version>0.22.6</jcabi-aspects.version>
         <aspectjrt.version>1.9.2</aspectjrt.version>
         <jcabi-maven-plugin.version>0.14.1</jcabi-maven-plugin.version>