Skip to content

Commit 0b762ad

Browse files
csviricsviri
committed
format
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent ab7ae08 commit 0b762ad

File tree

4 files changed

+45
-39
lines changed

4 files changed

+45
-39
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,9 @@ default boolean parseResourceVersionsForEventFilteringAndCaching() {
376376
}
377377

378378
/**
379-
* {@link io.javaoperatorsdk.operator.api.reconciler.UpdateControl} patch resource or status can either use
380-
* simple patches or SSA. Setting this to true, controller will use SSA for adding finalizers,
381-
* managing observed generation, patching resources and status.
379+
* {@link io.javaoperatorsdk.operator.api.reconciler.UpdateControl} patch resource or status can
380+
* either use simple patches or SSA. Setting this to true, controller will use SSA for adding
381+
* finalizers, managing observed generation, patching resources and status.
382382
*
383383
* @return true by default
384384
*/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package io.javaoperatorsdk.operator.api.reconciler;
22

3+
import java.util.Optional;
4+
35
import io.fabric8.kubernetes.api.model.HasMetadata;
46
import io.fabric8.kubernetes.client.CustomResource;
57

6-
import java.util.Optional;
7-
88
public class UpdateControl<P extends HasMetadata> extends BaseControl<UpdateControl<P>> {
99

1010
private final P resource;
1111
private final boolean patchResource;
1212
private final boolean patchStatus;
1313

1414
private UpdateControl(
15-
P resource, boolean patchResource, boolean patchStatus) {
15+
P resource, boolean patchResource, boolean patchStatus) {
1616
if ((patchResource || patchStatus) && resource == null) {
1717
throw new IllegalArgumentException("CustomResource cannot be null in case of update");
1818
}

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

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private PostExecutionControl<P> handleDispatch(ExecutionScope<P> executionScope)
9090
Context<P> context =
9191
new DefaultContext<>(executionScope.getRetryInfo(), controller, originalResource);
9292
if (markedForDeletion) {
93-
return handleCleanup(resourceForExecution, originalResource,context);
93+
return handleCleanup(resourceForExecution, originalResource, context);
9494
} else {
9595
return handleReconcile(executionScope, resourceForExecution, originalResource, context);
9696
}
@@ -157,13 +157,15 @@ private PostExecutionControl<P> reconcileExecution(ExecutionScope<P> executionSc
157157
toUpdate = updateControl.getResource().orElseThrow();
158158
}
159159
} else {
160-
toUpdate = updateControl.isNoUpdate() ? originalResource : updateControl.getResource().orElseThrow();
160+
toUpdate =
161+
updateControl.isNoUpdate() ? originalResource : updateControl.getResource().orElseThrow();
161162
}
162163

163164
if (updateControl.isPatchResource()) {
164165
updatedCustomResource = patchResource(toUpdate, originalResource);
165166
if (!useSSA) {
166-
toUpdate.getMetadata().setResourceVersion(updatedCustomResource.getMetadata().getResourceVersion());
167+
toUpdate.getMetadata()
168+
.setResourceVersion(updatedCustomResource.getMetadata().getResourceVersion());
167169
}
168170
}
169171

@@ -206,12 +208,14 @@ public boolean isLastAttempt() {
206208
P updatedResource = null;
207209
if (errorStatusUpdateControl.getResource().isPresent()) {
208210
updatedResource =
209-
patchStatusGenerationAware(errorStatusUpdateControl.getResource().orElseThrow(), originalResource);
211+
patchStatusGenerationAware(errorStatusUpdateControl.getResource().orElseThrow(),
212+
originalResource);
210213
}
211214
if (errorStatusUpdateControl.isNoRetry()) {
212215
PostExecutionControl<P> postExecutionControl;
213216
if (updatedResource != null) {
214-
postExecutionControl = PostExecutionControl.customResourceStatusPatched(updatedResource);
217+
postExecutionControl =
218+
PostExecutionControl.customResourceStatusPatched(updatedResource);
215219
} else {
216220
postExecutionControl = PostExecutionControl.defaultDispatch();
217221
}
@@ -267,8 +271,8 @@ private PostExecutionControl<P> createPostExecutionControl(P updatedCustomResour
267271
UpdateControl<P> updateControl) {
268272
PostExecutionControl<P> postExecutionControl;
269273
if (updatedCustomResource != null) {
270-
postExecutionControl =
271-
PostExecutionControl.customResourceStatusPatched(updatedCustomResource);
274+
postExecutionControl =
275+
PostExecutionControl.customResourceStatusPatched(updatedCustomResource);
272276
} else {
273277
postExecutionControl = PostExecutionControl.defaultDispatch();
274278
}
@@ -283,7 +287,7 @@ private void updatePostExecutionControlWithReschedule(
283287
}
284288

285289
private PostExecutionControl<P> handleCleanup(P resource,
286-
P originalResource, Context<P> context) {
290+
P originalResource, Context<P> context) {
287291
if (log.isDebugEnabled()) {
288292
log.debug(
289293
"Executing delete for resource: {} with version: {}",
@@ -297,7 +301,7 @@ private PostExecutionControl<P> handleCleanup(P resource,
297301
// cleanup is finished, nothing left to done
298302
final var finalizerName = configuration().getFinalizerName();
299303
if (deleteControl.isRemoveFinalizer() && resource.hasFinalizer(finalizerName)) {
300-
P customResource = conflictRetryingPatch(resource,originalResource, r -> {
304+
P customResource = conflictRetryingPatch(resource, originalResource, r -> {
301305
// the operator might not be allowed to retrieve the resource on a retry, e.g. when its
302306
// permissions are removed by deleting the namespace concurrently
303307
if (r == null) {
@@ -346,7 +350,7 @@ private P updateCustomResourceWithFinalizer(P resourceForExecution, P originalRe
346350
log.debug(
347351
"Adding finalizer for resource: {} version: {}", getUID(originalResource),
348352
getVersion(originalResource));
349-
return conflictRetryingPatch(resourceForExecution,originalResource,
353+
return conflictRetryingPatch(resourceForExecution, originalResource,
350354
r -> r.addFinalizer(configuration().getFinalizerName()));
351355
}
352356

@@ -357,18 +361,19 @@ private P patchResource(P resource, P originalResource) {
357361

358362
// todo unit test
359363
if (useSSA && controller.useFinalizer() &&
360-
!resource.getMetadata().getFinalizers().contains(configuration().getFinalizerName())) {
361-
resource.getMetadata().getFinalizers().add(configuration().getFinalizerName());
364+
!resource.getMetadata().getFinalizers().contains(configuration().getFinalizerName())) {
365+
resource.getMetadata().getFinalizers().add(configuration().getFinalizerName());
362366
}
363367

364-
return customResourceFacade.patchResource(resource,originalResource);
368+
return customResourceFacade.patchResource(resource, originalResource);
365369
}
366370

367371
ControllerConfiguration<P> configuration() {
368372
return controller.getConfiguration();
369373
}
370374

371-
public P conflictRetryingPatch(P resource, P originalResource, Function<P, Boolean> modificationFunction) {
375+
public P conflictRetryingPatch(P resource, P originalResource,
376+
Function<P, Boolean> modificationFunction) {
372377
if (log.isDebugEnabled()) {
373378
log.debug("Conflict retrying update for: {}", ResourceID.fromResource(resource));
374379
}
@@ -379,7 +384,7 @@ public P conflictRetryingPatch(P resource, P originalResource, Function<P, Boole
379384
if (Boolean.FALSE.equals(modified)) {
380385
return resource;
381386
}
382-
return customResourceFacade.patchResource(resource,originalResource);
387+
return customResourceFacade.patchResource(resource, originalResource);
383388
} catch (KubernetesClientException e) {
384389
log.trace("Exception during patch for resource: {}", resource);
385390
retryIndex++;
@@ -426,14 +431,14 @@ public R getResource(String namespace, String name) {
426431
public R patchResource(R resource, R originalResource) {
427432
if (log.isDebugEnabled()) {
428433
log.debug(
429-
"Trying to replace resource {}, version: {}",
430-
ResourceID.fromResource(resource),
431-
resource.getMetadata().getResourceVersion());
434+
"Trying to replace resource {}, version: {}",
435+
ResourceID.fromResource(resource),
436+
resource.getMetadata().getResourceVersion());
432437
}
433438
if (useSSA) {
434439
return patchResourceWithSSA(resource);
435440
} else {
436-
return resource(originalResource).edit(r->resource);
441+
return resource(originalResource).edit(r -> resource);
437442
}
438443
}
439444

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ void addFinalizerOnNewResource() {
129129
.reconcile(ArgumentMatchers.eq(testCustomResource), any());
130130
verify(customResourceFacade, times(1))
131131
.patchResource(
132-
argThat(testCustomResource -> testCustomResource.hasFinalizer(DEFAULT_FINALIZER)),any());
132+
argThat(testCustomResource -> testCustomResource.hasFinalizer(DEFAULT_FINALIZER)),
133+
any());
133134
assertThat(testCustomResource.hasFinalizer(DEFAULT_FINALIZER)).isTrue();
134135
}
135136

@@ -324,21 +325,21 @@ void doesNotUpdateTheResourceIfNoUpdateUpdateControlIfFinalizerSet() {
324325

325326
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
326327
verify(customResourceFacade, never()).patchResource(any(), any());
327-
verify(customResourceFacade, never()).patchStatus(eq(testCustomResource),any());
328+
verify(customResourceFacade, never()).patchStatus(eq(testCustomResource), any());
328329
}
329330

330331
@Test
331332
void addsFinalizerIfNotMarkedForDeletionAndEmptyCustomResourceReturned() {
332333
removeFinalizers(testCustomResource);
333334
reconciler.reconcile = (r, c) -> UpdateControl.noUpdate();
334-
when(customResourceFacade.patchResource(any(),any()))
335+
when(customResourceFacade.patchResource(any(), any()))
335336
.thenReturn(testCustomResource);
336337

337338
var postExecControl =
338339
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
339340

340341
assertEquals(1, testCustomResource.getMetadata().getFinalizers().size());
341-
verify(customResourceFacade, times(1)).patchResource(any(),any());
342+
verify(customResourceFacade, times(1)).patchResource(any(), any());
342343
assertThat(postExecControl.updateIsStatusPatch()).isFalse();
343344
assertThat(postExecControl.getUpdatedCustomResource()).isPresent();
344345
}
@@ -350,7 +351,7 @@ void doesNotCallDeleteIfMarkedForDeletionButNotOurFinalizer() {
350351

351352
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
352353

353-
verify(customResourceFacade, never()).patchResource(any(),any());
354+
verify(customResourceFacade, never()).patchResource(any(), any());
354355
verify(reconciler, never()).cleanup(eq(testCustomResource), any());
355356
}
356357

@@ -453,7 +454,7 @@ void updatesObservedGenerationOnNoUpdateUpdateControl() throws Exception {
453454
when(config.isGenerationAware()).thenReturn(true);
454455
when(reconciler.reconcile(any(), any()))
455456
.thenReturn(UpdateControl.noUpdate());
456-
when(facade.patchStatus(any(),any())).thenReturn(observedGenResource);
457+
when(facade.patchStatus(any(), any())).thenReturn(observedGenResource);
457458
var dispatcher = init(observedGenResource, reconciler, config, facade, true);
458459

459460
PostExecutionControl<ObservedGenCustomResource> control = dispatcher.handleExecution(
@@ -473,8 +474,8 @@ void patchObservedGenerationOnCustomResourceUpdate() throws Exception {
473474
when(config.isGenerationAware()).thenReturn(true);
474475
when(reconciler.reconcile(any(), any()))
475476
.thenReturn(UpdateControl.patchResource(observedGenResource));
476-
when(facade.patchResource(any(),any())).thenReturn(observedGenResource);
477-
when(facade.patchStatus(eq(observedGenResource),any())).thenReturn(observedGenResource);
477+
when(facade.patchResource(any(), any())).thenReturn(observedGenResource);
478+
when(facade.patchStatus(eq(observedGenResource), any())).thenReturn(observedGenResource);
478479
var dispatcher = init(observedGenResource, reconciler, config, facade, true);
479480

480481
PostExecutionControl<ObservedGenCustomResource> control = dispatcher.handleExecution(
@@ -510,7 +511,7 @@ public boolean isLastAttempt() {
510511
}
511512
}).setResource(testCustomResource));
512513

513-
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource),any());
514+
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource), any());
514515
verify(((ErrorStatusHandler) reconciler), times(1)).updateErrorStatus(eq(testCustomResource),
515516
any(), any());
516517
}
@@ -529,7 +530,7 @@ void callErrorStatusHandlerEvenOnFirstError() {
529530

530531
var postExecControl = reconciliationDispatcher.handleExecution(
531532
new ExecutionScope(null).setResource(testCustomResource));
532-
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource),any());
533+
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource), any());
533534
verify(((ErrorStatusHandler) reconciler), times(1)).updateErrorStatus(eq(testCustomResource),
534535
any(), any());
535536
assertThat(postExecControl.exceptionDuringExecution()).isTrue();
@@ -551,7 +552,7 @@ void errorHandlerCanInstructNoRetryWithUpdate() {
551552

552553
verify(((ErrorStatusHandler) reconciler), times(1)).updateErrorStatus(eq(testCustomResource),
553554
any(), any());
554-
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource),any());
555+
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource), any());
555556
assertThat(postExecControl.exceptionDuringExecution()).isFalse();
556557
}
557558

@@ -571,7 +572,7 @@ void errorHandlerCanInstructNoRetryNoUpdate() {
571572

572573
verify(((ErrorStatusHandler) reconciler), times(1)).updateErrorStatus(eq(testCustomResource),
573574
any(), any());
574-
verify(customResourceFacade, times(0)).patchStatus(eq(testCustomResource),any());
575+
verify(customResourceFacade, times(0)).patchStatus(eq(testCustomResource), any());
575576
assertThat(postExecControl.exceptionDuringExecution()).isFalse();
576577
}
577578

@@ -637,7 +638,7 @@ void canSkipSchedulingMaxDelayIf() {
637638
void retriesAddingFinalizer() {
638639
removeFinalizers(testCustomResource);
639640
reconciler.reconcile = (r, c) -> UpdateControl.noUpdate();
640-
when(customResourceFacade.patchResource(any(),any()))
641+
when(customResourceFacade.patchResource(any(), any()))
641642
.thenThrow(new KubernetesClientException(null, 409, null))
642643
.thenReturn(testCustomResource);
643644
when(customResourceFacade.getResource(any(), any()))
@@ -648,7 +649,7 @@ void retriesAddingFinalizer() {
648649

649650
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
650651

651-
verify(customResourceFacade, times(2)).patchResource(any(),any());
652+
verify(customResourceFacade, times(2)).patchResource(any(), any());
652653
}
653654

654655
@Test

0 commit comments

Comments
 (0)