Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,22 @@
<dependency>
<groupId>com.dslplatform</groupId>
<artifactId>dsl-json</artifactId>
<version>0.9.5</version>
<version>1.0.0</version>
</dependency>

<dependency>
<groupId>com.dslplatform</groupId>
<artifactId>dsl-json-processor</artifactId>
<version>0.4</version>
<version>1.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>

</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand All @@ -26,6 +27,11 @@ public Map<?,?> _readItems(byte[] input) throws Exception {
return mapper.readValue(input, Map.class);
}

@Override
public Map<?,?> _readItems(InputStream input) throws Exception {
return mapper.readValue(input, Map.class);
}

@Override
public Map<?,?> _readItems(String input) throws Exception {
return mapper.readValue(input, Map.class);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.cowtowncoder.jsonperf.dzone.read;

import com.dslplatform.json.DslJson;
import org.openjdk.jmh.annotations.OutputTimeUnit;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;

import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

@State(Scope.Thread)
@OutputTimeUnit(TimeUnit.SECONDS)
public class DZoneReadMapDslJson extends DZoneReadTestBase<Map<String, Object>>
{
private final DslJson<Object> dsl;
private final byte[] buffer = new byte[8192];

public DZoneReadMapDslJson()
{
dsl = new DslJson<>();
}

@SuppressWarnings("unchecked")
@Override
public Map<String, Object> _readItems(byte[] input) throws Exception {
return dsl.deserialize(Map.class, input, input.length);
}

@SuppressWarnings("unchecked")
@Override
public Map<String, Object> _readItems(InputStream input) throws Exception {
return dsl.deserialize(Map.class, input, buffer);
}

@Override
public Map<String, Object> _readItems(String input) throws Exception {
return _readItems(input.getBytes("UTF-8"));
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand All @@ -25,6 +26,12 @@ public Map<Object,Object> _readItems(byte[] input) throws Exception {
return (Map<Object,Object>) JSON.parse(input, Feature.DisableCircularReferenceDetect);
}

@SuppressWarnings("unchecked")
@Override
public Map<Object,Object> _readItems(InputStream input) throws Exception {
return (Map<Object,Object>) JSON.parseObject(input, Map.class, Feature.DisableCircularReferenceDetect);
}

@SuppressWarnings("unchecked")
@Override
public Map<Object,Object> _readItems(String input) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ public DZoneReadMapGSON()

@Override
public Map<?,?> _readItems(byte[] input) throws Exception {
InputStreamReader r = new InputStreamReader(new ByteArrayInputStream(input), "UTF-8");
return _readItems(new ByteArrayInputStream(input));
}

@Override
public Map<?,?> _readItems(InputStream input) throws Exception {
InputStreamReader r = new InputStreamReader(input, "UTF-8");
Map<?,?> value = gson.fromJson(r, Map.class);
r.close();
return value;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand All @@ -26,6 +27,11 @@ public Map<Object,Object> _readItems(byte[] input) throws Exception {
return objectReader.readValue(input);
}

@Override
public Map<Object,Object> _readItems(InputStream input) throws Exception {
return objectReader.readValue(input);
}

@Override
public Map<Object,Object> _readItems(String input) throws Exception {
return objectReader.readValue(input);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand All @@ -25,6 +26,11 @@ public Map<?,?> _readItems(byte[] input) throws Exception {
return json.mapFrom(input);
}

@Override
public Map<?,?> _readItems(InputStream input) throws Exception {
return json.mapFrom(input);
}

@Override
public Map<?,?> _readItems(String input) throws Exception {
return json.mapFrom(input);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand All @@ -23,8 +24,13 @@ public DZoneReadMapJohnzon()

@Override
public Map<?,?> _readItems(byte[] input) throws Exception {
return _readItems(new ByteArrayInputStream(input));
}

@Override
public Map<?,?> _readItems(InputStream input) throws Exception {
// force assign to ensure casting checks the type
Map<?,?> value = mapper.readObject(new ByteArrayInputStream(input), Object.class);
Map<?,?> value = mapper.readObject(input, Object.class);
return value;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ public DZoneReadMapJsonIO() { }

@Override
public Map<?,?> _readItems(byte[] input) throws Exception {
JsonReader r = new JsonReader(new ByteArrayInputStream(input));
return _readItems(new ByteArrayInputStream(input));
}

@Override
public Map<?,?> _readItems(InputStream input) throws Exception {
JsonReader r = new JsonReader(input);
Map<?,?> value = (Map<?,?>) r.readObject();
r.close();
return value;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import org.apache.commons.io.IOUtils;
import org.openjdk.jmh.annotations.OutputTimeUnit;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;
Expand Down Expand Up @@ -30,6 +32,11 @@ public Map _readItems(byte[] input) throws Exception {
return adapter.fromJson(new String(input, "UTF-8"));
}

@Override
public Map _readItems(InputStream input) throws Exception {
return adapter.fromJson(IOUtils.toString(input, "UTF-8"));
}

@Override
public Map _readItems(String input) throws Exception {
return adapter.fromJson(input);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import org.apache.commons.io.IOUtils;
import org.openjdk.jmh.annotations.OutputTimeUnit;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;
Expand All @@ -27,6 +29,11 @@ public Map<?,?> _readItems(byte[] input) throws Exception {
return _readItems(new String(input, "UTF-8"));
}

@Override
public Map<?,?> _readItems(InputStream input) throws Exception {
return _readItems(IOUtils.toString(input, "UTF-8"));
}

@Override
public Map<?,?> _readItems(String input) throws Exception {
return parse.map(input);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.OutputTimeUnit;
Expand Down Expand Up @@ -27,6 +28,11 @@ public MeasurementPOJO _readItems(byte[] input) throws Exception {
return mapper.readValue(input, MeasurementPOJO.class);
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
return mapper.readValue(input, MeasurementPOJO.class);
}

@Override
public MeasurementPOJO _readItems(String input) throws Exception {
return mapper.readValue(input, MeasurementPOJO.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;

import java.io.InputStream;
import java.util.concurrent.TimeUnit;

@State(Scope.Thread)
@OutputTimeUnit(TimeUnit.SECONDS)
public class DZoneReadPojoDslJson extends DZoneReadTestBase<MeasurementPOJO>
{
private final DslJson<Object> dsl;
private final byte[] buffer = new byte[8192];

public DZoneReadPojoDslJson()
{
Expand All @@ -24,6 +26,11 @@ public MeasurementPOJO _readItems(byte[] input) throws Exception {
return dsl.deserialize(MeasurementPOJO.class, input, input.length);
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
return dsl.deserialize(MeasurementPOJO.class, input, buffer);
}

@Override
public MeasurementPOJO _readItems(String input) throws Exception {
return _readItems(input.getBytes("UTF-8"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.OutputTimeUnit;
Expand All @@ -24,6 +25,11 @@ public MeasurementPOJO _readItems(byte[] input) throws Exception {
return JSON.parseObject(input, MeasurementPOJO.class, Feature.DisableCircularReferenceDetect);
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
return JSON.parseObject(input, MeasurementPOJO.class, Feature.DisableCircularReferenceDetect);
}

@Override
public MeasurementPOJO _readItems(String input) throws Exception {
return JSON.parseObject(input, MeasurementPOJO.class, Feature.DisableCircularReferenceDetect);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ public DZoneReadPojoGSON()

@Override
public MeasurementPOJO _readItems(byte[] input) throws Exception {
InputStreamReader r = new InputStreamReader(new ByteArrayInputStream(input), "UTF-8");
return _readItems(new ByteArrayInputStream(input));
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
InputStreamReader r = new InputStreamReader(input, "UTF-8");
MeasurementPOJO value = gson.fromJson(r, MeasurementPOJO.class);
r.close();
return value;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.OutputTimeUnit;
Expand All @@ -26,6 +27,11 @@ public MeasurementPOJO _readItems(byte[] input) throws Exception {
return objectReader.readValue(input);
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
return objectReader.readValue(input);
}

@Override
public MeasurementPOJO _readItems(String input) throws Exception {
return objectReader.readValue(input);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.OutputTimeUnit;
Expand Down Expand Up @@ -29,6 +30,11 @@ public MeasurementPOJO _readItems(byte[] input) throws Exception {
return objectReader.readValue(input);
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
return objectReader.readValue(input);
}

@Override
public MeasurementPOJO _readItems(String input) throws Exception {
return objectReader.readValue(input);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.InputStream;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.OutputTimeUnit;
Expand All @@ -25,6 +26,11 @@ public MeasurementPOJO _readItems(byte[] input) throws Exception {
return json.beanFrom(MeasurementPOJO.class, input);
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
return json.beanFrom(MeasurementPOJO.class, input);
}

@Override
public MeasurementPOJO _readItems(String input) throws Exception {
return json.beanFrom(MeasurementPOJO.class, input);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cowtowncoder.jsonperf.dzone.read;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.concurrent.TimeUnit;

import org.apache.johnzon.mapper.Mapper;
Expand All @@ -27,6 +28,11 @@ public MeasurementPOJO _readItems(byte[] input) throws Exception {
return mapper.readObject(new ByteArrayInputStream(input), MeasurementPOJO.class);
}

@Override
public MeasurementPOJO _readItems(InputStream input) throws Exception {
return mapper.readObject(input, MeasurementPOJO.class);
}

@Override
public MeasurementPOJO _readItems(String input) throws Exception {
return mapper.readObject(input, MeasurementPOJO.class);
Expand Down
Loading