From 440a0e5f055d647868970cce95837867f3a8893e Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 17 Nov 2022 09:45:04 +0100 Subject: [PATCH 1/3] fix: quarkus deserialization problem --- ...stomResourceDeserializationCustomizer.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java diff --git a/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java b/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java new file mode 100644 index 00000000..6949082a --- /dev/null +++ b/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java @@ -0,0 +1,20 @@ +package io.javaoperatorsdk.webhook.admission.sample.quarkus.conversion; + +import javax.inject.Singleton; + +import io.javaoperatorsdk.webhook.conversion.Utils; +import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResource; +import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2; +import io.quarkus.jackson.ObjectMapperCustomizer; + +import com.fasterxml.jackson.databind.ObjectMapper; + +@Singleton +public class CustomResourceDeserializationCustomizer implements ObjectMapperCustomizer { + + @Override + public void customize(ObjectMapper objectMapper) { + Utils.registerCustomKind(MultiVersionCustomResource.class); + Utils.registerCustomKind(MultiVersionCustomResourceV2.class); + } +} From a3f41390926c90b09457b4c7f9d9f5e887dcc85d Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 17 Nov 2022 10:47:25 +0100 Subject: [PATCH 2/3] test enabled --- core/pom.xml | 6 ++++++ .../conversion/CustomResourceDeserializationCustomizer.java | 3 +++ .../sample/quarkus/conversion/ConversionEndpointTest.java | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index b8c3950b..32356e68 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -54,6 +54,12 @@ io.fabric8 kubernetes-client + + + com.fasterxml.jackson.core + jackson-databind + 2.13.4.2 + org.slf4j diff --git a/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java b/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java index 6949082a..cd2d20c9 100644 --- a/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java +++ b/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/CustomResourceDeserializationCustomizer.java @@ -9,6 +9,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; +/** + * For quarkus for now the custom kinds needs to be registered explicitly + */ @Singleton public class CustomResourceDeserializationCustomizer implements ObjectMapperCustomizer { diff --git a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionEndpointTest.java b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionEndpointTest.java index 781d07f8..22ad8b95 100644 --- a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionEndpointTest.java +++ b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionEndpointTest.java @@ -4,7 +4,6 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.junit.QuarkusTest; @@ -15,7 +14,6 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -@Disabled @QuarkusTest class ConversionEndpointTest { From 77e2a7d78d7a8669faa10d0a96bdf0cdf858d368 Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 17 Nov 2022 10:49:00 +0100 Subject: [PATCH 3/3] remove jackson --- core/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 32356e68..4c5a9b3b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -54,13 +54,6 @@ io.fabric8 kubernetes-client - - - com.fasterxml.jackson.core - jackson-databind - 2.13.4.2 - - org.slf4j slf4j-api