fix(deps): fix upgrade to jackson 2.18.2

streamthoughts · Jan 23, 2025 · fa4d646 · fa4d646
1 parent 3361f43
commit fa4d646
Show file tree

Hide file tree

Showing 32 changed files with 187 additions and 450 deletions.
diff --git a/core/src/main/java/io/streamthoughts/jikkou/core/reconciler/DefaultChangeResult.java b/core/src/main/java/io/streamthoughts/jikkou/core/reconciler/DefaultChangeResult.java
@@ -12,7 +12,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
 import io.streamthoughts.jikkou.core.models.change.ResourceChange;
-import java.beans.ConstructorProperties;
 import java.time.Instant;
 import java.util.List;
 

diff --git a/...test/java/io/streamthoughts/jikkou/core/models/change/SpecificStateChangeBuilderTest.java b/...test/java/io/streamthoughts/jikkou/core/models/change/SpecificStateChangeBuilderTest.java
@@ -9,7 +9,6 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.streamthoughts.jikkou.core.io.Jackson;
 import io.streamthoughts.jikkou.core.reconciler.Operation;

diff --git a/core/src/test/java/io/streamthoughts/jikkou/core/models/generics/GenericResourceTest.java b/core/src/test/java/io/streamthoughts/jikkou/core/models/generics/GenericResourceTest.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) The original authors
+ *
+ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package io.streamthoughts.jikkou.core.models.generics;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import io.streamthoughts.jikkou.core.io.Jackson;
+import io.streamthoughts.jikkou.core.models.ObjectMeta;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class GenericResourceTest {
+
+    @Test
+    void shouldDeserializeAnyValue() throws JsonProcessingException {
+        // Given
+        String yaml = """
+            apiVersion: io.jikkou/v1
+            kind: Test
+            metadata:
+                name: "test"
+            spec: 
+               field1: value1
+               field2: value2
+            """;
+
+        // When
+        GenericResource deserialized = Jackson.YAML_OBJECT_MAPPER.readValue(yaml, GenericResource.class);
+
+        // Then
+        GenericResource expected = new GenericResource(
+            "io.jikkou/v1",
+            "Test",
+            ObjectMeta
+                .builder()
+                .withName("test")
+                .build(),
+            null,
+            Map.of("spec", Map.of("field1", "value1", "field2", "value2"))
+        );
+
+        Assertions.assertEquals(expected, deserialized);
+    }
+}
diff --git a/core/src/test/java/io/streamthoughts/jikkou/core/reconciler/DefaultChangeResultTest.java b/core/src/test/java/io/streamthoughts/jikkou/core/reconciler/DefaultChangeResultTest.java
@@ -1,3 +1,9 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) The original authors
+ *
+ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
 package io.streamthoughts.jikkou.core.reconciler;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

diff --git a/pom.xml b/pom.xml
@@ -117,7 +117,7 @@
         <!-- Dependencies -->
         <kafka.version>3.7.0</kafka.version>
         <picocli.version>4.7.6</picocli.version>
-        <jackson.version>2.18.0</jackson.version>
+        <jackson.version>2.18.2</jackson.version>
         <jinjava.version>2.7.2</jinjava.version>
         <lombok.version>1.18.32</lombok.version>
         <config.version>1.4.3</config.version>

diff --git a/...in/java/io/streamthoughts/jikkou/extension/aiven/api/data/CompatibilityCheckResponse.java b/...in/java/io/streamthoughts/jikkou/extension/aiven/api/data/CompatibilityCheckResponse.java
@@ -6,8 +6,8 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -21,18 +21,11 @@
  * @param message      Printable result of the request
  */
 @Reflectable
-public record CompatibilityCheckResponse(boolean isCompatible,
-                                         @Nullable List<Error> errors,
-                                         @Nullable String message
+public record CompatibilityCheckResponse(@JsonProperty("is_compatible") boolean isCompatible,
+                                         @JsonProperty("errors") @Nullable List<Error> errors,
+                                         @JsonProperty("message") @Nullable String message
 ) {
 
-    @ConstructorProperties({
-            "is_compatible",
-            "errors",
-            "message",
-    })
-    public CompatibilityCheckResponse {}
-
     /**
      * {@inheritDoc}
      **/

diff --git a/...provider-aiven/src/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/Error.java b/...provider-aiven/src/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/Error.java
@@ -6,8 +6,8 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 
 /**
  * Represents an error occurred during request processing.
@@ -18,13 +18,9 @@
  * @param errorCode Machine-readable error_code
  */
 @Reflectable
-public record Error(String message, String moreInfo, int status, String errorCode) {
-
-    @ConstructorProperties({
-            "message",
-            "more_info",
-            "status",
-            "error_code"
-    })
-    public Error {}
+public record Error(
+    @JsonProperty("message") String message,
+    @JsonProperty("more_info") String moreInfo,
+    @JsonProperty("status")  int status,
+    @JsonProperty("error_code") String errorCode) {
 }
diff --git a/...-aiven/src/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/KafkaAclEntry.java b/...-aiven/src/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/KafkaAclEntry.java
@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 import java.util.Objects;
 
 /**
@@ -32,17 +31,6 @@ public record KafkaAclEntry(@JsonProperty("permission") String permission,
                             @JsonProperty("username") String username,
                             @JsonProperty("id") String id) {
 
-    /**
-     * Creates a new {@link KafkaAclEntry} instance.
-     */
-    @ConstructorProperties({
-            "permission",
-            "topic",
-            "username",
-            "id"
-    })
-    public KafkaAclEntry {
-    }
 
     /**
      * Creates a new {@link KafkaAclEntry} instance.

diff --git a/...src/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/ListKafkaAclResponse.java b/...src/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/ListKafkaAclResponse.java
@@ -6,8 +6,8 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -22,15 +22,10 @@
  * @param message Printable result of the request.
  */
 @Reflectable
-public record ListKafkaAclResponse(List<KafkaAclEntry> acl, List<Error> errors, String message) {
-
-    @ConstructorProperties({
-            "acl",
-            "errors",
-            "message"
-    })
-    public ListKafkaAclResponse {
-    }
+public record ListKafkaAclResponse(
+    @JsonProperty("acl") List<KafkaAclEntry> acl,
+    @JsonProperty("errors") List<Error> errors,
+    @JsonProperty("message") String message) {
 
     @Override
     public List<Error> errors() {

diff --git a/...c/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/ListKafkaQuotaResponse.java b/...c/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/ListKafkaQuotaResponse.java
@@ -6,8 +6,8 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -22,15 +22,10 @@
  * @param message Printable result of the request.
  */
 @Reflectable
-public record ListKafkaQuotaResponse(List<KafkaQuotaEntry> quotas, List<Error> errors, String message) {
-
-    @ConstructorProperties({
-            "quotas",
-            "errors",
-            "message"
-    })
-    public ListKafkaQuotaResponse {
-    }
+public record ListKafkaQuotaResponse(
+    @JsonProperty("quotas") List<KafkaQuotaEntry> quotas,
+    @JsonProperty("errors") List<Error> errors,
+    @JsonProperty("message") String message) {
 
     @Override
     public List<Error> errors() {

diff --git a/...java/io/streamthoughts/jikkou/extension/aiven/api/data/ListSchemaRegistryAclResponse.java b/...java/io/streamthoughts/jikkou/extension/aiven/api/data/ListSchemaRegistryAclResponse.java
@@ -6,8 +6,8 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -22,15 +22,10 @@
  * @param message Printable result of the request
  */
 @Reflectable
-public record ListSchemaRegistryAclResponse(List<SchemaRegistryAclEntry> acl, List<Error> errors, String message) {
-
-    @ConstructorProperties({
-            "acl",
-            "errors",
-            "message"
-    })
-    public ListSchemaRegistryAclResponse {
-    }
+public record ListSchemaRegistryAclResponse(
+    @JsonProperty("acl") List<SchemaRegistryAclEntry> acl,
+    @JsonProperty("errors") List<Error> errors,
+    @JsonProperty("message") String message) {
 
     @Override
     public List<Error> errors() {

diff --git a/...rc/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/MessageErrorsResponse.java b/...rc/main/java/io/streamthoughts/jikkou/extension/aiven/api/data/MessageErrorsResponse.java
@@ -6,8 +6,8 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 import java.util.List;
 
 /**
@@ -18,14 +18,9 @@
  * @param errors  the errors.
  */
 @Reflectable
-public record MessageErrorsResponse(String message, List<Error> errors) {
-
-    @ConstructorProperties({
-            "message",
-            "errors"
-    })
-    public MessageErrorsResponse {
-    }
+public record MessageErrorsResponse(
+    @JsonProperty("message") String message,
+    @JsonProperty("errors") List<Error> errors) {
 
     /**
      * Represents a single error.
@@ -34,15 +29,10 @@ public record MessageErrorsResponse(String message, List<Error> errors) {
      * @param status    HTTP error status name
      * @param errorCode Machine-readable error_code
      */
-    public record Error(String message, int status, String errorCode) {
-
-        @ConstructorProperties({
-                "message",
-                "status",
-                "error_code"
-        })
-        public Error {
-        }
+    public record Error(
+        @JsonProperty("message") String message,
+        @JsonProperty("status") int status,
+        @JsonProperty("error_code") String errorCode) {
 
     }
 }
diff --git a/...in/java/io/streamthoughts/jikkou/extension/aiven/api/data/ServiceInformationResponse.java b/...in/java/io/streamthoughts/jikkou/extension/aiven/api/data/ServiceInformationResponse.java
@@ -6,8 +6,8 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
-import java.beans.ConstructorProperties;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -21,15 +21,10 @@
  * @param message Printable result of the request
  */
 @Reflectable
-public record ServiceInformationResponse(Map<String, Object> service, List<Error> errors, String message) {
-
-    @ConstructorProperties({
-            "service",
-            "errors",
-            "message",
-    })
-    public ServiceInformationResponse {
-    }
+public record ServiceInformationResponse(
+    @JsonProperty("service") Map<String, Object> service,
+    @JsonProperty("errors") List<Error> errors,
+    @JsonProperty("message") String message) {
 
     @Override
     public List<Error> errors() {

diff --git a/...io/streamthoughts/jikkou/extension/aiven/api/data/SubjectSchemaConfigurationResponse.java b/...io/streamthoughts/jikkou/extension/aiven/api/data/SubjectSchemaConfigurationResponse.java
@@ -6,9 +6,9 @@
  */
 package io.streamthoughts.jikkou.extension.aiven.api.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.streamthoughts.jikkou.core.annotation.Reflectable;
 import io.streamthoughts.jikkou.schema.registry.model.CompatibilityLevels;
-import java.beans.ConstructorProperties;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -22,19 +22,11 @@
  * @param message            Printable result of the request
  */
 @Reflectable
-public record SubjectSchemaConfigurationResponse(CompatibilityLevels compatibilityLevel,
-                                                 @Nullable List<Error> errors,
-                                                 @Nullable String message
+public record SubjectSchemaConfigurationResponse(@JsonProperty("compatibilityLevel") CompatibilityLevels compatibilityLevel,
+                                                 @JsonProperty("errors") @Nullable List<Error> errors,
+                                                 @JsonProperty("message") @Nullable String message
 ) {
 
-    @ConstructorProperties({
-            "compatibilityLevel",
-            "errors",
-            "message",
-    })
-    public SubjectSchemaConfigurationResponse {
-    }
-
     /**
      * {@inheritDoc}
      **/