Skip to content

Commit 724008a

Browse files
committed
refactor: rename ResourceConfiguration to Informable
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent 2ce5fe7 commit 724008a

File tree

8 files changed

+14
-18
lines changed

8 files changed

+14
-18
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
1515
import io.javaoperatorsdk.operator.processing.retry.Retry;
1616

17-
public interface ControllerConfiguration<P extends HasMetadata> extends ResourceConfiguration<P> {
17+
public interface ControllerConfiguration<P extends HasMetadata> extends Informable<P> {
1818

1919
@SuppressWarnings("rawtypes")
2020
RateLimiter DEFAULT_RATE_LIMITER = LinearRateLimiter.deactivatedRateLimiter();
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import io.javaoperatorsdk.operator.ReconcilerUtils;
77
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
88

9-
public class DefaultResourceConfiguration<R extends HasMetadata>
10-
implements ResourceConfiguration<R> {
9+
public class DefaultInformable<R extends HasMetadata>
10+
implements Informable<R> {
1111

1212
private final Class<R> resourceClass;
1313
private final String resourceTypeName;
1414
private final InformerConfiguration<R> informerConfig;
1515

16-
protected DefaultResourceConfiguration(Class<R> resourceClass,
16+
protected DefaultInformable(Class<R> resourceClass,
1717
InformerConfiguration<R> informerConfig) {
1818
this.resourceClass = resourceClass;
1919
this.resourceTypeName = resourceClass.isAssignableFrom(GenericKubernetesResource.class)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import io.fabric8.kubernetes.api.model.HasMetadata;
55
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
66

7-
public interface ResourceConfiguration<R extends HasMetadata> {
7+
public interface Informable<R extends HasMetadata> {
88

99
default String getResourceTypeName() {
1010
return getInformerConfig().getResourceTypeName();
1111
}
1212

1313
InformerConfiguration<R> getInformerConfig();
1414

15-
@SuppressWarnings("unchecked")
1615
default Class<R> getResourceClass() {
1716
return getInformerConfig().getResourceClass();
1817
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
@SuppressWarnings("rawtypes")
1818
public class ResolvedControllerConfiguration<P extends HasMetadata>
19-
extends DefaultResourceConfiguration<P>
19+
extends DefaultInformable<P>
2020
implements io.javaoperatorsdk.operator.api.config.ControllerConfiguration<P> {
2121

2222
private final String name;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
88
import io.fabric8.kubernetes.api.model.HasMetadata;
9-
import io.javaoperatorsdk.operator.api.config.DefaultResourceConfiguration;
10-
import io.javaoperatorsdk.operator.api.config.ResourceConfiguration;
9+
import io.javaoperatorsdk.operator.api.config.DefaultInformable;
10+
import io.javaoperatorsdk.operator.api.config.Informable;
1111
import io.javaoperatorsdk.operator.api.config.Utils;
1212
import io.javaoperatorsdk.operator.processing.GroupVersionKind;
1313
import io.javaoperatorsdk.operator.processing.event.source.PrimaryToSecondaryMapper;
1414
import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
1515
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
1616

1717
public interface InformerEventSourceConfiguration<R extends HasMetadata>
18-
extends ResourceConfiguration<R> {
18+
extends Informable<R> {
1919

2020
static <R extends HasMetadata> Builder<R> from(
2121
Class<R> resourceClass, Class<? extends HasMetadata> primaryResourceClass) {
@@ -67,7 +67,7 @@ default Class<R> getResourceClass() {
6767
}
6868

6969
class DefaultInformerEventSourceConfiguration<R extends HasMetadata> extends
70-
DefaultResourceConfiguration<R> implements InformerEventSourceConfiguration<R> {
70+
DefaultInformable<R> implements InformerEventSourceConfiguration<R> {
7171
private final PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
7272
private final SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
7373
private final GroupVersionKind groupVersionKind;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.javaoperatorsdk.operator.OperatorException;
2020
import io.javaoperatorsdk.operator.ReconcilerUtils;
2121
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
22-
import io.javaoperatorsdk.operator.api.config.ResourceConfiguration;
22+
import io.javaoperatorsdk.operator.api.config.Informable;
2323
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
2424
import io.javaoperatorsdk.operator.health.InformerHealthIndicator;
2525
import io.javaoperatorsdk.operator.processing.LifecycleAware;
@@ -29,7 +29,7 @@
2929

3030
import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_ALL_NAMESPACES;
3131

32-
class InformerManager<R extends HasMetadata, C extends ResourceConfiguration<R>>
32+
class InformerManager<R extends HasMetadata, C extends Informable<R>>
3333
implements LifecycleAware, IndexerResourceCache<R> {
3434

3535
private static final Logger log = LoggerFactory.getLogger(InformerManager.class);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
1818
import io.javaoperatorsdk.operator.OperatorException;
1919
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
20+
import io.javaoperatorsdk.operator.api.config.Informable;
2021
import io.javaoperatorsdk.operator.api.config.NamespaceChangeable;
21-
import io.javaoperatorsdk.operator.api.config.ResourceConfiguration;
2222
import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationCacheFiller;
2323
import io.javaoperatorsdk.operator.health.InformerHealthIndicator;
2424
import io.javaoperatorsdk.operator.health.InformerWrappingEventSourceHealthIndicator;
@@ -27,7 +27,7 @@
2727
import io.javaoperatorsdk.operator.processing.event.source.*;
2828

2929
@SuppressWarnings("rawtypes")
30-
public abstract class ManagedInformerEventSource<R extends HasMetadata, P extends HasMetadata, C extends ResourceConfiguration<R>>
30+
public abstract class ManagedInformerEventSource<R extends HasMetadata, P extends HasMetadata, C extends Informable<R>>
3131
extends AbstractEventSource<R, P>
3232
implements ResourceEventHandler<R>, Cache<R>, IndexerResourceCache<R>,
3333
RecentOperationCacheFiller<R>, NamespaceChangeable,

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import io.javaoperatorsdk.operator.Operator;
2121
import io.javaoperatorsdk.operator.OperatorException;
2222
import io.javaoperatorsdk.operator.ReconcilerUtils;
23-
import io.javaoperatorsdk.operator.Operator;
24-
import io.javaoperatorsdk.operator.OperatorException;
25-
import io.javaoperatorsdk.operator.ReconcilerUtils;
2623
import io.javaoperatorsdk.operator.health.InformerHealthIndicator;
2724
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
2825
import io.javaoperatorsdk.operator.processing.event.source.controller.ControllerEventSource;

0 commit comments

Comments
 (0)