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 2018/03/30 14:49:34 UTC
[5/8] johnzon git commit: fix padding
fix padding
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/da9e52a3
Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/da9e52a3
Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/da9e52a3
Branch: refs/heads/master
Commit: da9e52a356c1678021df5435daf27c297b7a218c
Parents: 7924dfc
Author: amoscatelli <al...@live.com>
Authored: Fri Mar 30 16:17:07 2018 +0200
Committer: amoscatelli <al...@live.com>
Committed: Fri Mar 30 16:17:07 2018 +0200
----------------------------------------------------------------------
.../apache/johnzon/jsonb/JohnzonBuilder.java | 64 ++++++++++----------
1 file changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/johnzon/blob/da9e52a3/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 f647744..71bea04 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
@@ -163,41 +163,41 @@ public class JohnzonBuilder implements JsonbBuilder {
return strategy == this ? Modifier.isPublic(field.getModifiers()) : strategy.isVisible(field);
}
- @Override
- public boolean isVisible(final Method method) {
- final PropertyVisibilityStrategy strategy = strategies.computeIfAbsent(method.getDeclaringClass(), this::visibilityStrategy);
- return strategy == this ? Modifier.isPublic(method.getModifiers()) : strategy.isVisible(method);
- }
-
- private PropertyVisibilityStrategy visibilityStrategy(final Class<?> type) { // can be cached
- JsonbVisibility visibility = type.getAnnotation(JsonbVisibility.class);
- if (visibility != null) {
- try {
- return visibility.value().newInstance();
- } catch (final InstantiationException | IllegalAccessException e) {
- throw new IllegalArgumentException(e);
+ @Override
+ public boolean isVisible(final Method method) {
+ final PropertyVisibilityStrategy strategy = strategies.computeIfAbsent(method.getDeclaringClass(), this::visibilityStrategy);
+ return strategy == this ? Modifier.isPublic(method.getModifiers()) : strategy.isVisible(method);
}
- }
- Package p = type.getPackage();
- while (p != null) {
- visibility = p.getAnnotation(JsonbVisibility.class);
- if (visibility != null) {
- try {
- return visibility.value().newInstance();
- } catch (final InstantiationException | IllegalAccessException e) {
- throw new IllegalArgumentException(e);
+
+ private PropertyVisibilityStrategy visibilityStrategy(final Class<?> type) { // can be cached
+ JsonbVisibility visibility = type.getAnnotation(JsonbVisibility.class);
+ if (visibility != null) {
+ try {
+ return visibility.value().newInstance();
+ } catch (final InstantiationException | IllegalAccessException e) {
+ throw new IllegalArgumentException(e);
+ }
}
+ Package p = type.getPackage();
+ while (p != null) {
+ visibility = p.getAnnotation(JsonbVisibility.class);
+ if (visibility != null) {
+ try {
+ return visibility.value().newInstance();
+ } catch (final InstantiationException | IllegalAccessException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+ final String name = p.getName();
+ final int end = name.lastIndexOf('.');
+ if (end < 0) {
+ break;
+ }
+ p = Package.getPackage(name.substring(0, end));
+ }
+ return this;
}
- final String name = p.getName();
- final int end = name.lastIndexOf('.');
- if (end < 0) {
- break;
- }
- p = Package.getPackage(name.substring(0, end));
- }
- return this;
- }
- });
+ });
config.getProperty("johnzon.attributeOrder").ifPresent(comp -> builder.setAttributeOrder(Comparator.class.cast(comp)));
config.getProperty("johnzon.enforceQuoteString")