fix: update deprecated client usage and minor improvements (#1707)

Author: csviri

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

@@ -23,7 +23,8 @@ public static final <T, B> B newBuilder(Class<B> builderType, T item) {
     }
   }
 
-  public static final <T, B> Class<T> builderTargetType(Class<B> builderType) {
+  @SuppressWarnings("unchecked")
+  public static <T, B> Class<T> builderTargetType(Class<B> builderType) {
     try {
       Method method = builderType.getDeclaredMethod("build");
       return (Class<T>) method.getReturnType();

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

@@ -26,7 +26,7 @@ public class ResolvedControllerConfiguration<P extends HasMetadata>
   private final String associatedReconcilerClassName;
   private final Retry retry;
   private final RateLimiter rateLimiter;
-  private final Optional<Duration> maxReconciliationInterval;
+  private final Duration maxReconciliationInterval;
   private final String finalizer;
   private final Map<DependentResourceSpec, Object> configurations;
 
@@ -86,7 +86,7 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
     this.associatedReconcilerClassName = associatedReconcilerClassName;
     this.retry = ensureRetry(retry);
     this.rateLimiter = ensureRateLimiter(rateLimiter);
-    this.maxReconciliationInterval = Optional.ofNullable(maxReconciliationInterval);
+    this.maxReconciliationInterval = maxReconciliationInterval;
     this.configurations = configurations != null ? configurations : Collections.emptyMap();
 
     this.finalizer =
@@ -142,7 +142,7 @@ protected void setDependentResources(List<DependentResourceSpec> dependentResour
 
   @Override
   public Optional<Duration> maxReconciliationInterval() {
-    return maxReconciliationInterval;
+    return Optional.ofNullable(maxReconciliationInterval);
   }
 
   @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator.api.reconciler.dependent;
 
-import io.javaoperatorsdk.operator.api.reconciler.Constants;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/EventSourceNotFoundException.java

@@ -4,7 +4,7 @@
 
 public class EventSourceNotFoundException extends OperatorException {
 
-  private String eventSourceName;
+  private final String eventSourceName;
 
   public EventSourceNotFoundException(String eventSourceName) {
     this.eventSourceName = eventSourceName;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/health/ControllerHealthInfo.java

@@ -8,7 +8,7 @@
 @SuppressWarnings("rawtypes")
 public class ControllerHealthInfo {
 
-  private EventSourceManager<?> eventSourceManager;
+  private final EventSourceManager<?> eventSourceManager;
 
   public ControllerHealthInfo(EventSourceManager eventSourceManager) {
     this.eventSourceManager = eventSourceManager;

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

@@ -8,10 +8,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
 import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.processing.event.source.filter.*;
-import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
-import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
-import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
-import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/AbstractWorkflowExecutor.java

@@ -100,6 +100,7 @@ protected synchronized void handleNodeExecutionFinish(
     }
   }
 
+  @SuppressWarnings("unchecked")
   protected <R> boolean isConditionMet(Optional<Condition<R, P>> condition,
       DependentResource<R, P> dependentResource) {
     if (condition.isEmpty()) {

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

@@ -1,10 +1,6 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

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

@@ -35,7 +35,8 @@
 public abstract class ExternalResourceCachingEventSource<R, P extends HasMetadata>
     extends AbstractResourceEventSource<R, P> implements RecentOperationCacheFiller<R> {
 
-  private static Logger log = LoggerFactory.getLogger(ExternalResourceCachingEventSource.class);
+  private static final Logger log =
+      LoggerFactory.getLogger(ExternalResourceCachingEventSource.class);
 
   protected final CacheKeyMapper<R> cacheKeyMapper;
 

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

@@ -9,8 +9,8 @@
 
 class DefaultPrimaryToSecondaryIndex<R extends HasMetadata> implements PrimaryToSecondaryIndex<R> {
 
-  private SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
-  private Map<ResourceID, Set<ResourceID>> index = new HashMap<>();
+  private final SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
+  private final Map<ResourceID, Set<ResourceID>> index = new HashMap<>();
 
   public DefaultPrimaryToSecondaryIndex(SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper) {
     this.secondaryToPrimaryMapper = secondaryToPrimaryMapper;