refactor: pull out allowedAdmissionResponse method

Signed-off-by: David Sondermann <[email protected]>

Author: Donnerbart

core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionUtils.java

@@ -17,6 +17,12 @@ public class AdmissionUtils {
   private AdmissionUtils() {
   }
 
+  public static AdmissionResponse allowedAdmissionResponse() {
+    var admissionResponse = new AdmissionResponse();
+    admissionResponse.setAllowed(true);
+    return admissionResponse;
+  }
+
   public static AdmissionResponse notAllowedExceptionToAdmissionResponse(
       NotAllowedException notAllowedException) {
     var admissionResponse = new AdmissionResponse();

core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/DefaultAdmissionRequestMutator.java

@@ -4,14 +4,14 @@
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
 import io.javaoperatorsdk.webhook.admission.AdmissionRequestHandler;
-import io.javaoperatorsdk.webhook.admission.AdmissionUtils;
 import io.javaoperatorsdk.webhook.admission.NotAllowedException;
 import io.javaoperatorsdk.webhook.admission.Operation;
 import io.javaoperatorsdk.webhook.clone.Cloner;
 import io.javaoperatorsdk.webhook.clone.ObjectMapperCloner;
 
 import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.admissionResponseFromMutation;
 import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.getTargetResource;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.notAllowedExceptionToAdmissionResponse;
 
 public class DefaultAdmissionRequestMutator<T extends KubernetesResource>
     implements AdmissionRequestHandler {
@@ -34,14 +34,11 @@ public AdmissionResponse handle(AdmissionRequest admissionRequest) {
     var operation = Operation.valueOf(admissionRequest.getOperation());
     var originalResource = (T) getTargetResource(admissionRequest, operation);
     var clonedResource = cloner.clone(originalResource);
-    AdmissionResponse admissionResponse;
     try {
       var mutatedResource = mutator.mutate(clonedResource, operation);
-      admissionResponse = admissionResponseFromMutation(originalResource, mutatedResource);
+      return admissionResponseFromMutation(originalResource, mutatedResource);
     } catch (NotAllowedException e) {
-      admissionResponse = AdmissionUtils.notAllowedExceptionToAdmissionResponse(e);
+      return notAllowedExceptionToAdmissionResponse(e);
     }
-    return admissionResponse;
   }
-
 }

core/src/main/java/io/javaoperatorsdk/webhook/admission/validation/AsyncDefaultAdmissionRequestValidator.java

@@ -7,12 +7,13 @@
 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.javaoperatorsdk.webhook.admission.AdmissionUtils;
 import io.javaoperatorsdk.webhook.admission.AsyncAdmissionRequestHandler;
 import io.javaoperatorsdk.webhook.admission.NotAllowedException;
 import io.javaoperatorsdk.webhook.admission.Operation;
 
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.allowedAdmissionResponse;
 import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.getTargetResource;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.notAllowedExceptionToAdmissionResponse;
 
 public class AsyncDefaultAdmissionRequestValidator<T extends KubernetesResource>
     implements AsyncAdmissionRequestHandler {
@@ -28,28 +29,18 @@ public AsyncDefaultAdmissionRequestValidator(Validator<T> validator) {
   public CompletionStage<AdmissionResponse> handle(AdmissionRequest admissionRequest) {
     var operation = Operation.valueOf(admissionRequest.getOperation());
     var originalResource = (T) getTargetResource(admissionRequest, operation);
-
     var asyncValidate =
         CompletableFuture.runAsync(() -> validator.validate(originalResource, operation));
     return asyncValidate
         .thenApply(v -> allowedAdmissionResponse())
         .exceptionally(e -> {
           if (e instanceof CompletionException) {
             if (e.getCause() instanceof NotAllowedException) {
-              return AdmissionUtils.notAllowedExceptionToAdmissionResponse(
-                  (NotAllowedException) e.getCause());
-            } else {
-              throw new IllegalStateException(e.getCause());
+              return notAllowedExceptionToAdmissionResponse((NotAllowedException) e.getCause());
             }
-          } else {
-            throw new IllegalStateException(e);
+            throw new IllegalStateException(e.getCause());
           }
+          throw new IllegalStateException(e);
         });
   }
-
-  private AdmissionResponse allowedAdmissionResponse() {
-    AdmissionResponse admissionResponse = new AdmissionResponse();
-    admissionResponse.setAllowed(true);
-    return admissionResponse;
-  }
 }

core/src/main/java/io/javaoperatorsdk/webhook/admission/validation/DefaultAdmissionRequestValidator.java

@@ -4,11 +4,12 @@
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
 import io.javaoperatorsdk.webhook.admission.AdmissionRequestHandler;
-import io.javaoperatorsdk.webhook.admission.AdmissionUtils;
 import io.javaoperatorsdk.webhook.admission.NotAllowedException;
 import io.javaoperatorsdk.webhook.admission.Operation;
 
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.allowedAdmissionResponse;
 import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.getTargetResource;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.notAllowedExceptionToAdmissionResponse;
 
 public class DefaultAdmissionRequestValidator<T extends KubernetesResource>
     implements AdmissionRequestHandler {
@@ -24,19 +25,11 @@ public DefaultAdmissionRequestValidator(Validator<T> validator) {
   public AdmissionResponse handle(AdmissionRequest admissionRequest) {
     var operation = Operation.valueOf(admissionRequest.getOperation());
     var originalResource = (T) getTargetResource(admissionRequest, operation);
-    AdmissionResponse admissionResponse;
     try {
       validator.validate(originalResource, operation);
-      admissionResponse = allowedAdmissionResponse();
+      return allowedAdmissionResponse();
     } catch (NotAllowedException e) {
-      admissionResponse = AdmissionUtils.notAllowedExceptionToAdmissionResponse(e);
+      return notAllowedExceptionToAdmissionResponse(e);
     }
-    return admissionResponse;
-  }
-
-  private AdmissionResponse allowedAdmissionResponse() {
-    AdmissionResponse admissionResponse = new AdmissionResponse();
-    admissionResponse.setAllowed(true);
-    return admissionResponse;
   }
 }