refactor: better naming

Author: metacosm

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

@@ -130,7 +130,7 @@ public DefaultContext<P> setRetryInfo(RetryInfo retryInfo) {
   }
 
   @SuppressWarnings("unchecked")
-  public <R> R desiredStateFor(
+  public <R> R getOrComputeDesiredStateFor(
       DependentResource<R, P> dependentResource, Function<P, R> desiredStateComputer) {
     return (R)
         desiredStates.computeIfAbsent(

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

@@ -71,7 +71,7 @@ protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> c
     if (creatable() || updatable()) {
       if (actualResource == null) {
         if (creatable) {
-          var desired = doDesired(context);
+          var desired = getOrComputeDesired(context);
           throwIfNull(desired, primary, "Desired");
           logForOperation("Creating", primary, desired);
           var createdResource = handleCreate(desired, primary, context);
@@ -81,7 +81,7 @@ protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> c
         if (updatable()) {
           final Matcher.Result<R> match = match(actualResource, primary, context);
           if (!match.matched()) {
-            final var desired = match.computedDesired().orElseGet(() -> doDesired(context));
+            final var desired = match.computedDesired().orElseGet(() -> getOrComputeDesired(context));
             throwIfNull(desired, primary, "Desired");
             logForOperation("Updating", primary, desired);
             var updatedResource = handleUpdate(actualResource, desired, primary, context);
@@ -136,7 +136,7 @@ public Optional<R> getSecondaryResource(P primary, Context<P> context) {
    */
   protected Optional<R> selectTargetSecondaryResource(
       Set<R> secondaryResources, P primary, Context<P> context) {
-    R desired = doDesired(context);
+    R desired = getOrComputeDesired(context);
     var targetResources = secondaryResources.stream().filter(r -> r.equals(desired)).toList();
     if (targetResources.size() > 1) {
       throw new IllegalStateException(
@@ -205,10 +205,10 @@ protected R desired(P primary, Context<P> context) {
             + " updated");
   }
 
-  protected R doDesired(Context<P> context) {
+  protected R getOrComputeDesired(Context<P> context) {
     assert context instanceof DefaultContext<P>;
     DefaultContext<P> defaultContext = (DefaultContext<P>) context;
-    return defaultContext.desiredStateFor(this, p -> desired(p, defaultContext));
+    return defaultContext.getOrComputeDesiredStateFor(this, p -> desired(p, defaultContext));
   }
 
   public void delete(P primary, Context<P> context) {

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

@@ -83,7 +83,7 @@ protected void handleExplicitStateCreation(P primary, R created, Context<P> cont
 
   @Override
   public Matcher.Result<R> match(R resource, P primary, Context<P> context) {
-    var desired = doDesired(context);
+    var desired = getOrComputeDesired(context);
     return Matcher.Result.computed(resource.equals(desired), desired);
   }
 

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

@@ -123,7 +123,7 @@ public static <R extends HasMetadata, P extends HasMetadata> Matcher.Result<R> m
       Context<P> context,
       boolean labelsAndAnnotationsEquality,
       String... ignorePaths) {
-    final var desired = dependentResource.doDesired(context);
+    final var desired = dependentResource.getOrComputeDesired(context);
     return match(desired, actualResource, labelsAndAnnotationsEquality, context, ignorePaths);
   }
 
@@ -135,7 +135,7 @@ public static <R extends HasMetadata, P extends HasMetadata> Matcher.Result<R> m
       boolean specEquality,
       boolean labelsAndAnnotationsEquality,
       String... ignorePaths) {
-    final var desired = dependentResource.doDesired(context);
+    final var desired = dependentResource.getOrComputeDesired(context);
     return match(
         desired, actualResource, labelsAndAnnotationsEquality, specEquality, context, ignorePaths);
   }

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

@@ -109,7 +109,7 @@ public R update(R actual, R desired, P primary, Context<P> context) {
 
   @Override
   public Result<R> match(R actualResource, P primary, Context<P> context) {
-    final var desired = doDesired(context);
+    final var desired = getOrComputeDesired(context);
     return match(actualResource, desired, primary, context);
   }
 
@@ -288,16 +288,16 @@ protected Optional<R> selectTargetSecondaryResource(
    * @return id of the target managed resource
    */
   protected ResourceID targetSecondaryResourceID(P primary, Context<P> context) {
-    return ResourceID.fromResource(doDesired(context));
+    return ResourceID.fromResource(getOrComputeDesired(context));
   }
 
   protected boolean addOwnerReference() {
     return garbageCollected;
   }
 
   @Override
-  protected R doDesired(Context<P> context) {
-    return super.doDesired(context);
+  protected R getOrComputeDesired(Context<P> context) {
+    return super.getOrComputeDesired(context);
   }
 
   @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java

@@ -76,7 +76,7 @@ void doesNotMatchRemovedValues() {
     final var localContext = new TestContext(createPrimary("removed"));
     assertThat(
             GenericKubernetesResourceMatcher.match(
-                    dependentResource.doDesired(localContext), actual, localContext)
+                    dependentResource.getOrComputeDesired(localContext), actual, localContext)
                 .matched())
         .withFailMessage("Removing values in metadata should lead to a mismatch")
         .isFalse();