Expand @Value to Inline regular classes (#220)

* prism 1.6

* use enum switch

* enhanced switch case

* throw exception on duplicate enum value

* skip iteration if static maps are filled

* Update EnumReader.java

* use configs

* Update DefaultJsonbProvider.java

* Update DefaultJsonbProvider.java

* Update DefaultJsonbProvider.java

* Revert "Update DefaultJsonbProvider.java"

This reverts commit afdd3a8.

* support java.util.Date

People shouldn't use it, but the reality is that this is still used all over the place

* C style for is faster

* Bump io.helidon.webserver:helidon-webserver from 4.0.4 to 4.0.5

Bumps io.helidon.webserver:helidon-webserver from 4.0.4 to 4.0.5.

---
updated-dependencies:
- dependency-name: io.helidon.webserver:helidon-webserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* start

* fix tests

* Update TypeReader.java

* Bump io.avaje:junit from 1.3 to 1.4

Bumps io.avaje:junit from 1.3 to 1.4.

---
updated-dependencies:
- dependency-name: io.avaje:junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Version 1.10

* Bump to next snapshot

* Bump io.avaje:avaje-inject from 9.10 to 9.11

Bumps [io.avaje:avaje-inject](https://github.com/avaje/avaje-inject) from 9.10 to 9.11.
- [Release notes](https://github.com/avaje/avaje-inject/releases)
- [Commits](avaje/avaje-inject@9.10...9.11)

---
updated-dependencies:
- dependency-name: io.avaje:avaje-inject
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.springframework.boot:spring-boot-dependencies

Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* if not a double, get int value

* Update BasicTypeAdapters.java

* Update JsonWriteAdapter.java

* Update Processor.java

* move test package

* add generator version

* Revert "add generator version"

This reverts commit 844b204.

* Format only changes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>

Author: 3 people

.gitignore

@@ -8,3 +8,4 @@ build/
 *.project
 *.class
 .DS_Store
+jsonb-generator/.factorypath

blackbox-test/src/main/java/org/example/customer/value/ValueInline.java

@@ -0,0 +1,37 @@
+package org.example.customer.value;
+
+import org.example.customer.Address;
+
+import io.avaje.jsonb.Json;
+
+@Json
+public record ValueInline(int a, Nested nested, Nested2 nested2, Nested3 nested3, Nested4 complex) {
+  public record Nested(@Json.Value int nestA, String nestB) {
+    public Nested(int nestA) {
+      this(nestA, "idk");
+    }
+  }
+
+  public record Nested2(@Json.Value int nestb, String nestB) {
+
+    @Json.Creator
+    public static Nested2 of(int nestB) {
+      return new Nested2(nestB, "somethin");
+    }
+  }
+
+  public record Nested3(@Json.Value Nested2 nesting) {}
+
+  public static class Nested4 {
+    private final Address address;
+
+    public Nested4(Address address) {
+      this.address = address;
+    }
+
+    @Json.Value
+    public Address address() {
+      return address;
+    }
+  }
+}

blackbox-test/src/test/java/org/example/customer/value/InlineTest.java

@@ -0,0 +1,38 @@
+package org.example.customer.value;
+
+import io.avaje.jsonb.Jsonb;
+import org.example.customer.Address;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class InlineTest {
+
+  Jsonb jsonb = Jsonb.builder().build();
+
+  @Test
+  void toJsonFromJson() {
+
+    final var address = new Address((long) 123, "avenue");
+    final var bean =
+      new ValueInline(
+        69,
+        new ValueInline.Nested(2),
+        new ValueInline.Nested2(3, "discarded"),
+        new ValueInline.Nested3(new ValueInline.Nested2(2, "discarded")),
+        new ValueInline.Nested4(address));
+
+    final var asJson = jsonb.toJson(bean);
+    assertThat(asJson)
+      .isEqualTo(
+        "{\"a\":69,\"nested\":2,\"nested2\":3,\"nested3\":2,\"complex\":{\"id\":123,\"street\":\"avenue\"}}");
+
+    final var fromJson = jsonb.type(ValueInline.class).fromJson(asJson);
+
+    assertThat(fromJson.nested().nestB()).isEqualTo("idk");
+    assertThat(fromJson.nested2().nestB()).isEqualTo("somethin");
+    var fromAddress = fromJson.complex().address();
+    assertThat(fromAddress.getId()).isEqualTo(address.getId());
+    assertThat(fromAddress.getStreet()).isEqualTo(address.getStreet());
+  }
+}

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

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.util.*;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 @GenerateAPContext
 @GenerateModuleInfoReader
@@ -36,7 +37,7 @@ public final class Processor extends AbstractProcessor {
   private final List<BeanReader> allReaders = new ArrayList<>();
   private final Set<String> sourceTypes = new HashSet<>();
   private final Set<String> mixInImports = new HashSet<>();
-  private final Set<String> enumElements = new HashSet<>();
+  private final Set<String> valueElements = new HashSet<>();
 
   private SimpleComponentWriter componentWriter;
   private boolean readModuleInfo;
@@ -68,8 +69,8 @@ private void readModule() {
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment round) {
     APContext.setProjectModuleElement(annotations, round);
     readModule();
+    writeValueAdapters(round.getElementsAnnotatedWith(typeElement(ValuePrism.PRISM_TYPE)));
     writeAdapters(round.getElementsAnnotatedWith(typeElement(JSON)));
-    writeEnumAdapters(round.getElementsAnnotatedWith(typeElement(ValuePrism.PRISM_TYPE)));
     writeAdaptersForMixInTypes(round.getElementsAnnotatedWith(typeElement(JSON_MIXIN)));
     writeAdaptersForImportedList(round.getElementsAnnotatedWith(typeElement(JSON_IMPORT_LIST)));
     writeAdaptersForImported(round.getElementsAnnotatedWith(typeElement(JSON_IMPORT)));
@@ -119,22 +120,44 @@ private static Predicate<VariableElement> isStaticFactory() {
     return v -> v.getModifiers().contains(Modifier.STATIC) && "FACTORY".equals(v.getSimpleName().toString());
   }
 
-  private void writeEnumAdapters(Set<? extends Element> elements) {
+  private void writeValueAdapters(Set<? extends Element> elements) {
     for (final ExecutableElement element : ElementFilter.methodsIn(elements)) {
       final var typeElement = (TypeElement) element.getEnclosingElement();
-      if (typeElement.getKind() != ElementKind.ENUM) {
-        logError("@Json.Value is only for enum methods at: " + typeElement);
-      } else {
-        writeEnumAdapterForType(typeElement, element);
-      }
+      validateValue(element, typeElement);
+      writeAdapter(typeElement, new ValueReader(typeElement, element));
     }
   }
 
-  private void writeEnumAdapterForType(TypeElement typeElement, ExecutableElement element) {
-    if (!enumElements.add(typeElement.asType().toString())) {
-      logError("@Json.Value can only be used once on a given enum methods at: " + typeElement);
+  private void validateValue(final ExecutableElement element, final TypeElement typeElement) {
+    if (!valueElements.add(typeElement.asType().toString())) {
+      logError(typeElement, "@Json.Value can only be used once on a given type");
+    } else if (!element.getParameters().isEmpty()) {
+      logError(element, "@Json.Value can only be used on methods with no parameters");
+    }
+    if (typeElement.getKind() == ElementKind.ENUM) {
+      return;
+    }
+    var returnType = Util.trimAnnotations(element.getReturnType().toString());
+
+    var methods =
+      ElementFilter.methodsIn(typeElement.getEnclosedElements()).stream()
+        .filter(CreatorPrism::isPresent);
+
+    final var constructors =
+      ElementFilter.constructorsIn(typeElement.getEnclosedElements()).stream();
+
+    if (Stream.concat(methods, constructors)
+      .filter(s -> s.getParameters().size() == 1)
+      .map(s -> s.getParameters().get(0).asType().toString())
+      .map(Util::trimAnnotations)
+      .noneMatch(returnType::equals)) {
+
+      logError(
+        typeElement,
+        "Missing constructor or @Json.Creator factory method with signature %s(%s value)",
+        Util.shortName(typeElement.getQualifiedName().toString()),
+        Util.shortName(returnType));
     }
-    writeAdapter(typeElement, new EnumReader(typeElement, element));
   }
 
   private void cascadeTypes() {
@@ -154,7 +177,7 @@ private void cascadeTypesInner() {
     for (final String type : extraTypes) {
       if (!ignoreType(type)) {
         final TypeElement element = typeElement(type);
-        if (cascadeElement(element)) {
+        if (element != null && cascadeElement(element)) {
           writeAdapterForType(element);
         }
       }
@@ -259,6 +282,9 @@ private void writeAdapters(Set<? extends Element> beans) {
   }
 
   private void writeAdapterForType(TypeElement typeElement) {
+    if (valueElements.contains(typeElement.toString())) {
+      return;
+    }
     writeAdapter(typeElement, new ClassReader(typeElement));
   }