Merge pull request #59 from SentryMan/clean

Use Avaje Prisms 1.3

Author: rbygrave

jsonb-generator/pom.xml

@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-prisms</artifactId>
-      <version>1.1</version>
+      <version>1.3</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
@@ -54,7 +54,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-prisms</artifactId>
-              <version>1.1</version>
+              <version>1.3</version>
             </path>
           </annotationProcessorPaths>
         </configuration>

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

@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 final class ComponentReader {
 
@@ -46,18 +45,18 @@ private void readMetaData(TypeElement moduleType) {
       final FactoryPrism metaDataFactory = FactoryPrism.getInstance(annotationMirror);
 
       if (metaData != null) {
-        Optional.ofNullable(metaData.value()).stream()
-          .flatMap(List::stream)
-          .map(TypeMirror::toString)
-          .map(this::adapterNameFromEntry)
-          .forEach(componentMetaData::add);
+
+        metaData.value().stream()
+            .map(TypeMirror::toString)
+            .map(this::adapterNameFromEntry)
+            .forEach(componentMetaData::add);
 
       } else if (metaDataFactory != null) {
-        Optional.ofNullable(metaDataFactory.value()).stream()
-          .flatMap(List::stream)
-          .map(TypeMirror::toString)
-          .map(this::adapterNameFromEntry)
-          .forEach(componentMetaData::add);
+
+        metaDataFactory.value().stream()
+            .map(TypeMirror::toString)
+            .map(this::adapterNameFromEntry)
+            .forEach(componentMetaData::add);
       }
     }
   }

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

@@ -46,19 +46,20 @@ final class FieldReader {
     this.deserialize = ignoreReader.deserialize();
 
     this.propertyName =
-      Optional.ofNullable(PropertyPrism.getInstanceOn(element))
-        .map(PropertyPrism::value)
-        .filter(Objects::nonNull)
-        .map(Util::escapeQuotes)
-        .orElse(namingConvention.from(fieldName));
+        PropertyPrism.getOptionalOn(element)
+            .map(PropertyPrism::value)
+            .filter(Objects::nonNull)
+            .map(Util::escapeQuotes)
+            .orElse(namingConvention.from(fieldName));
+    
     this.aliases =
-      Optional.ofNullable(JsonAliasPrism.getInstanceOn(element))
-        .map(JsonAliasPrism::value)
-        .filter(Objects::nonNull)
-        .stream()
-        .flatMap(List::stream)
-        .map(Util::escapeQuotes)
-        .collect(Collectors.toList());
+        JsonAliasPrism.getOptionalOn(element)
+            .map(JsonAliasPrism::value)
+            .filter(Objects::nonNull)
+            .stream()
+            .flatMap(List::stream)
+            .map(Util::escapeQuotes)
+            .collect(Collectors.toList());
 
     if (raw) {
       genericType = GenericType.parse("java.lang.String");

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

@@ -18,7 +18,7 @@ public String toString() {
 
   TypeSubTypeMeta(SubTypePrism prism) {
     type = prism.type().toString();
-    name = Optional.of(Util.escapeQuotes(prism.name())).filter(s -> s.length() > 0).orElse(null);
+    name = Util.escapeQuotes(prism.name());
   }
 
   void setElement(TypeElement element) {
@@ -34,7 +34,7 @@ String type() {
   }
 
   String name() {
-    if (name == null) {
+    if (name.isBlank()) {
       name = Util.shortName(type);
     }
     return name;