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 2015/02/25 09:52:57 UTC
incubator-johnzon git commit: avoiding npe + checkstyle
Repository: incubator-johnzon
Updated Branches:
refs/heads/master fee273e27 -> dcc3a2c2a
avoiding npe + checkstyle
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/dcc3a2c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/dcc3a2c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/dcc3a2c2
Branch: refs/heads/master
Commit: dcc3a2c2a96d095251328740c03ebc0c053077c6
Parents: fee273e
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Feb 25 09:52:47 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Feb 25 09:52:47 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/johnzon/mapper/Mapper.java | 2 ++
.../java/org/apache/johnzon/mapper/access/FieldAccessMode.java | 4 ++--
.../java/org/apache/johnzon/mapper/access/MethodAccessMode.java | 4 ++--
.../main/java/org/apache/johnzon/mapper/reflection/Mappings.java | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/dcc3a2c2/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 05f76c6..6a92f5d 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
@@ -81,11 +81,13 @@ public class Mapper {
protected final boolean skipEmptyArray;
protected final boolean treatByteArrayAsBase64;
+ // CHECKSTYLE:OFF
public Mapper(final JsonReaderFactory readerFactory, final JsonGeneratorFactory generatorFactory,
final boolean doClose, final Map<Class<?>, Converter<?>> converters,
final int version, final Comparator<String> attributeOrder, final boolean skipNull, final boolean skipEmptyArray,
final AccessMode accessMode, final boolean hiddenConstructorSupported, final boolean useConstructors,
final boolean treatByteArrayAsBase64) {
+ // CHECKSTYLE:ON
this.readerFactory = readerFactory;
this.generatorFactory = generatorFactory;
this.close = doClose;
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/dcc3a2c2/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
index 1299cfa..5bf9f0c 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
@@ -84,8 +84,8 @@ public class FieldAccessMode implements AccessMode {
return fields;
}
- public static abstract class FieldDecoratedType implements DecoratedType {
- public final Field field;
+ protected static abstract class FieldDecoratedType implements DecoratedType {
+ protected final Field field;
public FieldDecoratedType(final Field field) {
this.field = field;
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/dcc3a2c2/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
index 9167b98..4318a17 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
@@ -93,8 +93,8 @@ public class MethodAccessMode implements AccessMode {
return propertyDescriptors;
}
- public static abstract class MethodDecoratedType implements DecoratedType {
- public final Method method;
+ protected static abstract class MethodDecoratedType implements DecoratedType {
+ protected final Method method;
public MethodDecoratedType(final Method method) {
this.method = method;
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/dcc3a2c2/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
index 6fafcc3..1401d1f 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
@@ -62,7 +62,7 @@ public class Mappings {
this.setters = setters;
this.constructor = findConstructor(acceptHiddenConstructor, useConstructor);
- this.constructorHasArguments = this.constructor.getGenericParameterTypes().length > 0;
+ this.constructorHasArguments = this.constructor != null && this.constructor.getGenericParameterTypes().length > 0;
if (this.constructorHasArguments) {
this.constructorParameterTypes = this.constructor.getGenericParameterTypes();