Skip to content

Commit 22ae21a

Browse files
committed
fix: after rebase
1 parent b2854e4 commit 22ae21a

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
3434
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
3535
import io.javaoperatorsdk.operator.api.reconciler.dependent.EventSourceProvider;
36-
import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
3736
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedDependentResourceContext;
3837
import io.javaoperatorsdk.operator.processing.dependent.workflow.ManagedWorkflow;
3938
import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowCleanupResult;

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
3131

3232
@Ignore
33+
@SuppressWarnings("rawtypes")
3334
public abstract class KubernetesDependentResource<R extends HasMetadata, P extends HasMetadata>
3435
extends AbstractEventSourceHolderDependentResource<R, P, InformerEventSource<R, P>>
3536
implements KubernetesClientAware,
@@ -90,20 +91,6 @@ private SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
9091
}
9192
}
9293

93-
@SuppressWarnings("unchecked")
94-
private SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
95-
if (this instanceof SecondaryToPrimaryMapper) {
96-
return (SecondaryToPrimaryMapper<R>) this;
97-
} else if (garbageCollected) {
98-
return Mappers.fromOwnerReference();
99-
} else if (useDefaultAnnotationsToIdentifyPrimary()) {
100-
return Mappers.fromDefaultAnnotations();
101-
} else {
102-
throw new OperatorException("Provide a SecondaryToPrimaryMapper to associate " +
103-
"this resource with the primary resource. DependentResource: " + getClass().getName());
104-
}
105-
}
106-
10794
/**
10895
* Use to share informers between event more resources.
10996
*

0 commit comments

Comments
 (0)