honeymoose
/
jjwt
mirror of https://github.com/jwtk/jjwt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for reviews. Hope i did not forget something.

This commit is contained in:
patton73 2019-07-17 22:46:18 +02:00
parent bb1fb76ce9
commit 2bb8e4d02e
9 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/gson/src/main/java/io/jsonwebtoken/io/GsonDeserializer.java → extensions/gson/src/main/java/io/jsonwebtoken/gson/io/GsonDeserializer.java
View File

@ -1,6 +1,8 @@
package io.jsonwebtoken.io; package io.jsonwebtoken.gson.io;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.jsonwebtoken.io.DeserializationException;
import io.jsonwebtoken.io.Deserializer;
import io.jsonwebtoken.lang.Assert; import io.jsonwebtoken.lang.Assert;
import java.io.IOException; import java.io.IOException;

11
extensions/gson/src/main/java/io/jsonwebtoken/io/GsonSerializer.java → extensions/gson/src/main/java/io/jsonwebtoken/gson/io/GsonSerializer.java
View File

@ -1,7 +1,10 @@
package io.jsonwebtoken.io; package io.jsonwebtoken.gson.io;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import io.jsonwebtoken.io.Encoders;
import io.jsonwebtoken.io.SerializationException;
import io.jsonwebtoken.io.Serializer;
import io.jsonwebtoken.lang.Assert; import io.jsonwebtoken.lang.Assert;
import io.jsonwebtoken.lang.Strings; import io.jsonwebtoken.lang.Strings;
@ -24,8 +27,12 @@ public class GsonSerializer<T> implements Serializer<T> {
@Override @Override
public byte[] serialize(T t) throws SerializationException { public byte[] serialize(T t) throws SerializationException {
Assert.notNull(t, "Object to serialize cannot be null."); Assert.notNull(t, "Object to serialize cannot be null.");
//Gson never throws any serialization exception try {
return writeValueAsBytes(t); return writeValueAsBytes(t);
} catch (Exception e) {
String msg = "Unable to serialize object: " + e.getMessage();
throw new SerializationException(msg, e);
}
} }
@SuppressWarnings("WeakerAccess") //for testing @SuppressWarnings("WeakerAccess") //for testing

0
extensions/gson/src/test/groovy/io/jsonwebtoken/io/GsonDeserializerTest.groovy → extensions/gson/src/test/groovy/io/jsonwebtoken/gson/io/GsonDeserializerTest.groovy
View File

0
extensions/gson/src/test/groovy/io/jsonwebtoken/io/GsonSerializerTest.groovy → extensions/gson/src/test/groovy/io/jsonwebtoken/gson/io/GsonSerializerTest.groovy
View File

4
impl/src/main/java/io/jsonwebtoken/impl/io/RuntimeClasspathDeserializerLocator.java
View File

@ -34,8 +34,8 @@ public class RuntimeClasspathDeserializerLocator<T> implements InstanceLocator<D
return Classes.newInstance("io.jsonwebtoken.io.JacksonDeserializer"); return Classes.newInstance("io.jsonwebtoken.io.JacksonDeserializer");
} else if (isAvailable("io.jsonwebtoken.io.OrgJsonDeserializer")) { } else if (isAvailable("io.jsonwebtoken.io.OrgJsonDeserializer")) {
return Classes.newInstance("io.jsonwebtoken.io.OrgJsonDeserializer"); return Classes.newInstance("io.jsonwebtoken.io.OrgJsonDeserializer");
} else if (isAvailable("io.jsonwebtoken.io.GsonDeserializer")) { } else if (isAvailable("io.jsonwebtoken.gson.io.GsonDeserializer")) {
return Classes.newInstance("io.jsonwebtoken.io.GsonDeserializer"); return Classes.newInstance("io.jsonwebtoken.gson.io.GsonDeserializer");
} else { } else {
throw new IllegalStateException("Unable to discover any JSON Deserializer implementations on the classpath."); throw new IllegalStateException("Unable to discover any JSON Deserializer implementations on the classpath.");
} }

4
impl/src/main/java/io/jsonwebtoken/impl/io/RuntimeClasspathSerializerLocator.java
View File

@ -34,8 +34,8 @@ public class RuntimeClasspathSerializerLocator implements InstanceLocator<Serial
return Classes.newInstance("io.jsonwebtoken.io.JacksonSerializer"); return Classes.newInstance("io.jsonwebtoken.io.JacksonSerializer");
} else if (isAvailable("io.jsonwebtoken.io.OrgJsonSerializer")) { } else if (isAvailable("io.jsonwebtoken.io.OrgJsonSerializer")) {
return Classes.newInstance("io.jsonwebtoken.io.OrgJsonSerializer"); return Classes.newInstance("io.jsonwebtoken.io.OrgJsonSerializer");
} else if (isAvailable("io.jsonwebtoken.io.GsonSerializer")) { } else if (isAvailable("io.jsonwebtoken.gson.io.GsonSerializer")) {
return Classes.newInstance("io.jsonwebtoken.io.GsonSerializer"); return Classes.newInstance("io.jsonwebtoken.gson.io.GsonSerializer");
} else { } else {
throw new IllegalStateException("Unable to discover any JSON Serializer implementations on the classpath."); throw new IllegalStateException("Unable to discover any JSON Serializer implementations on the classpath.");
} }