Skip to content

Commit 3ab42bf

Browse files
csviricsviri
authored
fix: update deprecated client usage and minor improvements (#1707)
1 parent 4107952 commit 3ab42bf

File tree

62 files changed

+114
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+114
-109
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public static final <T, B> B newBuilder(Class<B> builderType, T item) {
2323
}
2424
}
2525

26-
public static final <T, B> Class<T> builderTargetType(Class<B> builderType) {
26+
@SuppressWarnings("unchecked")
27+
public static <T, B> Class<T> builderTargetType(Class<B> builderType) {
2728
try {
2829
Method method = builderType.getDeclaredMethod("build");
2930
return (Class<T>) method.getReturnType();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class ResolvedControllerConfiguration<P extends HasMetadata>
2626
private final String associatedReconcilerClassName;
2727
private final Retry retry;
2828
private final RateLimiter rateLimiter;
29-
private final Optional<Duration> maxReconciliationInterval;
29+
private final Duration maxReconciliationInterval;
3030
private final String finalizer;
3131
private final Map<DependentResourceSpec, Object> configurations;
3232

@@ -86,7 +86,7 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
8686
this.associatedReconcilerClassName = associatedReconcilerClassName;
8787
this.retry = ensureRetry(retry);
8888
this.rateLimiter = ensureRateLimiter(rateLimiter);
89-
this.maxReconciliationInterval = Optional.ofNullable(maxReconciliationInterval);
89+
this.maxReconciliationInterval = maxReconciliationInterval;
9090
this.configurations = configurations != null ? configurations : Collections.emptyMap();
9191

9292
this.finalizer =
@@ -142,7 +142,7 @@ protected void setDependentResources(List<DependentResourceSpec> dependentResour
142142

143143
@Override
144144
public Optional<Duration> maxReconciliationInterval() {
145-
return maxReconciliationInterval;
145+
return Optional.ofNullable(maxReconciliationInterval);
146146
}
147147

148148
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.javaoperatorsdk.operator.api.reconciler.dependent;
22

3-
import io.javaoperatorsdk.operator.api.reconciler.Constants;
43
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
54

65
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class EventSourceNotFoundException extends OperatorException {
66

7-
private String eventSourceName;
7+
private final String eventSourceName;
88

99
public EventSourceNotFoundException(String eventSourceName) {
1010
this.eventSourceName = eventSourceName;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@SuppressWarnings("rawtypes")
99
public class ControllerHealthInfo {
1010

11-
private EventSourceManager<?> eventSourceManager;
11+
private final EventSourceManager<?> eventSourceManager;
1212

1313
public ControllerHealthInfo(EventSourceManager eventSourceManager) {
1414
this.eventSourceManager = eventSourceManager;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
import io.javaoperatorsdk.operator.api.reconciler.Constants;
99
import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
1010
import io.javaoperatorsdk.operator.processing.event.source.filter.*;
11-
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
12-
import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
13-
import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
14-
import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
1511

1612
import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;
1713

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ protected synchronized void handleNodeExecutionFinish(
100100
}
101101
}
102102

103+
@SuppressWarnings("unchecked")
103104
protected <R> boolean isConditionMet(Optional<Condition<R, P>> condition,
104105
DependentResource<R, P> dependentResource) {
105106
if (condition.isEmpty()) {

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package io.javaoperatorsdk.operator.processing.event;
22

3-
import java.util.LinkedHashSet;
4-
import java.util.List;
5-
import java.util.Map;
6-
import java.util.Objects;
7-
import java.util.Set;
3+
import java.util.*;
84
import java.util.function.Function;
95
import java.util.stream.Collectors;
106
import java.util.stream.Stream;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
public abstract class ExternalResourceCachingEventSource<R, P extends HasMetadata>
3636
extends AbstractResourceEventSource<R, P> implements RecentOperationCacheFiller<R> {
3737

38-
private static Logger log = LoggerFactory.getLogger(ExternalResourceCachingEventSource.class);
38+
private static final Logger log =
39+
LoggerFactory.getLogger(ExternalResourceCachingEventSource.class);
3940

4041
protected final CacheKeyMapper<R> cacheKeyMapper;
4142

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
class DefaultPrimaryToSecondaryIndex<R extends HasMetadata> implements PrimaryToSecondaryIndex<R> {
1111

12-
private SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
13-
private Map<ResourceID, Set<ResourceID>> index = new HashMap<>();
12+
private final SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
13+
private final Map<ResourceID, Set<ResourceID>> index = new HashMap<>();
1414

1515
public DefaultPrimaryToSecondaryIndex(SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper) {
1616
this.secondaryToPrimaryMapper = secondaryToPrimaryMapper;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ class NOOPPrimaryToSecondaryIndex<R extends HasMetadata>
1111
@SuppressWarnings("rawtypes")
1212
private static final NOOPPrimaryToSecondaryIndex instance = new NOOPPrimaryToSecondaryIndex();
1313

14+
@SuppressWarnings("unchecked")
1415
public static <T extends HasMetadata> NOOPPrimaryToSecondaryIndex<T> getInstance() {
1516
return instance;
1617
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
public class TransformingItemStore<R extends HasMetadata> implements ItemStore<R> {
1313

14-
private Function<R, String> keyFunction;
15-
private UnaryOperator<R> transformationFunction;
16-
private ConcurrentHashMap<String, R> store = new ConcurrentHashMap<>();
14+
private final Function<R, String> keyFunction;
15+
private final UnaryOperator<R> transformationFunction;
16+
private final ConcurrentHashMap<String, R> store = new ConcurrentHashMap<>();
1717

1818
public TransformingItemStore(UnaryOperator<R> transformationFunction) {
1919
this(Cache::metaNamespaceKeyFunc, transformationFunction);

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/LeaderElectionManagerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121

2222
class LeaderElectionManagerTest {
2323

24-
private ControllerManager controllerManager;
2524
private KubernetesClient kubernetesClient;
2625
private LeaderElectionManager leaderElectionManager;
2726

2827
@BeforeEach
2928
void setUp() {
30-
controllerManager = mock(ControllerManager.class);
29+
ControllerManager controllerManager = mock(ControllerManager.class);
3130
kubernetesClient = mock(KubernetesClient.class);
3231
leaderElectionManager = new LeaderElectionManager(controllerManager);
3332
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/MockKubernetesClient.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@
1313
import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
1414
import io.fabric8.kubernetes.client.informers.cache.Indexer;
1515

16-
import static org.mockito.ArgumentMatchers.any;
17-
import static org.mockito.ArgumentMatchers.anyLong;
18-
import static org.mockito.ArgumentMatchers.anyString;
19-
import static org.mockito.ArgumentMatchers.nullable;
2016
import static org.mockito.Mockito.*;
21-
import static org.mockito.Mockito.doAnswer;
2217

2318
public class MockKubernetesClient {
2419

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private static class Tomcat extends CustomResource<TomcatSpec, Void> implements
151151

152152
}
153153

154-
private class TomcatSpec {
154+
private static class TomcatSpec {
155155
private Integer replicas;
156156

157157
public Integer getReplicas() {

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public ConfigMap update(ConfigMap actual, ConfigMap desired, TestCustomResource
127127
}
128128

129129
@Override
130+
@SuppressWarnings("unchecked")
130131
public Matcher.Result<ConfigMap> match(ConfigMap actualResource, TestCustomResource primary,
131132
Context<TestCustomResource> context) {
132133
var result = mock(Matcher.Result.class);

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ExecutionAssert.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ExecutionAssert deleted(DependentResource<?, ?>... dependentResources) {
4848
}
4949

5050
private List<DependentResource> getActualDependentResources() {
51-
return actual.stream().map(rr -> rr.getDependentResource()).collect(Collectors.toList());
51+
return actual.stream().map(ReconcileRecord::getDependentResource).collect(Collectors.toList());
5252
}
5353

5454
private Optional<ReconcileRecord> getReconcileRecordFor(DependentResource dependentResource) {

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ void isCleanerIfHasDeleter() {
5757
assertThat(managedWorkflow(spec).hasCleaner()).isTrue();
5858
}
5959

60+
@SuppressWarnings("unchecked")
6061
ManagedWorkflow managedWorkflow(DependentResourceSpec... specs) {
6162
final var configuration = mock(ControllerConfiguration.class);
6263
final var specList = List.of(specs);

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ReconcileRecord.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class ReconcileRecord {
66

7-
private DependentResource<?, ?> dependentResource;
7+
private final DependentResource<?, ?> dependentResource;
88
private final boolean deleted;
99

1010
public ReconcileRecord(DependentResource<?, ?> dependentResource) {

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/AbstractEventSourceTestBase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public void setUpSource(S source) {
1919
setUpSource(source, true);
2020
}
2121

22+
@SuppressWarnings("unchecked")
2223
public void setUpSource(S source, boolean start) {
2324
setUpSource(source, (T) mock(EventHandler.class), start);
2425
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void genericFilteringEvents() {
197197
public static class TestExternalCachingEventSource
198198
extends ExternalResourceCachingEventSource<SampleExternalResource, HasMetadata> {
199199
public TestExternalCachingEventSource() {
200-
super(SampleExternalResource.class, (r) -> r.getName());
200+
super(SampleExternalResource.class, SampleExternalResource::getName);
201201
}
202202
}
203203

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/InternalEventFiltersTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import static io.javaoperatorsdk.operator.TestUtils.markForDeletion;
1212
import static org.assertj.core.api.Assertions.assertThat;
13-
import static org.junit.jupiter.api.Assertions.*;
1413

1514
class InternalEventFiltersTest {
1615

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
import static org.mockito.Mockito.verify;
2323
import static org.mockito.Mockito.when;
2424

25-
public class CachingInboundEventSourceTest extends
25+
class CachingInboundEventSourceTest extends
2626
AbstractEventSourceTestBase<CachingInboundEventSource<SampleExternalResource, TestCustomResource>, EventHandler> {
2727

28-
public static final int PERIOD = 150;
29-
private CachingInboundEventSource.ResourceFetcher<SampleExternalResource, TestCustomResource> supplier =
28+
@SuppressWarnings("unchecked")
29+
private final CachingInboundEventSource.ResourceFetcher<SampleExternalResource, TestCustomResource> supplier =
3030
mock(
3131
CachingInboundEventSource.ResourceFetcher.class);
32-
private TestCustomResource testCustomResource = TestUtils.testCustomResource();
33-
private CacheKeyMapper<SampleExternalResource> cacheKeyMapper =
32+
private final TestCustomResource testCustomResource = TestUtils.testCustomResource();
33+
private final CacheKeyMapper<SampleExternalResource> cacheKeyMapper =
3434
r -> r.getName() + "#" + r.getValue();
3535

3636
@BeforeEach

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/EventRecorderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ class EventRecorderTest {
1212

1313
public static final String RESOURCE_VERSION = "0";
1414
public static final String RESOURCE_VERSION1 = "1";
15-
EventRecorder<ConfigMap> eventRecorder = new EventRecorder();
15+
16+
EventRecorder<ConfigMap> eventRecorder = new EventRecorder<>();
1617

1718
ConfigMap testConfigMap = testConfigMap(RESOURCE_VERSION);
1819
ConfigMap testConfigMap2 = testConfigMap(RESOURCE_VERSION1);

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/PrimaryToSecondaryIndexTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717

1818
class PrimaryToSecondaryIndexTest {
1919

20-
private SecondaryToPrimaryMapper<ConfigMap> secondaryToPrimaryMapperMock =
20+
@SuppressWarnings("unchecked")
21+
private final SecondaryToPrimaryMapper<ConfigMap> secondaryToPrimaryMapperMock =
2122
mock(SecondaryToPrimaryMapper.class);
22-
private PrimaryToSecondaryIndex<ConfigMap> primaryToSecondaryIndex =
23+
private final PrimaryToSecondaryIndex<ConfigMap> primaryToSecondaryIndex =
2324
new DefaultPrimaryToSecondaryIndex<>(secondaryToPrimaryMapperMock);
2425

2526
private ResourceID primaryID1 = new ResourceID("id1", "default");

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCacheTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
class TemporaryResourceCacheTest {
1818

1919
public static final String RESOURCE_VERSION = "1";
20-
private InformerEventSource<ConfigMap, ?> informerEventSource = mock(InformerEventSource.class);
21-
private TemporaryResourceCache<ConfigMap> temporaryResourceCache =
20+
@SuppressWarnings("unchecked")
21+
private final InformerEventSource<ConfigMap, ?> informerEventSource =
22+
mock(InformerEventSource.class);
23+
private final TemporaryResourceCache<ConfigMap> temporaryResourceCache =
2224
new TemporaryResourceCache<>(informerEventSource);
2325

2426
@Test

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ class PerResourcePollingEventSourceTest extends
2929
AbstractEventSourceTestBase<PerResourcePollingEventSource<SampleExternalResource, TestCustomResource>, EventHandler> {
3030

3131
public static final int PERIOD = 150;
32-
private PerResourcePollingEventSource.ResourceFetcher<SampleExternalResource, TestCustomResource> supplier =
32+
@SuppressWarnings("unchecked")
33+
private final PerResourcePollingEventSource.ResourceFetcher<SampleExternalResource, TestCustomResource> supplier =
3334
mock(PerResourcePollingEventSource.ResourceFetcher.class);
34-
private Cache<TestCustomResource> resourceCache = mock(Cache.class);
35-
private TestCustomResource testCustomResource = TestUtils.testCustomResource();
35+
@SuppressWarnings("unchecked")
36+
private final Cache<TestCustomResource> resourceCache = mock(Cache.class);
37+
private final TestCustomResource testCustomResource = TestUtils.testCustomResource();
3638

3739
@BeforeEach
3840
public void setup() {

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ class PollingEventSourceTest
2727
public static final int DEFAULT_WAIT_PERIOD = 100;
2828
public static final long POLL_PERIOD = 30L;
2929

30-
private PollingEventSource.GenericResourceFetcher<SampleExternalResource> resourceFetcher =
30+
@SuppressWarnings("unchecked")
31+
private final PollingEventSource.GenericResourceFetcher<SampleExternalResource> resourceFetcher =
3132
mock(PollingEventSource.GenericResourceFetcher.class);
3233
private final PollingEventSource<SampleExternalResource, HasMetadata> pollingEventSource =
3334
new PollingEventSource<>(resourceFetcher, POLL_PERIOD, SampleExternalResource.class,

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.fabric8.kubernetes.client.CustomResource;
1313
import io.fabric8.kubernetes.client.KubernetesClient;
1414
import io.javaoperatorsdk.operator.api.reconciler.*;
15-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
1615

1716
@ControllerConfiguration(generationAwareEventProcessing = false)
1817
public class TestCustomReconciler
@@ -78,8 +77,8 @@ public UpdateControl<TestCustomResource> reconcile(
7877
kubernetesClient
7978
.configMaps()
8079
.inNamespace(resource.getMetadata().getNamespace())
81-
.withName(existingConfigMap.getMetadata().getName())
82-
.createOrReplace(existingConfigMap);
80+
.resource(existingConfigMap)
81+
.createOrReplace();
8382
} else {
8483
Map<String, String> labels = new HashMap<>();
8584
labels.put("managedBy", TestCustomReconciler.class.getSimpleName());
@@ -96,7 +95,8 @@ public UpdateControl<TestCustomResource> reconcile(
9695
kubernetesClient
9796
.configMaps()
9897
.inNamespace(resource.getMetadata().getNamespace())
99-
.createOrReplace(newConfigMap);
98+
.resource(newConfigMap)
99+
.createOrReplace();
100100
}
101101
if (updateStatus) {
102102
if (resource.getStatus() == null) {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ private ChangeNamespaceTestCustomResource createResourceInAdditionalNamespace(St
122122
var res = customResource(name);
123123
return client().resources(ChangeNamespaceTestCustomResource.class)
124124
.inNamespace(ADDITIONAL_TEST_NAMESPACE)
125-
.create(res);
125+
.resource(res)
126+
.create();
126127
}
127128

128129
private KubernetesClient client() {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException {
3434
log.info("Creating {} new resources", NUMBER_OF_RESOURCES_CREATED);
3535
for (int i = 0; i < NUMBER_OF_RESOURCES_CREATED; i++) {
3636
TestCustomResource tcr = TestUtils.testCustomResourceWithPrefix(String.valueOf(i));
37-
operator.resources(TestCustomResource.class).create(tcr);
37+
operator.resources(TestCustomResource.class).resource(tcr).create();
3838
}
3939

4040
await()
@@ -57,8 +57,8 @@ void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException {
5757
operator.get(TestCustomResource.class,
5858
TestUtils.TEST_CUSTOM_RESOURCE_PREFIX + i);
5959
tcr.getSpec().setValue(i + UPDATED_SUFFIX);
60-
operator.resources(TestCustomResource.class)
61-
.createOrReplace(tcr);
60+
operator.resources(TestCustomResource.class).resource(tcr)
61+
.createOrReplace();
6262
}
6363
// sleep for a short time to make variability to the test, so some updates are not
6464
// executed before delete
@@ -67,7 +67,7 @@ void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException {
6767
log.info("Deleting {} resources", NUMBER_OF_RESOURCES_DELETED);
6868
for (int i = 0; i < NUMBER_OF_RESOURCES_DELETED; i++) {
6969
TestCustomResource tcr = TestUtils.testCustomResourceWithPrefix(String.valueOf(i));
70-
operator.resources(TestCustomResource.class).delete(tcr);
70+
operator.resources(TestCustomResource.class).resource(tcr).delete();
7171
}
7272

7373
await()

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateBulkIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ExternalStateBulkIT {
2525
public static final int INCREASED_BULK_SIZE = 4;
2626
public static final int DECREASED_BULK_SIZE = 2;
2727

28-
private ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
28+
private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
2929

3030
@RegisterExtension
3131
LocallyRunOperatorExtension operator =

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ExternalStateIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ExternalStateIT {
2222
public static final String INITIAL_TEST_DATA = "initialTestData";
2323
public static final String UPDATED_DATA = "updatedData";
2424

25-
private ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
25+
private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
2626

2727
@RegisterExtension
2828
LocallyRunOperatorExtension operator =

0 commit comments

Comments
 (0)