From d9cadea49691ea510f65b86a955928f3256cdf94 Mon Sep 17 00:00:00 2001
From: Albert Bos <albert@myndocs.nl>
Date: Thu, 30 Aug 2018 19:31:58 +0200
Subject: [PATCH] json module

---
 oauth2-server-json/pom.xml                    | 58 +++++++++++++++++++
 .../nl/myndocs/oauth2}/json/JsonMapper.kt     |  2 +-
 oauth2-server-ktor/pom.xml                    |  8 +--
 .../oauth2/ktor/feature/json/JsonMapper.kt    |  9 ---
 .../ktor/feature/request/KtorCallContext.kt   |  2 +-
 oauth2-server-sparkjava/pom.xml               |  8 +--
 .../sparkjava/request/SparkjavaCallContext.kt |  2 +-
 pom.xml                                       |  1 +
 8 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 oauth2-server-json/pom.xml
 rename {oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava => oauth2-server-json/src/main/java/nl/myndocs/oauth2}/json/JsonMapper.kt (76%)
 delete mode 100644 oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/json/JsonMapper.kt

diff --git a/oauth2-server-json/pom.xml b/oauth2-server-json/pom.xml
new file mode 100644
index 0000000..07917c0
--- /dev/null
+++ b/oauth2-server-json/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <parent>
+        <artifactId>kotlin-oauth2-server</artifactId>
+        <groupId>nl.myndocs</groupId>
+        <version>0.1.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>oauth2-server-json</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <createSourcesJar>true</createSourcesJar>
+                    <artifactSet>
+                        <includes>
+                            <include>com.google.code.gson:*</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.google.gson</pattern>
+                            <shadedPattern>nl.myndocs.oauth2.shaded.com.google.gson</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <transformers>
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/json/JsonMapper.kt b/oauth2-server-json/src/main/java/nl/myndocs/oauth2/json/JsonMapper.kt
similarity index 76%
rename from oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/json/JsonMapper.kt
rename to oauth2-server-json/src/main/java/nl/myndocs/oauth2/json/JsonMapper.kt
index 5286b4e..30c4882 100644
--- a/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/json/JsonMapper.kt
+++ b/oauth2-server-json/src/main/java/nl/myndocs/oauth2/json/JsonMapper.kt
@@ -1,4 +1,4 @@
-package nl.myndocs.oauth2.sparkjava.json
+package nl.myndocs.oauth2.json
 
 import com.google.gson.Gson
 
diff --git a/oauth2-server-ktor/pom.xml b/oauth2-server-ktor/pom.xml
index b51b93b..68be8a6 100644
--- a/oauth2-server-ktor/pom.xml
+++ b/oauth2-server-ktor/pom.xml
@@ -31,10 +31,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.5</version>
-            <scope>provided</scope>
+            <groupId>nl.myndocs</groupId>
+            <artifactId>oauth2-server-json</artifactId>
+            <version>${project.version}</version>
+            <classifier>shaded</classifier>
         </dependency>
     </dependencies>
 
diff --git a/oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/json/JsonMapper.kt b/oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/json/JsonMapper.kt
deleted file mode 100644
index ef1f113..0000000
--- a/oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/json/JsonMapper.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package nl.myndocs.oauth2.ktor.feature.json
-
-import com.google.gson.Gson
-
-object JsonMapper {
-    private val gson = Gson()
-
-    fun toJson(content: Any) = gson.toJson(content)
-}
\ No newline at end of file
diff --git a/oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/request/KtorCallContext.kt b/oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/request/KtorCallContext.kt
index f117158..301495a 100644
--- a/oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/request/KtorCallContext.kt
+++ b/oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/request/KtorCallContext.kt
@@ -11,7 +11,7 @@ import io.ktor.response.respondRedirect
 import io.ktor.response.respondText
 import io.ktor.util.toMap
 import kotlinx.coroutines.experimental.runBlocking
-import nl.myndocs.oauth2.ktor.feature.json.JsonMapper
+import nl.myndocs.oauth2.json.JsonMapper
 import nl.myndocs.oauth2.request.CallContext
 
 class KtorCallContext(val applicationCall: ApplicationCall) : CallContext {
diff --git a/oauth2-server-sparkjava/pom.xml b/oauth2-server-sparkjava/pom.xml
index f9fb865..7da8316 100644
--- a/oauth2-server-sparkjava/pom.xml
+++ b/oauth2-server-sparkjava/pom.xml
@@ -25,10 +25,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.5</version>
-            <scope>provided</scope>
+            <groupId>nl.myndocs</groupId>
+            <artifactId>oauth2-server-json</artifactId>
+            <version>${project.version}</version>
+            <classifier>shaded</classifier>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/request/SparkjavaCallContext.kt b/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/request/SparkjavaCallContext.kt
index f47d713..ec77dc1 100644
--- a/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/request/SparkjavaCallContext.kt
+++ b/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/request/SparkjavaCallContext.kt
@@ -1,7 +1,7 @@
 package nl.myndocs.oauth2.sparkjava.request
 
+import nl.myndocs.oauth2.json.JsonMapper
 import nl.myndocs.oauth2.request.CallContext
-import nl.myndocs.oauth2.sparkjava.json.JsonMapper
 import spark.Request
 import spark.Response
 
diff --git a/pom.xml b/pom.xml
index f730b09..6c4afd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
 
     <modules>
         <module>oauth2-server-core</module>
+        <module>oauth2-server-json</module>
         <module>oauth2-server-ktor</module>
         <module>oauth2-server-client-inmemory</module>
         <module>oauth2-server-identity-inmemory</module>