fix: rename getAssiciatedResource to getResource

Author: csviri

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

@@ -32,7 +32,7 @@ public Optional<RetryInfo> getRetryInfo() {
   public <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventSourceName) {
     return controller.getEventSourceManager()
         .getResourceEventSourceFor(expectedType, eventSourceName)
-        .flatMap(es -> es.getAssociatedResource(primaryResource));
+        .flatMap(es -> es.getResource(primaryResource));
   }
 
   @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java

@@ -22,5 +22,5 @@ public interface ResourceOwner<R, P extends HasMetadata> {
    * @return an {@link Optional} containing the secondary resource or {@link Optional#empty()} if it
    *         doesn't exist
    */
-  Optional<R> getAssociatedResource(P primary);
+  Optional<R> getResource(P primary);
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java

@@ -28,7 +28,7 @@ public AbstractDependentResource() {
 
   @Override
   public ReconcileResult<R> reconcile(P primary, Context<P> context) {
-    var maybeActual = getAssociatedResource(primary);
+    var maybeActual = getResource(primary);
     if (creatable || updatable) {
       if (maybeActual.isEmpty()) {
         if (creatable) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractCachingDependentResource.java

@@ -16,7 +16,7 @@ protected AbstractCachingDependentResource(Class<R> resourceType) {
   }
 
   public Optional<R> fetchResource(P primaryResource) {
-    return eventSource().getAssociatedResource(primaryResource);
+    return eventSource().getResource(primaryResource);
   }
 
   @Override
@@ -25,7 +25,7 @@ public Class<R> resourceType() {
   }
 
   @Override
-  public Optional<R> getAssociatedResource(P primaryResource) {
-    return eventSource().getAssociatedResource(primaryResource);
+  public Optional<R> getResource(P primaryResource) {
+    return eventSource().getResource(primaryResource);
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractSimpleDependentResource.java

@@ -31,7 +31,7 @@ public AbstractSimpleDependentResource(UpdatableCache<R> cache) {
   }
 
   @Override
-  public Optional<R> getAssociatedResource(HasMetadata primaryResource) {
+  public Optional<R> getResource(HasMetadata primaryResource) {
     return cache.get(ResourceID.fromResource(primaryResource));
   }
 

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

@@ -97,7 +97,7 @@ public Result<R> match(R actualResource, P primary, Context<P> context) {
 
   public void delete(P primary, Context<P> context) {
     if (!addOwnerReference()) {
-      var resource = getAssociatedResource(primary);
+      var resource = getResource(primary);
       resource.ifPresent(r -> client.resource(r).delete());
     }
   }
@@ -134,8 +134,8 @@ public Class<R> resourceType() {
   }
 
   @Override
-  public Optional<R> getAssociatedResource(P primaryResource) {
-    return eventSource().getAssociatedResource(primaryResource);
+  public Optional<R> getResource(P primaryResource) {
+    return eventSource().getResource(primaryResource);
   }
 
   @Override

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

@@ -54,7 +54,7 @@ public Optional<R> getCachedValue(ResourceID resourceID) {
   }
 
   @Override
-  public Optional<R> getAssociatedResource(P primary) {
+  public Optional<R> getResource(P primary) {
     return cache.get(ResourceID.fromResource(primary));
   }
 

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<T> getAssociatedResource(T primary) {
+  public Optional<T> getResource(T primary) {
     return get(ResourceID.fromResource(primary));
   }
 }

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<R> getAssociatedResource(P resource) {
+  public Optional<R> getResource(P resource) {
     final var id = configuration.getAssociatedResourceIdentifier().associatedSecondaryID(resource);
     return get(id);
   }

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

@@ -93,7 +93,7 @@ public Optional<R> get(ResourceID resourceID) {
   }
 
   @Override
-  public Optional<R> getAssociatedResource(P primary) {
+  public Optional<R> getResource(P primary) {
     return get(ResourceID.fromResource(primary));
   }
 

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<R> getAssociatedResource(P primary) {
+  public Optional<R> getResource(P primary) {
     return getValueFromCacheOrSupplier(ResourceID.fromResource(primary));
   }
 

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<R> getAssociatedResource(P primary) {
+  public Optional<R> getResource(P primary) {
     return getCachedValue(ResourceID.fromResource(primary));
   }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java

@@ -98,7 +98,7 @@ public ReconcileResult<Deployment> reconcile(TestCustomResource primary,
     }
 
     @Override
-    public Optional<Deployment> getAssociatedResource(TestCustomResource primaryResource) {
+    public Optional<Deployment> getResource(TestCustomResource primaryResource) {
       return Optional.empty();
     }
 

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());

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java

@@ -48,7 +48,7 @@ public UpdateControl<StandaloneDependentTestCustomResource> reconcile(
       StandaloneDependentTestCustomResource primary,
       Context<StandaloneDependentTestCustomResource> context) {
     deploymentDependent.reconcile(primary, context);
-    Optional<Deployment> deployment = deploymentDependent.getAssociatedResource(primary);
+    Optional<Deployment> deployment = deploymentDependent.getResource(primary);
     if (deployment.isEmpty()) {
       throw new IllegalStateException("Resource should not be empty after reconcile.");
     }

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java

@@ -62,7 +62,7 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
 
     webPage.setStatus(
         createStatus(
-            configMapDR.getAssociatedResource(webPage).orElseThrow().getMetadata().getName()));
+            configMapDR.getResource(webPage).orElseThrow().getMetadata().getName()));
     return UpdateControl.updateStatus(webPage);
   }