refactor: fix generics

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java

@@ -5,6 +5,7 @@
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ResourceController;
 
+@SuppressWarnings("rawtypes")
 public class ControllerUtils {
 
   private static final String FINALIZER_NAME_SUFFIX = "/finalizer";

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -114,7 +114,7 @@ public void close() {
    * @param <R> the {@code CustomResource} type associated with the controller
    * @throws OperatorException if a problem occurred during the registration process
    */
-  public <R extends CustomResource> void register(ResourceController<R> controller)
+  public <R extends CustomResource<?, ?>> void register(ResourceController<R> controller)
       throws OperatorException {
     register(controller, null);
   }
@@ -132,7 +132,7 @@ public <R extends CustomResource> void register(ResourceController<R> controller
    * @param <R> the {@code CustomResource} type associated with the controller
    * @throws OperatorException if a problem occurred during the registration process
    */
-  public <R extends CustomResource> void register(
+  public <R extends CustomResource<?, ?>> void register(
       ResourceController<R> controller, ControllerConfiguration<R> configuration)
       throws OperatorException {
     final var existing = configurationService.getConfigurationFor(controller);
@@ -148,7 +148,7 @@ public <R extends CustomResource> void register(
         configuration = existing;
       }
       final var configuredController =
-          new ConfiguredController(controller, configuration, kubernetesClient);
+          new ConfiguredController<>(controller, configuration, kubernetesClient);
       controllers.add(configuredController);
 
       final var watchedNS =

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

@@ -3,7 +3,7 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-public abstract class BaseControl<T extends BaseControl> {
+public abstract class BaseControl<T extends BaseControl<T>> {
 
   private Long scheduleDelay = null;
 

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

@@ -2,9 +2,7 @@
 
 import java.util.Optional;
 
-import io.fabric8.kubernetes.client.CustomResource;
-
-public interface Context<T extends CustomResource> {
+public interface Context {
 
   Optional<RetryInfo> getRetryInfo();
 

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

@@ -2,9 +2,7 @@
 
 import java.util.Optional;
 
-import io.fabric8.kubernetes.client.CustomResource;
-
-public class DefaultContext<T extends CustomResource> implements Context<T> {
+public class DefaultContext implements Context {
 
   private final RetryInfo retryInfo;
 

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

@@ -22,7 +22,7 @@ public boolean isRemoveFinalizer() {
 
   @Override
   public DeleteControl rescheduleAfter(long delay) {
-    if (removeFinalizer == true) {
+    if (removeFinalizer) {
       throw new IllegalStateException("Cannot reschedule deleteResource if removing finalizer");
     }
     return super.rescheduleAfter(delay);

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

@@ -2,7 +2,7 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 
-public interface ResourceController<R extends CustomResource> {
+public interface ResourceController<R extends CustomResource<?, ?>> {
 
   /**
    * Note that this method is used in combination of finalizers. If automatic finalizer handling is
@@ -28,7 +28,7 @@ public interface ResourceController<R extends CustomResource> {
    *         finalizer to indicate that the resource should not be deleted after all, in which case
    *         the controller should restore the resource's state appropriately.
    */
-  default DeleteControl deleteResource(R resource, Context<R> context) {
+  default DeleteControl deleteResource(R resource, Context context) {
     return DeleteControl.defaultDelete();
   }
 
@@ -46,6 +46,6 @@ default DeleteControl deleteResource(R resource, Context<R> context) {
    *         be skipped. <b>However we will always call an update if there is no finalizer on object
    *         and it's not marked for deletion.</b>
    */
-  UpdateControl<R> createOrUpdateResource(R resource, Context<R> context);
+  UpdateControl<R> createOrUpdateResource(R resource, Context context);
 
 }

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

@@ -2,6 +2,7 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 
+@SuppressWarnings("rawtypes")
 public class UpdateControl<T extends CustomResource> extends BaseControl<UpdateControl<T>> {
 
   private final T customResource;
@@ -34,12 +35,12 @@ public static <T extends CustomResource> UpdateControl<T> updateStatusSubResourc
    * @param customResource - custom resource to use in both API calls
    * @return UpdateControl instance
    */
-  public static <T extends CustomResource> UpdateControl<T> updateCustomResourceAndStatus(
+  public static <T extends CustomResource<?, ?>> UpdateControl<T> updateCustomResourceAndStatus(
       T customResource) {
     return new UpdateControl<>(customResource, true, true);
   }
 
-  public static <T extends CustomResource> UpdateControl<T> noUpdate() {
+  public static <T extends CustomResource<?, ?>> UpdateControl<T> noUpdate() {
     return new UpdateControl<>(null, false, false);
   }
 

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

@@ -9,6 +9,7 @@
 import io.javaoperatorsdk.operator.ControllerUtils;
 import io.javaoperatorsdk.operator.api.ResourceController;
 
+@SuppressWarnings("rawtypes")
 public class AbstractConfigurationService implements ConfigurationService {
   private final Map<String, ControllerConfiguration> configurations = new ConcurrentHashMap<>();
   private final Version version;
@@ -17,15 +18,15 @@ public AbstractConfigurationService(Version version) {
     this.version = version;
   }
 
-  protected <R extends CustomResource> void register(ControllerConfiguration<R> config) {
+  protected <R extends CustomResource<?, ?>> void register(ControllerConfiguration<R> config) {
     put(config, true);
   }
 
-  protected <R extends CustomResource> void replace(ControllerConfiguration<R> config) {
+  protected <R extends CustomResource<?, ?>> void replace(ControllerConfiguration<R> config) {
     put(config, false);
   }
 
-  private <R extends CustomResource> void put(
+  private <R extends CustomResource<?, ?>> void put(
       ControllerConfiguration<R> config, boolean failIfExisting) {
     final var name = config.getName();
     if (failIfExisting) {
@@ -38,8 +39,8 @@ private <R extends CustomResource> void put(
     config.setConfigurationService(this);
   }
 
-  protected void throwExceptionOnNameCollision(
-      String newControllerClassName, ControllerConfiguration existing) {
+  protected <R extends CustomResource<?, ?>> void throwExceptionOnNameCollision(
+      String newControllerClassName, ControllerConfiguration<R> existing) {
     throw new IllegalArgumentException(
         "Controller name '"
             + existing.getName()
@@ -50,7 +51,7 @@ protected void throwExceptionOnNameCollision(
   }
 
   @Override
-  public <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor(
+  public <R extends CustomResource<?, ?>> ControllerConfiguration<R> getConfigurationFor(
       ResourceController<R> controller) {
     final var key = keyFor(controller);
     final var configuration = configurations.get(key);
@@ -72,7 +73,7 @@ private String getControllersNameMessage() {
         + ".";
   }
 
-  protected String keyFor(ResourceController controller) {
+  protected <R extends CustomResource<?, ?>> String keyFor(ResourceController<R> controller) {
     return ControllerUtils.getNameFor(controller);
   }
 

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

@@ -36,7 +36,7 @@ public interface ConfigurationService {
    * @return the {@link ControllerConfiguration} associated with the specified controller or {@code
    *     null} if no configuration exists for the controller
    */
-  <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor(
+  <R extends CustomResource<?, ?>> ControllerConfiguration<R> getConfigurationFor(
       ResourceController<R> controller);
 
   /**

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

@@ -61,7 +61,7 @@ public ConfigurationServiceOverrider withMetrics(Metrics metrics) {
   public ConfigurationService build() {
     return new ConfigurationService() {
       @Override
-      public <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor(
+      public <R extends CustomResource<?, ?>> ControllerConfiguration<R> getConfigurationFor(
           ResourceController<R> controller) {
         return original.getConfigurationFor(controller);
       }

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

@@ -10,7 +10,7 @@
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEventFilter;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEventFilters;
 
-public interface ControllerConfiguration<R extends CustomResource> {
+public interface ControllerConfiguration<R extends CustomResource<?, ?>> {
 
   default String getName() {
     return ControllerUtils.getDefaultResourceControllerName(getAssociatedControllerClassName());

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ConfiguredController.java

@@ -18,11 +18,11 @@
 import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
 
 public class ConfiguredController<R extends CustomResource<?, ?>> implements ResourceController<R>,
-    Stoppable, EventSourceInitializer {
+    Stoppable, EventSourceInitializer<R> {
   private final ResourceController<R> controller;
   private final ControllerConfiguration<R> configuration;
   private final KubernetesClient kubernetesClient;
-  private DefaultEventSourceManager eventSourceManager;
+  private DefaultEventSourceManager<R> eventSourceManager;
 
   public ConfiguredController(ResourceController<R> controller,
       ControllerConfiguration<R> configuration,
@@ -33,7 +33,7 @@ public ConfiguredController(ResourceController<R> controller,
   }
 
   @Override
-  public DeleteControl deleteResource(R resource, Context<R> context) {
+  public DeleteControl deleteResource(R resource, Context context) {
     return configuration.getConfigurationService().getMetrics().timeControllerExecution(
         new ControllerExecution<>() {
           @Override
@@ -59,7 +59,7 @@ public DeleteControl execute() {
   }
 
   @Override
-  public UpdateControl<R> createOrUpdateResource(R resource, Context<R> context) {
+  public UpdateControl<R> createOrUpdateResource(R resource, Context context) {
     return configuration.getConfigurationService().getMetrics().timeControllerExecution(
         new ControllerExecution<>() {
           @Override
@@ -92,7 +92,7 @@ public UpdateControl<R> execute() {
   }
 
   @Override
-  public void prepareEventSources(EventSourceManager eventSourceManager) {
+  public void prepareEventSources(EventSourceManager<R> eventSourceManager) {
     throw new UnsupportedOperationException("This method should never be called directly");
   }
 
@@ -165,7 +165,7 @@ public void start() throws OperatorException {
     try {
       eventSourceManager = new DefaultEventSourceManager<>(this);
       if (controller instanceof EventSourceInitializer) {
-        ((EventSourceInitializer) controller).prepareEventSources(eventSourceManager);
+        ((EventSourceInitializer<R>) controller).prepareEventSources(eventSourceManager);
       }
     } catch (MissingCRDException e) {
       throwMissingCRDException(crdName, specVersion, controllerName);
@@ -208,7 +208,7 @@ private boolean failOnMissingCurrentNS() {
     return false;
   }
 
-  public EventSourceManager getEventSourceManager() {
+  public EventSourceManager<R> getEventSourceManager() {
     return eventSourceManager;
   }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

@@ -64,8 +64,8 @@ private PostExecutionControl<R> handleDispatch(ExecutionScope<R> executionScope)
       return PostExecutionControl.defaultDispatch();
     }
 
-    Context<R> context =
-        new DefaultContext<>(executionScope.getRetryInfo());
+    Context context =
+        new DefaultContext(executionScope.getRetryInfo());
     if (markedForDeletion) {
       return handleDelete(resource, context);
     } else {
@@ -92,7 +92,7 @@ private boolean shouldNotDispatchToDelete(R resource) {
   }
 
   private PostExecutionControl<R> handleCreateOrUpdate(
-      ExecutionScope<R> executionScope, R resource, Context<R> context) {
+      ExecutionScope<R> executionScope, R resource, Context context) {
     if (configuration().useFinalizer() && !resource.hasFinalizer(configuration().getFinalizer())) {
       /*
        * We always add the finalizer if missing and the controller is configured to use a finalizer.
@@ -147,7 +147,7 @@ private void updatePostExecutionControlWithReschedule(
     baseControl.getScheduleDelay().ifPresent(postExecutionControl::withReSchedule);
   }
 
-  private PostExecutionControl<R> handleDelete(R resource, Context<R> context) {
+  private PostExecutionControl<R> handleDelete(R resource, Context context) {
     log.debug(
         "Executing delete for resource: {} with version: {}",
         getName(resource),

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventFilter.java

@@ -11,7 +11,7 @@
  * @param <T> the type of custom resources handled by this filter
  */
 @FunctionalInterface
-public interface CustomResourceEventFilter<T extends CustomResource> {
+public interface CustomResourceEventFilter<T extends CustomResource<?, ?>> {
 
   /**
    * Determines whether the change between the old version of the resource and the new one needs to

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventFilters.java

@@ -7,7 +7,7 @@
  */
 public final class CustomResourceEventFilters {
 
-  private static final CustomResourceEventFilter<CustomResource> USE_FINALIZER =
+  private static final CustomResourceEventFilter<CustomResource<?, ?>> USE_FINALIZER =
       (configuration, oldResource, newResource) -> {
         if (configuration.useFinalizer()) {
           final var finalizer = configuration.getFinalizer();
@@ -20,18 +20,18 @@ public final class CustomResourceEventFilters {
         }
       };
 
-  private static final CustomResourceEventFilter<CustomResource> GENERATION_AWARE =
+  private static final CustomResourceEventFilter<CustomResource<?, ?>> GENERATION_AWARE =
       (configuration, oldResource, newResource) -> oldResource == null
           || !configuration.isGenerationAware()
           || oldResource.getMetadata().getGeneration() < newResource.getMetadata().getGeneration();
 
-  private static final CustomResourceEventFilter<CustomResource> PASSTHROUGH =
+  private static final CustomResourceEventFilter<CustomResource<?, ?>> PASSTHROUGH =
       (configuration, oldResource, newResource) -> true;
 
-  private static final CustomResourceEventFilter<CustomResource> NONE =
+  private static final CustomResourceEventFilter<CustomResource<?, ?>> NONE =
       (configuration, oldResource, newResource) -> false;
 
-  private static final CustomResourceEventFilter<CustomResource> MARKED_FOR_DELETION =
+  private static final CustomResourceEventFilter<CustomResource<?, ?>> MARKED_FOR_DELETION =
       (configuration, oldResource, newResource) -> newResource.isMarkedForDeletion();
 
   private CustomResourceEventFilters() {}
@@ -43,7 +43,7 @@ private CustomResourceEventFilters() {}
    * @return a filter that accepts all events
    */
   @SuppressWarnings("unchecked")
-  public static <T extends CustomResource> CustomResourceEventFilter<T> passthrough() {
+  public static <T extends CustomResource<?, ?>> CustomResourceEventFilter<T> passthrough() {
     return (CustomResourceEventFilter<T>) PASSTHROUGH;
   }
 
@@ -54,7 +54,7 @@ public static <T extends CustomResource> CustomResourceEventFilter<T> passthroug
    * @return a filter that reject all events
    */
   @SuppressWarnings("unchecked")
-  public static <T extends CustomResource> CustomResourceEventFilter<T> none() {
+  public static <T extends CustomResource<?, ?>> CustomResourceEventFilter<T> none() {
     return (CustomResourceEventFilter<T>) NONE;
   }
 
@@ -66,7 +66,7 @@ public static <T extends CustomResource> CustomResourceEventFilter<T> none() {
    * @return a filter accepting changes based on generation information
    */
   @SuppressWarnings("unchecked")
-  public static <T extends CustomResource> CustomResourceEventFilter<T> generationAware() {
+  public static <T extends CustomResource<?, ?>> CustomResourceEventFilter<T> generationAware() {
     return (CustomResourceEventFilter<T>) GENERATION_AWARE;
   }
 
@@ -79,7 +79,7 @@ public static <T extends CustomResource> CustomResourceEventFilter<T> generation
    *         applied
    */
   @SuppressWarnings("unchecked")
-  public static <T extends CustomResource> CustomResourceEventFilter<T> finalizerNeededAndApplied() {
+  public static <T extends CustomResource<?, ?>> CustomResourceEventFilter<T> finalizerNeededAndApplied() {
     return (CustomResourceEventFilter<T>) USE_FINALIZER;
   }
 
@@ -90,7 +90,7 @@ public static <T extends CustomResource> CustomResourceEventFilter<T> finalizerN
    * @return a filter accepting changes based on whether the Custom Resource is marked for deletion.
    */
   @SuppressWarnings("unchecked")
-  public static <T extends CustomResource> CustomResourceEventFilter<T> markedForDeletion() {
+  public static <T extends CustomResource<?, ?>> CustomResourceEventFilter<T> markedForDeletion() {
     return (CustomResourceEventFilter<T>) MARKED_FOR_DELETION;
   }