Update to avaje-jsonb 3.0-RC7 with SimpleMapper renamed to JsonMapper (#562)

For http-client SingleBodyAdapter and Cognito AuthTokenProvider

Author: rbygrave

aws-cognito/http-client-authtoken/pom.xml

@@ -23,14 +23,14 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-json-core</artifactId>
-      <version>3.0-RC6</version>
+      <version>3.0-RC7</version>
     </dependency>
 
     <!-- test dependencies -->
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-json-node</artifactId>
-      <version>3.0-RC6</version>
+      <version>3.0-RC7</version>
       <scope>test</scope>
     </dependency>
 

aws-cognito/http-client-authtoken/src/main/java/io/avaje/aws/client/cognito/AmzCognitoAuthTokenProvider.java

@@ -4,7 +4,7 @@
 import io.avaje.http.client.AuthTokenProvider;
 import io.avaje.http.client.BasicAuthIntercept;
 import io.avaje.http.client.HttpClientRequest;
-import io.avaje.json.simple.SimpleMapper;
+import io.avaje.json.mapper.JsonMapper;
 
 import java.net.http.HttpResponse;
 import java.time.Instant;
@@ -47,7 +47,7 @@ public AuthTokenProvider build() {
 
   private static final class Provider implements AuthTokenProvider {
 
-    private static final SimpleMapper MAPPER = SimpleMapper.builder().build();
+    private static final JsonMapper MAPPER = JsonMapper.builder().build();
 
     private final String url;
     private final String clientId;

http-client/pom.xml

@@ -36,14 +36,14 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>3.0-RC6</version>
+      <version>3.0-RC7</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-json-node</artifactId>
-      <version>3.0-RC6</version>
+      <version>3.0-RC7</version>
       <scope>test</scope>
     </dependency>
 

http-client/src/main/java/io/avaje/http/client/DSingleAdapter.java

@@ -1,7 +1,7 @@
 package io.avaje.http.client;
 
 import io.avaje.http.client.SingleBodyAdapter.JsonBodyAdapter;
-import io.avaje.json.simple.SimpleMapper;
+import io.avaje.json.mapper.JsonMapper;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ final class DSingleAdapter implements BodyAdapter {
 
     private final ReaderWriter<?> adapter;
 
-    static BodyAdapter of(SimpleMapper.Type<?> jsonType) {
+    static BodyAdapter of(JsonMapper.Type<?> jsonType) {
         return new DSingleAdapter(toAdapter(jsonType));
     }
 
@@ -22,7 +22,7 @@ private DSingleAdapter(JsonBodyAdapter<?> source) {
         this.adapter = new ReaderWriter<>(source);
     }
 
-    private static <T> JsonBodyAdapter<T> toAdapter(SimpleMapper.Type<T> jsonType) {
+    private static <T> JsonBodyAdapter<T> toAdapter(JsonMapper.Type<T> jsonType) {
         return new SimpleJsonAdapter<>(jsonType);
     }
 
@@ -72,9 +72,9 @@ public BodyContent write(T bean) {
 
     private static final class SimpleJsonAdapter<T> implements JsonBodyAdapter<T> {
 
-        private final SimpleMapper.Type<T> jsonType;
+        private final JsonMapper.Type<T> jsonType;
 
-        public SimpleJsonAdapter(SimpleMapper.Type<T> jsonType) {
+        public SimpleJsonAdapter(JsonMapper.Type<T> jsonType) {
             this.jsonType = jsonType;
         }
 

http-client/src/main/java/io/avaje/http/client/SingleBodyAdapter.java

@@ -1,6 +1,6 @@
 package io.avaje.http.client;
 
-import io.avaje.json.simple.SimpleMapper;
+import io.avaje.json.mapper.JsonMapper;
 
 /**
  * A BodyAdapter that supports converting the request/response body to a single type.
@@ -25,7 +25,7 @@ static BodyAdapter create(JsonBodyAdapter<?> jsonAdapter) {
      * @param jsonType The only type supported to read or write the body content.
      * @return The BodyAdapter that the HttpClient can use.
      */
-    static BodyAdapter create(SimpleMapper.Type<?> jsonType) {
+    static BodyAdapter create(JsonMapper.Type<?> jsonType) {
         return DSingleAdapter.of(jsonType);
     }
 

http-client/src/test/java/io/avaje/http/client/HelloControllerTest.java

@@ -1,7 +1,7 @@
 package io.avaje.http.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.avaje.json.simple.SimpleMapper;
+import io.avaje.json.mapper.JsonMapper;
 import org.example.webserver.ErrorResponse;
 import org.example.webserver.HelloDto;
 import org.junit.jupiter.api.Test;
@@ -821,9 +821,9 @@ void get_bean_404() {
 
   @Test
   void singleBodyAdapter_returningBean() {
-    var simpleMapper = SimpleMapper.builder().build();
+    var mapper = JsonMapper.builder().build();
 
-    SimpleMapper.Type<HelloDto> type = simpleMapper.type(new HelloDtoAdapter());
+    JsonMapper.Type<HelloDto> type = mapper.type(new HelloDtoAdapter());
     BodyAdapter bodyAdapter = SingleBodyAdapter.create(type);
     HttpClient client = client(bodyAdapter);