Skip to content

json module #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2018
Merged

json module #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions oauth2-server-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion ...ndocs/oauth2/sparkjava/json/JsonMapper.kt → ...java/nl/myndocs/oauth2/json/JsonMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.myndocs.oauth2.sparkjava.json
package nl.myndocs.oauth2.json

import com.google.gson.Gson

Expand Down
8 changes: 4 additions & 4 deletions oauth2-server-ktor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
9 changes: 0 additions & 9 deletions oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/json/JsonMapper.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/request/KtorCallContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions oauth2-server-sparkjava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...erver-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/request/SparkjavaCallContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down