From c5c44d73d6951cf8ac904db86ca0170d20cc0e46 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 29 Mar 2022 09:35:16 +0200 Subject: [PATCH 1/2] fix: rename getAssiciatedResource to getResource --- .../operator/api/reconciler/DefaultContext.java | 2 +- .../javaoperatorsdk/operator/processing/ResourceOwner.java | 2 +- .../processing/dependent/AbstractDependentResource.java | 2 +- .../external/AbstractCachingDependentResource.java | 6 +++--- .../dependent/external/AbstractSimpleDependentResource.java | 2 +- .../dependent/kubernetes/KubernetesDependentResource.java | 6 +++--- .../processing/event/source/CachingEventSource.java | 2 +- .../source/controller/ControllerResourceEventSource.java | 2 +- .../event/source/informer/InformerEventSource.java | 2 +- .../event/source/informer/ManagedInformerEventSource.java | 2 +- .../event/source/polling/PerResourcePollingEventSource.java | 2 +- .../processing/event/source/polling/PollingEventSource.java | 2 +- .../io/javaoperatorsdk/operator/api/config/UtilsTest.java | 2 +- .../external/AbstractSimpleDependentResourceTest.java | 4 ++-- .../StandaloneDependentTestReconciler.java | 2 +- .../sample/WebPageStandaloneDependentsReconciler.java | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java index c6801ff271..b9e90a2fdf 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java @@ -32,7 +32,7 @@ public Optional getRetryInfo() { public Optional getSecondaryResource(Class expectedType, String eventSourceName) { return controller.getEventSourceManager() .getResourceEventSourceFor(expectedType, eventSourceName) - .flatMap(es -> es.getAssociatedResource(primaryResource)); + .flatMap(es -> es.getResource(primaryResource)); } @Override diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java index e0dfaf5694..36dc900a73 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java @@ -22,5 +22,5 @@ public interface ResourceOwner { * @return an {@link Optional} containing the secondary resource or {@link Optional#empty()} if it * doesn't exist */ - Optional getAssociatedResource(P primary); + Optional getResource(P primary); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java index c0c245db46..3823b07c2f 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java @@ -28,7 +28,7 @@ public AbstractDependentResource() { @Override public ReconcileResult reconcile(P primary, Context

context) { - var maybeActual = getAssociatedResource(primary); + var maybeActual = getResource(primary); if (creatable || updatable) { if (maybeActual.isEmpty()) { if (creatable) { diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java index 7350c2d741..5e1a60175f 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java @@ -16,7 +16,7 @@ protected AbstractCachingDependentResource(Class resourceType) { } public Optional fetchResource(P primaryResource) { - return eventSource().getAssociatedResource(primaryResource); + return eventSource().getResource(primaryResource); } @Override @@ -25,7 +25,7 @@ public Class resourceType() { } @Override - public Optional getAssociatedResource(P primaryResource) { - return eventSource().getAssociatedResource(primaryResource); + public Optional getResource(P primaryResource) { + return eventSource().getResource(primaryResource); } } 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 9b1d008077..62eeaeb96b 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 @@ -31,7 +31,7 @@ public AbstractSimpleDependentResource(UpdatableCache cache) { } @Override - public Optional getAssociatedResource(HasMetadata primaryResource) { + public Optional getResource(HasMetadata primaryResource) { return cache.get(ResourceID.fromResource(primaryResource)); } 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 0c8153a959..a8c826d1f3 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 @@ -97,7 +97,7 @@ public Result match(R actualResource, P primary, Context

context) { public void delete(P primary, Context

context) { if (!addOwnerReference()) { - var resource = getAssociatedResource(primary); + var resource = getResource(primary); resource.ifPresent(r -> client.resource(r).delete()); } } @@ -134,8 +134,8 @@ public Class resourceType() { } @Override - public Optional getAssociatedResource(P primaryResource) { - return eventSource().getAssociatedResource(primaryResource); + public Optional getResource(P primaryResource) { + return eventSource().getResource(primaryResource); } @Override diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java index 5b3926e20c..92ad4dc880 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java @@ -54,7 +54,7 @@ public Optional getCachedValue(ResourceID resourceID) { } @Override - public Optional getAssociatedResource(P primary) { + public Optional getResource(P primary) { return cache.get(ResourceID.fromResource(primary)); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java index 67a59e48d3..b8cb84b2c9 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java @@ -102,7 +102,7 @@ private void handleKubernetesClientException(Exception e) { } @Override - public Optional getAssociatedResource(T primary) { + public Optional getResource(T primary) { return get(ResourceID.fromResource(primary)); } } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java index 4650637f3b..4e57643761 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java @@ -152,7 +152,7 @@ private void propagateEvent(R object) { * @return the informed resource associated with the specified primary resource */ @Override - public Optional getAssociatedResource(P resource) { + public Optional getResource(P resource) { final var id = configuration.getAssociatedResourceIdentifier().associatedSecondaryID(resource); return get(id); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java index f5f181ecf0..b2a1650ec9 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java @@ -93,7 +93,7 @@ public Optional get(ResourceID resourceID) { } @Override - public Optional getAssociatedResource(P primary) { + public Optional getResource(P primary) { return get(ResourceID.fromResource(primary)); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java index 1827324c3e..c80305328f 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java @@ -132,7 +132,7 @@ public void run() { * @return the related resource for this event source */ @Override - public Optional getAssociatedResource(P primary) { + public Optional getResource(P primary) { return getValueFromCacheOrSupplier(ResourceID.fromResource(primary)); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java index 6d9a5a3f2f..3c7c9c1e38 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java @@ -98,7 +98,7 @@ public void stop() throws OperatorException { * @return related resource */ @Override - public Optional getAssociatedResource(P primary) { + public Optional getResource(P primary) { return getCachedValue(ResourceID.fromResource(primary)); } } 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 de1c7e4cc1..f762b7d2c3 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 @@ -98,7 +98,7 @@ public ReconcileResult reconcile(TestCustomResource primary, } @Override - public Optional getAssociatedResource(TestCustomResource primaryResource) { + public Optional getResource(TestCustomResource primaryResource) { return Optional.empty(); } 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 2594a935b7..53bbd05464 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 @@ -45,14 +45,14 @@ void getsTheResourceFromSupplyIfReconciling() { simpleDependentResource.reconcile(TestUtils.testCustomResource1(), null); verify(supplierMock, times(1)).get(); - assertThat(simpleDependentResource.getAssociatedResource(TestUtils.testCustomResource1())) + assertThat(simpleDependentResource.getResource(TestUtils.testCustomResource1())) .isPresent() .isEqualTo(Optional.of(SampleExternalResource.testResource1())); } @Test void getResourceReadsTheResourceFromCache() { - simpleDependentResource.getAssociatedResource(TestUtils.testCustomResource1()); + simpleDependentResource.getResource(TestUtils.testCustomResource1()); verify(supplierMock, times(0)).get(); verify(updatableCacheMock, times(1)).get(any()); 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 ce7eeade23..ce0a97c9b0 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 @@ -48,7 +48,7 @@ public UpdateControl reconcile( StandaloneDependentTestCustomResource primary, Context context) { deploymentDependent.reconcile(primary, context); - Optional deployment = deploymentDependent.getAssociatedResource(primary); + Optional deployment = deploymentDependent.getResource(primary); if (deployment.isEmpty()) { throw new IllegalStateException("Resource should not be empty after reconcile."); } diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java index b0625cdb0c..cc37e88ac1 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java @@ -62,7 +62,7 @@ public UpdateControl reconcile(WebPage webPage, Context contex webPage.setStatus( createStatus( - configMapDR.getAssociatedResource(webPage).orElseThrow().getMetadata().getName())); + configMapDR.getResource(webPage).orElseThrow().getMetadata().getName())); return UpdateControl.updateStatus(webPage); } From 5be9e9ba998ff3438377802b01c2a8900053a121 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 29 Mar 2022 11:48:35 +0200 Subject: [PATCH 2/2] fix: rename to secondary resource --- .../operator/api/reconciler/DefaultContext.java | 2 +- .../javaoperatorsdk/operator/processing/ResourceOwner.java | 2 +- .../processing/dependent/AbstractDependentResource.java | 2 +- .../external/AbstractCachingDependentResource.java | 6 +++--- .../dependent/external/AbstractSimpleDependentResource.java | 2 +- .../dependent/kubernetes/KubernetesDependentResource.java | 6 +++--- .../processing/event/source/CachingEventSource.java | 2 +- .../source/controller/ControllerResourceEventSource.java | 2 +- .../event/source/informer/InformerEventSource.java | 2 +- .../event/source/informer/ManagedInformerEventSource.java | 2 +- .../event/source/polling/PerResourcePollingEventSource.java | 2 +- .../processing/event/source/polling/PollingEventSource.java | 2 +- .../io/javaoperatorsdk/operator/api/config/UtilsTest.java | 2 +- .../external/AbstractSimpleDependentResourceTest.java | 4 ++-- .../StandaloneDependentTestReconciler.java | 2 +- .../sample/WebPageStandaloneDependentsReconciler.java | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java index b9e90a2fdf..07033816df 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java @@ -32,7 +32,7 @@ public Optional getRetryInfo() { public Optional getSecondaryResource(Class expectedType, String eventSourceName) { return controller.getEventSourceManager() .getResourceEventSourceFor(expectedType, eventSourceName) - .flatMap(es -> es.getResource(primaryResource)); + .flatMap(es -> es.getSecondaryResource(primaryResource)); } @Override diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java index 36dc900a73..f9c02a8a33 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java @@ -22,5 +22,5 @@ public interface ResourceOwner { * @return an {@link Optional} containing the secondary resource or {@link Optional#empty()} if it * doesn't exist */ - Optional getResource(P primary); + Optional getSecondaryResource(P primary); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java index 3823b07c2f..8611950e04 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java @@ -28,7 +28,7 @@ public AbstractDependentResource() { @Override public ReconcileResult reconcile(P primary, Context

context) { - var maybeActual = getResource(primary); + var maybeActual = getSecondaryResource(primary); if (creatable || updatable) { if (maybeActual.isEmpty()) { if (creatable) { diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java index 5e1a60175f..4366f424eb 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java @@ -16,7 +16,7 @@ protected AbstractCachingDependentResource(Class resourceType) { } public Optional fetchResource(P primaryResource) { - return eventSource().getResource(primaryResource); + return eventSource().getSecondaryResource(primaryResource); } @Override @@ -25,7 +25,7 @@ public Class resourceType() { } @Override - public Optional getResource(P primaryResource) { - return eventSource().getResource(primaryResource); + public Optional getSecondaryResource(P primaryResource) { + return eventSource().getSecondaryResource(primaryResource); } } 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 62eeaeb96b..79c0957c7e 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 @@ -31,7 +31,7 @@ public AbstractSimpleDependentResource(UpdatableCache cache) { } @Override - public Optional getResource(HasMetadata primaryResource) { + public Optional getSecondaryResource(HasMetadata primaryResource) { return cache.get(ResourceID.fromResource(primaryResource)); } 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 a8c826d1f3..a3ca4c89f9 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 @@ -97,7 +97,7 @@ public Result match(R actualResource, P primary, Context

context) { public void delete(P primary, Context

context) { if (!addOwnerReference()) { - var resource = getResource(primary); + var resource = getSecondaryResource(primary); resource.ifPresent(r -> client.resource(r).delete()); } } @@ -134,8 +134,8 @@ public Class resourceType() { } @Override - public Optional getResource(P primaryResource) { - return eventSource().getResource(primaryResource); + public Optional getSecondaryResource(P primaryResource) { + return eventSource().getSecondaryResource(primaryResource); } @Override diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java index 92ad4dc880..cd60cf5939 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java @@ -54,7 +54,7 @@ public Optional getCachedValue(ResourceID resourceID) { } @Override - public Optional getResource(P primary) { + public Optional getSecondaryResource(P primary) { return cache.get(ResourceID.fromResource(primary)); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java index b8cb84b2c9..e069fcc3d4 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java @@ -102,7 +102,7 @@ private void handleKubernetesClientException(Exception e) { } @Override - public Optional getResource(T primary) { + public Optional getSecondaryResource(T primary) { return get(ResourceID.fromResource(primary)); } } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java index 4e57643761..5227d5836a 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java @@ -152,7 +152,7 @@ private void propagateEvent(R object) { * @return the informed resource associated with the specified primary resource */ @Override - public Optional getResource(P resource) { + public Optional getSecondaryResource(P resource) { final var id = configuration.getAssociatedResourceIdentifier().associatedSecondaryID(resource); return get(id); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java index b2a1650ec9..5f414d0696 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java @@ -93,7 +93,7 @@ public Optional get(ResourceID resourceID) { } @Override - public Optional getResource(P primary) { + public Optional getSecondaryResource(P primary) { return get(ResourceID.fromResource(primary)); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java index c80305328f..8b04dc9e57 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java @@ -132,7 +132,7 @@ public void run() { * @return the related resource for this event source */ @Override - public Optional getResource(P primary) { + public Optional getSecondaryResource(P primary) { return getValueFromCacheOrSupplier(ResourceID.fromResource(primary)); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java index 3c7c9c1e38..dcdb2cdda9 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java @@ -98,7 +98,7 @@ public void stop() throws OperatorException { * @return related resource */ @Override - public Optional getResource(P primary) { + public Optional getSecondaryResource(P primary) { return getCachedValue(ResourceID.fromResource(primary)); } } 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 f762b7d2c3..05ab4d1258 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 @@ -98,7 +98,7 @@ public ReconcileResult reconcile(TestCustomResource primary, } @Override - public Optional getResource(TestCustomResource primaryResource) { + public Optional getSecondaryResource(TestCustomResource primaryResource) { return Optional.empty(); } 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 53bbd05464..e020fd27a3 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 @@ -45,14 +45,14 @@ void getsTheResourceFromSupplyIfReconciling() { simpleDependentResource.reconcile(TestUtils.testCustomResource1(), null); verify(supplierMock, times(1)).get(); - assertThat(simpleDependentResource.getResource(TestUtils.testCustomResource1())) + assertThat(simpleDependentResource.getSecondaryResource(TestUtils.testCustomResource1())) .isPresent() .isEqualTo(Optional.of(SampleExternalResource.testResource1())); } @Test void getResourceReadsTheResourceFromCache() { - simpleDependentResource.getResource(TestUtils.testCustomResource1()); + simpleDependentResource.getSecondaryResource(TestUtils.testCustomResource1()); verify(supplierMock, times(0)).get(); verify(updatableCacheMock, times(1)).get(any()); 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 ce0a97c9b0..6f5b24e54c 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 @@ -48,7 +48,7 @@ public UpdateControl reconcile( StandaloneDependentTestCustomResource primary, Context context) { deploymentDependent.reconcile(primary, context); - Optional deployment = deploymentDependent.getResource(primary); + Optional deployment = deploymentDependent.getSecondaryResource(primary); if (deployment.isEmpty()) { throw new IllegalStateException("Resource should not be empty after reconcile."); } diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java index cc37e88ac1..e41bb6d484 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java @@ -62,7 +62,7 @@ public UpdateControl reconcile(WebPage webPage, Context contex webPage.setStatus( createStatus( - configMapDR.getResource(webPage).orElseThrow().getMetadata().getName())); + configMapDR.getSecondaryResource(webPage).orElseThrow().getMetadata().getName())); return UpdateControl.updateStatus(webPage); }