sander/JsonToy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

V1.1 support for UUID and Big numbers

Browse source
This commit is contained in:
Shautvast 2023-06-25 14:08:36 +02:00
parent 514702a40d
commit 3ca89dadb5
6 changed files with 34 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jmh/pom.xml
View file

@ -10,7 +10,7 @@
<name>JsonToy-JMH</name>
<artifactId>jsonthingy-jmhtests</artifactId>
<version>${project.version}</version>
<version>1.1</version>
<packaging>jar</packaging>
<properties>

2
lib/pom.xml
View file

@ -10,7 +10,7 @@
<name>JsonToy</name>
<artifactId>jsonthingy</artifactId>
<version>${project.version}</version>
<version>1.1</version>
<packaging>jar</packaging>
<properties>

125
lib/src/main/java/nl/sanderhautvast/json/ser/Mapper.java
View file

@ -5,6 +5,8 @@ import org.objectweb.asm.ClassWriter;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@ -17,16 +19,6 @@ public class Mapper {
private static final Map<Class<?>, BaseMapper<?>> mappers = new ConcurrentHashMap<>();
private static final ByteClassLoader generatedClassesLoader = new ByteClassLoader();
private static final StringMapper stringMapper = new StringMapper();
private static final BooleanMapper booleanMapper = new BooleanMapper();
private static final IntegerMapper integerMapper = new IntegerMapper();
private static final LongMapper longMapper = new LongMapper();
private static final ShortMapper shortMapper = new ShortMapper();
private static final ByteMapper byteMapper = new ByteMapper();
private static final CharMapper charMapper = new CharMapper();
private static final FloatMapper floatMapper = new FloatMapper();
private static final DoubleMapper doubleMapper = new DoubleMapper();
/**
@ -49,7 +41,7 @@ public class Mapper {
return b.toString();
}
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({"unchecked", "rawtypes", "UnnecessaryToStringCall"})
public static void json(StringBuilder b, Object value) {
if (value == null) {
b.append("null");
@ -80,25 +72,26 @@ public class Mapper {
} else if (value instanceof Map) {
object(b, (Map) value);
} else {
if (type.equals(String.class)) {
stringMapper.json(b, (String) value);
} else if (type.equals(Boolean.class)) {
booleanMapper.json(b, (Boolean) value);
} else if (type.equals(Integer.class)) {
integerMapper.json(b, (Integer) value);
} else if (type.equals(Long.class)) {
longMapper.json(b, (Long) value);
} else if (type.equals(Short.class)) {
shortMapper.json(b, (Short) value);
} else if (type.equals(Byte.class)) {
byteMapper.json(b, (Byte) value);
} else if (type.equals(Character.class)) {
charMapper.json(b, (Character) value);
} else if (type.equals(Float.class)) {
floatMapper.json(b, (Float) value);
} else if (type.equals(Double.class)) {
doubleMapper.json(b, (Double) value);
if (type == String.class) {
b.append("\"");
Mapper.escape(b, (String) value);
b.append("\"");
} else if (type == Character.class) {
b.append("\"");
Mapper.escape(b, (Character) value);
b.append("\"");
} else if (type == Boolean.class
|| type == Integer.class
|| type == Long.class
|| type == Float.class
|| type == Double.class
|| type == UUID.class
|| type == Byte.class
|| type == Short.class
|| type == BigInteger.class
|| type == BigDecimal.class
) {
b.append(value.toString()); // prevents another nullcheck
} else {
BaseMapper mapper = mappers.computeIfAbsent(type, key -> createObjectMapper(type));
mapper.json(b, value);
@ -402,77 +395,5 @@ public class Mapper {
}
}
class BooleanMapper extends BaseMapper<Boolean> {
@Override
public void json(StringBuilder b, Boolean value) {
b.append(value);
}
}
class ShortMapper extends BaseMapper<Short> {
@Override
public void json(StringBuilder b, Short value) {
b.append(value);
}
}
class StringMapper extends BaseMapper<String> {
@Override
public void json(StringBuilder b, String value) {
b.append("\"");
Mapper.escape(b, value);
b.append("\"");
}
}
class IntegerMapper extends BaseMapper<Integer> {
@Override
public void json(StringBuilder b, Integer value) {
b.append(value);
}
}
class LongMapper extends BaseMapper<Long> {
@Override
public void json(StringBuilder b, Long value) {
b.append(value);
}
}
class ByteMapper extends BaseMapper<Byte> {
@Override
protected void json(StringBuilder b, Byte value) {
b.append(value);
}
}
class CharMapper extends BaseMapper<Character> {
@Override
protected void json(StringBuilder b, Character value) {
b.append("\"");
Mapper.escape(b, value);
b.append("\"");
}
}
class FloatMapper extends BaseMapper<Float> {
@Override
protected void json(StringBuilder b, Float value) {
b.append(value);
}
}
class DoubleMapper extends BaseMapper<Double> {
@Override
protected void json(StringBuilder b, Double value) {
b.append(value);
}
}

6
lib/src/test/java/nl/sanderhautvast/json/ser/JacksonComparisonTest.java
View file

@ -22,7 +22,7 @@ public class JacksonComparisonTest {
ObjectMapper objectMapper = new ObjectMapper();
Bean1 bean1 = new Bean1();
Bean2 bean2 = new Bean2();
bean1.setData1(UUID.randomUUID().toString());
bean1.setData1(UUID.randomUUID());
bean1.setBean2(bean2);
bean2.setData2(UUID.randomUUID().toString());
String valueAsString;
@ -34,7 +34,7 @@ public class JacksonComparisonTest {
for (int i = 0; i < INNERLOOP_COUNT; i++) {
bean1 = new Bean1();
bean2 = new Bean2();
bean1.setData1(UUID.randomUUID().toString());
bean1.setData1(UUID.randomUUID());
bean1.setBean2(bean2);
bean2.setData2(UUID.randomUUID().toString());
valueAsString = objectMapper.writeValueAsString(bean1);
@ -47,7 +47,7 @@ public class JacksonComparisonTest {
for (int i = 0; i < INNERLOOP_COUNT; i++) {
bean1 = new Bean1();
bean2 = new Bean2();
bean1.setData1(UUID.randomUUID().toString());
bean1.setData1(UUID.randomUUID());
bean1.setBean2(bean2);
bean2.setData2(UUID.randomUUID().toString());
jsonString = Mapper.json(bean1);

8
lib/src/test/java/nl/sanderhautvast/json/ser/nested/Bean1.java
View file

@ -1,16 +1,18 @@
package nl.sanderhautvast.json.ser.nested;
import java.util.UUID;
@SuppressWarnings("unused")
public class Bean1 {
private String data1;
private UUID data1;
private Bean2 bean2;
public String getData1() {
public UUID getData1() {
return data1;
}
public void setData1(String data1) {
public void setData1(UUID data1) {
this.data1 = data1;
}

8
pom.xml
View file

@ -5,15 +5,9 @@
<name>JsonToy</name>
<groupId>nl.sander</groupId>
<artifactId>jsonthingy-pom</artifactId>
<version>1.0</version>
<version>1.1</version>
<packaging>pom</packaging>
<properties>
<maven.compiler.source>9</maven.compiler.source>
<maven.compiler.target>9</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>lib</module>
<module>jmh</module>