From bf6ce76fb70af415afde0d7323536449e7f7f3cc Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 14 Jan 2025 22:43:05 +1300
Subject: [PATCH 1/2] Add pom descriptions for json-core and json-node + more
 consistent pom names

---
 json-core/pom.xml            | 2 ++
 json-node/pom.xml            | 6 ++----
 jsonb-generator/pom.xml      | 4 ++--
 jsonb-inject-plugin/pom.xml  | 2 +-
 jsonb-jackson/pom.xml        | 2 +-
 jsonb-spring-adapter/pom.xml | 2 +-
 jsonb/pom.xml                | 4 ++--
 pom.xml                      | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/json-core/pom.xml b/json-core/pom.xml
index 90d3a4c4..c4248629 100644
--- a/json-core/pom.xml
+++ b/json-core/pom.xml
@@ -10,6 +10,8 @@
   </parent>
 
   <artifactId>avaje-json-core</artifactId>
+  <name>avaje json core</name>
+  <description>Core JSON Streaming and Generation API</description>
 
   <dependencies>
     <dependency>
diff --git a/json-node/pom.xml b/json-node/pom.xml
index fbaced22..a275495f 100644
--- a/json-node/pom.xml
+++ b/json-node/pom.xml
@@ -10,10 +10,8 @@
   </parent>
 
   <artifactId>avaje-json-node</artifactId>
-
-  <properties>
-<!--    <maven.compiler.release>17</maven.compiler.release>-->
-  </properties>
+  <name>avaje json node</name>
+  <description>JSON Node API for avaje-json</description>
 
   <dependencies>
 
diff --git a/jsonb-generator/pom.xml b/jsonb-generator/pom.xml
index 1b4737b5..a9ac9c03 100644
--- a/jsonb-generator/pom.xml
+++ b/jsonb-generator/pom.xml
@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>avaje-jsonb-generator</artifactId>
-  <name>jsonb generator</name>
+  <name>avaje jsonb generator</name>
   <description>annotation processor generating source code json adapters for avaje-jsonb</description>
   <properties>
     <avaje.prisms.version>1.36</avaje.prisms.version>
@@ -31,7 +31,7 @@
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-spi-service</artifactId>
diff --git a/jsonb-inject-plugin/pom.xml b/jsonb-inject-plugin/pom.xml
index bf54fcf3..fffdd69d 100644
--- a/jsonb-inject-plugin/pom.xml
+++ b/jsonb-inject-plugin/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>avaje-jsonb-inject-plugin</artifactId>
-  <name>jsonb-inject-plugin</name>
+  <name>avaje jsonb inject plugin</name>
   <description>avaje-inject plugin for avaje-jsonb</description>
 
   <dependencies>
diff --git a/jsonb-jackson/pom.xml b/jsonb-jackson/pom.xml
index 6e7d664b..b98c41ab 100644
--- a/jsonb-jackson/pom.xml
+++ b/jsonb-jackson/pom.xml
@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>avaje-jsonb-jackson</artifactId>
-  <name>jsonb-jackson</name>
+  <name>avaje jsonb jackson</name>
   <description>jackson adapter for avaje-jsonb</description>
 
   <dependencies>
diff --git a/jsonb-spring-adapter/pom.xml b/jsonb-spring-adapter/pom.xml
index 7580f432..2791d14f 100644
--- a/jsonb-spring-adapter/pom.xml
+++ b/jsonb-spring-adapter/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>avaje-jsonb-spring-starter</artifactId>
-  <name>jsonb-spring-adapter</name>
+  <name>avaje jsonb spring adapter</name>
   <description>springframework adapter for avaje-jsonb</description>
 
   <dependencyManagement>
diff --git a/jsonb/pom.xml b/jsonb/pom.xml
index 25ca0ab5..c72a456d 100644
--- a/jsonb/pom.xml
+++ b/jsonb/pom.xml
@@ -8,8 +8,8 @@
   </parent>
 
   <artifactId>avaje-jsonb</artifactId>
-  <name>jsonb</name>
-  <description>avaje-jsonb json streaming and binding library using source code generation</description>
+  <name>avaje jsonb</name>
+  <description>JSON Streaming Generation and data binding library using source code generation</description>
 
   <dependencies>
 
diff --git a/pom.xml b/pom.xml
index d86c777a..f130ccae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   <version>3.0-RC6</version>
 
   <packaging>pom</packaging>
-  <name>jsonb parent</name>
+  <name>avaje json parent pom</name>
   <description>parent pom for jsonb</description>
 
   <scm>

From 5de5d44c5a9581ed3f28d3370d81e52252d33a87 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 14 Jan 2025 23:09:14 +1300
Subject: [PATCH 2/2] [core] Add type() method to SimpleMapper that takes a
 function that creates JsonAdapter

Typically, the function is the constructor of the JsonAdapter. This makes it slightly cleaner to create the SimpleMapper.Type, for example:

    SimpleMapper mapper = SimpleMapper.builder().build();
    SimpleMapper.Type<MyCustomType> myType = mapper.type(MyAdapter::new);
---
 .../java/io/avaje/json/simple/DSimpleMapper.java    |  6 ++++++
 .../java/io/avaje/json/simple/SimpleMapper.java     | 13 +++++++++++++
 .../io/avaje/json/simple/CustomAdapterTest.java     |  6 ++++--
 .../java/io/avaje/json/node/JsonNodeMapper.java     | 13 +++++++++++++
 .../io/avaje/json/node/adapter/DJsonNodeMapper.java |  6 ++++++
 .../java/io/avaje/json/node/CustomAdapterTest.java  |  4 +---
 6 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/json-core/src/main/java/io/avaje/json/simple/DSimpleMapper.java b/json-core/src/main/java/io/avaje/json/simple/DSimpleMapper.java
index 24f35949..fb11eedc 100644
--- a/json-core/src/main/java/io/avaje/json/simple/DSimpleMapper.java
+++ b/json-core/src/main/java/io/avaje/json/simple/DSimpleMapper.java
@@ -9,6 +9,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 final class DSimpleMapper implements SimpleMapper {
 
@@ -34,6 +35,11 @@ public <T> Type<T> type(JsonAdapter<T> myAdapter) {
     return new DTypeMapper<>(myAdapter, jsonStream);
   }
 
+  @Override
+  public <T> Type<T> type(Function<SimpleMapper, JsonAdapter<T>> adapterFunction) {
+    return type(adapterFunction.apply(this));
+  }
+
   @Override
   public Type<Object> object() {
     return objectType;
diff --git a/json-core/src/main/java/io/avaje/json/simple/SimpleMapper.java b/json-core/src/main/java/io/avaje/json/simple/SimpleMapper.java
index d3a3629f..9566a937 100644
--- a/json-core/src/main/java/io/avaje/json/simple/SimpleMapper.java
+++ b/json-core/src/main/java/io/avaje/json/simple/SimpleMapper.java
@@ -12,6 +12,7 @@
 import java.io.Writer;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 /**
  * A mapper for mapping to basic Java types.
@@ -136,6 +137,18 @@ static Builder builder() {
    */
   <T> Type<T> type(JsonAdapter<T> customAdapter);
 
+  /**
+   * Return a Type specific mapper using a function that creates a JsonAdapter.
+   * <p>
+   * Often the adapterFunction is the constructor of the custom JsonAdapter where
+   * the constructor takes SimpleMapper as the only argument.
+   *
+   * @param adapterFunction The function that creates a JsonAdapter.
+   * @param <T>             The type of the class to map to/from json.
+   * @return The Type specific mapper.
+   */
+  <T> Type<T> type(Function<SimpleMapper, JsonAdapter<T>> adapterFunction);
+
   default JsonExtract extract(Map<String, Object> map) {
     return new DExtract(map);
   }
diff --git a/json-core/src/test/java/io/avaje/json/simple/CustomAdapterTest.java b/json-core/src/test/java/io/avaje/json/simple/CustomAdapterTest.java
index db92ecfd..f7d4ecc1 100644
--- a/json-core/src/test/java/io/avaje/json/simple/CustomAdapterTest.java
+++ b/json-core/src/test/java/io/avaje/json/simple/CustomAdapterTest.java
@@ -21,13 +21,15 @@ class CustomAdapterTest {
 
   @Test
   void mapUsingCustomAdapter() {
+    SimpleMapper mapper = SimpleMapper.builder().build();
+    SimpleMapper.Type<MyCustomType> myType = mapper.type(MyAdapter::new);
 
     MyCustomType source = new MyCustomType();
     source.foo = "hi";
     source.bar = 42;
-    String asJson = type.toJson(source);
+    String asJson = myType.toJson(source);
 
-    MyCustomType fromJson = type.fromJson(asJson);
+    MyCustomType fromJson = myType.fromJson(asJson);
 
     assertThat(fromJson.foo).isEqualTo(source.foo);
     assertThat(fromJson.bar).isEqualTo(source.bar);
diff --git a/json-node/src/main/java/io/avaje/json/node/JsonNodeMapper.java b/json-node/src/main/java/io/avaje/json/node/JsonNodeMapper.java
index 508b55e8..7c57a6a1 100644
--- a/json-node/src/main/java/io/avaje/json/node/JsonNodeMapper.java
+++ b/json-node/src/main/java/io/avaje/json/node/JsonNodeMapper.java
@@ -13,6 +13,7 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.lang.reflect.Type;
+import java.util.function.Function;
 
 /**
  * Provide JsonAdapters for the JsonNode types.
@@ -204,6 +205,18 @@ static Builder builder() {
    */
   <T> SimpleMapper.Type<T> type(JsonAdapter<T> customAdapter);
 
+  /**
+   * Return a Type specific mapper using a function that creates a JsonAdapter.
+   * <p>
+   * Often the adapterFunction is the constructor of the custom JsonAdapter where
+   * the constructor takes JsonNodeMapper as the only argument.
+   *
+   * @param adapterFunction The function that creates a JsonAdapter.
+   * @param <T>             The type of the class to map to/from json.
+   * @return The Type specific mapper.
+   */
+  <T> SimpleMapper.Type<T> type(Function<JsonNodeMapper, JsonAdapter<T>> adapterFunction);
+
   /**
    * Build the JsonNodeMapper.
    */
diff --git a/json-node/src/main/java/io/avaje/json/node/adapter/DJsonNodeMapper.java b/json-node/src/main/java/io/avaje/json/node/adapter/DJsonNodeMapper.java
index 9a2281a1..2d81ec13 100644
--- a/json-node/src/main/java/io/avaje/json/node/adapter/DJsonNodeMapper.java
+++ b/json-node/src/main/java/io/avaje/json/node/adapter/DJsonNodeMapper.java
@@ -9,6 +9,7 @@
 import io.avaje.json.stream.JsonStream;
 
 import java.lang.reflect.Type;
+import java.util.function.Function;
 
 final class DJsonNodeMapper implements JsonNodeMapper {
 
@@ -42,6 +43,11 @@ public <T> SimpleMapper.Type<T> type(JsonAdapter<T> customAdapter) {
     return new DMapper<>(customAdapter, jsonStream);
   }
 
+  @Override
+  public <T> SimpleMapper.Type<T> type(Function<JsonNodeMapper, JsonAdapter<T>> adapterFunction) {
+    return type(adapterFunction.apply(this));
+  }
+
   @Override
   public SimpleMapper.Type<JsonNode> nodeMapper() {
     return new DMapper<>(nodeAdapter, jsonStream);
diff --git a/json-node/src/test/java/io/avaje/json/node/CustomAdapterTest.java b/json-node/src/test/java/io/avaje/json/node/CustomAdapterTest.java
index 2462db36..781aa210 100644
--- a/json-node/src/test/java/io/avaje/json/node/CustomAdapterTest.java
+++ b/json-node/src/test/java/io/avaje/json/node/CustomAdapterTest.java
@@ -21,9 +21,7 @@ class CustomAdapterTest {
 
   @Test
   void propertyNames() {
-
-    var adapter = new MyAdapter2(mapper);
-    SimpleMapper.Type<MyCustomType> type = mapper.type(adapter);
+    SimpleMapper.Type<MyCustomType> type = mapper.type(MyAdapter2::new);
 
     var source = as("a", 1);
     String asJson = type.toJson(source);