You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2017/06/24 12:40:13 UTC
johnzon git commit: JOHNZON-126 thanks James Carman to have renamed
JohnsonJsonb JohnzonJsonb
Repository: johnzon
Updated Branches:
refs/heads/master 59f8f7b75 -> 88629d3aa
JOHNZON-126 thanks James Carman to have renamed JohnsonJsonb JohnzonJsonb
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/88629d3a
Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/88629d3a
Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/88629d3a
Branch: refs/heads/master
Commit: 88629d3aa98ef1fb73286e2026749e011e77851f
Parents: 59f8f7b
Author: rmannibucau <rm...@apache.org>
Authored: Sat Jun 24 14:40:02 2017 +0200
Committer: rmannibucau <rm...@apache.org>
Committed: Sat Jun 24 14:40:02 2017 +0200
----------------------------------------------------------------------
.../org/apache/johnzon/jsonb/JohnsonJsonb.java | 368 -------------------
.../apache/johnzon/jsonb/JohnzonBuilder.java | 4 +-
.../org/apache/johnzon/jsonb/JohnzonJsonb.java | 368 +++++++++++++++++++
.../java/org/apache/johnzon/jsonb/cdi/CDIs.java | 10 +-
.../johnzon/jsonb/cdi/JohnzonCdiExtension.java | 8 +-
5 files changed, 379 insertions(+), 379 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/johnzon/blob/88629d3a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnsonJsonb.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnsonJsonb.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnsonJsonb.java
deleted file mode 100644
index 7308374..0000000
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnsonJsonb.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.johnzon.jsonb;
-
-import org.apache.johnzon.mapper.Mapper;
-import org.apache.johnzon.mapper.MapperException;
-import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
-
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.Writer;
-import java.lang.reflect.Array;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.Optional;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
-
-// TODO: Optional handling for lists (and arrays)?
-public class JohnsonJsonb implements Jsonb, AutoCloseable {
- private final Mapper delegate;
-
- public JohnsonJsonb(final Mapper build) {
- this.delegate = build;
- }
-
- @Override
- public <T> T fromJson(final String str, final Class<T> type) throws JsonbException {
- try {
- if (isArray(type)) {
- return delegate.readTypedArray(new StringReader(str), type.getComponentType(), type);
- } else if (Collection.class.isAssignableFrom(type)) {
- return (T) delegate.readCollection(new StringReader(str), new JohnzonParameterizedType(type, Object.class));
- }
- final Type mappingType = unwrapPrimitiveOptional(type);
- final Object object = delegate.readObject(str, mappingType);
- if (mappingType != type) {
- return wrapPrimitiveOptional(object, type);
- }
- return (T) object;
- } catch (final MapperException me) {
- throw new JsonbException(me.getMessage(), me);
- }
- }
-
- private <T> T wrapPrimitiveOptional(final Object object, final Type type) {
- if (OptionalDouble.class == type) {
- if (object == null) {
- return (T) OptionalDouble.empty();
- }
- return (T) OptionalDouble.of(Number.class.cast(object).doubleValue());
- } else if (OptionalInt.class == type) {
- if (object == null) {
- return (T) OptionalInt.empty();
- }
- return (T) OptionalInt.of(Number.class.cast(object).intValue());
- } else if (OptionalLong.class == type) {
- if (object == null) {
- return (T) OptionalLong.empty();
- }
- return (T) OptionalLong.of(Number.class.cast(object).longValue());
- }
- // Optional
- return (T) Optional.ofNullable(object);
- }
-
- private Type unwrapPrimitiveOptional(final Type type) {
- if (OptionalDouble.class == type) {
- return double.class;
- } else if (OptionalInt.class == type) {
- return int.class;
- } else if (OptionalLong.class == type) {
- return long.class;
- } else if (ParameterizedType.class.isInstance(type)) {
- final ParameterizedType pt = ParameterizedType.class.cast(type);
- if (Optional.class == pt.getRawType()) {
- return pt.getActualTypeArguments()[0];
- }
- }
- return type;
- }
-
- @Override
- public <T> T fromJson(final String str, final Type runtimeType) throws JsonbException {
- try {
- if (isArray(runtimeType)) {
- final Class cast = Class.class.cast(runtimeType);
- return (T) delegate.readTypedArray(new StringReader(str), cast.getComponentType(), cast);
- } else if (isCollection(runtimeType)) {
- return (T) delegate.readCollection(new StringReader(str), ParameterizedType.class.cast(runtimeType));
- }
- final Type mappingType = unwrapPrimitiveOptional(runtimeType);
- final Object object = delegate.readObject(str, mappingType);
- if (mappingType != runtimeType) {
- return wrapPrimitiveOptional(object, runtimeType);
- }
- return (T) object;
- } catch (final MapperException me) {
- throw new JsonbException(me.getMessage(), me);
- }
- }
-
- @Override
- public <T> T fromJson(final Reader reader, final Class<T> type) throws JsonbException {
- try {
- if (isArray(type)) {
- return delegate.readTypedArray(reader, type.getComponentType(), type);
- } else if (Collection.class.isAssignableFrom(type)) {
- return (T) delegate.readCollection(reader, new JohnzonParameterizedType(type, Object.class));
- }
- final Type mappingType = unwrapPrimitiveOptional(type);
- final Object object = delegate.readObject(reader, mappingType);
- if (mappingType != type) {
- return wrapPrimitiveOptional(object, type);
- }
- return (T) object;
- } catch (final MapperException me) {
- throw new JsonbException(me.getMessage(), me);
- }
- }
-
- @Override
- public <T> T fromJson(final Reader reader, final Type runtimeType) throws JsonbException {
- try {
- if (isArray(runtimeType)) {
- final Class<T> type = Class.class.cast(runtimeType);
- return delegate.readTypedArray(reader, type.getComponentType(), type);
- } else if (isCollection(runtimeType)) {
- return (T) delegate.readCollection(reader, ParameterizedType.class.cast(runtimeType));
- }
- final Type mappingType = unwrapPrimitiveOptional(runtimeType);
- final Object object = delegate.readObject(reader, mappingType);
- if (mappingType != runtimeType) {
- return wrapPrimitiveOptional(object, runtimeType);
- }
- return (T) object;
- } catch (final MapperException me) {
- throw new JsonbException(me.getMessage(), me);
- }
- }
-
- @Override
- public <T> T fromJson(final InputStream stream, final Class<T> type) throws JsonbException {
- try {
- if (isArray(type)) {
- return delegate.readTypedArray(stream, type.getComponentType(), type);
- } else if (Collection.class.isAssignableFrom(type)) {
- return (T) delegate.readCollection(stream, new JohnzonParameterizedType(type, Object.class));
- }
- final Type mappingType = unwrapPrimitiveOptional(type);
- final Object object = delegate.readObject(stream, mappingType);
- if (mappingType != type) {
- return wrapPrimitiveOptional(object, type);
- }
- return (T) object;
- } catch (final MapperException me) {
- throw new JsonbException(me.getMessage(), me);
- }
- }
-
- @Override
- public <T> T fromJson(final InputStream stream, final Type runtimeType) throws JsonbException {
- try {
- if (isArray(runtimeType)) {
- final Class<T> type = Class.class.cast(runtimeType);
- return delegate.readTypedArray(stream, type.getComponentType(), type);
- } else if (isCollection(runtimeType)) {
- return (T) delegate.readCollection(stream, ParameterizedType.class.cast(runtimeType));
- }
-
- final Type mappingType = unwrapPrimitiveOptional(runtimeType);
- final Object object = delegate.readObject(stream, mappingType);
- if (mappingType != runtimeType) {
- return wrapPrimitiveOptional(object, runtimeType);
- }
- return (T) object;
- } catch (final MapperException me) {
- throw new JsonbException(me.getMessage(), me);
- }
- }
-
- @Override
- public String toJson(final Object inObject) throws JsonbException {
- try {
- final Object object = unwrapOptional(inObject);
- if (object == null) {
- return "null";
- }
- if (isArray(object.getClass())) {
- return delegate.writeArrayAsString(toArray(object));
- } else if (Collection.class.isInstance(object)) {
- return delegate.writeArrayAsString(Collection.class.cast(object));
- }
- return delegate.writeObjectAsString(object);
-
- } catch (final MapperException me) {
- throw new JsonbException(me.getMessage(), me);
- }
- }
-
- private Object[] toArray(final Object object) {
- final Class<?> componentType = object.getClass().getComponentType();
- Object[] array;
- if (int.class == componentType) {
- final int length = Array.getLength(object);
- array = new Integer[length];
- for (int i = 0; i < length; i++) {
- array[i] = Array.getInt(object, i);
- }
- } else if (double.class == componentType) {
- final int length = Array.getLength(object);
- array = new Integer[length];
- for (int i = 0; i < length; i++) {
- array[i] = Array.getDouble(object, i);
- }
- } else if (byte.class == componentType) {
- final int length = Array.getLength(object);
- array = new Integer[length];
- for (int i = 0; i < length; i++) {
- array[i] = Array.getByte(object, i);
- }
- } else if (char.class == componentType) {
- final int length = Array.getLength(object);
- array = new Integer[length];
- for (int i = 0; i < length; i++) {
- array[i] = Array.getChar(object, i);
- }
- } else if (float.class == componentType) {
- final int length = Array.getLength(object);
- array = new Integer[length];
- for (int i = 0; i < length; i++) {
- array[i] = Array.getFloat(object, i);
- }
- } else if (long.class == componentType) {
- final int length = Array.getLength(object);
- array = new Integer[length];
- for (int i = 0; i < length; i++) {
- array[i] = Array.getLong(object, i);
- }
- } else if (short.class == componentType) {
- final int length = Array.getLength(object);
- array = new Integer[length];
- for (int i = 0; i < length; i++) {
- array[i] = Array.getShort(object, i);
- }
- } else {
- array = (Object[]) object;
- }
- return array;
- }
-
- @Override
- public String toJson(final Object inObject, final Type runtimeType) throws JsonbException {
- final Object object = unwrapOptional(inObject);
- if (object != null && isArray(runtimeType)) {
- return delegate.writeArrayAsString((Object[]) object);
- } else if (isCollection(runtimeType)) {
- return delegate.writeArrayAsString(Collection.class.cast(object));
- }
- return delegate.writeObjectAsString(object);
- }
-
- @Override
- public void toJson(final Object inObject, final Writer writer) throws JsonbException {
- final Object object = unwrapOptional(inObject);
- if (object != null && isArray(object.getClass())) {
- delegate.writeArray((Object[]) object, writer);
- } else if (Collection.class.isInstance(object)) {
- delegate.writeArray(Collection.class.cast(object), writer);
- } else {
- delegate.writeObject(object, writer);
- }
- }
-
- @Override
- public void toJson(final Object inObject, final Type runtimeType, final Writer writer) throws JsonbException {
- final Object object = unwrapOptional(inObject);
- if (object != null && isArray(runtimeType)) {
- delegate.writeArray((Object[]) object, writer);
- } else if (isCollection(runtimeType)) {
- delegate.writeArray(Collection.class.cast(object), writer);
- } else {
- delegate.writeObject(object, writer);
- }
- }
-
- @Override
- public void toJson(final Object inObject, final OutputStream stream) throws JsonbException {
- final Object object = unwrapOptional(inObject);
- if (object != null && isArray(object.getClass())) {
- delegate.writeArray((Object[]) object, stream);
- } else if (Collection.class.isInstance(object)) {
- delegate.writeArray(Collection.class.cast(object), stream);
- } else {
- delegate.writeObject(object, stream);
- }
- }
-
- @Override
- public void toJson(final Object inObject, final Type runtimeType, final OutputStream stream) throws JsonbException {
- final Object object = unwrapOptional(inObject);
- if (object != null && isArray(runtimeType)) {
- delegate.writeArray((Object[]) object, stream);
- } else if (isCollection(runtimeType)) {
- delegate.writeArray(Collection.class.cast(object), stream);
- } else {
- delegate.writeObject(object, stream);
- }
- }
-
- private Object unwrapOptional(final Object inObject) {
- if (Optional.class.isInstance(inObject)) {
- return Optional.class.cast(inObject).orElse(null);
- }
- if (OptionalInt.class.isInstance(inObject)) {
- final OptionalInt optionalInt = OptionalInt.class.cast(inObject);
- return optionalInt.isPresent() ? optionalInt.getAsInt() : null;
- }
- if (OptionalLong.class.isInstance(inObject)) {
- final OptionalLong optionalLong = OptionalLong.class.cast(inObject);
- return optionalLong.isPresent() ? optionalLong.getAsLong() : null;
- }
- if (OptionalDouble.class.isInstance(inObject)) {
- final OptionalDouble optionalDouble = OptionalDouble.class.cast(inObject);
- return optionalDouble.isPresent() ? optionalDouble.getAsDouble() : null;
- }
- return inObject;
- }
-
- private boolean isArray(final Type runtimeType) {
- return Class.class.isInstance(runtimeType) && Class.class.cast(runtimeType).isArray();
- }
-
- private boolean isCollection(final Type runtimeType) {
- if (!ParameterizedType.class.isInstance(runtimeType)) {
- return false;
- }
- final Type rawType = ParameterizedType.class.cast(runtimeType).getRawType();
- return Class.class.isInstance(rawType) && Collection.class.isAssignableFrom(Class.class.cast(rawType));
- }
-
- @Override
- public void close() {
- delegate.close();
- }
-}
http://git-wip-us.apache.org/repos/asf/johnzon/blob/88629d3a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index b3a55cb..3778ff6 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -330,7 +330,7 @@ public class JohnzonBuilder implements JsonbBuilder {
final boolean useCdi = cdiIntegration != null && cdiIntegration.isCanWrite() && config.getProperty("johnzon.cdi.activated").map(Boolean.class::cast).orElse(Boolean.TRUE);
final Mapper mapper = builder.addCloseable(accessMode).build();
- return useCdi ? new JohnsonJsonb(mapper) {
+ return useCdi ? new JohnzonJsonb(mapper) {
{
cdiIntegration.track(this);
}
@@ -345,7 +345,7 @@ public class JohnzonBuilder implements JsonbBuilder {
}
}
}
- } : new JohnsonJsonb(mapper);
+ } : new JohnzonJsonb(mapper);
}
private Supplier<JsonParserFactory> createJsonParserFactory() {
http://git-wip-us.apache.org/repos/asf/johnzon/blob/88629d3a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
new file mode 100644
index 0000000..9894228
--- /dev/null
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
@@ -0,0 +1,368 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.johnzon.jsonb;
+
+import org.apache.johnzon.mapper.Mapper;
+import org.apache.johnzon.mapper.MapperException;
+import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
+import java.lang.reflect.Array;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+
+// TODO: Optional handling for lists (and arrays)?
+public class JohnzonJsonb implements Jsonb, AutoCloseable {
+ private final Mapper delegate;
+
+ public JohnzonJsonb(final Mapper build) {
+ this.delegate = build;
+ }
+
+ @Override
+ public <T> T fromJson(final String str, final Class<T> type) throws JsonbException {
+ try {
+ if (isArray(type)) {
+ return delegate.readTypedArray(new StringReader(str), type.getComponentType(), type);
+ } else if (Collection.class.isAssignableFrom(type)) {
+ return (T) delegate.readCollection(new StringReader(str), new JohnzonParameterizedType(type, Object.class));
+ }
+ final Type mappingType = unwrapPrimitiveOptional(type);
+ final Object object = delegate.readObject(str, mappingType);
+ if (mappingType != type) {
+ return wrapPrimitiveOptional(object, type);
+ }
+ return (T) object;
+ } catch (final MapperException me) {
+ throw new JsonbException(me.getMessage(), me);
+ }
+ }
+
+ private <T> T wrapPrimitiveOptional(final Object object, final Type type) {
+ if (OptionalDouble.class == type) {
+ if (object == null) {
+ return (T) OptionalDouble.empty();
+ }
+ return (T) OptionalDouble.of(Number.class.cast(object).doubleValue());
+ } else if (OptionalInt.class == type) {
+ if (object == null) {
+ return (T) OptionalInt.empty();
+ }
+ return (T) OptionalInt.of(Number.class.cast(object).intValue());
+ } else if (OptionalLong.class == type) {
+ if (object == null) {
+ return (T) OptionalLong.empty();
+ }
+ return (T) OptionalLong.of(Number.class.cast(object).longValue());
+ }
+ // Optional
+ return (T) Optional.ofNullable(object);
+ }
+
+ private Type unwrapPrimitiveOptional(final Type type) {
+ if (OptionalDouble.class == type) {
+ return double.class;
+ } else if (OptionalInt.class == type) {
+ return int.class;
+ } else if (OptionalLong.class == type) {
+ return long.class;
+ } else if (ParameterizedType.class.isInstance(type)) {
+ final ParameterizedType pt = ParameterizedType.class.cast(type);
+ if (Optional.class == pt.getRawType()) {
+ return pt.getActualTypeArguments()[0];
+ }
+ }
+ return type;
+ }
+
+ @Override
+ public <T> T fromJson(final String str, final Type runtimeType) throws JsonbException {
+ try {
+ if (isArray(runtimeType)) {
+ final Class cast = Class.class.cast(runtimeType);
+ return (T) delegate.readTypedArray(new StringReader(str), cast.getComponentType(), cast);
+ } else if (isCollection(runtimeType)) {
+ return (T) delegate.readCollection(new StringReader(str), ParameterizedType.class.cast(runtimeType));
+ }
+ final Type mappingType = unwrapPrimitiveOptional(runtimeType);
+ final Object object = delegate.readObject(str, mappingType);
+ if (mappingType != runtimeType) {
+ return wrapPrimitiveOptional(object, runtimeType);
+ }
+ return (T) object;
+ } catch (final MapperException me) {
+ throw new JsonbException(me.getMessage(), me);
+ }
+ }
+
+ @Override
+ public <T> T fromJson(final Reader reader, final Class<T> type) throws JsonbException {
+ try {
+ if (isArray(type)) {
+ return delegate.readTypedArray(reader, type.getComponentType(), type);
+ } else if (Collection.class.isAssignableFrom(type)) {
+ return (T) delegate.readCollection(reader, new JohnzonParameterizedType(type, Object.class));
+ }
+ final Type mappingType = unwrapPrimitiveOptional(type);
+ final Object object = delegate.readObject(reader, mappingType);
+ if (mappingType != type) {
+ return wrapPrimitiveOptional(object, type);
+ }
+ return (T) object;
+ } catch (final MapperException me) {
+ throw new JsonbException(me.getMessage(), me);
+ }
+ }
+
+ @Override
+ public <T> T fromJson(final Reader reader, final Type runtimeType) throws JsonbException {
+ try {
+ if (isArray(runtimeType)) {
+ final Class<T> type = Class.class.cast(runtimeType);
+ return delegate.readTypedArray(reader, type.getComponentType(), type);
+ } else if (isCollection(runtimeType)) {
+ return (T) delegate.readCollection(reader, ParameterizedType.class.cast(runtimeType));
+ }
+ final Type mappingType = unwrapPrimitiveOptional(runtimeType);
+ final Object object = delegate.readObject(reader, mappingType);
+ if (mappingType != runtimeType) {
+ return wrapPrimitiveOptional(object, runtimeType);
+ }
+ return (T) object;
+ } catch (final MapperException me) {
+ throw new JsonbException(me.getMessage(), me);
+ }
+ }
+
+ @Override
+ public <T> T fromJson(final InputStream stream, final Class<T> type) throws JsonbException {
+ try {
+ if (isArray(type)) {
+ return delegate.readTypedArray(stream, type.getComponentType(), type);
+ } else if (Collection.class.isAssignableFrom(type)) {
+ return (T) delegate.readCollection(stream, new JohnzonParameterizedType(type, Object.class));
+ }
+ final Type mappingType = unwrapPrimitiveOptional(type);
+ final Object object = delegate.readObject(stream, mappingType);
+ if (mappingType != type) {
+ return wrapPrimitiveOptional(object, type);
+ }
+ return (T) object;
+ } catch (final MapperException me) {
+ throw new JsonbException(me.getMessage(), me);
+ }
+ }
+
+ @Override
+ public <T> T fromJson(final InputStream stream, final Type runtimeType) throws JsonbException {
+ try {
+ if (isArray(runtimeType)) {
+ final Class<T> type = Class.class.cast(runtimeType);
+ return delegate.readTypedArray(stream, type.getComponentType(), type);
+ } else if (isCollection(runtimeType)) {
+ return (T) delegate.readCollection(stream, ParameterizedType.class.cast(runtimeType));
+ }
+
+ final Type mappingType = unwrapPrimitiveOptional(runtimeType);
+ final Object object = delegate.readObject(stream, mappingType);
+ if (mappingType != runtimeType) {
+ return wrapPrimitiveOptional(object, runtimeType);
+ }
+ return (T) object;
+ } catch (final MapperException me) {
+ throw new JsonbException(me.getMessage(), me);
+ }
+ }
+
+ @Override
+ public String toJson(final Object inObject) throws JsonbException {
+ try {
+ final Object object = unwrapOptional(inObject);
+ if (object == null) {
+ return "null";
+ }
+ if (isArray(object.getClass())) {
+ return delegate.writeArrayAsString(toArray(object));
+ } else if (Collection.class.isInstance(object)) {
+ return delegate.writeArrayAsString(Collection.class.cast(object));
+ }
+ return delegate.writeObjectAsString(object);
+
+ } catch (final MapperException me) {
+ throw new JsonbException(me.getMessage(), me);
+ }
+ }
+
+ private Object[] toArray(final Object object) {
+ final Class<?> componentType = object.getClass().getComponentType();
+ Object[] array;
+ if (int.class == componentType) {
+ final int length = Array.getLength(object);
+ array = new Integer[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = Array.getInt(object, i);
+ }
+ } else if (double.class == componentType) {
+ final int length = Array.getLength(object);
+ array = new Integer[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = Array.getDouble(object, i);
+ }
+ } else if (byte.class == componentType) {
+ final int length = Array.getLength(object);
+ array = new Integer[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = Array.getByte(object, i);
+ }
+ } else if (char.class == componentType) {
+ final int length = Array.getLength(object);
+ array = new Integer[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = Array.getChar(object, i);
+ }
+ } else if (float.class == componentType) {
+ final int length = Array.getLength(object);
+ array = new Integer[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = Array.getFloat(object, i);
+ }
+ } else if (long.class == componentType) {
+ final int length = Array.getLength(object);
+ array = new Integer[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = Array.getLong(object, i);
+ }
+ } else if (short.class == componentType) {
+ final int length = Array.getLength(object);
+ array = new Integer[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = Array.getShort(object, i);
+ }
+ } else {
+ array = (Object[]) object;
+ }
+ return array;
+ }
+
+ @Override
+ public String toJson(final Object inObject, final Type runtimeType) throws JsonbException {
+ final Object object = unwrapOptional(inObject);
+ if (object != null && isArray(runtimeType)) {
+ return delegate.writeArrayAsString((Object[]) object);
+ } else if (isCollection(runtimeType)) {
+ return delegate.writeArrayAsString(Collection.class.cast(object));
+ }
+ return delegate.writeObjectAsString(object);
+ }
+
+ @Override
+ public void toJson(final Object inObject, final Writer writer) throws JsonbException {
+ final Object object = unwrapOptional(inObject);
+ if (object != null && isArray(object.getClass())) {
+ delegate.writeArray((Object[]) object, writer);
+ } else if (Collection.class.isInstance(object)) {
+ delegate.writeArray(Collection.class.cast(object), writer);
+ } else {
+ delegate.writeObject(object, writer);
+ }
+ }
+
+ @Override
+ public void toJson(final Object inObject, final Type runtimeType, final Writer writer) throws JsonbException {
+ final Object object = unwrapOptional(inObject);
+ if (object != null && isArray(runtimeType)) {
+ delegate.writeArray((Object[]) object, writer);
+ } else if (isCollection(runtimeType)) {
+ delegate.writeArray(Collection.class.cast(object), writer);
+ } else {
+ delegate.writeObject(object, writer);
+ }
+ }
+
+ @Override
+ public void toJson(final Object inObject, final OutputStream stream) throws JsonbException {
+ final Object object = unwrapOptional(inObject);
+ if (object != null && isArray(object.getClass())) {
+ delegate.writeArray((Object[]) object, stream);
+ } else if (Collection.class.isInstance(object)) {
+ delegate.writeArray(Collection.class.cast(object), stream);
+ } else {
+ delegate.writeObject(object, stream);
+ }
+ }
+
+ @Override
+ public void toJson(final Object inObject, final Type runtimeType, final OutputStream stream) throws JsonbException {
+ final Object object = unwrapOptional(inObject);
+ if (object != null && isArray(runtimeType)) {
+ delegate.writeArray((Object[]) object, stream);
+ } else if (isCollection(runtimeType)) {
+ delegate.writeArray(Collection.class.cast(object), stream);
+ } else {
+ delegate.writeObject(object, stream);
+ }
+ }
+
+ private Object unwrapOptional(final Object inObject) {
+ if (Optional.class.isInstance(inObject)) {
+ return Optional.class.cast(inObject).orElse(null);
+ }
+ if (OptionalInt.class.isInstance(inObject)) {
+ final OptionalInt optionalInt = OptionalInt.class.cast(inObject);
+ return optionalInt.isPresent() ? optionalInt.getAsInt() : null;
+ }
+ if (OptionalLong.class.isInstance(inObject)) {
+ final OptionalLong optionalLong = OptionalLong.class.cast(inObject);
+ return optionalLong.isPresent() ? optionalLong.getAsLong() : null;
+ }
+ if (OptionalDouble.class.isInstance(inObject)) {
+ final OptionalDouble optionalDouble = OptionalDouble.class.cast(inObject);
+ return optionalDouble.isPresent() ? optionalDouble.getAsDouble() : null;
+ }
+ return inObject;
+ }
+
+ private boolean isArray(final Type runtimeType) {
+ return Class.class.isInstance(runtimeType) && Class.class.cast(runtimeType).isArray();
+ }
+
+ private boolean isCollection(final Type runtimeType) {
+ if (!ParameterizedType.class.isInstance(runtimeType)) {
+ return false;
+ }
+ final Type rawType = ParameterizedType.class.cast(runtimeType).getRawType();
+ return Class.class.isInstance(rawType) && Collection.class.isAssignableFrom(Class.class.cast(rawType));
+ }
+
+ @Override
+ public void close() {
+ delegate.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/johnzon/blob/88629d3a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java
index 9f92c9a..e119fd8 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java
@@ -18,7 +18,7 @@
*/
package org.apache.johnzon.jsonb.cdi;
-import org.apache.johnzon.jsonb.JohnsonJsonb;
+import org.apache.johnzon.jsonb.JohnzonJsonb;
// helper class to lazy trigger CDI deps
public final class CDIs {
@@ -28,12 +28,12 @@ public final class CDIs {
this.tracker = Lazy.load(beanManager);
}
- public void track(final JohnsonJsonb johnsonJsonb) {
- tracker.track(johnsonJsonb);
+ public void track(final JohnzonJsonb johnzonJsonb) {
+ tracker.track(johnzonJsonb);
}
- public void untrack(final JohnsonJsonb johnsonJsonb) {
- tracker.untrack(johnsonJsonb);
+ public void untrack(final JohnzonJsonb johnzonJsonb) {
+ tracker.untrack(johnzonJsonb);
}
public boolean isCanWrite() {
http://git-wip-us.apache.org/repos/asf/johnzon/blob/88629d3a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java
index 17dae3c..ee42c9a 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java
@@ -18,7 +18,7 @@
*/
package org.apache.johnzon.jsonb.cdi;
-import org.apache.johnzon.jsonb.JohnsonJsonb;
+import org.apache.johnzon.jsonb.JohnzonJsonb;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
@@ -29,7 +29,7 @@ import java.util.Collection;
import java.util.concurrent.locks.ReentrantLock;
public class JohnzonCdiExtension implements Extension {
- private final Collection<JohnsonJsonb> jsonbs = new ArrayList<>();
+ private final Collection<JohnzonJsonb> jsonbs = new ArrayList<>();
private final ReentrantLock lock = new ReentrantLock();
private volatile boolean canWrite = false;
@@ -37,7 +37,7 @@ public class JohnzonCdiExtension implements Extension {
return canWrite;
}
- public void track(final JohnsonJsonb jsonb) {
+ public void track(final JohnzonJsonb jsonb) {
if (!canWrite) {
throw new IllegalStateException("CDI context already shutdown");
}
@@ -49,7 +49,7 @@ public class JohnzonCdiExtension implements Extension {
}
}
- public void untrack(final JohnsonJsonb jsonb) {
+ public void untrack(final JohnzonJsonb jsonb) {
synchronized (this) {
lock.lock();
try {