Apply most changes from #190 Sonar Fixes

Author: rbygrave

jsonb/src/main/java/io/avaje/jsonb/core/ViewBuilder.java renamed to jsonb/src/main/java/io/avaje/jsonb/core/CoreViewBuilder.java

@@ -4,6 +4,7 @@
 import io.avaje.jsonb.spi.BufferedJsonWriter;
 import io.avaje.jsonb.spi.BytesJsonWriter;
 import io.avaje.jsonb.spi.PropertyNames;
+import io.avaje.jsonb.spi.ViewBuilder;
 import io.avaje.jsonb.stream.JsonOutput;
 
 import java.io.IOException;
@@ -13,26 +14,23 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Stack;
+import java.util.*;
 
-final class ViewBuilder implements io.avaje.jsonb.spi.ViewBuilder {
+final class CoreViewBuilder implements ViewBuilder {
 
   private final MethodHandles.Lookup lookup = MethodHandles.lookup();
-  private final Stack<Items> stack = new Stack<>();
+  private final Deque<Items> stack = new ArrayDeque<>();
   private final ViewDsl viewDsl;
   private final Names names;
   private Items current;
   private Element resultElement;
 
-  ViewBuilder(ViewDsl viewDsl) {
+  CoreViewBuilder(ViewDsl viewDsl) {
     this.viewDsl = viewDsl;
     this.names = new Names();
   }
 
-  private ViewBuilder(ViewDsl viewDsl, Names names) {
+  private CoreViewBuilder(ViewDsl viewDsl, Names names) {
     this.viewDsl = viewDsl;
     this.names = names;
   }
@@ -98,7 +96,7 @@ public void endObject() {
   @Override
   public void addArray(String name, JsonAdapter<?> adapter, MethodHandle methodHandle) {
     try {
-      ViewBuilder nested = new ViewBuilder(viewDsl, names);
+      CoreViewBuilder nested = new CoreViewBuilder(viewDsl, names);
       adapter.viewBuild().build(nested);
       JsonView<Object> nestedView = nested.build();
       if (name == null) {

jsonb/src/main/java/io/avaje/jsonb/core/DJsonb.java

@@ -36,6 +36,7 @@ final class DJsonb implements Jsonb {
       boolean failOnUnknown,
       boolean mathAsString,
       BufferRecycleStrategy strategy) {
+
     this.builder = new CoreAdapterBuilder(this, factories, mathAsString);
     if (adapter != null) {
       this.io = adapter;
@@ -184,10 +185,10 @@ <T> JsonView<T> buildView(final String dsl, final JsonAdapter<T> adapter, final
     final ViewKey key = new ViewKey(dsl, type);
     return (JsonView<T>) viewCache.computeIfAbsent(key, o -> {
       try {
-        ViewBuilder viewBuilder = new ViewBuilder(ViewDsl.parse(dsl));
+        CoreViewBuilder viewBuilder = new CoreViewBuilder(ViewDsl.parse(dsl));
         adapter.viewBuild().build(viewBuilder);
         return viewBuilder.build(this);
-      } catch (Throwable e) {
+      } catch (Exception e) {
         throw new IllegalStateException(e);
       }
     });
@@ -316,7 +317,7 @@ static <T> JsonAdapter.Factory newAdapterFactory(Type type, JsonAdapter<T> jsonA
       return (targetType, jsonb) -> simpleMatch(type, targetType) ? jsonAdapter : null;
     }
 
-    static <T> JsonAdapter.Factory newAdapterFactory(Type type, AdapterBuilder builder) {
+    static JsonAdapter.Factory newAdapterFactory(Type type, AdapterBuilder builder) {
       requireNonNull(type);
       requireNonNull(builder);
       return (targetType, jsonb) -> simpleMatch(type, targetType) ? builder.build(jsonb).nullSafe() : null;

jsonb/src/main/java/io/avaje/jsonb/core/ObjectJsonReader.java

@@ -31,7 +31,7 @@ public <T> T unwrap(Class<T> type) {
 
   @Override
   public void unmappedField(String fieldName) {
-
+    // do nothing
   }
 
   @Override
@@ -134,10 +134,7 @@ public String readString() {
 
   @Override
   public String readRaw() {
-    if (currentValue instanceof String) {
-      return (String) currentValue;
-    }
-    return currentValue.toString();
+    return readString();
   }
 
   @Override

jsonb/src/main/java/io/avaje/jsonb/core/Util.java

@@ -111,7 +111,7 @@ static Type removeSubtypeWildcard(Type type) {
   }
 
   static Type resolve(Type context, Class<?> contextRawType, Type toResolve) {
-    return resolve(context, contextRawType, toResolve, new LinkedHashSet<TypeVariable<?>>());
+    return resolve(context, contextRawType, toResolve, new LinkedHashSet<>());
   }
 
   private static Type resolve(
@@ -284,16 +284,10 @@ static final class ParameterizedTypeImpl implements ParameterizedType {
     private final Type rawType;
     public final Type[] typeArguments;
 
-    public ParameterizedTypeImpl(Type ownerType, Type rawType, Type... typeArguments) {
+    ParameterizedTypeImpl(Type ownerType, Type rawType, Type... typeArguments) {
       // Require an owner type if the raw type needs it.
       if (ownerType != null && rawType instanceof Class<?>) {
-        Class<?> enclosingClass = ((Class<?>) rawType).getEnclosingClass();
-        if (enclosingClass == null || Util.rawType(ownerType) != enclosingClass) {
-          throw new IllegalArgumentException("unexpected owner type for " + rawType + ": " + ownerType);
-
-        } else if (enclosingClass != null) {
-          throw new IllegalArgumentException("unexpected owner type for " + rawType + ": null");
-        }
+        throw new IllegalArgumentException("unexpected owner type for " + rawType + ": " + ownerType);
       }
 
       this.ownerType = ownerType == null ? null : canonicalize(ownerType);
@@ -386,9 +380,7 @@ static final class WildcardTypeImpl implements WildcardType {
     private final Type lowerBound;
 
     WildcardTypeImpl(Type[] upperBounds, Type[] lowerBounds) {
-      if (lowerBounds.length > 1) throw new IllegalArgumentException();
-      if (upperBounds.length != 1) throw new IllegalArgumentException();
-
+      if (lowerBounds.length > 1 || upperBounds.length != 1) throw new IllegalArgumentException();
       if (lowerBounds.length == 1) {
         if (lowerBounds[0] == null) throw new NullPointerException();
         checkNotPrimitive(lowerBounds[0]);

jsonb/src/main/java/io/avaje/jsonb/core/ViewDsl.java

@@ -1,12 +1,13 @@
 package io.avaje.jsonb.core;
 
+import java.util.ArrayDeque;
+import java.util.Deque;
 import java.util.Map;
 import java.util.Set;
-import java.util.Stack;
 
 final class ViewDsl {
 
-  private final Stack<Entry> stack = new Stack<>();
+  private final Deque<Entry> stack = new ArrayDeque<>();
   private Entry current;
 
   static ViewDsl parse(String dsl) {