You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by sa...@apache.org on 2015/01/12 21:03:36 UTC
[1/2] incubator-johnzon git commit: JOHNZON-35 Mapper fails on short
and byte array - patch from Prem Sangeeth, thanks a lot
Repository: incubator-johnzon
Updated Branches:
refs/heads/master bcab1c842 -> 92098f456
JOHNZON-35 Mapper fails on short and byte array - patch from Prem Sangeeth, thanks a lot
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/32d0715d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/32d0715d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/32d0715d
Branch: refs/heads/master
Commit: 32d0715dfbf7de615005a51efa862c159d94ba2e
Parents: bcab1c8
Author: Hendrik Saly <he...@gmail.com>
Authored: Mon Jan 12 17:56:17 2015 +0100
Committer: Hendrik Saly <he...@gmail.com>
Committed: Mon Jan 12 17:56:17 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/johnzon/mapper/Mapper.java | 2 +-
.../java/org/apache/johnzon/mapper/MapperTest.java | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/32d0715d/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
index 561edbb..a596d40 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
@@ -107,7 +107,7 @@ public class Mapper {
} else if (type == long.class || type == Long.class) {
return generator.write(Long.class.cast(value).longValue());
} else if (isInt(type)) {
- return generator.write(Integer.class.cast(value).intValue());
+ return generator.write(Number.class.cast(value).intValue());
} else if (isFloat(type)) {
final double doubleValue = Number.class.cast(value).doubleValue();
if (Double.isNaN(doubleValue)) {
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/32d0715d/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
index 1ff65f3..f0196d0 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
@@ -137,6 +137,21 @@ public class MapperTest {
assertEquals(instance, instance2);
}
+
+
+ @Test
+ public void writeShortArray() {
+ StringWriter writer = new StringWriter();
+ new MapperBuilder().build().writeArray(new Short[]{(short)1,(short)2,(short)3},writer);
+ assertEquals("[1,2,3]", writer.toString());
+ }
+
+ @Test
+ public void writeByteArray() {
+ StringWriter writer = new StringWriter();
+ new MapperBuilder().build().writeArray(new Byte[]{(byte)1,(byte)2,(byte)3},writer);
+ assertEquals("[1,2,3]", writer.toString());
+ }
static class Bool {
private boolean bool;
[2/2] incubator-johnzon git commit: Make byte[] de/serialization
configurable (de/serialize to plain int array which is the default or to
base64 encoded string)
Posted by sa...@apache.org.
Make byte[] de/serialization configurable (de/serialize to plain int array which is the default or to base64 encoded string)
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/92098f45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/92098f45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/92098f45
Branch: refs/heads/master
Commit: 92098f4561c80a569c8349d8132369dcfa998e08
Parents: 32d0715
Author: Hendrik Saly <he...@gmail.com>
Authored: Mon Jan 12 21:03:30 2015 +0100
Committer: Hendrik Saly <he...@gmail.com>
Committed: Mon Jan 12 21:03:30 2015 +0100
----------------------------------------------------------------------
.../jaxrs/ConfigurableJohnzonProvider.java | 4 +
.../java/org/apache/johnzon/mapper/Mapper.java | 56 ++++--
.../apache/johnzon/mapper/MapperBuilder.java | 33 ++--
.../org/apache/johnzon/mapper/MapperTest.java | 196 ++++++++++++++++++-
pom.xml | 2 +-
5 files changed, 248 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/92098f45/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java
----------------------------------------------------------------------
diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java
index bb23ebd..a169925 100644
--- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java
@@ -163,4 +163,8 @@ public class ConfigurableJohnzonProvider<T> implements MessageBodyWriter<T>, Mes
public void setMaxSize(final int size) {
builder.setMaxSize(size);
}
+
+ public void setTreatByteArrayAsBase64(final boolean treatByteArrayAsBase64) {
+ builder.setTreatByteArrayAsBase64(treatByteArrayAsBase64);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/92098f45/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
index a596d40..bba8ab3 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
@@ -18,22 +18,8 @@
*/
package org.apache.johnzon.mapper;
-import org.apache.johnzon.mapper.access.AccessMode;
-import org.apache.johnzon.mapper.converter.EnumConverter;
-import org.apache.johnzon.mapper.reflection.JohnzonCollectionType;
-import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
-import org.apache.johnzon.mapper.reflection.Mappings;
+import static java.util.Arrays.asList;
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -63,7 +49,23 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import static java.util.Arrays.asList;
+import javax.json.JsonArray;
+import javax.json.JsonNumber;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+import javax.json.JsonReaderFactory;
+import javax.json.JsonString;
+import javax.json.JsonValue;
+import javax.json.JsonValue.ValueType;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonGeneratorFactory;
+import javax.xml.bind.DatatypeConverter;
+
+import org.apache.johnzon.mapper.access.AccessMode;
+import org.apache.johnzon.mapper.converter.EnumConverter;
+import org.apache.johnzon.mapper.reflection.JohnzonCollectionType;
+import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
+import org.apache.johnzon.mapper.reflection.Mappings;
public class Mapper {
private static final Converter<Object> FALLBACK_CONVERTER = new FallbackConverter();
@@ -75,15 +77,16 @@ public class Mapper {
protected final boolean close;
protected final ConcurrentMap<Type, Converter<?>> converters;
protected final int version;
- private final boolean hiddenConstructorSupported;
- private final AccessMode accessMode;
+ //private final boolean hiddenConstructorSupported;
+ //private final AccessMode accessMode;
protected boolean skipNull;
protected boolean skipEmptyArray;
+ protected boolean treatByteArrayAsBase64;
public Mapper(final JsonReaderFactory readerFactory, final JsonGeneratorFactory generatorFactory,
final boolean doClose, final Map<Class<?>, Converter<?>> converters,
final int version, final Comparator<String> attributeOrder, boolean skipNull, boolean skipEmptyArray,
- final AccessMode accessMode, final boolean hiddenConstructorSupported) {
+ final AccessMode accessMode, final boolean hiddenConstructorSupported, boolean treatByteArrayAsBase64) {
this.readerFactory = readerFactory;
this.generatorFactory = generatorFactory;
this.close = doClose;
@@ -92,8 +95,9 @@ public class Mapper {
this.mappings = new Mappings(attributeOrder, accessMode, hiddenConstructorSupported);
this.skipNull = skipNull;
this.skipEmptyArray = skipEmptyArray;
- this.accessMode = accessMode;
- this.hiddenConstructorSupported = hiddenConstructorSupported;
+ //this.accessMode = accessMode;
+ //this.hiddenConstructorSupported = hiddenConstructorSupported;
+ this.treatByteArrayAsBase64 = treatByteArrayAsBase64;
}
private static JsonGenerator writePrimitives(final JsonGenerator generator, final Object value) {
@@ -389,6 +393,12 @@ public class Mapper {
if (length == 0 && skipEmptyArray) {
return generator;
}
+
+ if(treatByteArrayAsBase64 && (type == byte[].class /*|| type == Byte[].class*/)) {
+ String base64EncodedByteArray = DatatypeConverter.printBase64Binary((byte[]) value);
+ generator.write(key, base64EncodedByteArray);
+ return generator;
+ }
JsonGenerator gen = generator.writeStartArray(key);
for (int i = 0; i < length; i++) {
@@ -595,6 +605,10 @@ public class Mapper {
throw new MapperException("Unable to parse " + jsonValue + " to boolean");
}
+ if(treatByteArrayAsBase64 && jsonValue.getValueType() == ValueType.STRING && (type == byte[].class /*|| type == Byte[].class*/)) {
+ return DatatypeConverter.parseBase64Binary(((JsonString)jsonValue).getString());
+ }
+
if (Object.class == type) { // handling specific types here to keep exception in standard handling
if (jsonValue == JsonValue.TRUE) {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/92098f45/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
index f08527d..b447464 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
@@ -18,6 +18,18 @@
*/
package org.apache.johnzon.mapper;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.json.JsonReaderFactory;
+import javax.json.spi.JsonProvider;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonGeneratorFactory;
+
import org.apache.johnzon.mapper.access.AccessMode;
import org.apache.johnzon.mapper.access.FieldAccessMode;
import org.apache.johnzon.mapper.access.FieldAndMethodAccessMode;
@@ -37,17 +49,6 @@ import org.apache.johnzon.mapper.converter.LongConverter;
import org.apache.johnzon.mapper.converter.ShortConverter;
import org.apache.johnzon.mapper.converter.StringConverter;
-import javax.json.JsonReaderFactory;
-import javax.json.spi.JsonProvider;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
public class MapperBuilder {
private static final Map<Class<?>, Converter<?>> DEFAULT_CONVERTERS = new HashMap<Class<?>, Converter<?>>();
@@ -90,6 +91,7 @@ public class MapperBuilder {
private boolean supportsComments = false;
protected boolean pretty;
private AccessMode accessMode = new MethodAccessMode();
+ private boolean treatByteArrayAsBase64;
private final Map<Class<?>, Converter<?>> converters = new HashMap<Class<?>, Converter<?>>(DEFAULT_CONVERTERS);
public Mapper build() {
@@ -130,7 +132,8 @@ public class MapperBuilder {
attributeOrder,
skipNull, skipEmptyArray,
accessMode,
- supportHiddenAccess);
+ supportHiddenAccess,
+ treatByteArrayAsBase64);
}
public MapperBuilder setSupportsComments(final boolean supportsComments) {
@@ -220,4 +223,10 @@ public class MapperBuilder {
this.skipEmptyArray = skipEmptyArray;
return this;
}
+
+ public MapperBuilder setTreatByteArrayAsBase64(final boolean treatByteArrayAsBase64) {
+ this.treatByteArrayAsBase64 = treatByteArrayAsBase64;
+ return this;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/92098f45/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
index f0196d0..7f6e10c 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
@@ -18,25 +18,27 @@
*/
package org.apache.johnzon.mapper;
-import org.apache.johnzon.mapper.reflection.JohnzonCollectionType;
-import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
-import org.junit.Test;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.StringReader;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.johnzon.mapper.reflection.JohnzonCollectionType;
+import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
+import org.junit.Test;
public class MapperTest {
private static final String BIG_OBJECT_STR = "{" + "\"name\":\"the string\"," + "\"integer\":56," + "\"longnumber\":118,"
@@ -152,6 +154,98 @@ public class MapperTest {
new MapperBuilder().build().writeArray(new Byte[]{(byte)1,(byte)2,(byte)3},writer);
assertEquals("[1,2,3]", writer.toString());
}
+
+
+ @Test
+ public void shortAndByte() {
+ ByteShort bs = new ByteShort();
+ bs.setNumByte((byte) 6);
+ bs.setNumShort((short) -1);
+ bs.setNumByteA(new byte[]{(byte) 1, (byte) -1, (byte) 2});
+ bs.setNumShortA(new short[]{(short) 4, (short) -2});
+
+ bs.setByteW(new Byte((byte)7));
+ bs.setShortW(new Short((short)22));
+ bs.setByteWA(new Byte[]{new Byte((byte) 4), new Byte((byte) -12), new Byte((byte) 2)});
+ bs.setShortWA(new Short[]{new Short((short) 7), new Short((short) -2)});
+
+ final String expectedJson = "{\"byteW\":7,\"byteWA\":[4,-12,2],\"numByte\":6,\"numByteA\":[1,-1,2],\"numShort\":-1,\"numShortA\":[4,-2],\"shortW\":22,\"shortWA\":[7,-2]}";
+ final Comparator<String> attributeOrder = new Comparator<String>() {
+ @Override
+ public int compare(final String o1, final String o2) {
+ return o1.compareTo(o2);
+ }
+ };
+
+ Mapper mapper = new MapperBuilder().setAttributeOrder(attributeOrder).build();
+
+ StringWriter writer = new StringWriter();
+ mapper.writeObject(bs, writer);
+ assertEquals(expectedJson, writer.toString());
+
+ ByteShort bsr = mapper.readObject(new StringReader(expectedJson), ByteShort.class);
+
+ writer = new StringWriter();
+ mapper.writeObject(bsr, writer);
+ assertEquals(expectedJson, writer.toString());
+ }
+
+ @Test
+ public void shortAndByteBase64() {
+ ByteShort bs = new ByteShort();
+ bs.setNumByte((byte) 6);
+ bs.setNumShort((short) -1);
+ bs.setNumByteA(new byte[]{(byte) 1, (byte) -1, (byte) 2});
+ bs.setNumShortA(new short[]{(short) 4, (short) -2});
+
+ bs.setByteW(new Byte((byte)7));
+ bs.setShortW(new Short((short)22));
+ bs.setByteWA(new Byte[]{new Byte((byte) 4), new Byte((byte) -12), new Byte((byte) 2)});
+ bs.setShortWA(new Short[]{new Short((short) 7), new Short((short) -2)});
+
+ final String expectedJson = "{\"byteW\":7,\"byteWA\":[4,-12,2],\"numByte\":6,\"numByteA\":\"Af8C\",\"numShort\":-1,\"numShortA\":[4,-2],\"shortW\":22,\"shortWA\":[7,-2]}";
+
+
+ final Comparator<String> attributeOrder = new Comparator<String>() {
+ @Override
+ public int compare(final String o1, final String o2) {
+ return o1.compareTo(o2);
+ }
+ };
+
+ Mapper mapper = new MapperBuilder().setAttributeOrder(attributeOrder).setTreatByteArrayAsBase64(true).build();
+
+ StringWriter writer = new StringWriter();
+ mapper.writeObject(bs, writer);
+ assertEquals(expectedJson, writer.toString());
+
+ ByteShort bsr = mapper.readObject(new StringReader(expectedJson), ByteShort.class);
+
+ writer = new StringWriter();
+ mapper.writeObject(bsr, writer);
+ assertEquals(expectedJson, writer.toString());
+ }
+
+ /*@Test
+ public void byteArrayBase64Converter() {
+
+ Mapper mapper = new MapperBuilder().setTreatByteArrayAsBase64(false).build();
+
+ ByteArray ba = new ByteArray();
+ ba.setByteArray(new byte[]{(byte) 1,(byte) 1,(byte) 1 });
+
+ final String expectedJson = "{\"shortW\":22,\"shortWA\":[7,-2],\"byteW\":7,\"numShortA\":[4,-2],\"numByteA\":\"Af8C\",\"byteWA\":[4,-12,2],\"numByte\":6,\"numShort\":-1}";
+
+ StringWriter writer = new StringWriter();
+ mapper.writeObject(ba, writer);
+ assertEquals(expectedJson, writer.toString());
+
+ ByteShort bsr = mapper.readObject(new StringReader(expectedJson), ByteArray.class);
+
+ writer = new StringWriter();
+ mapper.writeObject(bsr, writer);
+ assertEquals(expectedJson, writer.toString());
+ }*/
static class Bool {
private boolean bool;
@@ -571,4 +665,88 @@ public class MapperTest {
public static class FieldAccess {
private int value;
}
+
+ public static class ByteShort {
+
+ private byte numByte;
+ private short numShort;
+
+ private byte[] numByteA;
+ private short[] numShortA;
+
+ private Byte byteW;
+ private Short shortW;
+
+ private Byte[] byteWA;
+ private Short[] shortWA;
+
+ public byte[] getNumByteA() {
+ return numByteA;
+ }
+ public void setNumByteA(byte[] numByteA) {
+ this.numByteA = numByteA;
+ }
+ public short[] getNumShortA() {
+ return numShortA;
+ }
+ public void setNumShortA(short[] numShortA) {
+ this.numShortA = numShortA;
+ }
+ public byte getNumByte() {
+ return numByte;
+ }
+ public void setNumByte(byte numByte) {
+ this.numByte = numByte;
+ }
+ public Byte getByteW() {
+ return byteW;
+ }
+ public void setByteW(Byte byteW) {
+ this.byteW = byteW;
+ }
+ public Short getShortW() {
+ return shortW;
+ }
+ public void setShortW(Short shortW) {
+ this.shortW = shortW;
+ }
+ public Byte[] getByteWA() {
+ return byteWA;
+ }
+ public void setByteWA(Byte[] byteWA) {
+ this.byteWA = byteWA;
+ }
+ public Short[] getShortWA() {
+ return shortWA;
+ }
+ public void setShortWA(Short[] shortWA) {
+ this.shortWA = shortWA;
+ }
+ public short getNumShort() {
+ return numShort;
+ }
+ public void setNumShort(short numShort) {
+ this.numShort = numShort;
+ }
+
+
+
+ }
+
+ /*public static class ByteArray {
+
+ public byte[] byteArray;
+
+ @JohnzonConverter(ByteArrayBase64Converter.class)
+ public byte[] getByteArray() {
+ return byteArray;
+ }
+
+ @JohnzonConverter(ByteArrayBase64Converter.class)
+ public void setByteArray(byte[] byteArray) {
+ this.byteArray = byteArray;
+ }
+
+
+ }*/
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/92098f45/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a51212..e71914f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,7 +212,7 @@
<property name="max" value="250" />
</module>
<module name="ParameterNumber">
- <property name="max" value="10" />
+ <property name="max" value="11" />
</module>
<module name="EmptyBlock">
<property name="option" value="text" />