From c2414e555d972f8c36b2b36451c62b6f712fce27 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 28 Mar 2022 11:08:00 +0200 Subject: [PATCH] fix: renaming empty sting --- .../java/io/javaoperatorsdk/operator/ReconcilerUtils.java | 2 +- .../javaoperatorsdk/operator/api/reconciler/Constants.java | 2 +- .../operator/api/reconciler/ControllerConfiguration.java | 6 +++--- .../operator/api/reconciler/dependent/Dependent.java | 4 ++-- .../dependent/kubernetes/KubernetesDependent.java | 4 ++-- .../kubernetes/KubernetesDependentResourceConfig.java | 4 ++-- .../processing/event/source/CustomResourceSelectorTest.java | 2 +- 7 files changed, 12 insertions(+), 12 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 a99abe4d8d..8da1de9e34 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 @@ -75,7 +75,7 @@ public static String getNameFor(Class reconcilerClass) { final var annotation = reconcilerClass.getAnnotation(ControllerConfiguration.class); if (annotation != null) { final var name = annotation.name(); - if (!Constants.EMPTY_STRING.equals(name)) { + if (!Constants.NO_VALUE_SET.equals(name)) { return name; } } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Constants.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Constants.java index e08e168ca4..285bcb16cb 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Constants.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Constants.java @@ -2,7 +2,7 @@ public final class Constants { - public static final String EMPTY_STRING = ""; + public static final String NO_VALUE_SET = ""; public static final String WATCH_CURRENT_NAMESPACE = "JOSDK_WATCH_CURRENT"; public static final long NO_RECONCILIATION_MAX_INTERVAL = -1L; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java index fe69738b1a..b48883a31c 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java @@ -12,7 +12,7 @@ @Target({ElementType.TYPE}) public @interface ControllerConfiguration { - String name() default Constants.EMPTY_STRING; + String name() default Constants.NO_VALUE_SET; /** * Optional finalizer name, if it is not provided, one will be automatically generated. Note that @@ -22,7 +22,7 @@ * * @return the finalizer name */ - String finalizerName() default Constants.EMPTY_STRING; + String finalizerName() default Constants.NO_VALUE_SET; /** * If true, will dispatch new event to the controller if generation increased since the last @@ -48,7 +48,7 @@ * * @return the label selector */ - String labelSelector() default Constants.EMPTY_STRING; + String labelSelector() default Constants.NO_VALUE_SET; /** *

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java index e773f57ba3..25c7418445 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java @@ -1,11 +1,11 @@ package io.javaoperatorsdk.operator.api.reconciler.dependent; -import static io.javaoperatorsdk.operator.api.reconciler.Constants.EMPTY_STRING; +import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET; public @interface Dependent { @SuppressWarnings("rawtypes") Class type(); - String name() default EMPTY_STRING; + String name() default NO_VALUE_SET; } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java index 1b3ceef1d6..6b456c954c 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import static io.javaoperatorsdk.operator.api.reconciler.Constants.EMPTY_STRING; +import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @@ -27,5 +27,5 @@ * * @return the label selector */ - String labelSelector() default EMPTY_STRING; + String labelSelector() default NO_VALUE_SET; } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java index 6e3e8220b6..f7b609b51f 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java @@ -1,11 +1,11 @@ package io.javaoperatorsdk.operator.processing.dependent.kubernetes; -import static io.javaoperatorsdk.operator.api.reconciler.Constants.EMPTY_STRING; +import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET; public class KubernetesDependentResourceConfig { private String[] namespaces = new String[0]; - private String labelSelector = EMPTY_STRING; + private String labelSelector = NO_VALUE_SET; public KubernetesDependentResourceConfig() {} diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java index 2d943deb80..01d15e5cd5 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java @@ -134,7 +134,7 @@ public TestCustomResource newMyResource(String app, String namespace) { public static class MyConfiguration extends DefaultControllerConfiguration { public MyConfiguration() { - super(MyController.class.getCanonicalName(), "mycontroller", null, Constants.EMPTY_STRING, + super(MyController.class.getCanonicalName(), "mycontroller", null, Constants.NO_VALUE_SET, false, null, null, null, null, TestCustomResource.class, null, null); }