From 88b830e8d7c57fe5922b9629e4f76a0b3475e288 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Tue, 13 Jun 2023 10:18:14 +0200
Subject: [PATCH 1/5] improve: filters accept super types

---
 .../ControllerConfigurationOverrider.java     |  6 +--
 .../config/DefaultResourceConfiguration.java  | 17 +++++----
 .../ResolvedControllerConfiguration.java      |  7 ++--
 .../api/config/ResourceConfiguration.java     |  6 +--
 .../informer/InformerConfiguration.java       | 38 ++++++++++---------
 .../source/AbstractResourceEventSource.java   | 16 ++++----
 .../event/source/ResourceEventSource.java     |  8 ++--
 .../ControllerResourceEventSource.java        |  2 +-
 8 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
index 5d96c2abf6..f2bd366328 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
@@ -32,9 +32,9 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
   private ResourceEventFilter<R> customResourcePredicate;
   private final ControllerConfiguration<R> original;
   private Duration reconciliationMaxInterval;
-  private OnAddFilter<R> onAddFilter;
-  private OnUpdateFilter<R> onUpdateFilter;
-  private GenericFilter<R> genericFilter;
+  private OnAddFilter<? super R> onAddFilter;
+  private OnUpdateFilter<? super R> onUpdateFilter;
+  private GenericFilter<? super R> genericFilter;
   private RateLimiter rateLimiter;
   private Map<DependentResourceSpec, Object> configurations;
   private ItemStore<R> itemStore;
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
index a612f2d136..781ab93e51 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
@@ -15,16 +15,17 @@ public class DefaultResourceConfiguration<R extends HasMetadata>
 
   private final Class<R> resourceClass;
   private final String resourceTypeName;
-  private final OnAddFilter<R> onAddFilter;
-  private final OnUpdateFilter<R> onUpdateFilter;
-  private final GenericFilter<R> genericFilter;
+  private final OnAddFilter<? super R> onAddFilter;
+  private final OnUpdateFilter<? super R> onUpdateFilter;
+  private final GenericFilter<? super R> genericFilter;
   private final String labelSelector;
   private final Set<String> namespaces;
   private final ItemStore<R> itemStore;
 
   protected DefaultResourceConfiguration(Class<R> resourceClass,
-      Set<String> namespaces, String labelSelector, OnAddFilter<R> onAddFilter,
-      OnUpdateFilter<R> onUpdateFilter, GenericFilter<R> genericFilter, ItemStore<R> itemStore) {
+      Set<String> namespaces, String labelSelector, OnAddFilter<? super R> onAddFilter,
+      OnUpdateFilter<? super R> onUpdateFilter, GenericFilter<? super R> genericFilter,
+      ItemStore<R> itemStore) {
     this.resourceClass = resourceClass;
     this.resourceTypeName = ReconcilerUtils.getResourceTypeName(resourceClass);
     this.onAddFilter = onAddFilter;
@@ -57,16 +58,16 @@ public Class<R> getResourceClass() {
   }
 
   @Override
-  public Optional<OnAddFilter<R>> onAddFilter() {
+  public Optional<OnAddFilter<? super R>> onAddFilter() {
     return Optional.ofNullable(onAddFilter);
   }
 
   @Override
-  public Optional<OnUpdateFilter<R>> onUpdateFilter() {
+  public Optional<OnUpdateFilter<? super R>> onUpdateFilter() {
     return Optional.ofNullable(onUpdateFilter);
   }
 
-  public Optional<GenericFilter<R>> genericFilter() {
+  public Optional<GenericFilter<? super R>> genericFilter() {
     return Optional.ofNullable(genericFilter);
   }
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
index f91e9c506a..9c96a5c0a7 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
@@ -67,8 +67,8 @@ protected RateLimiter ensureRateLimiter(RateLimiter given) {
   public ResolvedControllerConfiguration(Class<P> resourceClass, String name,
       boolean generationAware, String associatedReconcilerClassName, Retry retry,
       RateLimiter rateLimiter, Duration maxReconciliationInterval,
-      OnAddFilter<P> onAddFilter, OnUpdateFilter<P> onUpdateFilter,
-      GenericFilter<P> genericFilter,
+      OnAddFilter<? super P> onAddFilter, OnUpdateFilter<? super P> onUpdateFilter,
+      GenericFilter<? super P> genericFilter,
       List<DependentResourceSpec> dependentResources,
       Set<String> namespaces, String finalizer, String labelSelector,
       Map<DependentResourceSpec, Object> configurations, ItemStore<P> itemStore,
@@ -82,7 +82,8 @@ public ResolvedControllerConfiguration(Class<P> resourceClass, String name,
   protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
       boolean generationAware, String associatedReconcilerClassName, Retry retry,
       RateLimiter rateLimiter, Duration maxReconciliationInterval,
-      OnAddFilter<P> onAddFilter, OnUpdateFilter<P> onUpdateFilter, GenericFilter<P> genericFilter,
+      OnAddFilter<? super P> onAddFilter, OnUpdateFilter<? super P> onUpdateFilter,
+      GenericFilter<? super P> genericFilter,
       Set<String> namespaces, String finalizer, String labelSelector,
       Map<DependentResourceSpec, Object> configurations, ItemStore<P> itemStore,
       ConfigurationService configurationService) {
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java
index 1d7e10c5d5..b1b518a164 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java
@@ -23,15 +23,15 @@ default String getResourceTypeName() {
     return ReconcilerUtils.getResourceTypeName(getResourceClass());
   }
 
-  default Optional<OnAddFilter<R>> onAddFilter() {
+  default Optional<OnAddFilter<? super R>> onAddFilter() {
     return Optional.empty();
   }
 
-  default Optional<OnUpdateFilter<R>> onUpdateFilter() {
+  default Optional<OnUpdateFilter<? super R>> onUpdateFilter() {
     return Optional.empty();
   }
 
-  default Optional<GenericFilter<R>> genericFilter() {
+  default Optional<GenericFilter<? super R>> genericFilter() {
     return Optional.empty();
   }
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java
index f883799cc9..3ca680cf7f 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java
@@ -29,17 +29,17 @@ class DefaultInformerConfiguration<R extends HasMetadata> extends
     private final PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
     private final SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
     private final boolean followControllerNamespaceChanges;
-    private final OnDeleteFilter<R> onDeleteFilter;
+    private final OnDeleteFilter<? super R> onDeleteFilter;
 
     protected DefaultInformerConfiguration(String labelSelector,
         Class<R> resourceClass,
         PrimaryToSecondaryMapper<?> primaryToSecondaryMapper,
         SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper,
         Set<String> namespaces, boolean followControllerNamespaceChanges,
-        OnAddFilter<R> onAddFilter,
-        OnUpdateFilter<R> onUpdateFilter,
-        OnDeleteFilter<R> onDeleteFilter,
-        GenericFilter<R> genericFilter,
+        OnAddFilter<? super R> onAddFilter,
+        OnUpdateFilter<? super R> onUpdateFilter,
+        OnDeleteFilter<? super R> onDeleteFilter,
+        GenericFilter<? super R> genericFilter,
         ItemStore<R> itemStore) {
       super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter,
           itemStore);
@@ -62,7 +62,7 @@ public SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
       return secondaryToPrimaryMapper;
     }
 
-    public Optional<OnDeleteFilter<R>> onDeleteFilter() {
+    public Optional<OnDeleteFilter<? super R>> onDeleteFilter() {
       return Optional.ofNullable(onDeleteFilter);
     }
 
@@ -95,13 +95,13 @@ public <P extends HasMetadata> PrimaryToSecondaryMapper<P> getPrimaryToSecondary
    */
   SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper();
 
-  Optional<OnAddFilter<R>> onAddFilter();
+  Optional<OnAddFilter<? super R>> onAddFilter();
 
-  Optional<OnUpdateFilter<R>> onUpdateFilter();
+  Optional<OnUpdateFilter<? super R>> onUpdateFilter();
 
-  Optional<OnDeleteFilter<R>> onDeleteFilter();
+  Optional<OnDeleteFilter<? super R>> onDeleteFilter();
 
-  Optional<GenericFilter<R>> genericFilter();
+  Optional<GenericFilter<? super R>> genericFilter();
 
   <P extends HasMetadata> PrimaryToSecondaryMapper<P> getPrimaryToSecondaryMapper();
 
@@ -113,10 +113,10 @@ class InformerConfigurationBuilder<R extends HasMetadata> {
     private Set<String> namespaces;
     private String labelSelector;
     private final Class<R> resourceClass;
-    private OnAddFilter<R> onAddFilter;
-    private OnUpdateFilter<R> onUpdateFilter;
-    private OnDeleteFilter<R> onDeleteFilter;
-    private GenericFilter<R> genericFilter;
+    private OnAddFilter<? super R> onAddFilter;
+    private OnUpdateFilter<? super R> onUpdateFilter;
+    private OnDeleteFilter<? super R> onDeleteFilter;
+    private GenericFilter<? super R> genericFilter;
     private boolean inheritControllerNamespacesOnChange = false;
     private ItemStore<R> itemStore;
 
@@ -198,23 +198,25 @@ public InformerConfigurationBuilder<R> withLabelSelector(String labelSelector) {
       return this;
     }
 
-    public InformerConfigurationBuilder<R> withOnAddFilter(OnAddFilter<R> onAddFilter) {
+    public InformerConfigurationBuilder<R> withOnAddFilter(OnAddFilter<? super R> onAddFilter) {
       this.onAddFilter = onAddFilter;
       return this;
     }
 
-    public InformerConfigurationBuilder<R> withOnUpdateFilter(OnUpdateFilter<R> onUpdateFilter) {
+    public InformerConfigurationBuilder<R> withOnUpdateFilter(
+        OnUpdateFilter<? super R> onUpdateFilter) {
       this.onUpdateFilter = onUpdateFilter;
       return this;
     }
 
     public InformerConfigurationBuilder<R> withOnDeleteFilter(
-        OnDeleteFilter<R> onDeleteFilter) {
+        OnDeleteFilter<? super R> onDeleteFilter) {
       this.onDeleteFilter = onDeleteFilter;
       return this;
     }
 
-    public InformerConfigurationBuilder<R> withGenericFilter(GenericFilter<R> genericFilter) {
+    public InformerConfigurationBuilder<R> withGenericFilter(
+        GenericFilter<? super R> genericFilter) {
       this.genericFilter = genericFilter;
       return this;
     }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/AbstractResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/AbstractResourceEventSource.java
index 2a5c6c2d39..65294c1625 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/AbstractResourceEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/AbstractResourceEventSource.java
@@ -11,10 +11,10 @@ public abstract class AbstractResourceEventSource<R, P extends HasMetadata>
     implements ResourceEventSource<R, P> {
   private final Class<R> resourceClass;
 
-  protected OnAddFilter<R> onAddFilter;
-  protected OnUpdateFilter<R> onUpdateFilter;
-  protected OnDeleteFilter<R> onDeleteFilter;
-  protected GenericFilter<R> genericFilter;
+  protected OnAddFilter<? super R> onAddFilter;
+  protected OnUpdateFilter<? super R> onUpdateFilter;
+  protected OnDeleteFilter<? super R> onDeleteFilter;
+  protected GenericFilter<? super R> genericFilter;
 
   protected AbstractResourceEventSource(Class<R> resourceClass) {
     this.resourceClass = resourceClass;
@@ -25,21 +25,21 @@ public Class<R> resourceType() {
     return resourceClass;
   }
 
-  public void setOnAddFilter(OnAddFilter<R> onAddFilter) {
+  public void setOnAddFilter(OnAddFilter<? super R> onAddFilter) {
     this.onAddFilter = onAddFilter;
   }
 
   public void setOnUpdateFilter(
-      OnUpdateFilter<R> onUpdateFilter) {
+      OnUpdateFilter<? super R> onUpdateFilter) {
     this.onUpdateFilter = onUpdateFilter;
   }
 
   public void setOnDeleteFilter(
-      OnDeleteFilter<R> onDeleteFilter) {
+      OnDeleteFilter<? super R> onDeleteFilter) {
     this.onDeleteFilter = onDeleteFilter;
   }
 
-  public void setGenericFilter(GenericFilter<R> genericFilter) {
+  public void setGenericFilter(GenericFilter<? super R> genericFilter) {
     this.genericFilter = genericFilter;
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventSource.java
index 38b5d7007f..722e260878 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventSource.java
@@ -32,11 +32,11 @@ default Optional<R> getSecondaryResource(P primary) {
 
   Set<R> getSecondaryResources(P primary);
 
-  void setOnAddFilter(OnAddFilter<R> onAddFilter);
+  void setOnAddFilter(OnAddFilter<? super R> onAddFilter);
 
-  void setOnUpdateFilter(OnUpdateFilter<R> onUpdateFilter);
+  void setOnUpdateFilter(OnUpdateFilter<? super R> onUpdateFilter);
 
-  void setOnDeleteFilter(OnDeleteFilter<R> onDeleteFilter);
+  void setOnDeleteFilter(OnDeleteFilter<? super R> onDeleteFilter);
 
-  void setGenericFilter(GenericFilter<R> genericFilter);
+  void setGenericFilter(GenericFilter<? super R> genericFilter);
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
index bd01d71a94..71769c845b 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
@@ -133,7 +133,7 @@ public Set<T> getSecondaryResources(T primary) {
   }
 
   @Override
-  public void setOnDeleteFilter(OnDeleteFilter<T> onDeleteFilter) {
+  public void setOnDeleteFilter(OnDeleteFilter<? super T> onDeleteFilter) {
     throw new IllegalStateException(
         "onDeleteFilter is not supported for controller resource event source");
   }

From 1daf930092368a21685e65106b4c3e23314790e2 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Tue, 13 Jun 2023 10:57:43 +0200
Subject: [PATCH 2/5] fix

---
 .../event/source/controller/ControllerResourceEventSource.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
index 71769c845b..f29e48eba4 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
@@ -37,7 +37,7 @@ public class ControllerResourceEventSource<T extends HasMetadata>
   private final Controller<T> controller;
   private final ResourceEventFilter<T> legacyFilters;
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public ControllerResourceEventSource(Controller<T> controller) {
     super(controller.getCRClient(), controller.getConfiguration());
     this.controller = controller;

From f6cb7628159093b13a36baae8ccda3f35a58ce9b Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Tue, 13 Jun 2023 12:15:02 +0200
Subject: [PATCH 3/5] fix

---
 .../operator/api/config/DefaultResourceConfiguration.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
index 781ab93e51..821553b2c8 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
@@ -67,6 +67,7 @@ public Optional<OnUpdateFilter<? super R>> onUpdateFilter() {
     return Optional.ofNullable(onUpdateFilter);
   }
 
+  @Override
   public Optional<GenericFilter<? super R>> genericFilter() {
     return Optional.ofNullable(genericFilter);
   }

From e8533f89b5ec28aea6fd830bf6b57a85f973d5ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 08:31:58 +0200
Subject: [PATCH 4/5] chore(deps): bump micrometer-core from 1.11.0 to 1.11.1
 (#1939)

Bumps [micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.11.0...v1.11.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 35562eeb8b..b1dcd422f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
         <assertj.version>3.24.2</assertj.version>
         <awaitility.version>4.2.0</awaitility.version>
         <spring-boot.version>2.7.3</spring-boot.version>
-        <micrometer-core.version>1.11.0</micrometer-core.version>
+        <micrometer-core.version>1.11.1</micrometer-core.version>
         <okhttp.version>4.10.0</okhttp.version>
         <caffeine.version>3.1.3</caffeine.version>
         <jenvtest.version>0.9.0</jenvtest.version>

From 83a72bd18f1adaff56f4b1ad436b98567df7f9fe Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Tue, 13 Jun 2023 16:29:37 +0200
Subject: [PATCH 5/5] move base to next

---
 .../event/source/controller/ControllerResourceEventSource.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
index f29e48eba4..648febad30 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
@@ -43,7 +43,7 @@ public ControllerResourceEventSource(Controller<T> controller) {
     this.controller = controller;
 
     final var config = controller.getConfiguration();
-    OnUpdateFilter<T> internalOnUpdateFilter =
+    OnUpdateFilter internalOnUpdateFilter =
         (OnUpdateFilter<T>) onUpdateFinalizerNeededAndApplied(controller.useFinalizer(),
             config.getFinalizerName())
             .or(onUpdateGenerationAware(config.isGenerationAware()))