refactor: extracted diff method

Author: csviri

core/src/main/java/io/javaoperatorsdk/admissioncontroller/AdmissionUtils.java

@@ -1,12 +1,20 @@
 package io.javaoperatorsdk.admissioncontroller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.Status;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
+import io.fabric8.zjsonpatch.JsonDiff;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 public class AdmissionUtils {
 
+  public static final String JSON_PATCH = "JSONPatch";
+  private final static ObjectMapper mapper = new ObjectMapper();
+
   public static AdmissionResponse notAllowedExceptionToAdmissionResponse(
       NotAllowedException notAllowedException) {
     AdmissionResponse admissionResponse = new AdmissionResponse();
@@ -23,4 +31,20 @@ public static KubernetesResource getTargetResource(AdmissionRequest admissionReq
     return operation == Operation.DELETE ? admissionRequest.getOldObject()
         : admissionRequest.getObject();
   }
+
+  public static AdmissionResponse admissionResponseFromMutation(KubernetesResource originalResource,
+                                                                KubernetesResource mutatedResource) {
+    AdmissionResponse admissionResponse = new AdmissionResponse();
+    admissionResponse.setAllowed(true);
+    admissionResponse.setPatchType(JSON_PATCH);
+    var originalResNode = mapper.valueToTree(originalResource);
+    var mutatedResNode = mapper.valueToTree(mutatedResource);
+
+    var diff = JsonDiff.asJson(originalResNode, mutatedResNode);
+    String base64Diff =
+            Base64.getEncoder().encodeToString(diff.textValue().getBytes(StandardCharsets.UTF_8));
+    admissionResponse.setPatch(base64Diff);
+    return admissionResponse;
+  }
+
 }

core/src/main/java/io/javaoperatorsdk/admissioncontroller/mutation/DefaultRequestMutator.java

@@ -1,28 +1,20 @@
 package io.javaoperatorsdk.admissioncontroller.mutation;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
-import io.fabric8.zjsonpatch.JsonDiff;
 import io.javaoperatorsdk.admissioncontroller.AdmissionUtils;
 import io.javaoperatorsdk.admissioncontroller.NotAllowedException;
 import io.javaoperatorsdk.admissioncontroller.Operation;
 import io.javaoperatorsdk.admissioncontroller.RequestHandler;
 import io.javaoperatorsdk.admissioncontroller.clone.Cloner;
 import io.javaoperatorsdk.admissioncontroller.clone.ObjectMapperCloner;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
+import static io.javaoperatorsdk.admissioncontroller.AdmissionUtils.admissionResponseFromMutation;
 import static io.javaoperatorsdk.admissioncontroller.AdmissionUtils.getTargetResource;
 
 public class DefaultRequestMutator<T extends KubernetesResource> implements RequestHandler {
 
-  public static final String JSON_PATCH = "JSONPatch";
-  private final ObjectMapper mapper = new ObjectMapper();
-
   private final Mutator<T> mutator;
   private final Cloner<T> cloner;
 
@@ -43,26 +35,11 @@ public AdmissionResponse handle(AdmissionRequest admissionRequest) {
     AdmissionResponse admissionResponse;
     try {
       var mutatedResource = mutator.mutate(clonedResource, operation);
-      admissionResponse = createAdmissionResponseFromMutation(originalResource, mutatedResource);
+      admissionResponse = admissionResponseFromMutation(originalResource, mutatedResource);
     } catch (NotAllowedException e) {
       admissionResponse = AdmissionUtils.notAllowedExceptionToAdmissionResponse(e);
     }
     return admissionResponse;
   }
 
-  private AdmissionResponse createAdmissionResponseFromMutation(T originalResource,
-      T mutatedResource) {
-    AdmissionResponse admissionResponse = new AdmissionResponse();
-    admissionResponse.setAllowed(true);
-    admissionResponse.setPatchType(JSON_PATCH);
-    var originalResNode = mapper.valueToTree(originalResource);
-    var mutatedResNode = mapper.valueToTree(mutatedResource);
-
-    var diff = JsonDiff.asJson(originalResNode, mutatedResNode);
-    String base64Diff =
-        Base64.getEncoder().encodeToString(diff.textValue().getBytes(StandardCharsets.UTF_8));
-    admissionResponse.setPatch(base64Diff);
-    return admissionResponse;
-  }
-
 }

core/src/main/java/io/javaoperatorsdk/admissioncontroller/mutation/Mutator.java

@@ -1,9 +1,10 @@
 package io.javaoperatorsdk.admissioncontroller.mutation;
 
+import io.javaoperatorsdk.admissioncontroller.NotAllowedException;
 import io.javaoperatorsdk.admissioncontroller.Operation;
 
 public interface Mutator<T> {
 
-  T mutate(T resource, Operation operation);
+  T mutate(T resource, Operation operation) throws NotAllowedException;
 
 }

core/src/main/java/io/javaoperatorsdk/admissioncontroller/validation/Validator.java

@@ -1,9 +1,10 @@
 package io.javaoperatorsdk.admissioncontroller.validation;
 
+import io.javaoperatorsdk.admissioncontroller.NotAllowedException;
 import io.javaoperatorsdk.admissioncontroller.Operation;
 
 public interface Validator<T> {
 
-  void validate(T resource, Operation operation);
+  void validate(T resource, Operation operation) throws NotAllowedException;
 
 }