feat: simplified sample conversion (#36)

csviri · web-flow · commit 0d2e40b40aff · 2022-11-21T10:16:42.000+01:00
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResource.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResource.java
@@ -11,6 +11,6 @@
 @Kind("MultiVersionCustomResource")
 @ShortNames("tcr")
 public class MultiVersionCustomResource
-    extends CustomResource<MultiVersionCustomResourceSpec, MultiVersionCustomResourceStatus> {
+    extends CustomResource<MultiVersionCustomResourceSpec, Void> {
 
 }
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceSpecV2.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceSpecV2.java
@@ -4,7 +4,6 @@ public class MultiVersionCustomResourceSpecV2 {
 
   private String value;
 
-  private String additionalValue;
 
   public String getValue() {
     return value;
@@ -15,11 +14,4 @@ public MultiVersionCustomResourceSpecV2 setValue(String value) {
     return this;
   }
 
-  public String getAdditionalValue() {
-    return additionalValue;
-  }
-
-  public void setAdditionalValue(String additionalValue) {
-    this.additionalValue = additionalValue;
-  }
 }
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceStatus.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceStatus.java
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceStatusV2.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceStatusV2.java
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceV2.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/customresource/MultiVersionCustomResourceV2.java
@@ -11,5 +11,5 @@
 @Kind("MultiVersionCustomResource")
 @ShortNames("tcr")
 public class MultiVersionCustomResourceV2
-    extends CustomResource<MultiVersionCustomResourceSpecV2, MultiVersionCustomResourceStatusV2> {
+    extends CustomResource<MultiVersionCustomResourceSpecV2, Void> {
 }
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/AsyncV1Mapper.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/AsyncV1Mapper.java
@@ -6,22 +6,21 @@
 import io.javaoperatorsdk.webhook.conversion.AsyncMapper;
 import io.javaoperatorsdk.webhook.conversion.TargetVersion;
 import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResource;
-import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2;
 
 @TargetVersion("v1")
 public class AsyncV1Mapper
-    implements AsyncMapper<MultiVersionCustomResource, MultiVersionCustomResourceV2> {
+    implements AsyncMapper<MultiVersionCustomResource, MultiVersionHub> {
 
   private V1Mapper mapper = new V1Mapper();
 
   @Override
-  public CompletionStage<MultiVersionCustomResourceV2> toHub(MultiVersionCustomResource resource) {
+  public CompletionStage<MultiVersionHub> toHub(MultiVersionCustomResource resource) {
     return CompletableFuture.completedStage(mapper.toHub(resource));
   }
 
   @Override
   public CompletionStage<MultiVersionCustomResource> fromHub(
-      MultiVersionCustomResourceV2 testCustomResourceV2) {
-    return CompletableFuture.completedStage(mapper.fromHub(testCustomResourceV2));
+      MultiVersionHub hub) {
+    return CompletableFuture.completedStage(mapper.fromHub(hub));
   }
 }
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/AsyncV2Mapper.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/AsyncV2Mapper.java
@@ -9,19 +9,17 @@
 
 @TargetVersion("v2")
 public class AsyncV2Mapper
-    implements AsyncMapper<MultiVersionCustomResourceV2, MultiVersionCustomResourceV2> {
+    implements AsyncMapper<MultiVersionCustomResourceV2, MultiVersionHub> {
 
   private V2Mapper mapper = new V2Mapper();
 
   @Override
-  public CompletionStage<MultiVersionCustomResourceV2> toHub(
-      MultiVersionCustomResourceV2 resource) {
+  public CompletionStage<MultiVersionHub> toHub(MultiVersionCustomResourceV2 resource) {
     return CompletableFuture.completedStage(mapper.toHub(resource));
   }
 
   @Override
-  public CompletionStage<MultiVersionCustomResourceV2> fromHub(
-      MultiVersionCustomResourceV2 multiVersionCustomResourceV2) {
-    return CompletableFuture.completedStage(mapper.fromHub(multiVersionCustomResourceV2));
+  public CompletionStage<MultiVersionCustomResourceV2> fromHub(MultiVersionHub multiVersionHub) {
+    return CompletableFuture.completedStage(mapper.fromHub(multiVersionHub));
   }
 }
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/MultiVersionHub.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/MultiVersionHub.java
@@ -0,0 +1,26 @@
+package io.javaoperatorsdk.webhook.sample.commons.mapper;
+
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+
+public class MultiVersionHub {
+
+  private ObjectMeta metadata = new ObjectMeta();
+
+  private int value;
+
+  public ObjectMeta getMetadata() {
+    return metadata;
+  }
+
+  public void setMetadata(ObjectMeta metadata) {
+    this.metadata = metadata;
+  }
+
+  public int getValue() {
+    return value;
+  }
+
+  public void setValue(int value) {
+    this.value = value;
+  }
+}
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/V1Mapper.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/V1Mapper.java
@@ -5,44 +5,26 @@
 import io.javaoperatorsdk.webhook.sample.commons.customresource.*;
 
 @TargetVersion("v1")
-public class V1Mapper implements Mapper<MultiVersionCustomResource, MultiVersionCustomResourceV2> {
-
+public class V1Mapper implements Mapper<MultiVersionCustomResource, MultiVersionHub> {
 
   public static final String DEFAULT_ADDITIONAL_VALUE = "default_additional_value";
 
   @Override
-  public MultiVersionCustomResourceV2 toHub(MultiVersionCustomResource resource) {
-    var hub = new MultiVersionCustomResourceV2();
+  public MultiVersionHub toHub(MultiVersionCustomResource resource) {
+    var hub = new MultiVersionHub();
     hub.setMetadata(resource.getMetadata());
-
-    var spec = new MultiVersionCustomResourceSpecV2();
-    spec.setValue(String.valueOf(resource.getSpec().getValue()));
-    spec.setAdditionalValue(DEFAULT_ADDITIONAL_VALUE);
-    hub.setSpec(spec);
-
-
-    if (resource.getStatus() != null) {
-      var status = new MultiVersionCustomResourceStatusV2();
-      status.setReady(resource.getStatus().getReady());
-      hub.setStatus(status);
-    }
+    hub.setValue(resource.getSpec().getValue());
     return hub;
   }
 
   @Override
-  public MultiVersionCustomResource fromHub(MultiVersionCustomResourceV2 hub) {
+  public MultiVersionCustomResource fromHub(MultiVersionHub hub) {
     var res = new MultiVersionCustomResource();
     res.setMetadata(hub.getMetadata());
 
     var spec = new MultiVersionCustomResourceSpec();
-    spec.setValue(Integer.parseInt(hub.getSpec().getValue()));
+    spec.setValue(hub.getValue());
     res.setSpec(spec);
-
-    if (hub.getStatus() != null) {
-      var status = new MultiVersionCustomResourceStatus();
-      status.setReady(hub.getStatus().getReady());
-      res.setStatus(status);
-    }
     return res;
   }
 }
diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/V2Mapper.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/mapper/V2Mapper.java
@@ -2,20 +2,28 @@
 
 import io.javaoperatorsdk.webhook.conversion.Mapper;
 import io.javaoperatorsdk.webhook.conversion.TargetVersion;
+import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceSpecV2;
 import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2;
 
 @TargetVersion("v2")
 public class V2Mapper
-    implements Mapper<MultiVersionCustomResourceV2, MultiVersionCustomResourceV2> {
+    implements Mapper<MultiVersionCustomResourceV2, MultiVersionHub> {
 
   @Override
-  public MultiVersionCustomResourceV2 toHub(MultiVersionCustomResourceV2 resource) {
-    return resource;
+  public MultiVersionHub toHub(MultiVersionCustomResourceV2 resource) {
+    var hub = new MultiVersionHub();
+    hub.setMetadata(resource.getMetadata());
+    hub.setValue(Integer.parseInt(resource.getSpec().getValue()));
+    return hub;
   }
 
   @Override
   public MultiVersionCustomResourceV2 fromHub(
-      MultiVersionCustomResourceV2 multiVersionCustomResourceV2) {
-    return multiVersionCustomResourceV2;
+      MultiVersionHub hub) {
+    var res = new MultiVersionCustomResourceV2();
+    res.setMetadata(hub.getMetadata());
+    res.setSpec(new MultiVersionCustomResourceSpecV2());
+    res.getSpec().setValue(Integer.toString(hub.getValue()));
+    return res;
   }
 }
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
@@ -18,7 +18,7 @@
 class ConversionEndpointTest {
 
   final static String expectedResult =
-      "{\"apiVersion\":\"apiextensions.k8s.io/v1\",\"kind\":\"ConversionReview\",\"response\":{\"convertedObjects\":[{\"apiVersion\":\"sample.javaoperatorsdk/v2\",\"kind\":\"MultiVersionCustomResource\",\"metadata\":{\"creationTimestamp\":\"2021-09-04T14:03:02Z\",\"name\":\"resource1\",\"namespace\":\"default\",\"resourceVersion\":\"143\",\"uid\":\"3415a7fc-162b-4300-b5da-fd6083580d66\"},\"spec\":{\"value\":\"1\",\"additionalValue\":\"default_additional_value\"},\"status\":{\"ready\":true,\"message\":null}},{\"apiVersion\":\"sample.javaoperatorsdk/v2\",\"kind\":\"MultiVersionCustomResource\",\"metadata\":{\"creationTimestamp\":\"2021-09-04T14:03:02Z\",\"name\":\"resource2\",\"namespace\":\"default\",\"resourceVersion\":\"14344\",\"uid\":\"1115a7fc-162b-4300-b5da-fd6083580d55\"},\"spec\":{\"value\":\"2\",\"additionalValue\":\"default_additional_value\"},\"status\":{\"ready\":false,\"message\":null}}],\"result\":{\"apiVersion\":\"v1\",\"kind\":\"Status\",\"status\":\"Success\"},\"uid\":\"705ab4f5-6393-11e8-b7cc-42010a800002\"}}";
+      "{\"apiVersion\":\"apiextensions.k8s.io/v1\",\"kind\":\"ConversionReview\",\"response\":{\"convertedObjects\":[{\"apiVersion\":\"sample.javaoperatorsdk/v2\",\"kind\":\"MultiVersionCustomResource\",\"metadata\":{\"creationTimestamp\":\"2021-09-04T14:03:02Z\",\"name\":\"resource1\",\"namespace\":\"default\",\"resourceVersion\":\"143\",\"uid\":\"3415a7fc-162b-4300-b5da-fd6083580d66\"},\"spec\":{\"value\":\"1\"}},{\"apiVersion\":\"sample.javaoperatorsdk/v2\",\"kind\":\"MultiVersionCustomResource\",\"metadata\":{\"creationTimestamp\":\"2021-09-04T14:03:02Z\",\"name\":\"resource2\",\"namespace\":\"default\",\"resourceVersion\":\"14344\",\"uid\":\"1115a7fc-162b-4300-b5da-fd6083580d55\"},\"spec\":{\"value\":\"2\"}}],\"result\":{\"apiVersion\":\"v1\",\"kind\":\"Status\",\"status\":\"Success\"},\"uid\":\"705ab4f5-6393-11e8-b7cc-42010a800002\"}}";
 
 
   @Test
diff --git a/samples/spring-boot/src/test/java/io/javaoperatorsdk/webhook/sample/springboot/conversion/ConversionEndpointTest.java b/samples/spring-boot/src/test/java/io/javaoperatorsdk/webhook/sample/springboot/conversion/ConversionEndpointTest.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
 import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2;
 
-import static io.javaoperatorsdk.webhook.sample.commons.mapper.V1Mapper.DEFAULT_ADDITIONAL_VALUE;
 import static io.javaoperatorsdk.webhook.sample.springboot.conversion.ConversionEndpoint.ASYNC_CONVERSION_PATH;
 import static io.javaoperatorsdk.webhook.sample.springboot.conversion.ConversionEndpoint.CONVERSION_PATH;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -53,7 +52,6 @@ public void testConversion(String path) {
           var resource1 =
               ((MultiVersionCustomResourceV2) review.getResponse().getConvertedObjects().get(0));
           assertThat(review.getResponse().getConvertedObjects()).hasSize(2);
-          assertThat(resource1.getSpec().getAdditionalValue()).isEqualTo(DEFAULT_ADDITIONAL_VALUE);
           assertThat(resource1.getMetadata().getName()).isEqualTo("resource1");
         });
   }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`@Kind("MultiVersionCustomResource")`
`12`	`12`	`@ShortNames("tcr")`
`13`	`13`	`public class MultiVersionCustomResource`
`14`		`- extends CustomResource<MultiVersionCustomResourceSpec, MultiVersionCustomResourceStatus> {`
	`14`	`+ extends CustomResource<MultiVersionCustomResourceSpec, Void> {`
`15`	`15`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`@Kind("MultiVersionCustomResource")`
`12`	`12`	`@ShortNames("tcr")`
`13`	`13`	`public class MultiVersionCustomResourceV2`
`14`		`- extends CustomResource<MultiVersionCustomResourceSpecV2, MultiVersionCustomResourceStatusV2> {`
	`14`	`+ extends CustomResource<MultiVersionCustomResourceSpecV2, Void> {`
`15`	`15`	`}`