test skeleton

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -6,6 +6,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext;
+import io.javaoperatorsdk.operator.api.reconciler.expectation.Expectation;
 import io.javaoperatorsdk.operator.api.reconciler.expectation.ExpectationResult;
 import io.javaoperatorsdk.operator.processing.event.source.IndexerResourceCache;
 
@@ -54,5 +55,5 @@ public interface Context<P extends HasMetadata> extends CacheAware<P> {
    */
   boolean isNextReconciliationImminent();
 
-  Optional<ExpectationResult<P>> expectationResult();
+  <T extends Expectation<P>> Optional<ExpectationResult<P, T>> expectationResult();
 }

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

@@ -7,6 +7,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedWorkflowAndDependentResourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext;
+import io.javaoperatorsdk.operator.api.reconciler.expectation.Expectation;
 import io.javaoperatorsdk.operator.api.reconciler.expectation.ExpectationResult;
 import io.javaoperatorsdk.operator.processing.Controller;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
@@ -19,13 +20,15 @@ public class DefaultContext<P extends HasMetadata> extends DefaultCacheAware<P>
   private final DefaultManagedWorkflowAndDependentResourceContext<P>
       defaultManagedDependentResourceContext;
 
-  private final ExpectationResult<P> expectationResult;
+  @SuppressWarnings("rawtypes")
+  private final ExpectationResult expectationResult;
 
+  @SuppressWarnings("rawtypes")
   public DefaultContext(
       RetryInfo retryInfo,
       Controller<P> controller,
       P primaryResource,
-      ExpectationResult<P> expectationResult) {
+      ExpectationResult expectationResult) {
     super(controller, primaryResource);
     this.retryInfo = retryInfo;
     this.defaultManagedDependentResourceContext =
@@ -63,7 +66,8 @@ public boolean isNextReconciliationImminent() {
   }
 
   @Override
-  public Optional<ExpectationResult<P>> expectationResult() {
+  @SuppressWarnings("unchecked")
+  public <T extends Expectation<P>> Optional<ExpectationResult<P, T>> expectationResult() {
     return Optional.ofNullable(expectationResult);
   }
 

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

@@ -2,5 +2,5 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
-public record ExpectationResult<P extends HasMetadata>(
-    ExpectationStatus status, Expectation<P> expectation) {}
+public record ExpectationResult<P extends HasMetadata, T extends Expectation<P>>(
+    ExpectationStatus status, T expectation) {}

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

@@ -133,14 +133,15 @@ private void handleMarkedEventForResource(ResourceState state) {
     }
   }
 
+  @SuppressWarnings("rawtypes")
   private void submitReconciliationExecution(ResourceState state) {
     try {
       boolean controllerUnderExecution = isControllerUnderExecution(state);
       final var resourceID = state.getId();
       Optional<P> maybeLatest = cache.get(resourceID);
       maybeLatest.ifPresent(MDCUtils::addResourceInfo);
       if (!controllerUnderExecution && maybeLatest.isPresent()) {
-        ExpectationResult<P> expectationResult = null;
+        ExpectationResult expectationResult = null;
         if (isExpectationPresent(state)) {
           var expectationCheckResult =
               shouldProceedWithExpectation(state, maybeLatest.orElseThrow());
@@ -197,19 +198,17 @@ private boolean isExpectationPresent(ResourceState state) {
     return state.getExpectationHolder().isPresent();
   }
 
-  @SuppressWarnings("unchecked")
-  Optional<ExpectationResult<P>> shouldProceedWithExpectation(ResourceState state, P primary) {
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  Optional<ExpectationResult> shouldProceedWithExpectation(ResourceState state, P primary) {
 
     var holder = state.getExpectationHolder().orElseThrow();
     if (holder.isTimedOut()) {
-      return Optional.of(
-          new ExpectationResult<P>(ExpectationStatus.TIMEOUT, holder.getExpectation()));
+      return Optional.of(new ExpectationResult(ExpectationStatus.TIMEOUT, holder.getExpectation()));
     }
     ExpectationContext<P> expectationContext =
         new DefaultExpectationContext<>(this.eventSourceManager.getController(), primary);
     return holder.getExpectation().isFulfilled(primary, expectationContext)
-        ? Optional.of(
-            new ExpectationResult<P>(ExpectationStatus.FULFILLED, holder.getExpectation()))
+        ? Optional.of(new ExpectationResult(ExpectationStatus.FULFILLED, holder.getExpectation()))
         : Optional.empty();
   }
 

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

@@ -9,9 +9,9 @@ class ExecutionScope<R extends HasMetadata> {
   // the latest custom resource from cache
   private R resource;
   private final RetryInfo retryInfo;
-  private final ExpectationResult<R> expectationResult;
+  private final ExpectationResult<R, ?> expectationResult;
 
-  ExecutionScope(RetryInfo retryInfo, ExpectationResult<R> expectationResult) {
+  ExecutionScope(RetryInfo retryInfo, ExpectationResult<R, ?> expectationResult) {
     this.retryInfo = retryInfo;
     this.expectationResult = expectationResult;
   }
@@ -46,7 +46,7 @@ public RetryInfo getRetryInfo() {
     return retryInfo;
   }
 
-  public ExpectationResult<R> getExpectationResult() {
+  public ExpectationResult<R, ?> getExpectationResult() {
     return expectationResult;
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/simple/SimpleExpectationCustomResource.java

@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.baseapi.expectation.simple;
+
+import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.ShortNames;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Group("sample.javaoperatorsdk")
+@Version("v1")
+@ShortNames("secr")
+public class SimpleExpectationCustomResource
+    extends CustomResource<
+        SimpleExpectationCustomResourceSpec, SimpleExpectationCustomResourceStatus>
+    implements Namespaced {}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/simple/SimpleExpectationCustomResourceSpec.java

@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.baseapi.expectation.simple;
+
+public class SimpleExpectationCustomResourceSpec {
+
+  private int replicaCount;
+
+  public int getReplicaCount() {
+    return replicaCount;
+  }
+
+  public void setReplicaCount(int replicaCount) {
+    this.replicaCount = replicaCount;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/simple/SimpleExpectationCustomResourceStatus.java

@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.baseapi.expectation.simple;
+
+public class SimpleExpectationCustomResourceStatus {
+
+  private Boolean ready;
+
+  public Boolean getReady() {
+    return ready;
+  }
+
+  public void setReady(Boolean ready) {
+    this.ready = ready;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/simple/SimpleExpectationReconciler.java

@@ -0,0 +1,17 @@
+package io.javaoperatorsdk.operator.baseapi.expectation.simple;
+
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+
+@ControllerConfiguration
+public class SimpleExpectationReconciler implements Reconciler<SimpleExpectationCustomResource> {
+
+  @Override
+  public UpdateControl<SimpleExpectationCustomResource> reconcile(
+      SimpleExpectationCustomResource resource, Context<SimpleExpectationCustomResource> context) {
+
+    return UpdateControl.noUpdate();
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/simple/SimpleExpectationSampleIT.java

@@ -0,0 +1,29 @@
+package io.javaoperatorsdk.operator.baseapi.expectation.simple;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+
+class SimpleExpectationSampleIT {
+
+  @RegisterExtension
+  LocallyRunOperatorExtension operator =
+      LocallyRunOperatorExtension.builder()
+          .withReconciler(new SimpleExpectationReconciler())
+          .build();
+
+  @Test
+  void exceptDeploymentUp() {}
+
+  public SimpleExpectationCustomResource createCustomResource() {
+    SimpleExpectationCustomResource resource = new SimpleExpectationCustomResource();
+    resource.setMetadata(
+        new ObjectMetaBuilder()
+            .withName("error-status-test")
+            .withNamespace(operator.getNamespace())
+            .build());
+    return resource;
+  }
+}