fix: generics for kube config

Author: csviri

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

@@ -36,15 +36,15 @@
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_NAMESPACES_SET;
 
 @SuppressWarnings("rawtypes")
-public class AnnotationControllerConfiguration<R extends HasMetadata>
-    implements io.javaoperatorsdk.operator.api.config.ControllerConfiguration<R> {
+public class AnnotationControllerConfiguration<P extends HasMetadata>
+    implements io.javaoperatorsdk.operator.api.config.ControllerConfiguration<P> {
 
-  protected final Reconciler<R> reconciler;
+  protected final Reconciler<P> reconciler;
   private final ControllerConfiguration annotation;
   private List<DependentResourceSpec> specs;
-  private Class<R> resourceClass;
+  private Class<P> resourceClass;
 
-  public AnnotationControllerConfiguration(Reconciler<R> reconciler) {
+  public AnnotationControllerConfiguration(Reconciler<P> reconciler) {
     this.reconciler = reconciler;
     this.annotation = reconciler.getClass().getAnnotation(ControllerConfiguration.class);
     if (annotation == null) {
@@ -89,10 +89,10 @@ public Set<String> getNamespaces() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public Class<R> getResourceClass() {
+  public Class<P> getResourceClass() {
     if (resourceClass == null) {
       resourceClass =
-          (Class<R>) Utils.getFirstTypeArgumentFromSuperClassOrInterface(reconciler.getClass(),
+          (Class<P>) Utils.getFirstTypeArgumentFromSuperClassOrInterface(reconciler.getClass(),
               Reconciler.class);
     }
     return resourceClass;
@@ -110,16 +110,16 @@ public String getAssociatedReconcilerClassName() {
 
   @SuppressWarnings("unchecked")
   @Override
-  public ResourceEventFilter<R> getEventFilter() {
-    ResourceEventFilter<R> answer = null;
+  public ResourceEventFilter<P> getEventFilter() {
+    ResourceEventFilter<P> answer = null;
 
-    Class<ResourceEventFilter<R>>[] filterTypes =
-        (Class<ResourceEventFilter<R>>[]) valueOrDefault(annotation,
+    Class<ResourceEventFilter<P>>[] filterTypes =
+        (Class<ResourceEventFilter<P>>[]) valueOrDefault(annotation,
             ControllerConfiguration::eventFilters, new Object[] {});
     if (filterTypes.length > 0) {
       for (var filterType : filterTypes) {
         try {
-          ResourceEventFilter<R> filter = filterType.getConstructor().newInstance();
+          ResourceEventFilter<P> filter = filterType.getConstructor().newInstance();
 
           if (answer == null) {
             answer = filter;
@@ -151,8 +151,8 @@ public Optional<Duration> reconciliationMaxInterval() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public Optional<Predicate<R>> onAddFilter() {
-    return (Optional<Predicate<R>>) createFilter(annotation.onAddFilter(), FilterType.onAdd,
+  public Optional<Predicate<P>> onAddFilter() {
+    return (Optional<Predicate<P>>) createFilter(annotation.onAddFilter(), FilterType.onAdd,
         annotation.getClass().getSimpleName());
   }
 
@@ -186,8 +186,8 @@ private <T> Optional<T> createFilter(Class<T> filter, FilterType filterType, Str
 
   @SuppressWarnings("unchecked")
   @Override
-  public Optional<BiPredicate<R, R>> onUpdateFilter() {
-    return (Optional<BiPredicate<R, R>>) createFilter(annotation.onUpdateFilter(),
+  public Optional<BiPredicate<P, P>> onUpdateFilter() {
+    return (Optional<BiPredicate<P, P>>) createFilter(annotation.onUpdateFilter(),
         FilterType.onUpdate, annotation.getClass().getSimpleName());
   }
 
@@ -259,6 +259,7 @@ private String getName(Dependent dependent, Class<? extends DependentResource> d
     return name;
   }
 
+  @SuppressWarnings("rawtypes")
   private Object createKubernetesResourceConfig(Class<? extends DependentResource> dependentType) {
 
     Object config;
@@ -291,7 +292,6 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
               .orElse(null);
     }
 
-
     config =
         new KubernetesDependentResourceConfig(namespaces, labelSelector, configuredNS, onAddFilter,
             onUpdateFilter, onDeleteFilter);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

@@ -162,9 +162,9 @@ protected NonNamespaceOperation<R, KubernetesResourceList<R>, Resource<R>> prepa
   protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> context) {
     if (kubernetesDependentResourceConfig != null) {
       // sets the filters for the dependent resource, which are applied by parent class
-      setOnAddFilter(kubernetesDependentResourceConfig.onAddFilter());
-      setOnUpdateFilter(kubernetesDependentResourceConfig.onUpdateFilter());
-      setOnDeleteFilter(kubernetesDependentResourceConfig.onDeleteFilter());
+      onAddFilter = kubernetesDependentResourceConfig.onAddFilter();
+      onUpdateFilter = kubernetesDependentResourceConfig.onUpdateFilter();
+      onDeleteFilter = kubernetesDependentResourceConfig.onDeleteFilter();
 
       configureWith(kubernetesDependentResourceConfig.labelSelector(),
           kubernetesDependentResourceConfig.namespaces(),

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java

@@ -8,26 +8,26 @@
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;
 
-public class KubernetesDependentResourceConfig {
+public class KubernetesDependentResourceConfig<R> {
 
   private Set<String> namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
   private String labelSelector = NO_VALUE_SET;
   private boolean namespacesWereConfigured = false;
 
-  @SuppressWarnings("rawtypes")
-  private Predicate onAddFilter;
-  @SuppressWarnings("rawtypes")
-  private BiPredicate onUpdateFilter;
-  @SuppressWarnings("rawtypes")
-  private BiPredicate onDeleteFilter;
+
+  private Predicate<R> onAddFilter;
+
+  private BiPredicate<R, R> onUpdateFilter;
+
+  private BiPredicate<R, Boolean> onDeleteFilter;
 
   public KubernetesDependentResourceConfig() {}
 
   @SuppressWarnings("rawtypes")
   public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSelector,
-      boolean configuredNS, Predicate onAddFilter,
-      BiPredicate onUpdateFilter,
-      BiPredicate onDeleteFilter) {
+      boolean configuredNS, Predicate<R> onAddFilter,
+      BiPredicate<R, R> onUpdateFilter,
+      BiPredicate<R, Boolean> onDeleteFilter) {
     this.namespaces = namespaces;
     this.labelSelector = labelSelector;
     this.namespacesWereConfigured = configuredNS;
@@ -40,13 +40,13 @@ public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSel
     this(namespaces, labelSelector, true, null, null, null);
   }
 
-  public KubernetesDependentResourceConfig setNamespaces(Set<String> namespaces) {
+  public KubernetesDependentResourceConfig<R> setNamespaces(Set<String> namespaces) {
     this.namespacesWereConfigured = true;
     this.namespaces = namespaces;
     return this;
   }
 
-  public KubernetesDependentResourceConfig setLabelSelector(String labelSelector) {
+  public KubernetesDependentResourceConfig<R> setLabelSelector(String labelSelector) {
     this.labelSelector = labelSelector;
     return this;
   }