From ea44bbe61aa2f713fcfb1c4c3e4a39d15f5c025e Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 6 Apr 2022 18:54:15 +0200 Subject: [PATCH] refactor: use fabric8 finalizer validation Fixes #1141 --- .../operator/ReconcilerUtils.java | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtils.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtils.java index 8da1de9e34..d697422ef7 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtils.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtils.java @@ -7,7 +7,6 @@ import java.util.Locale; import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.client.utils.Serialization; import io.javaoperatorsdk.operator.api.reconciler.Constants; import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration; @@ -23,26 +22,7 @@ public class ReconcilerUtils { private ReconcilerUtils() {} public static boolean isFinalizerValid(String finalizer) { - // todo: use fabric8 method when 5.12 is released - // return HasMetadata.validateFinalizer(finalizer); - final var validator = new HasMetadata() { - - @Override - public ObjectMeta getMetadata() { - throw new UnsupportedOperationException(); - } - - @Override - public void setMetadata(ObjectMeta objectMeta) { - throw new UnsupportedOperationException(); - } - - @Override - public void setApiVersion(String s) { - throw new UnsupportedOperationException(); - } - }; - return validator.isFinalizerValid(finalizer); + return HasMetadata.validateFinalizer(finalizer); } public static String getResourceTypeNameWithVersion(Class resourceClass) {