Skip to content

Commit 574bfda

Browse files
metacosmmetacosm
committed
chore: clean-up
1 parent 9df916f commit 574bfda

File tree

4 files changed

+34
-50
lines changed

4 files changed

+34
-50
lines changed

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

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
1212
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
1313
import io.javaoperatorsdk.operator.api.monitoring.Metrics;
14-
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
15-
import io.javaoperatorsdk.operator.processing.event.Event;
16-
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
17-
import io.javaoperatorsdk.operator.processing.event.internal.ResourceAction;
1814
import io.javaoperatorsdk.operator.sample.observedgeneration.ObservedGenCustomResource;
1915
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
2016
import org.junit.jupiter.api.BeforeEach;
@@ -23,11 +19,7 @@
2319
import org.mockito.ArgumentMatchers;
2420

2521
import java.util.ArrayList;
26-
import java.util.Arrays;
27-
import java.util.List;
2822

29-
import static io.javaoperatorsdk.operator.processing.event.internal.ResourceAction.ADDED;
30-
import static io.javaoperatorsdk.operator.processing.event.internal.ResourceAction.UPDATED;
3123
import static org.assertj.core.api.Assertions.assertThat;
3224
import static org.mockito.ArgumentMatchers.argThat;
3325
import static org.mockito.Mockito.any;
@@ -74,9 +66,9 @@ void setup() {
7466
void addFinalizerOnNewResource() {
7567
assertFalse(testCustomResource.hasFinalizer(DEFAULT_FINALIZER));
7668
eventDispatcher.handleExecution(
77-
executionScopeWithCREvent(ADDED, testCustomResource));
69+
executionScopeWithCREvent(testCustomResource));
7870
verify(controller, never())
79-
.createOrUpdateResource(ArgumentMatchers.eq(testCustomResource), any());
71+
.createOrUpdateResource(ArgumentMatchers.eq(testCustomResource), any());
8072
verify(customResourceFacade, times(1))
8173
.replaceWithLock(
8274
argThat(testCustomResource -> testCustomResource.hasFinalizer(DEFAULT_FINALIZER)));
@@ -87,9 +79,9 @@ void addFinalizerOnNewResource() {
8779
void callCreateOrUpdateOnNewResourceIfFinalizerSet() {
8880
testCustomResource.addFinalizer(DEFAULT_FINALIZER);
8981
eventDispatcher.handleExecution(
90-
executionScopeWithCREvent(ADDED, testCustomResource));
82+
executionScopeWithCREvent(testCustomResource));
9183
verify(controller, times(1))
92-
.createOrUpdateResource(ArgumentMatchers.eq(testCustomResource), any());
84+
.createOrUpdateResource(ArgumentMatchers.eq(testCustomResource), any());
9385
}
9486

9587
@Test
@@ -100,7 +92,7 @@ void updatesOnlyStatusSubResourceIfFinalizerSet() {
10092
.thenReturn(UpdateControl.updateStatusSubResource(testCustomResource));
10193

10294
eventDispatcher.handleExecution(
103-
executionScopeWithCREvent(ADDED, testCustomResource));
95+
executionScopeWithCREvent(testCustomResource));
10496

10597
verify(customResourceFacade, times(1)).updateStatus(testCustomResource);
10698
verify(customResourceFacade, never()).replaceWithLock(any());
@@ -115,7 +107,7 @@ void updatesBothResourceAndStatusIfFinalizerSet() {
115107
when(customResourceFacade.replaceWithLock(testCustomResource)).thenReturn(testCustomResource);
116108

117109
eventDispatcher.handleExecution(
118-
executionScopeWithCREvent(UPDATED, testCustomResource));
110+
executionScopeWithCREvent(testCustomResource));
119111

120112
verify(customResourceFacade, times(1)).replaceWithLock(testCustomResource);
121113
verify(customResourceFacade, times(1)).updateStatus(testCustomResource);
@@ -126,9 +118,9 @@ void callCreateOrUpdateOnModifiedResourceIfFinalizerSet() {
126118
testCustomResource.addFinalizer(DEFAULT_FINALIZER);
127119

128120
eventDispatcher.handleExecution(
129-
executionScopeWithCREvent(UPDATED, testCustomResource));
121+
executionScopeWithCREvent(testCustomResource));
130122
verify(controller, times(1))
131-
.createOrUpdateResource(ArgumentMatchers.eq(testCustomResource), any());
123+
.createOrUpdateResource(ArgumentMatchers.eq(testCustomResource), any());
132124
}
133125

134126
@Test
@@ -138,7 +130,7 @@ void callsDeleteIfObjectHasFinalizerAndMarkedForDelete() {
138130
markForDeletion(testCustomResource);
139131

140132
eventDispatcher.handleExecution(
141-
executionScopeWithCREvent(UPDATED, testCustomResource));
133+
executionScopeWithCREvent(testCustomResource));
142134

143135
verify(controller, times(1)).deleteResource(eq(testCustomResource), any());
144136
}
@@ -150,7 +142,7 @@ void callDeleteOnControllerIfMarkedForDeletionWhenNoFinalizerIsConfigured() {
150142
markForDeletion(testCustomResource);
151143

152144
eventDispatcher.handleExecution(
153-
executionScopeWithCREvent(UPDATED, testCustomResource));
145+
executionScopeWithCREvent(testCustomResource));
154146

155147
verify(controller).deleteResource(eq(testCustomResource), any());
156148
}
@@ -160,7 +152,7 @@ void doNotCallDeleteIfMarkedForDeletionWhenFinalizerHasAlreadyBeenRemoved() {
160152
markForDeletion(testCustomResource);
161153

162154
eventDispatcher.handleExecution(
163-
executionScopeWithCREvent(UPDATED, testCustomResource));
155+
executionScopeWithCREvent(testCustomResource));
164156

165157
verify(controller, never()).deleteResource(eq(testCustomResource), any());
166158
}
@@ -181,7 +173,7 @@ void doesNotAddFinalizerIfConfiguredNotTo() {
181173
configureToNotUseFinalizer();
182174

183175
eventDispatcher.handleExecution(
184-
executionScopeWithCREvent(UPDATED, testCustomResource));
176+
executionScopeWithCREvent(testCustomResource));
185177

186178
assertEquals(0, testCustomResource.getMetadata().getFinalizers().size());
187179
}
@@ -192,7 +184,7 @@ void removesDefaultFinalizerOnDeleteIfSet() {
192184
markForDeletion(testCustomResource);
193185

194186
eventDispatcher.handleExecution(
195-
executionScopeWithCREvent(UPDATED, testCustomResource));
187+
executionScopeWithCREvent(testCustomResource));
196188

197189
assertEquals(0, testCustomResource.getMetadata().getFinalizers().size());
198190
verify(customResourceFacade, times(1)).replaceWithLock(any());
@@ -207,7 +199,7 @@ void doesNotRemovesTheSetFinalizerIfTheDeleteNotMethodInstructsIt() {
207199
markForDeletion(testCustomResource);
208200

209201
eventDispatcher.handleExecution(
210-
executionScopeWithCREvent(UPDATED, testCustomResource));
202+
executionScopeWithCREvent(testCustomResource));
211203

212204
assertEquals(1, testCustomResource.getMetadata().getFinalizers().size());
213205
verify(customResourceFacade, never()).replaceWithLock(any());
@@ -221,7 +213,7 @@ void doesNotUpdateTheResourceIfNoUpdateUpdateControlIfFinalizerSet() {
221213
.thenReturn(UpdateControl.noUpdate());
222214

223215
eventDispatcher.handleExecution(
224-
executionScopeWithCREvent(UPDATED, testCustomResource));
216+
executionScopeWithCREvent(testCustomResource));
225217
verify(customResourceFacade, never()).replaceWithLock(any());
226218
verify(customResourceFacade, never()).updateStatus(testCustomResource);
227219
}
@@ -233,7 +225,7 @@ void addsFinalizerIfNotMarkedForDeletionAndEmptyCustomResourceReturned() {
233225
.thenReturn(UpdateControl.noUpdate());
234226

235227
eventDispatcher.handleExecution(
236-
executionScopeWithCREvent(UPDATED, testCustomResource));
228+
executionScopeWithCREvent(testCustomResource));
237229

238230
assertEquals(1, testCustomResource.getMetadata().getFinalizers().size());
239231
verify(customResourceFacade, times(1)).replaceWithLock(any());
@@ -245,7 +237,7 @@ void doesNotCallDeleteIfMarkedForDeletionButNotOurFinalizer() {
245237
markForDeletion(testCustomResource);
246238

247239
eventDispatcher.handleExecution(
248-
executionScopeWithCREvent(UPDATED, testCustomResource));
240+
executionScopeWithCREvent(testCustomResource));
249241

250242
verify(customResourceFacade, never()).replaceWithLock(any());
251243
verify(controller, never()).deleteResource(eq(testCustomResource), any());
@@ -255,9 +247,9 @@ void doesNotCallDeleteIfMarkedForDeletionButNotOurFinalizer() {
255247
void executeControllerRegardlessGenerationInNonGenerationAwareModeIfFinalizerSet() {
256248
testCustomResource.addFinalizer(DEFAULT_FINALIZER);
257249
eventDispatcher.handleExecution(
258-
executionScopeWithCREvent(UPDATED, testCustomResource));
250+
executionScopeWithCREvent(testCustomResource));
259251
eventDispatcher.handleExecution(
260-
executionScopeWithCREvent(UPDATED, testCustomResource));
252+
executionScopeWithCREvent(testCustomResource));
261253

262254
verify(controller, times(2)).createOrUpdateResource(eq(testCustomResource), any());
263255
}
@@ -300,7 +292,7 @@ void setReScheduleToPostExecutionControlFromUpdateControl() {
300292
UpdateControl.updateStatusSubResource(testCustomResource).rescheduleAfter(1000L));
301293

302294
PostExecutionControl control = eventDispatcher.handleExecution(
303-
executionScopeWithCREvent(ADDED, testCustomResource));
295+
executionScopeWithCREvent(testCustomResource));
304296

305297
assertThat(control.getReScheduleDelay().get()).isEqualTo(1000L);
306298
}
@@ -311,11 +303,11 @@ void reScheduleOnDeleteWithoutFinalizerRemoval() {
311303
markForDeletion(testCustomResource);
312304

313305
when(controller.deleteResource(eq(testCustomResource), any()))
314-
.thenReturn(
315-
DeleteControl.noFinalizerRemoval().rescheduleAfter(1000L));
306+
.thenReturn(
307+
DeleteControl.noFinalizerRemoval().rescheduleAfter(1000L));
316308

317-
PostExecutionControl control = eventDispatcher.handleExecution(
318-
executionScopeWithCREvent(UPDATED, testCustomResource));
309+
PostExecutionControl control =
310+
eventDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
319311

320312
assertThat(control.getReScheduleDelay().get()).isEqualTo(1000L);
321313
}
@@ -355,13 +347,7 @@ private void removeFinalizers(CustomResource customResource) {
355347
customResource.getMetadata().getFinalizers().clear();
356348
}
357349

358-
public ExecutionScope executionScopeWithCREvent(
359-
ResourceAction action, CustomResource resource, Event... otherEvents) {
360-
CustomResourceEvent event =
361-
new CustomResourceEvent(action, CustomResourceID.fromResource(resource));
362-
List<Event> eventList = new ArrayList<>(1 + otherEvents.length);
363-
eventList.add(event);
364-
eventList.addAll(Arrays.asList(otherEvents));
365-
return new ExecutionScope(resource, null);
350+
public <T extends CustomResource<?, ?>> ExecutionScope<T> executionScopeWithCREvent(T resource) {
351+
return new ExecutionScope<>(resource, null);
366352
}
367353
}

‎operator-framework-junit5/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@
3434
<dependency>
3535
<groupId>org.assertj</groupId>
3636
<artifactId>assertj-core</artifactId>
37-
<version>3.20.2</version>
3837
</dependency>
3938
<dependency>
4039
<groupId>org.awaitility</groupId>
4140
<artifactId>awaitility</artifactId>
42-
<version>4.1.0</version>
4341
</dependency>
4442
</dependencies>
4543

‎operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/TypeParameterResolver.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package io.javaoperatorsdk.operator.config.runtime;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
import java.util.stream.Collectors;
6-
import java.util.stream.IntStream;
7-
83
import javax.lang.model.element.TypeElement;
94
import javax.lang.model.element.TypeParameterElement;
105
import javax.lang.model.type.DeclaredType;
116
import javax.lang.model.type.TypeKind;
127
import javax.lang.model.type.TypeMirror;
138
import javax.lang.model.type.TypeVariable;
149
import javax.lang.model.util.Types;
10+
import java.util.ArrayList;
11+
import java.util.List;
12+
import java.util.stream.Collectors;
13+
import java.util.stream.IntStream;
1514

1615
import static javax.lang.model.type.TypeKind.DECLARED;
1716
import static javax.lang.model.type.TypeKind.TYPEVAR;
@@ -75,9 +74,9 @@ public TypeMirror resolve(Types typeUtils, DeclaredType declaredType) {
7574
private int getTypeIndexWithName(
7675
String typeName, List<? extends TypeParameterElement> typeParameters) {
7776
return IntStream.range(0, typeParameters.size())
78-
.filter(i -> typeParameters.get(i).getSimpleName().toString().equals(typeName))
79-
.findFirst()
80-
.getAsInt();
77+
.filter(i -> typeParameters.get(i).getSimpleName().toString().equals(typeName))
78+
.findFirst()
79+
.orElseThrow();
8180
}
8281

8382
private List<DeclaredType> findChain(Types typeUtils, DeclaredType declaredType) {

‎pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@
301301
<goal>format</goal>
302302
</goals>
303303
<configuration>
304+
<!--suppress UnresolvedMavenProperty -->
304305
<configFile>${josdk.project.root}/contributing/eclipse-google-style.xml</configFile>
305306
</configuration>
306307
</execution>

0 commit comments

Comments
 (0)