diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/BuilderUtils.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/BuilderUtils.java index 1c6f388f62..1cb46bafab 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/BuilderUtils.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/BuilderUtils.java @@ -23,7 +23,8 @@ public static final B newBuilder(Class builderType, T item) { } } - public static final Class builderTargetType(Class builderType) { + @SuppressWarnings("unchecked") + public static Class builderTargetType(Class builderType) { try { Method method = builderType.getDeclaredMethod("build"); return (Class) method.getReturnType(); 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 6818c75c4a..5513b43060 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 @@ -26,7 +26,7 @@ public class ResolvedControllerConfiguration

private final String associatedReconcilerClassName; private final Retry retry; private final RateLimiter rateLimiter; - private final Optional maxReconciliationInterval; + private final Duration maxReconciliationInterval; private final String finalizer; private final Map configurations; @@ -86,7 +86,7 @@ protected ResolvedControllerConfiguration(Class

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 dependentResour @Override public Optional maxReconciliationInterval() { - return maxReconciliationInterval; + return Optional.ofNullable(maxReconciliationInterval); } @Override diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java index 1a52cbcfc3..78e9ee4581 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Dependent.java +++ b/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; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/EventSourceNotFoundException.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/EventSourceNotFoundException.java index 26681e2ca6..d4fcf139c9 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/EventSourceNotFoundException.java +++ b/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; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/health/ControllerHealthInfo.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/health/ControllerHealthInfo.java index 2adb3a8508..fe90b99ef3 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/health/ControllerHealthInfo.java +++ b/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; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java index 004a56b5f6..d6c372ca13 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java +++ b/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; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/AbstractWorkflowExecutor.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/AbstractWorkflowExecutor.java index 8fa9a6fd12..04576098b2 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/AbstractWorkflowExecutor.java +++ b/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 boolean isConditionMet(Optional> condition, DependentResource dependentResource) { if (condition.isEmpty()) { diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java index 5ba58154d1..a38ca3ec6e 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java +++ b/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; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java index 45049d5e3e..58778edbdf 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java @@ -35,7 +35,8 @@ public abstract class ExternalResourceCachingEventSource extends AbstractResourceEventSource implements RecentOperationCacheFiller { - private static Logger log = LoggerFactory.getLogger(ExternalResourceCachingEventSource.class); + private static final Logger log = + LoggerFactory.getLogger(ExternalResourceCachingEventSource.class); protected final CacheKeyMapper cacheKeyMapper; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/DefaultPrimaryToSecondaryIndex.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/DefaultPrimaryToSecondaryIndex.java index 65434cf53d..113deef767 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/DefaultPrimaryToSecondaryIndex.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/DefaultPrimaryToSecondaryIndex.java @@ -9,8 +9,8 @@ class DefaultPrimaryToSecondaryIndex implements PrimaryToSecondaryIndex { - private SecondaryToPrimaryMapper secondaryToPrimaryMapper; - private Map> index = new HashMap<>(); + private final SecondaryToPrimaryMapper secondaryToPrimaryMapper; + private final Map> index = new HashMap<>(); public DefaultPrimaryToSecondaryIndex(SecondaryToPrimaryMapper secondaryToPrimaryMapper) { this.secondaryToPrimaryMapper = secondaryToPrimaryMapper; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/NOOPPrimaryToSecondaryIndex.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/NOOPPrimaryToSecondaryIndex.java index ddc8cbec18..0830d8bb1b 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/NOOPPrimaryToSecondaryIndex.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/NOOPPrimaryToSecondaryIndex.java @@ -11,6 +11,7 @@ class NOOPPrimaryToSecondaryIndex @SuppressWarnings("rawtypes") private static final NOOPPrimaryToSecondaryIndex instance = new NOOPPrimaryToSecondaryIndex(); + @SuppressWarnings("unchecked") public static NOOPPrimaryToSecondaryIndex getInstance() { return instance; } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TransformingItemStore.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TransformingItemStore.java index 60fdd32005..e5f682b210 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TransformingItemStore.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TransformingItemStore.java @@ -11,9 +11,9 @@ public class TransformingItemStore implements ItemStore { - private Function keyFunction; - private UnaryOperator transformationFunction; - private ConcurrentHashMap store = new ConcurrentHashMap<>(); + private final Function keyFunction; + private final UnaryOperator transformationFunction; + private final ConcurrentHashMap store = new ConcurrentHashMap<>(); public TransformingItemStore(UnaryOperator transformationFunction) { this(Cache::metaNamespaceKeyFunc, transformationFunction); diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/LeaderElectionManagerTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/LeaderElectionManagerTest.java index dfa0d1244e..66b0030b5e 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/LeaderElectionManagerTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/LeaderElectionManagerTest.java @@ -21,13 +21,12 @@ class LeaderElectionManagerTest { - private ControllerManager controllerManager; private KubernetesClient kubernetesClient; private LeaderElectionManager leaderElectionManager; @BeforeEach void setUp() { - controllerManager = mock(ControllerManager.class); + ControllerManager controllerManager = mock(ControllerManager.class); kubernetesClient = mock(KubernetesClient.class); leaderElectionManager = new LeaderElectionManager(controllerManager); } diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/MockKubernetesClient.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/MockKubernetesClient.java index 81f8741de9..f9f196c2de 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/MockKubernetesClient.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/MockKubernetesClient.java @@ -13,12 +13,7 @@ import io.fabric8.kubernetes.client.informers.SharedIndexInformer; import io.fabric8.kubernetes.client.informers.cache.Indexer; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; -import static org.mockito.Mockito.doAnswer; public class MockKubernetesClient { diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java index ebce136775..25bdcf205f 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java @@ -151,7 +151,7 @@ private static class Tomcat extends CustomResource implements } - private class TomcatSpec { + private static class TomcatSpec { private Integer replicas; public Integer getReplicas() { diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java index 947596a710..330f5b85b7 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java @@ -127,6 +127,7 @@ public ConfigMap update(ConfigMap actual, ConfigMap desired, TestCustomResource } @Override + @SuppressWarnings("unchecked") public Matcher.Result match(ConfigMap actualResource, TestCustomResource primary, Context context) { var result = mock(Matcher.Result.class); diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ExecutionAssert.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ExecutionAssert.java index b928071bd7..095b090208 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ExecutionAssert.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ExecutionAssert.java @@ -48,7 +48,7 @@ public ExecutionAssert deleted(DependentResource... dependentResources) { } private List getActualDependentResources() { - return actual.stream().map(rr -> rr.getDependentResource()).collect(Collectors.toList()); + return actual.stream().map(ReconcileRecord::getDependentResource).collect(Collectors.toList()); } private Optional getReconcileRecordFor(DependentResource dependentResource) { diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTest.java index 68e3068de2..cfe6a7cfed 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTest.java @@ -57,6 +57,7 @@ void isCleanerIfHasDeleter() { assertThat(managedWorkflow(spec).hasCleaner()).isTrue(); } + @SuppressWarnings("unchecked") ManagedWorkflow managedWorkflow(DependentResourceSpec... specs) { final var configuration = mock(ControllerConfiguration.class); final var specList = List.of(specs); diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ReconcileRecord.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ReconcileRecord.java index 66e0b82d59..ba7b4ecef9 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ReconcileRecord.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ReconcileRecord.java @@ -4,7 +4,7 @@ public class ReconcileRecord { - private DependentResource dependentResource; + private final DependentResource dependentResource; private final boolean deleted; public ReconcileRecord(DependentResource dependentResource) { diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/AbstractEventSourceTestBase.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/AbstractEventSourceTestBase.java index 6aa974e695..79483e2865 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/AbstractEventSourceTestBase.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/AbstractEventSourceTestBase.java @@ -19,6 +19,7 @@ public void setUpSource(S source) { setUpSource(source, true); } + @SuppressWarnings("unchecked") public void setUpSource(S source, boolean start) { setUpSource(source, (T) mock(EventHandler.class), start); } diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java index 6b851fd135..3055975a98 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java @@ -197,7 +197,7 @@ void genericFilteringEvents() { public static class TestExternalCachingEventSource extends ExternalResourceCachingEventSource { public TestExternalCachingEventSource() { - super(SampleExternalResource.class, (r) -> r.getName()); + super(SampleExternalResource.class, SampleExternalResource::getName); } } diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/InternalEventFiltersTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/InternalEventFiltersTest.java index f77435c6b7..4a5caa74f0 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/InternalEventFiltersTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/InternalEventFiltersTest.java @@ -10,7 +10,6 @@ import static io.javaoperatorsdk.operator.TestUtils.markForDeletion; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; class InternalEventFiltersTest { diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java index d3b1bcff08..243d818df0 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java @@ -22,15 +22,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class CachingInboundEventSourceTest extends +class CachingInboundEventSourceTest extends AbstractEventSourceTestBase, EventHandler> { - public static final int PERIOD = 150; - private CachingInboundEventSource.ResourceFetcher supplier = + @SuppressWarnings("unchecked") + private final CachingInboundEventSource.ResourceFetcher supplier = mock( CachingInboundEventSource.ResourceFetcher.class); - private TestCustomResource testCustomResource = TestUtils.testCustomResource(); - private CacheKeyMapper cacheKeyMapper = + private final TestCustomResource testCustomResource = TestUtils.testCustomResource(); + private final CacheKeyMapper cacheKeyMapper = r -> r.getName() + "#" + r.getValue(); @BeforeEach diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/EventRecorderTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/EventRecorderTest.java index 3e25e1da3c..556ad089ff 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/EventRecorderTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/EventRecorderTest.java @@ -12,7 +12,8 @@ class EventRecorderTest { public static final String RESOURCE_VERSION = "0"; public static final String RESOURCE_VERSION1 = "1"; - EventRecorder eventRecorder = new EventRecorder(); + + EventRecorder eventRecorder = new EventRecorder<>(); ConfigMap testConfigMap = testConfigMap(RESOURCE_VERSION); ConfigMap testConfigMap2 = testConfigMap(RESOURCE_VERSION1); diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/PrimaryToSecondaryIndexTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/PrimaryToSecondaryIndexTest.java index 4baa531274..62f395f2d6 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/PrimaryToSecondaryIndexTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/PrimaryToSecondaryIndexTest.java @@ -17,9 +17,10 @@ class PrimaryToSecondaryIndexTest { - private SecondaryToPrimaryMapper secondaryToPrimaryMapperMock = + @SuppressWarnings("unchecked") + private final SecondaryToPrimaryMapper secondaryToPrimaryMapperMock = mock(SecondaryToPrimaryMapper.class); - private PrimaryToSecondaryIndex primaryToSecondaryIndex = + private final PrimaryToSecondaryIndex primaryToSecondaryIndex = new DefaultPrimaryToSecondaryIndex<>(secondaryToPrimaryMapperMock); private ResourceID primaryID1 = new ResourceID("id1", "default"); diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCacheTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCacheTest.java index d83d604fe8..f848e26cec 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCacheTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCacheTest.java @@ -17,8 +17,10 @@ class TemporaryResourceCacheTest { public static final String RESOURCE_VERSION = "1"; - private InformerEventSource informerEventSource = mock(InformerEventSource.class); - private TemporaryResourceCache temporaryResourceCache = + @SuppressWarnings("unchecked") + private final InformerEventSource informerEventSource = + mock(InformerEventSource.class); + private final TemporaryResourceCache temporaryResourceCache = new TemporaryResourceCache<>(informerEventSource); @Test diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java index 9756278712..fa4a624d59 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java @@ -29,10 +29,12 @@ class PerResourcePollingEventSourceTest extends AbstractEventSourceTestBase, EventHandler> { public static final int PERIOD = 150; - private PerResourcePollingEventSource.ResourceFetcher supplier = + @SuppressWarnings("unchecked") + private final PerResourcePollingEventSource.ResourceFetcher supplier = mock(PerResourcePollingEventSource.ResourceFetcher.class); - private Cache resourceCache = mock(Cache.class); - private TestCustomResource testCustomResource = TestUtils.testCustomResource(); + @SuppressWarnings("unchecked") + private final Cache resourceCache = mock(Cache.class); + private final TestCustomResource testCustomResource = TestUtils.testCustomResource(); @BeforeEach public void setup() { diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java index 605922f06b..bd0179d4cb 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java @@ -27,7 +27,8 @@ class PollingEventSourceTest public static final int DEFAULT_WAIT_PERIOD = 100; public static final long POLL_PERIOD = 30L; - private PollingEventSource.GenericResourceFetcher resourceFetcher = + @SuppressWarnings("unchecked") + private final PollingEventSource.GenericResourceFetcher resourceFetcher = mock(PollingEventSource.GenericResourceFetcher.class); private final PollingEventSource pollingEventSource = new PollingEventSource<>(resourceFetcher, POLL_PERIOD, SampleExternalResource.class, diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java index 5800c273e7..748b76b72d 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java @@ -12,7 +12,6 @@ import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.api.reconciler.*; -import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration; @ControllerConfiguration(generationAwareEventProcessing = false) public class TestCustomReconciler @@ -78,8 +77,8 @@ public UpdateControl reconcile( kubernetesClient .configMaps() .inNamespace(resource.getMetadata().getNamespace()) - .withName(existingConfigMap.getMetadata().getName()) - .createOrReplace(existingConfigMap); + .resource(existingConfigMap) + .createOrReplace(); } else { Map labels = new HashMap<>(); labels.put("managedBy", TestCustomReconciler.class.getSimpleName()); @@ -96,7 +95,8 @@ public UpdateControl reconcile( kubernetesClient .configMaps() .inNamespace(resource.getMetadata().getNamespace()) - .createOrReplace(newConfigMap); + .resource(newConfigMap) + .createOrReplace(); } if (updateStatus) { if (resource.getStatus() == null) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java index c7d3b04c4a..e669f6d06c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java @@ -122,7 +122,8 @@ private ChangeNamespaceTestCustomResource createResourceInAdditionalNamespace(St var res = customResource(name); return client().resources(ChangeNamespaceTestCustomResource.class) .inNamespace(ADDITIONAL_TEST_NAMESPACE) - .create(res); + .resource(res) + .create(); } private KubernetesClient client() { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java index b6216009b7..f33c581538 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java @@ -34,7 +34,7 @@ void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException { log.info("Creating {} new resources", NUMBER_OF_RESOURCES_CREATED); for (int i = 0; i < NUMBER_OF_RESOURCES_CREATED; i++) { TestCustomResource tcr = TestUtils.testCustomResourceWithPrefix(String.valueOf(i)); - operator.resources(TestCustomResource.class).create(tcr); + operator.resources(TestCustomResource.class).resource(tcr).create(); } await() @@ -57,8 +57,8 @@ void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException { operator.get(TestCustomResource.class, TestUtils.TEST_CUSTOM_RESOURCE_PREFIX + i); tcr.getSpec().setValue(i + UPDATED_SUFFIX); - operator.resources(TestCustomResource.class) - .createOrReplace(tcr); + operator.resources(TestCustomResource.class).resource(tcr) + .createOrReplace(); } // sleep for a short time to make variability to the test, so some updates are not // executed before delete @@ -67,7 +67,7 @@ void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException { log.info("Deleting {} resources", NUMBER_OF_RESOURCES_DELETED); for (int i = 0; i < NUMBER_OF_RESOURCES_DELETED; i++) { TestCustomResource tcr = TestUtils.testCustomResourceWithPrefix(String.valueOf(i)); - operator.resources(TestCustomResource.class).delete(tcr); + operator.resources(TestCustomResource.class).resource(tcr).delete(); } await() diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateBulkIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateBulkIT.java index a52e9dc3c1..7452958b8c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateBulkIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateBulkIT.java @@ -25,7 +25,7 @@ class ExternalStateBulkIT { public static final int INCREASED_BULK_SIZE = 4; public static final int DECREASED_BULK_SIZE = 2; - private ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); + private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); @RegisterExtension LocallyRunOperatorExtension operator = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateIT.java index ad81713239..3da607e324 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateIT.java @@ -22,7 +22,7 @@ class ExternalStateIT { public static final String INITIAL_TEST_DATA = "initialTestData"; public static final String UPDATED_DATA = "updatedData"; - private ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); + private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); @RegisterExtension LocallyRunOperatorExtension operator = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateTestBase.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateTestBase.java index 972b7e62dc..43982a6109 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateTestBase.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateTestBase.java @@ -20,7 +20,7 @@ public abstract class ExternalStateTestBase { public static final String INITIAL_TEST_DATA = "initialTestData"; public static final String UPDATED_DATA = "updatedData"; - private ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); + private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); @Test public void reconcilesResourceWithPersistentState() { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java index 97f5883a08..314d2199ce 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java @@ -191,7 +191,7 @@ private void assertReconciled() { }); } - + @SuppressWarnings("unchecked") private void assertRuntimeInfoNoCRPermission(Operator operator) { assertThat(operator.getRuntimeInfo().allEventSourcesAreHealthy()).isFalse(); var unhealthyEventSources = @@ -209,6 +209,7 @@ private void assertRuntimeInfoNoCRPermission(Operator operator) { .hasSize(1); } + @SuppressWarnings("unchecked") private void assertRuntimeInfoForSecondaryPermission(Operator operator) { assertThat(operator.getRuntimeInfo().allEventSourcesAreHealthy()).isFalse(); var unhealthyEventSources = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultipleManagedExternalDependentSameTypeIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultipleManagedExternalDependentSameTypeIT.java index ec2b7a394a..e62835c063 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultipleManagedExternalDependentSameTypeIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultipleManagedExternalDependentSameTypeIT.java @@ -10,7 +10,6 @@ import io.javaoperatorsdk.operator.sample.multiplemanagedexternaldependenttype.MultipleManagedExternalDependentResourceReconciler; import io.javaoperatorsdk.operator.support.ExternalServiceMock; -import static io.javaoperatorsdk.operator.MultipleManagedDependentSameTypeIT.DEFAULT_SPEC_VALUE; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java index 77eff4812d..ee6fc8e422 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java @@ -82,7 +82,7 @@ void updateCustomResourceAfterSubResourceChange() { // waits for the resource to start processing waitXms(EVENT_RECEIVE_WAIT); resource.getSpec().setValue("new value"); - operator.resources(SubResourceTestCustomResource.class).createOrReplace(resource); + operator.resources(SubResourceTestCustomResource.class).resource(resource).createOrReplace(); awaitStatusUpdated(resource.getMetadata().getName()); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/builtinresourcecleaner/ObservedGenerationTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/builtinresourcecleaner/ObservedGenerationTestReconciler.java index 729b5e0594..cba16a5c1f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/builtinresourcecleaner/ObservedGenerationTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/builtinresourcecleaner/ObservedGenerationTestReconciler.java @@ -14,8 +14,8 @@ public class ObservedGenerationTestReconciler private static final Logger log = LoggerFactory.getLogger(ObservedGenerationTestReconciler.class); - private AtomicInteger reconciled = new AtomicInteger(0); - private AtomicInteger cleaned = new AtomicInteger(0); + private final AtomicInteger reconciled = new AtomicInteger(0); + private final AtomicInteger cleaned = new AtomicInteger(0); @Override public UpdateControl reconcile( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedBulkDependentWithReadyConditionReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedBulkDependentWithReadyConditionReconciler.java index f250e16e56..aca78d5d25 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedBulkDependentWithReadyConditionReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedBulkDependentWithReadyConditionReconciler.java @@ -7,6 +7,7 @@ import io.javaoperatorsdk.operator.api.reconciler.Reconciler; import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent; +import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowReconcileResult; @ControllerConfiguration(dependents = @Dependent(readyPostcondition = SampleBulkCondition.class, type = CRUDConfigMapBulkDependentResource.class)) @@ -22,7 +23,7 @@ public UpdateControl reconcile( numberOfExecutions.incrementAndGet(); var ready = context.managedDependentResourceContext().getWorkflowReconcileResult() - .map(res -> res.allDependentResourcesReady()).orElseThrow(); + .map(WorkflowReconcileResult::allDependentResourcesReady).orElseThrow(); resource.setStatus(new BulkDependentTestStatus()); resource.getStatus().setReady(ready); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/SampleBulkCondition.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/SampleBulkCondition.java index 82b6a6d2d1..cff0bd10d1 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/SampleBulkCondition.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/SampleBulkCondition.java @@ -16,8 +16,6 @@ public class SampleBulkCondition @Override public boolean isMet(BulkDependentTestCustomResource primary, Map secondary, Context context) { - - return secondary.values().stream().allMatch(cm -> !cm.getData().isEmpty()); - + return secondary.values().stream().noneMatch(cm -> cm.getData().isEmpty()); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java index 4033583340..ad799116a0 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java @@ -16,7 +16,7 @@ public class StandaloneBulkDependentReconciler private final AtomicInteger numberOfExecutions = new AtomicInteger(0); - private ConfigMapDeleterBulkDependentResource dependent; + private final ConfigMapDeleterBulkDependentResource dependent; private KubernetesClient kubernetesClient; public StandaloneBulkDependentReconciler() { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalResource.java index 935fd99e47..ef101a8ca2 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalResource.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalResource.java @@ -4,8 +4,8 @@ public class ExternalResource { - private String id; - private String data; + private final String id; + private final String data; public ExternalResource(String id, String data) { this.id = id; diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalServiceMock.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalServiceMock.java index e73062ccf2..4ae0cbccfa 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalServiceMock.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalServiceMock.java @@ -8,9 +8,9 @@ public class ExternalServiceMock { - private static ExternalServiceMock serviceMock = new ExternalServiceMock(); + private static final ExternalServiceMock serviceMock = new ExternalServiceMock(); - private Map resourceMap = new ConcurrentHashMap<>(); + private final Map resourceMap = new ConcurrentHashMap<>(); public ExternalResource create(ExternalResource externalResource) { resourceMap.put(externalResource.getId(), externalResource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java index f984d30f33..f891eac525 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/changenamespace/ChangeNamespaceTestReconciler.java @@ -41,7 +41,8 @@ public UpdateControl reconcile( var actualConfigMap = context.getSecondaryResource(ConfigMap.class); if (actualConfigMap.isEmpty()) { client.configMaps().inNamespace(primary.getMetadata().getNamespace()) - .create(configMap(primary)); + .resource(configMap(primary)) + .create(); } increaseNumberOfResourceExecutions(primary); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java index 988b1466c1..ef2ddfc4ec 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java @@ -52,7 +52,8 @@ public UpdateControl reconcile( client .configMaps() .inNamespace(resource.getMetadata().getNamespace()) - .create(configMapToCreate); + .resource(configMapToCreate) + .create(); informerEventSource.handleRecentResourceCreate(resourceID, configMap); } catch (RuntimeException e) { informerEventSource @@ -71,7 +72,8 @@ public UpdateControl reconcile( client .configMaps() .inNamespace(resource.getMetadata().getNamespace()) - .replace(configMap); + .resource(configMap) + .replace(); informerEventSource.handleRecentResourceUpdate(resourceID, newConfigMap, configMap); } catch (RuntimeException e) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java index a7d97b83f3..4435f72f98 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java @@ -3,7 +3,6 @@ import java.util.concurrent.atomic.AtomicInteger; import io.javaoperatorsdk.operator.api.reconciler.*; -import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration; import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider; @ControllerConfiguration diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java index 3d202e1d52..333522eb99 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java @@ -30,7 +30,7 @@ public class ExternalStateReconciler public static final String ID_KEY = "id"; private final AtomicInteger numberOfExecutions = new AtomicInteger(0); - private ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); + private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); private KubernetesClient client; InformerEventSource configMapEventSource; @@ -116,7 +116,7 @@ public Map prepareEventSources( } var id = configMap.getData().get(ID_KEY); var externalResource = externalService.read(id); - return externalResource.map(er -> Set.of(er)).orElse(Collections.emptySet()); + return externalResource.map(Set::of).orElse(Collections.emptySet()); }, context.getPrimaryCache(), 300L, ExternalResource.class); return EventSourceInitializer.nameEventSources(configMapEventSource, diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java index b1236b7126..6d2aa79ab3 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java @@ -40,7 +40,7 @@ public Set fetchResources( return configMapOptional.map(configMap -> { var id = configMap.getData().get(ID_KEY); var externalResource = externalService.read(id); - return externalResource.map(er -> Set.of(er)).orElse(Collections.emptySet()); + return externalResource.map(Set::of).orElse(Collections.emptySet()); }).orElse(Collections.emptySet()); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java index 7189b10c7f..776f857bc8 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/filter/FilterTestReconciler.java @@ -31,7 +31,8 @@ public UpdateControl reconcile( Context context) { numberOfExecutions.addAndGet(1); client.configMaps().inNamespace(resource.getMetadata().getNamespace()) - .createOrReplace(createConfigMap(resource)); + .resource(createConfigMap(resource)) + .createOrReplace(); return UpdateControl.noUpdate(); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxintervalafterretry/MaxIntervalAfterRetryTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxintervalafterretry/MaxIntervalAfterRetryTestReconciler.java index 8473ee03ff..5608731a3e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxintervalafterretry/MaxIntervalAfterRetryTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxintervalafterretry/MaxIntervalAfterRetryTestReconciler.java @@ -16,7 +16,8 @@ public class MaxIntervalAfterRetryTestReconciler implements Reconciler, TestExecutionInfoProvider { - private Logger log = LoggerFactory.getLogger(MaxIntervalAfterRetryTestReconciler.class); + private static final Logger log = + LoggerFactory.getLogger(MaxIntervalAfterRetryTestReconciler.class); private final AtomicInteger numberOfExecutions = new AtomicInteger(0); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/ExternalResourceDiscriminator.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/ExternalResourceDiscriminator.java index ba265455de..5a394113c1 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/ExternalResourceDiscriminator.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/ExternalResourceDiscriminator.java @@ -9,7 +9,7 @@ public class ExternalResourceDiscriminator implements ResourceDiscriminator { - private String suffix; + private final String suffix; public ExternalResourceDiscriminator(String suffix) { this.suffix = suffix; diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java index 29557b0a30..e3cc6e8c63 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java @@ -33,12 +33,14 @@ public UpdateControl reconcile( if (client.configMaps().inNamespace(resource.getMetadata().getNamespace()) .withName(getName1(resource)).get() == null) { client.configMaps().inNamespace(resource.getMetadata().getNamespace()) - .createOrReplace(configMap(getName1(resource), resource)); + .resource(configMap(getName1(resource), resource)) + .createOrReplace(); } if (client.configMaps().inNamespace(resource.getMetadata().getNamespace()) .withName(getName2(resource)).get() == null) { client.configMaps().inNamespace(resource.getMetadata().getNamespace()) - .createOrReplace(configMap(getName2(resource), resource)); + .resource(configMap(getName2(resource), resource)) + .createOrReplace(); } if (numberOfExecutions.get() >= 3) { @@ -75,8 +77,7 @@ public Map prepareEventSources( return Set.of(new ResourceID(name.toString(), s.getMetadata().getNamespace())); }).build(); InformerEventSource configMapEventSource = - new InformerEventSource(config, - context); + new InformerEventSource<>(config, context); return EventSourceInitializer.nameEventSources(configMapEventSource); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java index ecc33afcb3..d22285d6a7 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java @@ -22,7 +22,6 @@ public class PerResourcePollingEventSourceTestReconciler private final Map numberOfFetchExecutions = new ConcurrentHashMap<>(); private KubernetesClient client; - private PerResourcePollingEventSource eventSource; @Override public UpdateControl reconcile( @@ -36,7 +35,7 @@ public UpdateControl reconcile( @Override public Map prepareEventSources( EventSourceContext context) { - this.eventSource = + PerResourcePollingEventSource eventSource = new PerResourcePollingEventSource<>(resource -> { numberOfFetchExecutions.putIfAbsent(resource.getMetadata().getName(), 0); numberOfFetchExecutions.compute(resource.getMetadata().getName(), (s, v) -> v + 1); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java index d39c3c8d15..df24cbe38e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java @@ -13,7 +13,6 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.ReconcilerUtils; import io.javaoperatorsdk.operator.api.reconciler.*; -import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration; import io.javaoperatorsdk.operator.junit.KubernetesClientAware; import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider; @@ -108,8 +107,8 @@ public UpdateControl reconcile( kubernetesClient .configMaps() .inNamespace(resource.getMetadata().getNamespace()) - .withName(existingConfigMap.getMetadata().getName()) - .createOrReplace(existingConfigMap); + .resource(existingConfigMap) + .createOrReplace(); } else { Map labels = new HashMap<>(); labels.put("managedBy", TestReconciler.class.getSimpleName()); @@ -125,8 +124,8 @@ public UpdateControl reconcile( .build(); kubernetesClient .configMaps() - .inNamespace(resource.getMetadata().getNamespace()) - .createOrReplace(newConfigMap); + .inNamespace(resource.getMetadata().getNamespace()).resource(newConfigMap) + .createOrReplace(); } if (updateStatus) { if (resource.getStatus() == null) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java index 76d11c3044..f30b3fa959 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java @@ -5,9 +5,9 @@ public class ExternalIDGenServiceMock { - private static ExternalIDGenServiceMock serviceMock = new ExternalIDGenServiceMock(); + private final static ExternalIDGenServiceMock serviceMock = new ExternalIDGenServiceMock(); - private Map resourceMap = new ConcurrentHashMap<>(); + private final Map resourceMap = new ConcurrentHashMap<>(); public ExternalResource create(ExternalResource externalResource) { if (externalResource.getId() != null) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java index 2d897bbdc7..dd3e5ab113 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java @@ -10,7 +10,7 @@ public class ExternalResource { public static final String EXTERNAL_RESOURCE_NAME_DELIMITER = "#"; private String id; - private String data; + private final String data; /** * For the case that ide is generated by server diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceMock.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceMock.java index d939f253ac..08e723145f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceMock.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceMock.java @@ -8,9 +8,9 @@ public class ExternalServiceMock { - private static ExternalServiceMock serviceMock = new ExternalServiceMock(); + private static final ExternalServiceMock serviceMock = new ExternalServiceMock(); - private Map resourceMap = new ConcurrentHashMap<>(); + private final Map resourceMap = new ConcurrentHashMap<>(); public ExternalResource create(ExternalResource externalResource) { if (externalResource.getId() == null) { diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java index 836951a004..34c1e54255 100644 --- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java +++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java @@ -5,8 +5,8 @@ public class Schema implements Serializable { - private String name; - private String characterSet; + private final String name; + private final String characterSet; public Schema(String name, String characterSet) { this.name = name; diff --git a/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java b/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java index 10959c4c48..377d6c540f 100644 --- a/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java +++ b/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java @@ -86,9 +86,9 @@ void test() { var webappClient = client.resources(Webapp.class); log.info("Creating test Tomcat object: {}", tomcat); - tomcatClient.inNamespace(operator.getNamespace()).create(tomcat); + tomcatClient.inNamespace(operator.getNamespace()).resource(tomcat).create(); log.info("Creating test Webapp object: {}", webapp1); - webappClient.inNamespace(operator.getNamespace()).create(webapp1); + webappClient.inNamespace(operator.getNamespace()).resource(webapp1).create(); log.info("Waiting 5 minutes for Tomcat and Webapp CR statuses to be updated"); await().atMost(5, MINUTES).untilAsserted(() -> { diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java index d1d1b299e2..ff63cbcac7 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java @@ -105,7 +105,8 @@ public UpdateControl reconcile(WebPage webPage, Context contex "Creating or updating ConfigMap {} in {}", desiredHtmlConfigMap.getMetadata().getName(), ns); - kubernetesClient.configMaps().inNamespace(ns).createOrReplace(desiredHtmlConfigMap); + kubernetesClient.configMaps().inNamespace(ns).resource(desiredHtmlConfigMap) + .createOrReplace(); } var existingDeployment = context.getSecondaryResource(Deployment.class).orElse(null); @@ -114,7 +115,8 @@ public UpdateControl reconcile(WebPage webPage, Context contex "Creating or updating Deployment {} in {}", desiredDeployment.getMetadata().getName(), ns); - kubernetesClient.apps().deployments().inNamespace(ns).createOrReplace(desiredDeployment); + kubernetesClient.apps().deployments().inNamespace(ns).resource(desiredDeployment) + .createOrReplace(); } var existingService = context.getSecondaryResource(Service.class).orElse(null); @@ -123,7 +125,7 @@ public UpdateControl reconcile(WebPage webPage, Context contex "Creating or updating Deployment {} in {}", desiredDeployment.getMetadata().getName(), ns); - kubernetesClient.services().inNamespace(ns).createOrReplace(desiredService); + kubernetesClient.services().inNamespace(ns).resource(desiredService).createOrReplace(); } var existingIngress = context.getSecondaryResource(Ingress.class); diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java index 15262acb48..12e61d19a1 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java @@ -74,12 +74,14 @@ public ErrorStatusUpdateControl updateErrorStatus( return handleError(resource, e); } + @SuppressWarnings("unchecked") private void createDependentResources(KubernetesClient client) { this.configMapDR = new ConfigMapDependentResource(); this.deploymentDR = new DeploymentDependentResource(); this.serviceDR = new ServiceDependentResource(); this.ingressDR = new IngressDependentResource(); + Arrays.asList(configMapDR, deploymentDR, serviceDR, ingressDR).forEach(dr -> { dr.setKubernetesClient(client); dr.configureWith(new KubernetesDependentResourceConfig() diff --git a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorAbstractTest.java b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorAbstractTest.java index 48537f93a3..4db22853c6 100644 --- a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorAbstractTest.java +++ b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorAbstractTest.java @@ -14,8 +14,8 @@ import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.apps.Deployment; -import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.LocalPortForward; import io.javaoperatorsdk.operator.junit.AbstractOperatorExtension; @@ -29,7 +29,7 @@ public abstract class WebPageOperatorAbstractTest { static final Logger log = LoggerFactory.getLogger(WebPageOperatorStandaloneDependentResourcesE2E.class); - static final KubernetesClient client = new DefaultKubernetesClient(); + static final KubernetesClient client = new KubernetesClientBuilder().build(); public static final String TEST_PAGE = "test-page"; public static final String TITLE1 = "Hello Operator World"; public static final String TITLE2 = "Hello Operator World Title 2";