Skip to content

Commit f4950b2

Browse files
committed
refactor: rename inner InformerConfigurationBuilder to simply Builder
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent fb139e5 commit f4950b2

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ static boolean inheritsNamespacesFromController(Set<String> namespaces) {
2828
return SAME_AS_CONTROLLER_NAMESPACES_SET.equals(namespaces);
2929
}
3030

31-
static <R extends HasMetadata> InformerConfigurationBuilder<R> from(
31+
static <R extends HasMetadata> Builder<R> from(
3232
Class<R> resourceClass, Class<? extends HasMetadata> primaryResourceClass) {
33-
return new InformerConfigurationBuilder<>(resourceClass, primaryResourceClass);
33+
return new Builder<>(resourceClass, primaryResourceClass);
3434
}
3535

36-
static InformerConfigurationBuilder<GenericKubernetesResource> from(
36+
static Builder<GenericKubernetesResource> from(
3737
GroupVersionKind groupVersionKind, Class<? extends HasMetadata> primaryResourceClass) {
38-
return new InformerConfigurationBuilder<>(groupVersionKind, primaryResourceClass);
38+
return new Builder<>(groupVersionKind, primaryResourceClass);
3939
}
4040

4141
/**
@@ -136,7 +136,7 @@ public Set<String> getEffectiveNamespaces(ControllerConfiguration<?> controllerC
136136

137137

138138
@SuppressWarnings({"unused", "UnusedReturnValue"})
139-
class InformerConfigurationBuilder<R extends HasMetadata> {
139+
class Builder<R extends HasMetadata> {
140140

141141
private final Class<R> resourceClass;
142142
private final GroupVersionKind groupVersionKind;
@@ -146,44 +146,44 @@ class InformerConfigurationBuilder<R extends HasMetadata> {
146146
private PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
147147
private SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
148148

149-
private InformerConfigurationBuilder(Class<R> resourceClass,
149+
private Builder(Class<R> resourceClass,
150150
Class<? extends HasMetadata> primaryResourceClass) {
151151
this(resourceClass, primaryResourceClass, null);
152152
}
153153

154154
@SuppressWarnings("unchecked")
155-
private InformerConfigurationBuilder(GroupVersionKind groupVersionKind,
155+
private Builder(GroupVersionKind groupVersionKind,
156156
Class<? extends HasMetadata> primaryResourceClass) {
157157
this((Class<R>) GenericKubernetesResource.class, primaryResourceClass, groupVersionKind);
158158
}
159159

160-
private InformerConfigurationBuilder(Class<R> resourceClass,
160+
private Builder(Class<R> resourceClass,
161161
Class<? extends HasMetadata> primaryResourceClass, GroupVersionKind groupVersionKind) {
162162
this.resourceClass = resourceClass;
163163
this.groupVersionKind = groupVersionKind;
164164
this.primaryResourceClass = primaryResourceClass;
165165
this.config = InformerConfigHolder.builder(resourceClass);
166166
}
167167

168-
public InformerConfigurationBuilder<R> withInformerConfiguration(
168+
public Builder<R> withInformerConfiguration(
169169
Consumer<InformerConfigHolder<R>.Builder> configurator) {
170170
configurator.accept(config);
171171
return this;
172172
}
173173

174-
public InformerConfigurationBuilder<R> withName(String name) {
174+
public Builder<R> withName(String name) {
175175
this.name = name;
176176
config.withName(name);
177177
return this;
178178
}
179179

180-
public <P extends HasMetadata> InformerConfigurationBuilder<R> withPrimaryToSecondaryMapper(
180+
public <P extends HasMetadata> Builder<R> withPrimaryToSecondaryMapper(
181181
PrimaryToSecondaryMapper<P> primaryToSecondaryMapper) {
182182
this.primaryToSecondaryMapper = primaryToSecondaryMapper;
183183
return this;
184184
}
185185

186-
public InformerConfigurationBuilder<R> withSecondaryToPrimaryMapper(
186+
public Builder<R> withSecondaryToPrimaryMapper(
187187
SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper) {
188188
this.secondaryToPrimaryMapper = secondaryToPrimaryMapper;
189189
return this;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public GenericKubernetesDependentResource(GroupVersionKind groupVersionKind) {
1616
this.groupVersionKind = groupVersionKind;
1717
}
1818

19-
protected InformerEventSourceConfiguration.InformerConfigurationBuilder<GenericKubernetesResource> informerConfigurationBuilder(
19+
protected InformerEventSourceConfiguration.Builder<GenericKubernetesResource> informerConfigurationBuilder(
2020
EventSourceContext<P> context) {
2121
return InformerEventSourceConfiguration.from(groupVersionKind,
2222
context.getPrimaryResourceClass());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ protected void addReferenceHandlingMetadata(R desired, P primary) {
188188

189189
@Override
190190
protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> context) {
191-
final InformerEventSourceConfiguration.InformerConfigurationBuilder<R> configBuilder =
191+
final InformerEventSourceConfiguration.Builder<R> configBuilder =
192192
informerConfigurationBuilder(context)
193193
.withSecondaryToPrimaryMapper(getSecondaryToPrimaryMapper(context).orElseThrow())
194194
.withName(name());
@@ -207,7 +207,7 @@ protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> cont
207207
/**
208208
* To handle {@link io.fabric8.kubernetes.api.model.GenericKubernetesResource} based dependents.
209209
*/
210-
protected InformerEventSourceConfiguration.InformerConfigurationBuilder<R> informerConfigurationBuilder(
210+
protected InformerEventSourceConfiguration.Builder<R> informerConfigurationBuilder(
211211
EventSourceContext<P> context) {
212212
return InformerEventSourceConfiguration.from(resourceType(), context.getPrimaryResourceClass());
213213
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/JobReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public List<EventSource<?, Job>> prepareEventSources(EventSourceContext<Job> con
6565
context.getPrimaryCache().addIndexer(JOB_CLUSTER_INDEX, (job -> List
6666
.of(indexKey(job.getSpec().getClusterName(), job.getMetadata().getNamespace()))));
6767

68-
InformerEventSourceConfiguration.InformerConfigurationBuilder<Cluster> informerConfiguration =
68+
InformerEventSourceConfiguration.Builder<Cluster> informerConfiguration =
6969
InformerEventSourceConfiguration.from(Cluster.class, Job.class)
7070
.withSecondaryToPrimaryMapper(cluster -> context.getPrimaryCache()
7171
.byIndex(JOB_CLUSTER_INDEX, indexKey(cluster.getMetadata().getName(),

0 commit comments

Comments
 (0)