Skip to content

Commit d53048e

Browse files
metacosmcsviri
authored andcommitted
fix: adapt after rebase
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent 593323d commit d53048e

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/managed/DefaultManagedWorkflowAndDependentResourceContext.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
import java.util.Optional;
44
import java.util.concurrent.ConcurrentHashMap;
55

6-
import io.fabric8.kubernetes.api.model.HasMetadata;
7-
import io.javaoperatorsdk.operator.api.reconciler.Context;
8-
import io.javaoperatorsdk.operator.processing.Controller;
96
import org.slf4j.Logger;
107
import org.slf4j.LoggerFactory;
118

9+
import io.fabric8.kubernetes.api.model.HasMetadata;
10+
import io.javaoperatorsdk.operator.api.reconciler.Context;
11+
import io.javaoperatorsdk.operator.processing.Controller;
1212
import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowCleanupResult;
1313
import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowReconcileResult;
1414

1515
@SuppressWarnings("rawtypes")
1616
public class DefaultManagedWorkflowAndDependentResourceContext<P extends HasMetadata>
1717
implements ManagedWorkflowAndDependentResourceContext {
18-
private static final Logger log = LoggerFactory.getLogger(DefaultManagedWorkflowAndDependentResourceContext.class);
18+
private static final Logger log =
19+
LoggerFactory.getLogger(DefaultManagedWorkflowAndDependentResourceContext.class);
1920
public static final Object RECONCILE_RESULT_KEY = new Object();
2021
public static final Object CLEANUP_RESULT_KEY = new Object();
2122
private final ConcurrentHashMap attributes = new ConcurrentHashMap();

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/dependent/managed/DefaultManagedDependentResourceContextTest.java

+3-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
package io.javaoperatorsdk.operator.api.reconciler.dependent.managed;
22

3-
import java.util.List;
4-
import java.util.Map;
53
import java.util.Optional;
64

75
import org.junit.jupiter.api.Test;
86

9-
import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowReconcileResult;
10-
11-
import static io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedDependentResourceContext.RECONCILE_RESULT_KEY;
127
import static org.assertj.core.api.Assertions.assertThat;
138
import static org.assertj.core.api.Assertions.assertThatThrownBy;
149

1510
class DefaultManagedDependentResourceContextTest {
1611

17-
private final ManagedDependentResourceContext context =
18-
new DefaultManagedDependentResourceContext();
12+
private final ManagedWorkflowAndDependentResourceContext context =
13+
new DefaultManagedWorkflowAndDependentResourceContext<>(null, null, null);
1914

2015
@Test
2116
void getWhenEmpty() {
@@ -50,7 +45,7 @@ void putNewValueReturnsPriorValue() {
5045
void putNewValueLogsWarningIfTypesDiffer() {
5146
// to check that we properly log things without setting up a complex fixture
5247
final String[] messages = new String[1];
53-
var context = new DefaultManagedDependentResourceContext() {
48+
var context = new DefaultManagedWorkflowAndDependentResourceContext<>(null, null, null) {
5449
@Override
5550
void logWarning(String message) {
5651
messages[0] = message;
@@ -93,13 +88,4 @@ void getMandatoryWhenEmpty() {
9388
.hasMessage(
9489
"Mandatory attribute (key: key, type: java.lang.String) is missing or not of the expected type");
9590
}
96-
97-
@Test
98-
void getWorkflowReconcileResult() {
99-
WorkflowReconcileResult result =
100-
new WorkflowReconcileResult(List.of(), List.of(), Map.of(), Map.of());
101-
context.put(RECONCILE_RESULT_KEY, result);
102-
Optional<WorkflowReconcileResult> actual = context.getWorkflowReconcileResult();
103-
assertThat(actual).containsSame(result);
104-
}
10591
}

0 commit comments

Comments
 (0)