refactor: clean-up

Signed-off-by: Chris Laprun <claprun@redhat.com>

Author: metacosm

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

@@ -152,7 +152,7 @@ static boolean inheritsNamespacesFromController(Set<String> namespaces) {
   class InformerConfigurationBuilder<R extends HasMetadata> {
 
     private final Class<R> resourceClass;
-    private GroupVersionKind groupVersionKind;
+    private final GroupVersionKind groupVersionKind;
     private final Class<? extends HasMetadata> primaryResourceClass;
     private String name;
     private PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
@@ -252,6 +252,7 @@ public <P extends HasMetadata> InformerConfigurationBuilder<R> withWatchCurrentN
      *        controller's namespaces are reconfigured, {@code false} otherwise
      * @return the builder instance so that calls can be chained fluently
      */
+    @SuppressWarnings("UnusedReturnValue")
     public InformerConfigurationBuilder<R> followControllerNamespacesOnChange(
         boolean followChanges) {
       this.followControllerNamespacesOnChange = followChanges;
@@ -263,6 +264,7 @@ public InformerConfigurationBuilder<R> withLabelSelector(String labelSelector) {
       return this;
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     public InformerConfigurationBuilder<R> withOnAddFilter(OnAddFilter<? super R> onAddFilter) {
       this.onAddFilter = onAddFilter;
       return this;
@@ -274,12 +276,14 @@ public InformerConfigurationBuilder<R> withOnUpdateFilter(
       return this;
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     public InformerConfigurationBuilder<R> withOnDeleteFilter(
         OnDeleteFilter<? super R> onDeleteFilter) {
       this.onDeleteFilter = onDeleteFilter;
       return this;
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     public InformerConfigurationBuilder<R> withGenericFilter(
         GenericFilter<? super R> genericFilter) {
       this.genericFilter = genericFilter;

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

@@ -12,6 +12,7 @@ public final class KubernetesDependentResourceConfigBuilder<R extends HasMetadat
 
   public KubernetesDependentResourceConfigBuilder() {}
 
+  @SuppressWarnings("unused")
   public KubernetesDependentResourceConfigBuilder<R> withCreateResourceOnlyIfNotExistingWithSSA(
       boolean createResourceOnlyIfNotExistingWithSSA) {
     this.createResourceOnlyIfNotExistingWithSSA = createResourceOnlyIfNotExistingWithSSA;
@@ -29,7 +30,6 @@ public KubernetesDependentResourceConfigBuilder<R> withInformerConfiguration(
     return this;
   }
 
-  @SuppressWarnings("unchecked")
   public KubernetesDependentResourceConfig<R> build() {
     return new KubernetesDependentResourceConfig<>(
         useSSA, createResourceOnlyIfNotExistingWithSSA,

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java

@@ -237,6 +237,7 @@ void shouldBePossibleToForceDependentToWatchAllNamespaces() {
   }
 
   @Test
+  @SuppressWarnings("unchecked")
   void overridingNamespacesShouldBePropagatedToDependentsWithDefaultConfig() {
     var configuration = createConfiguration(new OneDepReconciler());
     // retrieve the config for the first (and unique) dependent
@@ -277,8 +278,8 @@ void alreadyOverriddenDependentNamespacesShouldNotBePropagated() {
         config.informerConfiguration().getNamespaces());
   }
 
-  @SuppressWarnings("rawtypes")
   @Test
+  @SuppressWarnings({"rawtypes", "unchecked"})
   void replaceNamedDependentResourceConfigShouldWork() {
     var configuration = createConfiguration(new OneDepReconciler());
     var dependents = configuration.getWorkflowSpec().orElseThrow().getDependentResourceSpecs();

operator-framework/src/test/java/io/javaoperatorsdk/operator/config/BaseConfigurationServiceTest.java

@@ -74,7 +74,7 @@ void defaultValuesShouldBeConsistent() {
     assertNull(unannotated.informerConfiguration().getLabelSelector());
   }
 
-  @SuppressWarnings("rawtypes")
+  @SuppressWarnings({"rawtypes", "unchecked"})
   private static KubernetesDependentResourceConfig extractDependentKubernetesResourceConfig(
       io.javaoperatorsdk.operator.api.config.ControllerConfiguration<?> configuration, int index) {
     final var spec =
@@ -83,7 +83,7 @@ private static KubernetesDependentResourceConfig extractDependentKubernetesResou
   }
 
   @Test
-  @SuppressWarnings("rawtypes")
+  @SuppressWarnings({"rawtypes", "unchecked"})
   void getDependentResources() {
     var configuration = configFor(new NoDepReconciler());
     var workflowSpec = configuration.getWorkflowSpec();
@@ -226,11 +226,12 @@ void configuringFromCustomAnnotationsShouldWork() {
     assertEquals(CustomConfigConverter.CONVERTER_PROVIDED_DEFAULT, getValue(config, 1));
   }
 
+  @SuppressWarnings("unchecked")
   private static int getValue(
       io.javaoperatorsdk.operator.api.config.ControllerConfiguration<?> configuration, int index) {
     final var spec =
         configuration.getWorkflowSpec().orElseThrow().getDependentResourceSpecs().get(index);
-    return ((CustomConfig) configuration.getConfigurationFor(spec)).getValue();
+    return ((CustomConfig) configuration.getConfigurationFor(spec)).value();
   }
 
   @ControllerConfiguration(
@@ -481,18 +482,7 @@ private static class ChildCustomAnnotatedDep extends CustomAnnotatedDep {
     int value();
   }
 
-  private static class CustomConfig {
-
-    private final int value;
-
-    private CustomConfig(int value) {
-      this.value = value;
-    }
-
-    public int getValue() {
-      return value;
-    }
-  }
+  private record CustomConfig(int value) {}
 
   private static class CustomConfigConverter
       implements ConfigurationConverter<CustomAnnotation, CustomConfig> {