Merge branch 'main' into java8-backport

Author: rbygrave

.github/dependabot.yml

@@ -11,7 +11,7 @@ updates:
         - "*"
     labels:
       - "dependencies"
-    target-branch: "master"
+    target-branch: "main"
 
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -22,4 +22,4 @@ updates:
       prefix: "[workflow]"
     labels:
       - "dependencies"
-    target-branch: "master"
+    target-branch: "main"

.github/workflows/build.yml

@@ -16,14 +16,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java_version }}
           distribution: 'zulu'
       - name: Maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-cache
         with:

.github/workflows/dependabot-merge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve a PR

.github/workflows/jdk-ea-stable.yml

@@ -16,15 +16,15 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
       uses: oracle-actions/setup-java@v1
       with:
         website: jdk.java.net
         release: ea
         version: stable
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

.github/workflows/jdk-ea.yml

@@ -22,14 +22,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
       uses: oracle-actions/setup-java@v1
       with:
         website: jdk.java.net
         release: ${{ matrix.java_version }}
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: maven-cache
       with:

README.md

@@ -95,7 +95,7 @@ For types we cannot annotate with `@Json` we can place `@Json.Import(TypeToimpor
 
 ```java
 // build using defaults
-Jsonb jsonb = Jsonb.builder().build();
+Jsonb jsonb = Jsonb.instance();
 
 JsonType<Customer> customerType = jsonb.type(Customer.class);
 
@@ -116,7 +116,7 @@ to include when serializing to json.
 For example:
 
 ```java
-Jsonb jsonb = Jsonb.builder().build();
+Jsonb jsonb = Jsonb.instance();
 
 JsonType<Customer> customerType = jsonb.type(Customer.class);
 
@@ -226,7 +226,7 @@ public final class AddressJsonAdapter implements JsonAdapter<Address>, ViewBuild
 
 ## Based on Moshi
 
-`avaje-jsonb` is based on [Moshi](https://github.com/square/moshi) with some changes as summarised below:
+`avaje-jsonb` was based on [Moshi](https://github.com/square/moshi) with some changes as summarised below:
 
 #### Changes from Moshi
 - Generates Java source code (rather than Kotlin)
@@ -245,7 +245,6 @@ public final class AddressJsonAdapter implements JsonAdapter<Address>, ViewBuild
 - Add `@Json.Import` to generate adapters for types that we can't put the annotation on (types we might not 'own')
 - Add Mixin feature similar to Jackson Mixins
 - Add Types.listOf(), Types.setOf(), Types.mapOf() helper methods
-- Provide an SPI with the view to target other json-p implementations JSONP/Yasson, GSON, etc
 - Adds more common Java types with default built-in support - java.time types, java.util.UUID
 - Adds support for json views
 

blackbox-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-jsonb-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.6</version>
   </parent>
 
   <artifactId>blackbox-test</artifactId>
@@ -28,13 +28,13 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>3.1-SNAPSHOT</version>
+      <version>3.6</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-json-node</artifactId>
-      <version>3.1-SNAPSHOT</version>
+      <version>3.6</version>
     </dependency>
 
 <!--    <dependency>-->
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.3</version>
+      <version>11.5</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -54,13 +54,13 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb-generator</artifactId>
-      <version>3.1-SNAPSHOT</version>
+      <version>3.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>10.3</version>
+      <version>11.5</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.5</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 

blackbox-test/src/main/java/module-info.java

@@ -1,10 +1,17 @@
+import io.avaje.jsonb.spi.JsonbExtension;
+
 module blackbox.test {
 
   requires static io.avaje.jsonb;
   requires static io.avaje.spi;
   requires java.validation;
   requires io.avaje.json.node;
 
-  provides io.avaje.jsonb.spi.JsonbExtension with org.example.customer.customtype.CustomTypeComponent, org.example.jsonb.GeneratedJsonComponent;
+  provides JsonbExtension
+    with
+      org.example.customer.customtype.CustomTypeComponent,
+      org.example.other.custom.CustomJsonComponent,
+      org.example.jsonb.GeneratedJsonComponent,
+      org.example.pkg_private.PkgPrivateJsonComponent;
 
 }

blackbox-test/src/main/java/org/example/customer/datetime/MyCalData.java

@@ -0,0 +1,9 @@
+package org.example.customer.datetime;
+
+import io.avaje.jsonb.Json;
+
+import java.util.Calendar;
+
+@Json
+public record MyCalData(Calendar cal) {
+}

blackbox-test/src/main/java/org/example/customer/jaxb/MyJaxbType.java

@@ -0,0 +1,46 @@
+package org.example.customer.jaxb;
+
+import io.avaje.jsonb.Json;
+
+import java.util.*;
+
+@Json
+public class MyJaxbType {
+
+  private String name;
+
+  private List<String> tags;
+  private Set<String> tags2;
+  private Collection<Long> tags3;
+
+
+  public String name() {
+    return name;
+  }
+
+  public MyJaxbType setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public List<String> getTags() {
+    if (tags == null) {
+      tags = new ArrayList<>();
+    }
+    return tags;
+  }
+
+  public Set<String> getTags2() {
+    if (tags2 == null) {
+      tags2 = new LinkedHashSet<>();
+    }
+    return tags2;
+  }
+
+  public Collection<Long> getTags3() {
+    if (tags3 == null) {
+      tags3 = new TreeSet<>();
+    }
+    return tags3;
+  }
+}