Merge pull request #42 from avaje/feature/tidy-coreadapterbuilder

Refactor tidy CoreAdapterBuilder

Author: rbygrave

jsonb-generator/src/main/java/io/avaje/jsonb/generator/BeanReader.java

@@ -1,16 +1,14 @@
 package io.avaje.jsonb.generator;
 
+import io.avaje.jsonb.Json;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-
-import io.avaje.jsonb.Json;
-
 class BeanReader {
 
   private final TypeElement beanType;
@@ -44,27 +42,22 @@ class BeanReader {
     this.constructor = typeReader.constructor();
   }
 
-  public BeanReader(
-      TypeElement beanType,
-      TypeElement mixInElement,
-      ProcessingContext context) {
-
-	    this.beanType = beanType;
-	    this.type = beanType.getQualifiedName().toString();
-	    this.shortName = shortName(beanType);
-	    final NamingConventionReader ncReader = new NamingConventionReader(beanType);
-	    this.namingConvention = ncReader.get();
-	    this.typeProperty = ncReader.typeProperty();
-	    this.typeReader = new TypeReader(beanType, mixInElement, context, namingConvention);
-	    typeReader.process();
-	    this.nonAccessibleField = typeReader.nonAccessibleField();
-	    this.hasSubTypes = typeReader.hasSubTypes();
-	    this.allFields = typeReader.allFields();
-	    this.constructor = typeReader.constructor();
-
+  public BeanReader(TypeElement beanType, TypeElement mixInElement, ProcessingContext context) {
+    this.beanType = beanType;
+    this.type = beanType.getQualifiedName().toString();
+    this.shortName = shortName(beanType);
+    final NamingConventionReader ncReader = new NamingConventionReader(beanType);
+    this.namingConvention = ncReader.get();
+    this.typeProperty = ncReader.typeProperty();
+    this.typeReader = new TypeReader(beanType, mixInElement, context, namingConvention);
+    typeReader.process();
+    this.nonAccessibleField = typeReader.nonAccessibleField();
+    this.hasSubTypes = typeReader.hasSubTypes();
+    this.allFields = typeReader.allFields();
+    this.constructor = typeReader.constructor();
   }
 
-@Override
+  @Override
   public String toString() {
     return beanType.toString();
   }
@@ -198,6 +191,7 @@ void writeViewSupport(Append writer) {
       writeViewBuild(writer);
     }
   }
+
   private void writeView(Append writer) {
     writer.eol();
     writer.append("  @Override").eol();
@@ -375,4 +369,5 @@ private void writeFromJsonSwitch(Append writer, boolean defaultConstructor, Stri
     writer.append("    }").eol();
     writer.append("    reader.endObject();").eol();
   }
+
 }

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

@@ -39,28 +39,6 @@ abstract class CollectionAdapter<C extends Collection<T>, T> extends JsonAdapter
     return null;
   };
 
-  /**
-   * Helper that takes a base JsonAdapter and returns another JsonAdapter for a List
-   * containing elements of the base type.
-   */
-  static <T> JsonAdapter<List<T>> listOf(JsonAdapter<T> base) {
-    return new CollectionAdapter<List<T>, T>(base) {
-      @Override
-      List<T> newCollection() {
-        return new ArrayList<>();
-      }
-    };
-  }
-
-  static <T> JsonAdapter<Set<T>> setOf(JsonAdapter<T> base) {
-    return new CollectionAdapter<Set<T>, T>(base) {
-      @Override
-      Set<T> newCollection() {
-        return new LinkedHashSet<>();
-      }
-    };
-  }
-
   static <T> JsonAdapter<Collection<T>> newListAdapter(Type type, Jsonb jsonb) {
     Type elementType = Util.collectionElementType(type);
     JsonAdapter<T> elementAdapter = jsonb.adapter(elementType);

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

@@ -21,6 +21,7 @@
 
 import java.lang.reflect.Type;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -31,7 +32,7 @@ class CoreAdapterBuilder {
   private final DJsonb context;
   private final List<JsonAdapter.Factory> factories;
   private final ThreadLocal<LookupChain> lookupChainThreadLocal = new ThreadLocal<>();
-  private final Map<Object, JsonAdapter<?>> adapterCache = new LinkedHashMap<>();
+  private final Map<Object, JsonAdapter<?>> adapterCache = new ConcurrentHashMap<>();
   private final ReentrantLock lock = new ReentrantLock();
 
   CoreAdapterBuilder(DJsonb context, List<JsonAdapter.Factory> userFactories, boolean mathAsString) {
@@ -51,16 +52,7 @@ class CoreAdapterBuilder {
    */
   @SuppressWarnings("unchecked")
   <T> JsonAdapter<T> get(Object cacheKey) {
-    lock.lock();
-    try {
-      JsonAdapter<?> result = adapterCache.get(cacheKey);
-      if (result != null) {
-        return (JsonAdapter<T>) result;
-      }
-    } finally {
-      lock.unlock();
-    }
-    return null;
+    return (JsonAdapter<T>) adapterCache.get(cacheKey);
   }
 
   /**