Helidon 4.0-M2

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [20]
+        java_version: [21-ea]
         os: [ubuntu-latest]
 
     steps:

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

@@ -38,7 +38,7 @@ static String shortName(String fullType) {
   }
 
   static String shortType(String fullType) {
-    int p = fullType.lastIndexOf('.');
+    final int p = fullType.lastIndexOf('.');
     if (p == -1) {
       return fullType;
     } else if (fullType.startsWith("java")) {
@@ -47,11 +47,18 @@ static String shortType(String fullType) {
       var result = "";
       var foundClass = false;
       for (final String part : fullType.split("\\.")) {
-        if (foundClass || Character.isUpperCase(part.charAt(0))) {
+        char firstChar = part.charAt(0);
+        if (foundClass
+            || Character.isUpperCase(firstChar)
+            || (!Character.isAlphabetic(firstChar) && Character.isJavaIdentifierStart(firstChar))) {
           foundClass = true;
           result += (result.isEmpty() ? "" : ".") + part;
         }
       }
+      // when in doubt, do the basic thing
+      if (result.isBlank()) {
+        return fullType.substring(p + 1);
+      }
       return result;
     }
   }

jsonb/pom.xml

@@ -19,9 +19,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.helidon.nima.webserver</groupId>
-      <artifactId>helidon-nima-webserver</artifactId>
-      <version>4.0.0-M1</version>
+      <groupId>io.helidon.webserver</groupId>
+      <artifactId>helidon-webserver</artifactId>
+      <version>4.0.0-M2</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

jsonb/src/main/java/io/avaje/jsonb/Json.java

@@ -1,9 +1,14 @@
 package io.avaje.jsonb;
 
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.MODULE;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -30,7 +35,7 @@
  * }</pre>
  */
 @Retention(CLASS)
-@Target(ElementType.TYPE)
+@Target(TYPE)
 public @interface Json {
 
   /**
@@ -69,7 +74,7 @@
    */
   @Retention(CLASS)
   @Repeatable(List.class)
-  @Target({ElementType.TYPE, ElementType.PACKAGE, ElementType.MODULE})
+  @Target({TYPE, PACKAGE, MODULE})
   @interface Import {
 
     /** Specify types to generate Json Adapters for. */
@@ -87,7 +92,7 @@
     Class<?> implementation() default Void.class;
 
     @Retention(CLASS)
-    @Target({ElementType.TYPE, ElementType.PACKAGE, ElementType.MODULE})
+    @Target({TYPE, PACKAGE, MODULE})
     @interface List {
 
       Import[] value();
@@ -105,7 +110,7 @@
    * }</pre>
    */
   @Retention(CLASS)
-  @Target({ElementType.FIELD})
+  @Target(FIELD)
   @interface Property {
 
     /**
@@ -125,7 +130,7 @@
    * }</pre>
    */
   @Retention(CLASS)
-  @Target({ElementType.FIELD})
+  @Target(FIELD)
   @interface Alias {
 
     /** One or more secondary names to accept as aliases to the official name. */
@@ -137,7 +142,7 @@
    */
   @Deprecated
   @Retention(CLASS)
-  @Target({ElementType.FIELD})
+  @Target(FIELD)
   @interface JsonAlias {
 
     /** One or more secondary names to accept as aliases to the official name. */
@@ -155,7 +160,7 @@
    * serialization but not deserialization.
    */
   @Retention(CLASS)
-  @Target({ElementType.FIELD})
+  @Target(FIELD)
   @interface Ignore {
 
     /**
@@ -183,7 +188,7 @@
    * }</pre>
    */
   @Retention(CLASS)
-  @Target({ElementType.FIELD})
+  @Target(FIELD)
   @interface Unmapped {
 
   }
@@ -217,7 +222,7 @@
    * }</pre>
    */
   @Retention(RUNTIME)
-  @Target({ElementType.METHOD})
+  @Target(METHOD)
   @interface Value {
   }
 
@@ -241,7 +246,7 @@
    * }</pre>
    */
   @Retention(CLASS)
-  @Target({ElementType.TYPE})
+  @Target(TYPE)
   @Repeatable(SubTypes.class)
   @interface SubType {
 
@@ -263,7 +268,7 @@
    * type can be represented as.
    */
   @Retention(CLASS)
-  @Target({ElementType.TYPE})
+  @Target(TYPE)
   @interface SubTypes {
 
     SubType[] value();
@@ -273,7 +278,7 @@
    * Marks a String field as containing raw JSON content.
    */
   @Retention(CLASS)
-  @Target({ElementType.FIELD})
+  @Target(FIELD)
   @interface Raw {
 
   }
@@ -298,7 +303,7 @@
    * }</pre>
    */
   @Retention(CLASS)
-  @Target({ElementType.TYPE})
+  @Target(TYPE)
   @interface MixIn {
     /** The concrete type to mix. */
     Class<?> value();

jsonb/src/main/java/io/avaje/jsonb/stream/JsonOutput.java

@@ -1,6 +1,6 @@
 package io.avaje.jsonb.stream;
 
-import io.helidon.nima.webserver.http.ServerResponse;
+import io.helidon.webserver.http.ServerResponse;
 
 import java.io.Closeable;
 import java.io.IOException;

jsonb/src/main/java/io/avaje/jsonb/stream/NimaJsonOutput.java

@@ -1,13 +1,15 @@
 package io.avaje.jsonb.stream;
 
-import io.helidon.common.http.Http;
-import io.helidon.nima.webserver.http.ServerResponse;
+import io.helidon.http.Http;
+import io.helidon.webserver.http.ServerResponse;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
 final class NimaJsonOutput implements JsonOutput {
 
+  private static final String CHUNKED = "chunked";
+
   private final ServerResponse res;
   private OutputStream os;
   private boolean fixedLength;
@@ -20,7 +22,7 @@ private OutputStream os() {
     if (os == null) {
       if (!fixedLength) {
         // going to use chunked content
-        res.header(Http.HeaderValues.TRANSFER_ENCODING_CHUNKED);
+        res.header(Http.HeaderNames.TRANSFER_ENCODING, CHUNKED);
       }
       os = res.outputStream();
     }

jsonb/src/main/java/module-info.java

@@ -10,6 +10,6 @@
   uses io.avaje.jsonb.JsonbComponent;
   uses io.avaje.jsonb.Jsonb.GeneratedComponent;
 
-  requires static io.helidon.nima.webserver;
+  requires static io.helidon.webserver;
 
 }