refactor

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/Field.java

@@ -2,7 +2,9 @@
 
 public @interface Field {
 
-  String field();
+  String path();
 
   String value();
+
+  boolean negate() default false;
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/FieldSelector.java

@@ -0,0 +1,26 @@
+package io.javaoperatorsdk.operator.api.config.informer;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class FieldSelector {
+  private final List<Field> fields;
+
+  public FieldSelector(List<Field> fields) {
+    this.fields = fields;
+  }
+
+  public FieldSelector(Field... fields) {
+    this.fields = Arrays.asList(fields);
+  }
+
+  public List<Field> getFields() {
+    return fields;
+  }
+
+  public record Field(String path, String value, boolean negated) {
+    public Field(String value, String path) {
+      this(path, value, false);
+    }
+  }
+}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/FieldSelectorBuilder.java

@@ -0,0 +1,23 @@
+package io.javaoperatorsdk.operator.api.config.informer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FieldSelectorBuilder {
+
+  private final List<FieldSelector.Field> fields = new ArrayList<>();
+
+  public FieldSelectorBuilder withField(String path, String value) {
+    fields.add(new FieldSelector.Field(path, value));
+    return this;
+  }
+
+  public FieldSelectorBuilder withoutField(String path, String value) {
+    fields.add(new FieldSelector.Field(path, value, true));
+    return this;
+  }
+
+  public FieldSelector build() {
+    return new FieldSelector(fields);
+  }
+}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/Informer.java

@@ -114,9 +114,6 @@
    */
   long informerListLimit() default NO_LONG_VALUE_SET;
 
-  /** Field selector for informer, for matching field with the value: field=value; */
-  Field[] withFields() default {};
-
-  /** Negated field selector for informer, for non-matching field with the value: field!=value; */
-  Field[] withoutFields() default {};
+  /** Kubernetes field selector for additional resource filtering */
+  Field[] fieldSelector() default {};
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java

@@ -1,13 +1,8 @@
 package io.javaoperatorsdk.operator.api.config.informer;
 
-import java.util.AbstractMap;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -42,8 +37,7 @@ public class InformerConfiguration<R extends HasMetadata> {
   private GenericFilter<? super R> genericFilter;
   private ItemStore<R> itemStore;
   private Long informerListLimit;
-  private Map<String, String> withFields = new HashMap<>();
-  private List<AbstractMap.SimpleEntry<String, String>> withoutFields = new ArrayList<>();
+  private FieldSelector fieldSelector;
 
   protected InformerConfiguration(
       Class<R> resourceClass,
@@ -57,8 +51,7 @@ protected InformerConfiguration(
       GenericFilter<? super R> genericFilter,
       ItemStore<R> itemStore,
       Long informerListLimit,
-      Map<String, String> withFields,
-      List<AbstractMap.SimpleEntry<String, String>> withoutFields) {
+      FieldSelector fieldSelector) {
     this(resourceClass);
     this.name = name;
     this.namespaces = namespaces;
@@ -70,8 +63,7 @@ protected InformerConfiguration(
     this.genericFilter = genericFilter;
     this.itemStore = itemStore;
     this.informerListLimit = informerListLimit;
-    this.withFields = withFields;
-    this.withoutFields = withoutFields;
+    this.fieldSelector = fieldSelector;
   }
 
   private InformerConfiguration(Class<R> resourceClass) {
@@ -106,8 +98,7 @@ public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
             original.genericFilter,
             original.itemStore,
             original.informerListLimit,
-            original.withFields,
-            original.withoutFields)
+            original.fieldSelector)
         .builder;
   }
 
@@ -278,12 +269,8 @@ public Long getInformerListLimit() {
     return informerListLimit;
   }
 
-  public Map<String, String> getWithFields() {
-    return withFields;
-  }
-
-  public List<AbstractMap.SimpleEntry<String, String>> getWithoutFields() {
-    return withoutFields;
+  public FieldSelector getFieldSelector() {
+    return fieldSelector;
   }
 
   @SuppressWarnings("UnusedReturnValue")
@@ -352,9 +339,11 @@ public InformerConfiguration<R>.Builder initFromAnnotation(
             informerListLimitValue == Constants.NO_LONG_VALUE_SET ? null : informerListLimitValue;
         withInformerListLimit(informerListLimit);
 
-        Arrays.stream(informerConfig.withFields()).forEach(f -> withField(f.field(), f.value()));
-        Arrays.stream(informerConfig.withoutFields())
-            .forEach(f -> withoutField(f.field(), f.value()));
+        withFieldSelector(
+            new FieldSelector(
+                Arrays.stream(informerConfig.fieldSelector())
+                    .map(f -> new FieldSelector.Field(f.path(), f.value(), f.negate()))
+                    .toList()));
       }
       return this;
     }
@@ -451,25 +440,8 @@ public Builder withInformerListLimit(Long informerListLimit) {
       return this;
     }
 
-    public Builder withField(String field, String value) {
-      InformerConfiguration.this.withFields.put(field, value);
-      return this;
-    }
-
-    public Builder withFields(Map<String, String> fields) {
-      InformerConfiguration.this.withFields.putAll(fields);
-      return this;
-    }
-
-    /**
-     * Note that there can be more values for the same field. Like key != value1,key != value2.
-     *
-     * @param field key
-     * @param value negated
-     * @return builder
-     */
-    public Builder withoutField(String field, String value) {
-      InformerConfiguration.this.withoutFields.add(new AbstractMap.SimpleEntry<>(field, value));
+    public Builder withFieldSelector(FieldSelector fieldSelector) {
+      InformerConfiguration.this.fieldSelector = fieldSelector;
       return this;
     }
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator.api.config.informer;
 
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -266,18 +265,8 @@ public Builder<R> withInformerListLimit(Long informerListLimit) {
       return this;
     }
 
-    public Builder<R> withField(String field, String value) {
-      config.withField(field, value);
-      return this;
-    }
-
-    public Builder<R> withFields(Map<String, String> fields) {
-      config.withFields(fields);
-      return this;
-    }
-
-    public Builder<R> withoutField(String field, String value) {
-      config.withoutField(field, value);
+    public Builder<R> withFieldSelector(FieldSelector fieldSelector) {
+      config.withFieldSelector(fieldSelector);
       return this;
     }
 
@@ -298,11 +287,7 @@ public void updateFrom(InformerConfiguration<R> informerConfig) {
             .withOnDeleteFilter(informerConfig.getOnDeleteFilter())
             .withGenericFilter(informerConfig.getGenericFilter())
             .withInformerListLimit(informerConfig.getInformerListLimit())
-            .withFields(informerConfig.getWithFields());
-
-        informerConfig
-            .getWithoutFields()
-            .forEach(f -> config.withoutField(f.getKey(), f.getValue()));
+            .withFieldSelector(informerConfig.getFieldSelector());
       }
     }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

@@ -135,14 +135,14 @@ private InformerWrapper<R> createEventSource(
       String namespaceIdentifier) {
     final var informerConfig = configuration.getInformerConfig();
 
-    if (!informerConfig.getWithFields().isEmpty()) {
-      filteredBySelectorClient =
-          filteredBySelectorClient.withFields(informerConfig.getWithFields());
-    }
-
-    if (!informerConfig.getWithoutFields().isEmpty()) {
-      for (var e : informerConfig.getWithoutFields()) {
-        filteredBySelectorClient = filteredBySelectorClient.withoutField(e.getKey(), e.getValue());
+    if (informerConfig.getFieldSelector() != null
+        && !informerConfig.getFieldSelector().getFields().isEmpty()) {
+      for (var f : informerConfig.getFieldSelector().getFields()) {
+        if (f.negated()) {
+          filteredBySelectorClient = filteredBySelectorClient.withoutField(f.path(), f.value());
+        } else {
+          filteredBySelectorClient = filteredBySelectorClient.withField(f.path(), f.value());
+        }
       }
     }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorTestReconciler.java

@@ -8,6 +8,7 @@
 
 import io.fabric8.kubernetes.api.model.Secret;
 import io.javaoperatorsdk.operator.api.config.informer.Field;
+import io.javaoperatorsdk.operator.api.config.informer.FieldSelectorBuilder;
 import io.javaoperatorsdk.operator.api.config.informer.Informer;
 import io.javaoperatorsdk.operator.api.config.informer.InformerEventSourceConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -22,8 +23,8 @@
 @ControllerConfiguration(
     informer =
         @Informer(
-            withFields =
-                @Field(field = "type", value = FieldSelectorTestReconciler.MY_SECRET_TYPE)))
+            fieldSelector =
+                @Field(path = "type", value = FieldSelectorTestReconciler.MY_SECRET_TYPE)))
 public class FieldSelectorTestReconciler implements Reconciler<Secret>, TestExecutionInfoProvider {
 
   public static final String MY_SECRET_TYPE = "my-secret-type";
@@ -54,7 +55,8 @@ public List<EventSource<?, Secret>> prepareEventSources(EventSourceContext<Secre
         new InformerEventSource<>(
             InformerEventSourceConfiguration.from(Secret.class, Secret.class)
                 .withNamespacesInheritedFromController()
-                .withField("type", OTHER_SECRET_TYPE)
+                .withFieldSelector(
+                    new FieldSelectorBuilder().withField("type", OTHER_SECRET_TYPE).build())
                 .build(),
             context);