Skip to content

Commit 40d4747

Browse files
csviricsviri
committed
format
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 806bb2e commit 40d4747

File tree

32 files changed

+57
-73
lines changed

32 files changed

+57
-73
lines changed

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
import io.fabric8.kubernetes.api.model.HasMetadata;
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
77
import io.javaoperatorsdk.operator.processing.dependent.workflow.Workflow;
8-
import io.javaoperatorsdk.operator.processing.event.Event;
98
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
109
import io.javaoperatorsdk.operator.processing.event.source.ResourceEventSource;
11-
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1210

1311
// todo cleanup / delete
1412
public class EventSourceUtils {
1513

1614
@SuppressWarnings("unchecked")
17-
public static <R extends HasMetadata> List<EventSource> dependentEventSources(EventSourceContext<R> eventSourceContext,DependentResource... dependentResources) {
18-
return Arrays.stream(dependentResources)
19-
.flatMap(dr-> dr.eventSource(eventSourceContext).stream()).toList();
15+
public static <R extends HasMetadata> List<EventSource> dependentEventSources(
16+
EventSourceContext<R> eventSourceContext, DependentResource... dependentResources) {
17+
return Arrays.stream(dependentResources)
18+
.flatMap(dr -> dr.eventSource(eventSourceContext).stream()).toList();
2019
}
2120

2221
/**
@@ -39,7 +38,7 @@ public static <K extends HasMetadata> List<EventSource> eventSourcesFromWorkflow
3938
EventSourceContext<K> context,
4039
Workflow<K> workflow) {
4140
return workflow.getDependentResourcesByNameWithoutActivationCondition().stream()
42-
.flatMap(dr->dr.eventSource(context).stream()).toList();
41+
.flatMap(dr -> dr.eventSource(context).stream()).toList();
4342
}
4443

4544
@SuppressWarnings("rawtypes")

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultWorkflow.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ public Map<String, DependentResource> getDependentResourcesByName() {
149149
}
150150

151151
public List<DependentResource> getDependentResourcesByNameWithoutActivationCondition() {
152-
return dependentResourceNodes.values().stream().filter(n->n.getActivationCondition().isEmpty())
153-
.map(DependentResourceNode::getDependentResource).toList();
152+
return dependentResourceNodes.values().stream()
153+
.filter(n -> n.getActivationCondition().isEmpty())
154+
.map(DependentResourceNode::getDependentResource).toList();
154155
}
155156
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
1515
import io.javaoperatorsdk.operator.api.config.NamespaceChangeable;
1616
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
17-
import io.javaoperatorsdk.operator.api.reconciler.EventSourceUtils;
1817
import io.javaoperatorsdk.operator.processing.Controller;
1918
import io.javaoperatorsdk.operator.processing.LifecycleAware;
2019
import io.javaoperatorsdk.operator.processing.event.source.EventSource;

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/AbstractResourceEventSource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public abstract class AbstractResourceEventSource<R, P extends HasMetadata>
1919
private final String name;
2020

2121
protected AbstractResourceEventSource(Class<R> resourceClass) {
22-
this(resourceClass,resourceClass.getName());
22+
this(resourceClass, resourceClass.getName());
2323
}
2424

2525
protected AbstractResourceEventSource(Class<R> resourceClass, String name) {

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public abstract class ExternalResourceCachingEventSource<R, P extends HasMetadat
4343
protected Map<ResourceID, Map<String, R>> cache = new ConcurrentHashMap<>();
4444

4545
protected ExternalResourceCachingEventSource(Class<R> resourceClass,
46-
CacheKeyMapper<R> cacheKeyMapper) {
47-
this(null,resourceClass,cacheKeyMapper);
46+
CacheKeyMapper<R> cacheKeyMapper) {
47+
this(null, resourceClass, cacheKeyMapper);
4848
}
4949

50-
protected ExternalResourceCachingEventSource(String name,Class<R> resourceClass,
50+
protected ExternalResourceCachingEventSource(String name, Class<R> resourceClass,
5151
CacheKeyMapper<R> cacheKeyMapper) {
52-
super(resourceClass,name);
52+
super(resourceClass, name);
5353
this.cacheKeyMapper = cacheKeyMapper;
5454
}
5555

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ControllerResourceEventSource<T extends HasMetadata>
3232

3333
@SuppressWarnings({"unchecked", "rawtypes"})
3434
public ControllerResourceEventSource(Controller<T> controller) {
35-
super(NAME,controller.getCRClient(), controller.getConfiguration(), false);
35+
super(NAME, controller.getCRClient(), controller.getConfiguration(), false);
3636
this.controller = controller;
3737

3838
final var config = controller.getConfiguration();

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

+8-7
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,25 @@ public class InformerEventSource<R extends HasMetadata, P extends HasMetadata>
7777
private final String id = UUID.randomUUID().toString();
7878

7979
public InformerEventSource(String name,
80-
InformerConfiguration<R> configuration, EventSourceContext<P> context) {
81-
this(name,configuration, context.getClient(),
82-
context.getControllerConfiguration().getConfigurationService()
83-
.parseResourceVersionsForEventFilteringAndCaching());
80+
InformerConfiguration<R> configuration, EventSourceContext<P> context) {
81+
this(name, configuration, context.getClient(),
82+
context.getControllerConfiguration().getConfigurationService()
83+
.parseResourceVersionsForEventFilteringAndCaching());
8484
}
8585

8686
public InformerEventSource(
8787
InformerConfiguration<R> configuration, EventSourceContext<P> context) {
88-
this(null,configuration, context.getClient(),
88+
this(null, configuration, context.getClient(),
8989
context.getControllerConfiguration().getConfigurationService()
9090
.parseResourceVersionsForEventFilteringAndCaching());
9191
}
9292

9393
public InformerEventSource(InformerConfiguration<R> configuration, KubernetesClient client) {
94-
this(null,configuration, client, false);
94+
this(null, configuration, client, false);
9595
}
9696

97-
public InformerEventSource(String name,InformerConfiguration<R> configuration, KubernetesClient client,
97+
public InformerEventSource(String name, InformerConfiguration<R> configuration,
98+
KubernetesClient client,
9899
boolean parseResourceVersions) {
99100
super(name,
100101
configuration.getGroupVersionKind()

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.function.Predicate;
66
import java.util.stream.Stream;
77

8-
import io.javaoperatorsdk.operator.processing.event.source.*;
98
import org.slf4j.Logger;
109
import org.slf4j.LoggerFactory;
1110

@@ -21,6 +20,7 @@
2120
import io.javaoperatorsdk.operator.health.InformerWrappingEventSourceHealthIndicator;
2221
import io.javaoperatorsdk.operator.health.Status;
2322
import io.javaoperatorsdk.operator.processing.event.ResourceID;
23+
import io.javaoperatorsdk.operator.processing.event.source.*;
2424

2525
public abstract class ManagedInformerEventSource<R extends HasMetadata, P extends HasMetadata, C extends ResourceConfiguration<R>>
2626
extends AbstractResourceEventSource<R, P>
@@ -194,8 +194,8 @@ public boolean scopeEquals(EventSource es) {
194194
if (!this.getClass().equals(es.getClass())) {
195195
return false;
196196
}
197-
var managedEventSource = (ManagedInformerEventSource)es;
197+
var managedEventSource = (ManagedInformerEventSource) es;
198198
return this.getInformerConfiguration()
199-
.equals(managedEventSource.getInformerConfiguration());
199+
.equals(managedEventSource.getInformerConfiguration());
200200
}
201201
}

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -50,34 +50,34 @@ public class PollingEventSource<R, P extends HasMetadata>
5050
private final AtomicBoolean healthy = new AtomicBoolean(true);
5151

5252
public PollingEventSource(GenericResourceFetcher<R> supplier,
53-
long period,
54-
Class<R> resourceClass) {
55-
this(null,supplier,period,resourceClass);
53+
long period,
54+
Class<R> resourceClass) {
55+
this(null, supplier, period, resourceClass);
5656
}
5757

5858
public PollingEventSource(String name,
5959
GenericResourceFetcher<R> supplier,
6060
long period,
6161
Class<R> resourceClass) {
62-
super(name,resourceClass, CacheKeyMapper.singleResourceCacheKeyMapper());
62+
super(name, resourceClass, CacheKeyMapper.singleResourceCacheKeyMapper());
6363
this.genericResourceFetcher = supplier;
6464
this.period = period;
6565
}
6666

6767
public PollingEventSource(
68-
GenericResourceFetcher<R> supplier,
69-
long period,
70-
Class<R> resourceClass,
71-
CacheKeyMapper<R> cacheKeyMapper) {
72-
this(null,supplier,period,resourceClass,cacheKeyMapper);
68+
GenericResourceFetcher<R> supplier,
69+
long period,
70+
Class<R> resourceClass,
71+
CacheKeyMapper<R> cacheKeyMapper) {
72+
this(null, supplier, period, resourceClass, cacheKeyMapper);
7373
}
7474

7575
public PollingEventSource(String name,
7676
GenericResourceFetcher<R> supplier,
7777
long period,
7878
Class<R> resourceClass,
7979
CacheKeyMapper<R> cacheKeyMapper) {
80-
super(name,resourceClass, cacheKeyMapper);
80+
super(name, resourceClass, cacheKeyMapper);
8181
this.genericResourceFetcher = supplier;
8282
this.period = period;
8383
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.bulkdependent;
22

33
import java.util.List;
4-
import java.util.Map;
54
import java.util.concurrent.atomic.AtomicInteger;
65

76
import io.javaoperatorsdk.operator.api.reconciler.*;

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.complexdependent;
22

33
import java.util.List;
4-
import java.util.Map;
54
import java.util.Objects;
65

76
import io.fabric8.kubernetes.api.model.Service;
@@ -55,10 +54,12 @@ public UpdateControl<ComplexDependentCustomResource> reconcile(
5554
public List<EventSource> prepareEventSources(
5655
EventSourceContext<ComplexDependentCustomResource> context) {
5756
InformerEventSource<Service, ComplexDependentCustomResource> serviceEventSource =
58-
new InformerEventSource<>(SERVICE_EVENT_SOURCE_NAME,InformerConfiguration.from(Service.class, context).build(),
57+
new InformerEventSource<>(SERVICE_EVENT_SOURCE_NAME,
58+
InformerConfiguration.from(Service.class, context).build(),
5959
context);
6060
InformerEventSource<StatefulSet, ComplexDependentCustomResource> statefulSetEventSource =
61-
new InformerEventSource<>(STATEFUL_SET_EVENT_SOURCE_NAME,InformerConfiguration.from(StatefulSet.class, context).build(),
61+
new InformerEventSource<>(STATEFUL_SET_EVENT_SOURCE_NAME,
62+
InformerConfiguration.from(StatefulSet.class, context).build(),
6263
context);
6364
return List.of(serviceEventSource, statefulSetEventSource);
6465
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.HashMap;
44
import java.util.List;
5-
import java.util.Map;
65
import java.util.Objects;
76
import java.util.concurrent.atomic.AtomicInteger;
87

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.dependentreinitialization;
22

33
import java.util.List;
4-
import java.util.Map;
54

65
import io.javaoperatorsdk.operator.api.reconciler.*;
76
import io.javaoperatorsdk.operator.processing.event.source.EventSource;

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.externalstate;
22

33
import java.util.List;
4-
import java.util.Map;
54
import java.util.concurrent.atomic.AtomicInteger;
65

76
import io.fabric8.kubernetes.api.model.ConfigMap;

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ public List<EventSource> prepareEventSources(
114114
}, context, Duration.ofMillis(300L), ExternalResource.class);
115115

116116
return Arrays.asList(configMapEventSource,
117-
externalResourceEventSource);
117+
externalResourceEventSource);
118118
}
119119
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.externalstate.externalstatebulkdependent;
22

33
import java.util.List;
4-
import java.util.Map;
54
import java.util.concurrent.atomic.AtomicInteger;
65

76
import io.fabric8.kubernetes.api.model.ConfigMap;

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java

-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesdependentstandalone;
22

3-
import java.util.Arrays;
43
import java.util.List;
5-
import java.util.Map;
6-
import java.util.stream.Collectors;
74

8-
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
95
import io.javaoperatorsdk.operator.api.reconciler.*;
106
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
11-
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
127

138
@ControllerConfiguration
149
public class GenericKubernetesDependentStandaloneReconciler

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.informereventsource;
22

33
import java.util.List;
4-
import java.util.Map;
54
import java.util.Optional;
65
import java.util.concurrent.atomic.AtomicInteger;
76

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public DependentGarbageCollectionTestReconciler() {
3131
@Override
3232
public List<EventSource> prepareEventSources(
3333
EventSourceContext<DependentGarbageCollectionTestCustomResource> context) {
34-
return EventSourceUtils.dependentEventSources(context,configMapDependent);
34+
return EventSourceUtils.dependentEventSources(context, configMapDependent);
3535
}
3636

3737
@Override

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.multipledependentresource;
22

33
import java.util.List;
4-
import java.util.Map;
54

65
import io.fabric8.kubernetes.api.model.ConfigMap;
76
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresourcewithdiscriminator/MultipleDependentResourceWithDiscriminatorReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.multipledependentresourcewithdiscriminator;
22

33
import java.util.List;
4-
import java.util.Map;
54
import java.util.concurrent.atomic.AtomicInteger;
65

76
import io.fabric8.kubernetes.api.model.ConfigMap;

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.javaoperatorsdk.operator.sample.multipledrsametypenodiscriminator;
22

3+
import java.util.List;
4+
import java.util.concurrent.atomic.AtomicInteger;
5+
36
import io.fabric8.kubernetes.api.model.ConfigMap;
47
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
58
import io.javaoperatorsdk.operator.api.reconciler.*;
@@ -8,9 +11,6 @@
811
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
912
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1013

11-
import java.util.List;
12-
import java.util.concurrent.atomic.AtomicInteger;
13-
1414
import static io.javaoperatorsdk.operator.sample.multiplemanageddependentsametype.MultipleManagedDependentResourceReconciler.CONFIG_MAP_EVENT_SOURCE;
1515

1616
@Workflow(dependents = {
@@ -49,8 +49,10 @@ public int getNumberOfExecutions() {
4949
public List<EventSource> prepareEventSources(
5050
EventSourceContext<MultipleManagedDependentNoDiscriminatorCustomResource> context) {
5151
InformerEventSource<ConfigMap, MultipleManagedDependentNoDiscriminatorCustomResource> ies =
52-
new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE,InformerConfiguration.from(ConfigMap.class, context)
53-
.build(), context);
52+
new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE,
53+
InformerConfiguration.from(ConfigMap.class, context)
54+
.build(),
55+
context);
5456

5557
return List.of(ies);
5658
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.sample.multiplemanageddependentsametype;
22

33
import java.util.List;
4-
import java.util.Map;
54
import java.util.concurrent.atomic.AtomicInteger;
65

76
import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -50,8 +49,10 @@ public int getNumberOfExecutions() {
5049
public List<EventSource> prepareEventSources(
5150
EventSourceContext<MultipleManagedDependentResourceCustomResource> context) {
5251
InformerEventSource<ConfigMap, MultipleManagedDependentResourceCustomResource> ies =
53-
new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE,InformerConfiguration.from(ConfigMap.class, context)
54-
.build(), context);
52+
new InformerEventSource<>(CONFIG_MAP_EVENT_SOURCE,
53+
InformerConfiguration.from(ConfigMap.class, context)
54+
.build(),
55+
context);
5556
return List.of(ies);
5657
}
5758
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public List<EventSource> prepareEventSources(
4949
EventSourceContext<MultipleManagedExternalDependentResourceCustomResource> context) {
5050

5151
PollingEventSource<ExternalResource, MultipleManagedExternalDependentResourceCustomResource> pollingEventSource =
52-
new PollingEventSource<>(CONFIG_MAP_EVENT_SOURCE,() -> {
52+
new PollingEventSource<>(CONFIG_MAP_EVENT_SOURCE, () -> {
5353
var lists = externalServiceMock.listResources();
5454
Map<ResourceID, Set<ExternalResource>> res = new HashMap<>();
5555
lists.forEach(er -> {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.HashMap;
44
import java.util.List;
5-
import java.util.Map;
65
import java.util.Set;
76
import java.util.concurrent.atomic.AtomicInteger;
87

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primaryindexer/PrimaryIndexerTestReconciler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.javaoperatorsdk.operator.sample.primaryindexer;
22

3+
import java.util.List;
4+
import java.util.stream.Collectors;
5+
36
import io.fabric8.kubernetes.api.model.ConfigMap;
47
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
58
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -8,9 +11,6 @@
811
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
912
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1013

11-
import java.util.List;
12-
import java.util.stream.Collectors;
13-
1414
@ControllerConfiguration
1515
public class PrimaryIndexerTestReconciler
1616
extends AbstractPrimaryIndexerTestReconciler {

0 commit comments

Comments
 (0)