From 1f7ef3a1e73c307fe4d23854b08729593d1cfdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20CROCQUESEL?= <88554524+scrocquesel@users.noreply.github.com> Date: Tue, 15 Mar 2022 19:06:29 +0100 Subject: [PATCH 1/2] refactor: fix Context is a raw type --- .../operator/api/reconciler/ContextInitializer.java | 2 +- .../external/AbstractSimpleDependentResource.java | 2 +- .../dependent/kubernetes/KubernetesDependentResource.java | 2 +- .../processing/event/ReconciliationDispatcher.java | 2 +- .../io/javaoperatorsdk/operator/api/config/UtilsTest.java | 2 +- .../external/AbstractSimpleDependentResourceTest.java | 8 ++++---- .../event/source/CustomResourceSelectorTest.java | 2 +- .../operator/sample/simple/DuplicateCRController.java | 2 +- .../operator/sample/simple/TestCustomReconciler.java | 4 ++-- .../sample/simple/TestCustomReconcilerOtherV1.java | 2 +- .../runtime/AnnotationControllerConfigurationTest.java | 4 ++-- .../config/runtime/DefaultConfigurationServiceTest.java | 6 +++--- .../CreateUpdateEventFilterTestReconciler.java | 2 +- .../customfilter/CustomFilteringTestReconciler.java | 2 +- .../operator/sample/deployment/DeploymentReconciler.java | 2 +- .../doubleupdate/DoubleUpdateTestCustomReconciler.java | 2 +- .../sample/event/EventSourceTestCustomReconciler.java | 2 +- .../InformerEventSourceTestCustomReconciler.java | 2 +- .../sample/maxinterval/MaxIntervalTestReconciler.java | 2 +- .../multiversioncrd/MultiVersionCRDTestReconciler1.java | 2 +- .../multiversioncrd/MultiVersionCRDTestReconciler2.java | 2 +- .../ObservedGenerationTestReconciler.java | 2 +- .../operator/sample/simple/TestReconciler.java | 4 ++-- .../StandaloneDependentTestReconciler.java | 2 +- .../subresource/SubResourceTestCustomReconciler.java | 2 +- .../sample/dependent/SecretDependentResource.java | 4 ++-- .../operator/sample/DeploymentDependentResource.java | 2 +- .../operator/sample/ServiceDependentResource.java | 2 +- .../sample/WebPageReconcilerDependentResources.java | 6 +++--- .../operator/sample/CustomServiceReconciler.java | 4 ++-- 30 files changed, 42 insertions(+), 42 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ContextInitializer.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ContextInitializer.java index e076723d0c..c1213cce67 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ContextInitializer.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ContextInitializer.java @@ -3,5 +3,5 @@ import io.fabric8.kubernetes.api.model.HasMetadata; public interface ContextInitializer

{ - void initContext(P primary, Context context); + void initContext(P primary, Context

context); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResource.java index 096e4265f6..850b290c12 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResource.java @@ -70,7 +70,7 @@ protected R handleUpdate(R actual, R desired, P primary, Context

context) { return res; } - public Matcher.Result match(R actualResource, P primary, Context context) { + public Matcher.Result match(R actualResource, P primary, Context

context) { return matcher.match(actualResource, primary, context); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java index a471df8c09..7ceadaf13c 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java @@ -99,7 +99,7 @@ public R update(R actual, R target, P primary, Context

context) { return prepare(target, primary, "Updating").replace(updatedActual); } - public Result match(R actualResource, P primary, Context context) { + public Result match(R actualResource, P primary, Context

context) { return matcher.match(actualResource, primary, context); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java index 180fbc2d28..6ca6959bbb 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java @@ -258,7 +258,7 @@ private void updatePostExecutionControlWithReschedule( } - private PostExecutionControl handleCleanup(R resource, Context context) { + private PostExecutionControl handleCleanup(R resource, Context context) { log.debug( "Executing delete for resource: {} with version: {}", getName(resource), diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java index fbaa28ba23..8895922e82 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java @@ -79,7 +79,7 @@ public static class TestKubernetesDependentResource extends KubernetesDependentResource { @Override - protected Deployment desired(TestCustomResource primary, Context context) { + protected Deployment desired(TestCustomResource primary, Context context) { return null; } } diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java index 00557e7e61..db3d81c376 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java @@ -113,7 +113,7 @@ public Optional fetchResource(HasMetadata primaryResourc @Override public SampleExternalResource create( - SampleExternalResource desired, TestCustomResource primary, Context context) { + SampleExternalResource desired, TestCustomResource primary, Context context) { return SampleExternalResource.testResource1(); } @@ -122,15 +122,15 @@ public SampleExternalResource update( SampleExternalResource actual, SampleExternalResource desired, TestCustomResource primary, - Context context) { + Context context) { return SampleExternalResource.testResource1(); } @Override - public void delete(TestCustomResource primary, Context context) {} + public void delete(TestCustomResource primary, Context context) {} @Override - protected SampleExternalResource desired(TestCustomResource primary, Context context) { + protected SampleExternalResource desired(TestCustomResource primary, Context context) { return SampleExternalResource.testResource1(); } } diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java index e995d3b9c4..fd08a614af 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java @@ -151,7 +151,7 @@ public MyController(Consumer consumer) { @Override public UpdateControl reconcile( - TestCustomResource resource, Context context) { + TestCustomResource resource, Context context) { LOGGER.info("Received event on: {}", resource); diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/DuplicateCRController.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/DuplicateCRController.java index 86f0c36261..6b5b6ab08d 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/DuplicateCRController.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/DuplicateCRController.java @@ -10,7 +10,7 @@ public class DuplicateCRController implements Reconciler { @Override public UpdateControl reconcile(TestCustomResource resource, - Context context) { + Context context) { return UpdateControl.noUpdate(); } } 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 ec0e9bffbd..9595f3c13f 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 @@ -36,7 +36,7 @@ public TestCustomReconciler(KubernetesClient kubernetesClient, boolean updateSta @Override public DeleteControl cleanup( - TestCustomResource resource, Context context) { + TestCustomResource resource, Context context) { Boolean delete = kubernetesClient .configMaps() @@ -59,7 +59,7 @@ public DeleteControl cleanup( @Override public UpdateControl reconcile( - TestCustomResource resource, Context context) { + TestCustomResource resource, Context context) { if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) { throw new IllegalStateException("Finalizer is not present."); } diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconcilerOtherV1.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconcilerOtherV1.java index 9a45fbbf93..97f2fb9098 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconcilerOtherV1.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconcilerOtherV1.java @@ -10,7 +10,7 @@ public class TestCustomReconcilerOtherV1 implements Reconciler reconcile(TestCustomResourceOtherV1 resource, - Context context) { + Context context) { return UpdateControl.noUpdate(); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/AnnotationControllerConfigurationTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/AnnotationControllerConfigurationTest.java index b9556aba1c..fc44c3622e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/AnnotationControllerConfigurationTest.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/AnnotationControllerConfigurationTest.java @@ -43,7 +43,7 @@ private static class OneDepReconciler implements Reconciler { public static final String CONFIGURED_NS = "foo"; @Override - public UpdateControl reconcile(ConfigMap resource, Context context) { + public UpdateControl reconcile(ConfigMap resource, Context context) { return null; } } @@ -51,7 +51,7 @@ public UpdateControl reconcile(ConfigMap resource, Context context) { private static class NoDepReconciler implements Reconciler { @Override - public UpdateControl reconcile(ConfigMap resource, Context context) { + public UpdateControl reconcile(ConfigMap resource, Context context) { return null; } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java index 6fd626b94b..d123aa4899 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java @@ -106,7 +106,7 @@ static class TestCustomFinalizerReconciler @Override public UpdateControl reconcile( - InnerCustomResource resource, Context context) { + InnerCustomResource resource, Context context) { return null; } @@ -123,7 +123,7 @@ static class NotAutomaticallyCreated implements Reconciler { @Override public UpdateControl reconcile( - TestCustomResource resource, Context context) { + TestCustomResource resource, Context context) { return null; } } @@ -133,7 +133,7 @@ static class TestCustomReconciler implements Reconciler { @Override public UpdateControl reconcile( - TestCustomResource resource, Context context) { + TestCustomResource resource, Context context) { return null; } } 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 015f7a18bd..599abd04a0 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 @@ -30,7 +30,7 @@ public class CreateUpdateEventFilterTestReconciler @Override public UpdateControl reconcile( - CreateUpdateEventFilterTestCustomResource resource, Context context) { + CreateUpdateEventFilterTestCustomResource resource, Context context) { numberOfExecutions.incrementAndGet(); ConfigMap configMap = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/customfilter/CustomFilteringTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/customfilter/CustomFilteringTestReconciler.java index 2a13dc3092..1e42e8e6e1 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/customfilter/CustomFilteringTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/customfilter/CustomFilteringTestReconciler.java @@ -14,7 +14,7 @@ public class CustomFilteringTestReconciler implements Reconciler reconcile(CustomFilteringTestResource resource, - Context context) { + Context context) { numberOfExecutions.incrementAndGet(); return UpdateControl.noUpdate(); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/deployment/DeploymentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/deployment/DeploymentReconciler.java index 3992920884..62697d7e88 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/deployment/DeploymentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/deployment/DeploymentReconciler.java @@ -26,7 +26,7 @@ public class DeploymentReconciler @Override public UpdateControl reconcile( - Deployment resource, Context context) { + Deployment resource, Context context) { log.info("Reconcile deployment: {}", resource); numberOfExecutions.incrementAndGet(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java index bd398d0a1c..11f0a54f3e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java @@ -24,7 +24,7 @@ public class DoubleUpdateTestCustomReconciler @Override public UpdateControl reconcile( - DoubleUpdateTestCustomResource resource, Context context) { + DoubleUpdateTestCustomResource resource, Context context) { numberOfExecutions.addAndGet(1); log.info("Value: " + resource.getSpec().getValue()); 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 55eb61634f..cc4d083372 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 @@ -19,7 +19,7 @@ public class EventSourceTestCustomReconciler @Override public UpdateControl reconcile( - EventSourceTestCustomResource resource, Context context) { + EventSourceTestCustomResource resource, Context context) { numberOfExecutions.addAndGet(1); ensureStatusExists(resource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java index d61aa7f0f2..6ac0c0137d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java @@ -48,7 +48,7 @@ public List prepareEventSources( @Override public UpdateControl reconcile( - InformerEventSourceTestCustomResource resource, Context context) { + InformerEventSourceTestCustomResource resource, Context context) { numberOfExecutions.incrementAndGet(); resource.setStatus(new InformerEventSourceTestCustomResourceStatus()); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxinterval/MaxIntervalTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxinterval/MaxIntervalTestReconciler.java index a5343c27a4..f9a34371ce 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxinterval/MaxIntervalTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/maxinterval/MaxIntervalTestReconciler.java @@ -18,7 +18,7 @@ public class MaxIntervalTestReconciler @Override public UpdateControl reconcile( - MaxIntervalTestCustomResource resource, Context context) { + MaxIntervalTestCustomResource resource, Context context) { numberOfExecutions.addAndGet(1); return UpdateControl.noUpdate(); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java index ab8ad417be..9405f7a56d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java @@ -18,7 +18,7 @@ public class MultiVersionCRDTestReconciler1 @Override public UpdateControl reconcile( - MultiVersionCRDTestCustomResource1 resource, Context context) { + MultiVersionCRDTestCustomResource1 resource, Context context) { log.info("Reconcile MultiVersionCRDTestCustomResource1: {}", resource.getMetadata().getName()); resource.getStatus().setValue1(resource.getStatus().getValue1() + 1); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java index d25297d1c6..b17744ae49 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java @@ -20,7 +20,7 @@ public class MultiVersionCRDTestReconciler2 @Override public UpdateControl reconcile( - MultiVersionCRDTestCustomResource2 resource, Context context) { + MultiVersionCRDTestCustomResource2 resource, Context context) { log.info("Reconcile MultiVersionCRDTestCustomResource2: {}", resource.getMetadata().getName()); resource.getStatus().setValue1(resource.getStatus().getValue1() + 1); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java index 65d7be4851..7534406c7c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java @@ -15,7 +15,7 @@ public class ObservedGenerationTestReconciler @Override public UpdateControl reconcile( - ObservedGenerationTestCustomResource resource, Context context) { + ObservedGenerationTestCustomResource resource, Context context) { log.info("Reconcile ObservedGenerationTestCustomResource: {}", resource.getMetadata().getName()); return UpdateControl.updateStatus(resource); 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 94a7d36868..146c96c7db 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 @@ -59,7 +59,7 @@ public void setKubernetesClient(KubernetesClient kubernetesClient) { @Override public DeleteControl cleanup( - TestCustomResource resource, Context context) { + TestCustomResource resource, Context context) { Boolean delete = kubernetesClient .configMaps() @@ -82,7 +82,7 @@ public DeleteControl cleanup( @Override public UpdateControl reconcile( - TestCustomResource resource, Context context) { + TestCustomResource resource, Context context) { numberOfExecutions.addAndGet(1); if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) { throw new IllegalStateException("Finalizer is not present."); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java index 5e3d41b32f..7506872885 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java @@ -39,7 +39,7 @@ public List prepareEventSources( @Override public UpdateControl reconcile( - StandaloneDependentTestCustomResource primary, Context context) { + StandaloneDependentTestCustomResource primary, Context context) { deploymentDependent.reconcile(primary, context); Optional deployment = deploymentDependent.getResource(primary); if (deployment.isEmpty()) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomReconciler.java index 8bfe6dd67d..e520e94411 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomReconciler.java @@ -29,7 +29,7 @@ public class SubResourceTestCustomReconciler @Override public UpdateControl reconcile( - SubResourceTestCustomResource resource, Context context) { + SubResourceTestCustomResource resource, Context context) { numberOfExecutions.addAndGet(1); if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) { throw new IllegalStateException("Finalizer is not present."); diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java index 1b26eaf47a..15fff4d65e 100644 --- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java +++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java @@ -27,7 +27,7 @@ private static String encode(String value) { } @Override - protected Secret desired(MySQLSchema schema, Context context) { + protected Secret desired(MySQLSchema schema, Context context) { final var password = RandomStringUtils .randomAlphanumeric(16); // NOSONAR: we don't need cryptographically-strong randomness here final var name = schema.getMetadata().getName(); @@ -49,7 +49,7 @@ private String getSecretName(String name) { } @Override - public Result match(Secret actual, MySQLSchema primary, Context context) { + public Result match(Secret actual, MySQLSchema primary, Context context) { final var desiredSecretName = getSecretName(primary.getMetadata().getName()); return Result.nonComputed(actual.getMetadata().getName().equals(desiredSecretName)); } diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java index 56b80b6c82..b408a07ac9 100644 --- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java +++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java @@ -19,7 +19,7 @@ private static String tomcatImage(Tomcat tomcat) { } @Override - protected Deployment desired(Tomcat tomcat, Context context) { + protected Deployment desired(Tomcat tomcat, Context context) { Deployment deployment = ReconcilerUtils.loadYaml(Deployment.class, getClass(), "deployment.yaml"); final ObjectMeta tomcatMetadata = tomcat.getMetadata(); diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java index 66ddebf31e..3b618906ab 100644 --- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java +++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java @@ -13,7 +13,7 @@ public class ServiceDependentResource extends KubernetesDependentResource, Updater { @Override - protected Service desired(Tomcat tomcat, Context context) { + protected Service desired(Tomcat tomcat, Context context) { final ObjectMeta tomcatMetadata = tomcat.getMetadata(); return new ServiceBuilder(ReconcilerUtils.loadYaml(Service.class, getClass(), "service.yaml")) .editMetadata() diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java index ad3ef36840..1cb39011a1 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java @@ -51,7 +51,7 @@ public List prepareEventSources(EventSourceContext context } @Override - public UpdateControl reconcile(WebPage webPage, Context context) { + public UpdateControl reconcile(WebPage webPage, Context context) { if (webPage.getSpec().getHtml().contains("error")) { // special case just to showcase error if doing a demo throw new ErrorSimulationException("Simulating error"); @@ -166,7 +166,7 @@ private class ConfigMapDependentResource PrimaryToSecondaryMapper { @Override - protected ConfigMap desired(WebPage webPage, Context context) { + protected ConfigMap desired(WebPage webPage, Context context) { Map data = new HashMap<>(); data.put("index.html", webPage.getSpec().getHtml()); return new ConfigMapBuilder() @@ -180,7 +180,7 @@ protected ConfigMap desired(WebPage webPage, Context context) { } @Override - public ConfigMap update(ConfigMap actual, ConfigMap target, WebPage primary, Context context) { + public ConfigMap update(ConfigMap actual, ConfigMap target, WebPage primary, Context context) { var res = super.update(actual, target, primary, context); var ns = actual.getMetadata().getNamespace(); log.info("Restarting pods because HTML has changed in {}", ns); diff --git a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java b/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java index 5e3348fadd..a899c50756 100644 --- a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java +++ b/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java @@ -30,14 +30,14 @@ public CustomServiceReconciler(KubernetesClient kubernetesClient) { } @Override - public DeleteControl cleanup(CustomService resource, Context context) { + public DeleteControl cleanup(CustomService resource, Context context) { log.info("Cleaning up for: {}", resource.getMetadata().getName()); return Reconciler.super.cleanup(resource, context); } @Override public UpdateControl reconcile( - CustomService resource, Context context) { + CustomService resource, Context context) { log.info("Reconciling: {}", resource.getMetadata().getName()); ServicePort servicePort = new ServicePort(); From c5b3aee96def6af6f9a8c6b0cf7ea522862507cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20CROCQUESEL?= <88554524+scrocquesel@users.noreply.github.com> Date: Tue, 15 Mar 2022 19:12:46 +0100 Subject: [PATCH 2/2] style: reformat --- .../external/AbstractSimpleDependentResourceTest.java | 6 ++++-- .../CreateUpdateEventFilterTestReconciler.java | 3 ++- .../InformerEventSourceTestCustomReconciler.java | 3 ++- .../multiversioncrd/MultiVersionCRDTestReconciler1.java | 3 ++- .../multiversioncrd/MultiVersionCRDTestReconciler2.java | 3 ++- .../ObservedGenerationTestReconciler.java | 3 ++- .../StandaloneDependentTestReconciler.java | 3 ++- .../sample/WebPageReconcilerDependentResources.java | 3 ++- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java index db3d81c376..b654ac5d1e 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResourceTest.java @@ -113,7 +113,8 @@ public Optional fetchResource(HasMetadata primaryResourc @Override public SampleExternalResource create( - SampleExternalResource desired, TestCustomResource primary, Context context) { + SampleExternalResource desired, TestCustomResource primary, + Context context) { return SampleExternalResource.testResource1(); } @@ -130,7 +131,8 @@ public SampleExternalResource update( public void delete(TestCustomResource primary, Context context) {} @Override - protected SampleExternalResource desired(TestCustomResource primary, Context context) { + protected SampleExternalResource desired(TestCustomResource primary, + Context context) { return SampleExternalResource.testResource1(); } } 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 599abd04a0..19e00e8ba2 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 @@ -30,7 +30,8 @@ public class CreateUpdateEventFilterTestReconciler @Override public UpdateControl reconcile( - CreateUpdateEventFilterTestCustomResource resource, Context context) { + CreateUpdateEventFilterTestCustomResource resource, + Context context) { numberOfExecutions.incrementAndGet(); ConfigMap configMap = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java index 6ac0c0137d..97a99eed35 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java @@ -48,7 +48,8 @@ public List prepareEventSources( @Override public UpdateControl reconcile( - InformerEventSourceTestCustomResource resource, Context context) { + InformerEventSourceTestCustomResource resource, + Context context) { numberOfExecutions.incrementAndGet(); resource.setStatus(new InformerEventSourceTestCustomResourceStatus()); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java index 9405f7a56d..de733ec6db 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java @@ -18,7 +18,8 @@ public class MultiVersionCRDTestReconciler1 @Override public UpdateControl reconcile( - MultiVersionCRDTestCustomResource1 resource, Context context) { + MultiVersionCRDTestCustomResource1 resource, + Context context) { log.info("Reconcile MultiVersionCRDTestCustomResource1: {}", resource.getMetadata().getName()); resource.getStatus().setValue1(resource.getStatus().getValue1() + 1); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java index b17744ae49..138647029e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java @@ -20,7 +20,8 @@ public class MultiVersionCRDTestReconciler2 @Override public UpdateControl reconcile( - MultiVersionCRDTestCustomResource2 resource, Context context) { + MultiVersionCRDTestCustomResource2 resource, + Context context) { log.info("Reconcile MultiVersionCRDTestCustomResource2: {}", resource.getMetadata().getName()); resource.getStatus().setValue1(resource.getStatus().getValue1() + 1); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java index 7534406c7c..7a7964623f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/observedgeneration/ObservedGenerationTestReconciler.java @@ -15,7 +15,8 @@ public class ObservedGenerationTestReconciler @Override public UpdateControl reconcile( - ObservedGenerationTestCustomResource resource, Context context) { + ObservedGenerationTestCustomResource resource, + Context context) { log.info("Reconcile ObservedGenerationTestCustomResource: {}", resource.getMetadata().getName()); return UpdateControl.updateStatus(resource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java index 7506872885..4a236e6e00 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java @@ -39,7 +39,8 @@ public List prepareEventSources( @Override public UpdateControl reconcile( - StandaloneDependentTestCustomResource primary, Context context) { + StandaloneDependentTestCustomResource primary, + Context context) { deploymentDependent.reconcile(primary, context); Optional deployment = deploymentDependent.getResource(primary); if (deployment.isEmpty()) { diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java index 1cb39011a1..d9efec3b19 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconcilerDependentResources.java @@ -180,7 +180,8 @@ protected ConfigMap desired(WebPage webPage, Context context) { } @Override - public ConfigMap update(ConfigMap actual, ConfigMap target, WebPage primary, Context context) { + public ConfigMap update(ConfigMap actual, ConfigMap target, WebPage primary, + Context context) { var res = super.update(actual, target, primary, context); var ns = actual.getMetadata().getNamespace(); log.info("Restarting pods because HTML has changed in {}", ns);