Skip to content

Commit 372f6ba

Browse files
xstefankxstefank
committed
fix: spotless plugin activation issue
Signed-off-by: xstefank <[email protected]>
1 parent 2d9d57c commit 372f6ba

File tree

511 files changed

+3263
-5621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+3263
-5621
lines changed

Diff for: ‎.github/workflows/pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
cache: 'maven'
2727
- name: Check code format
2828
run: |
29-
./mvnw ${MAVEN_ARGS} spotless:check --file pom.xml
29+
./mvnw ${MAVEN_ARGS} spotless:check --file pom.xml -Dhighest-basedir=$PWD
3030
- name: Run unit tests
3131
run: ./mvnw ${MAVEN_ARGS} clean install -Pno-apt --file pom.xml
3232

Diff for: ‎bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java

+6-10
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ public class Bootstrapper {
2727
private static final Map<String, String> TOP_LEVEL_STATIC_FILES =
2828
Map.of("_.gitignore", ".gitignore", "README.md", "README.md");
2929
private static final List<String> JAVA_FILES =
30-
List.of("CustomResource.java", "Reconciler.java",
31-
"Spec.java", "Status.java");
30+
List.of("CustomResource.java", "Reconciler.java", "Spec.java", "Status.java");
3231

3332
public void create(File targetDir, String groupId, String artifactId) {
3433
try {
@@ -67,8 +66,7 @@ private void addJavaFiles(File projectDir, String groupId, String artifactId) {
6766
addTemplatedFile(projectDir, "Runner.java", groupId, artifactId, targetDir, null);
6867
addTemplatedFile(projectDir, "ConfigMapDependentResource.java", groupId, artifactId,
6968
targetDir, null);
70-
addTemplatedFile(projectDir, "ReconcilerIntegrationTest.java", groupId,
71-
artifactId,
69+
addTemplatedFile(projectDir, "ReconcilerIntegrationTest.java", groupId, artifactId,
7270
targetTestDir, artifactClassId(artifactId) + "ReconcilerIntegrationTest.java");
7371
} catch (IOException e) {
7472
throw new RuntimeException(e);
@@ -89,10 +87,9 @@ private void addTemplatedFile(File projectDir, String fileName, String groupId,
8987
private void addTemplatedFile(File projectDir, String fileName, String groupId, String artifactId,
9088
File targetDir, String targetFileName) {
9189
try {
92-
var values = Map.of("groupId", groupId, "artifactId", artifactId,
93-
"artifactClassId", artifactClassId(artifactId),
94-
"josdkVersion", Versions.JOSDK,
95-
"fabric8Version", Versions.KUBERNETES_CLIENT);
90+
var values = Map.of("groupId", groupId, "artifactId", artifactId, "artifactClassId",
91+
artifactClassId(artifactId), "josdkVersion", Versions.JOSDK, "fabric8Version",
92+
Versions.KUBERNETES_CLIENT);
9693

9794
var mustache = mustacheFactory.compile("templates/" + fileName);
9895
var targetFile = new File(targetDir == null ? projectDir : targetDir,
@@ -132,8 +129,7 @@ private void addStaticFile(File targetDir, String fileName, String targetFilenam
132129

133130
public static String artifactClassId(String artifactId) {
134131
var parts = artifactId.split("-");
135-
return Arrays.stream(parts).map(p -> p.substring(0, 1)
136-
.toUpperCase() + p.substring(1))
132+
return Arrays.stream(parts).map(p -> p.substring(0, 1).toUpperCase() + p.substring(1))
137133
.collect(Collectors.joining(""));
138134
}
139135

Diff for: ‎bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/BootstrapperMojo.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88
import org.apache.maven.plugins.annotations.Parameter;
99

1010
@Mojo(name = "create", requiresProject = false)
11-
public class BootstrapperMojo
12-
extends AbstractMojo {
11+
public class BootstrapperMojo extends AbstractMojo {
1312

1413
@Parameter(defaultValue = "${projectGroupId}")
1514
protected String projectGroupId;
1615

1716
@Parameter(defaultValue = "${projectArtifactId}")
1817
protected String projectArtifactId;
1918

20-
public void execute()
21-
throws MojoExecutionException {
19+
public void execute() throws MojoExecutionException {
2220
String userDir = System.getProperty("user.dir");
2321
new Bootstrapper().create(new File(userDir), projectGroupId, projectArtifactId);
2422
}

Diff for: ‎bootstrapper-maven-plugin/src/test/java/io/javaoperatorsdk/bootstrapper/BootstrapperTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ void copiesFilesToTarget() {
3030

3131
private void assertProjectCompiles() {
3232
try {
33-
var process = Runtime.getRuntime()
34-
.exec(
35-
"mvn clean install -f target/test-project/pom.xml -DskipTests -Dspotless.apply.skip");
33+
var process = Runtime.getRuntime().exec(
34+
"mvn clean install -f target/test-project/pom.xml -DskipTests -Dspotless.apply.skip");
3635

3736
BufferedReader stdOut = new BufferedReader(new InputStreamReader(process.getInputStream()));
3837

Diff for: ‎caffeine-bounded-cache-support/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedItemStores.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ private CaffeineBoundedItemStores() {}
3939
*/
4040
@SuppressWarnings("unused")
4141
public static <R extends HasMetadata> BoundedItemStore<R> boundedItemStore(
42-
KubernetesClient client, Class<R> rClass,
43-
Duration accessExpireDuration) {
44-
Cache<String, R> cache = Caffeine.newBuilder()
45-
.expireAfterAccess(accessExpireDuration)
46-
.build();
42+
KubernetesClient client, Class<R> rClass, Duration accessExpireDuration) {
43+
Cache<String, R> cache = Caffeine.newBuilder().expireAfterAccess(accessExpireDuration).build();
4744
return boundedItemStore(client, rClass, cache);
4845
}
4946

Diff for: ‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedCacheClusterScopeIT.java

+6-13
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,16 @@ public class CaffeineBoundedCacheClusterScopeIT
1717
extends BoundedCacheTestBase<BoundedCacheClusterScopeTestCustomResource> {
1818

1919
@RegisterExtension
20-
LocallyRunOperatorExtension extension =
21-
LocallyRunOperatorExtension.builder()
22-
.withReconciler(new BoundedCacheClusterScopeTestReconciler(), o -> {
23-
o.withItemStore(boundedItemStore(
24-
new KubernetesClientBuilder().build(),
25-
BoundedCacheClusterScopeTestCustomResource.class,
26-
Duration.ofMinutes(1),
27-
1));
28-
})
29-
.build();
20+
LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder()
21+
.withReconciler(new BoundedCacheClusterScopeTestReconciler(), o -> {
22+
o.withItemStore(boundedItemStore(new KubernetesClientBuilder().build(),
23+
BoundedCacheClusterScopeTestCustomResource.class, Duration.ofMinutes(1), 1));
24+
}).build();
3025

3126
@Override
3227
BoundedCacheClusterScopeTestCustomResource createTestResource(int index) {
3328
var res = new BoundedCacheClusterScopeTestCustomResource();
34-
res.setMetadata(new ObjectMetaBuilder()
35-
.withName(RESOURCE_NAME_PREFIX + index)
36-
.build());
29+
res.setMetadata(new ObjectMetaBuilder().withName(RESOURCE_NAME_PREFIX + index).build());
3730
res.setSpec(new BoundedCacheTestSpec());
3831
res.getSpec().setData(INITIAL_DATA_PREFIX + index);
3932
res.getSpec().setTargetNamespace(extension.getNamespace());

Diff for: ‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedCacheNamespacedIT.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,13 @@ class CaffeineBoundedCacheNamespacedIT
1919
@RegisterExtension
2020
LocallyRunOperatorExtension extension =
2121
LocallyRunOperatorExtension.builder().withReconciler(new BoundedCacheTestReconciler(), o -> {
22-
o.withItemStore(boundedItemStore(
23-
new KubernetesClientBuilder().build(), BoundedCacheTestCustomResource.class,
24-
Duration.ofMinutes(1),
25-
1));
26-
})
27-
.build();
22+
o.withItemStore(boundedItemStore(new KubernetesClientBuilder().build(),
23+
BoundedCacheTestCustomResource.class, Duration.ofMinutes(1), 1));
24+
}).build();
2825

2926
BoundedCacheTestCustomResource createTestResource(int index) {
3027
var res = new BoundedCacheTestCustomResource();
31-
res.setMetadata(new ObjectMetaBuilder()
32-
.withName(RESOURCE_NAME_PREFIX + index)
33-
.build());
28+
res.setMetadata(new ObjectMetaBuilder().withName(RESOURCE_NAME_PREFIX + index).build());
3429
res.setSpec(new BoundedCacheTestSpec());
3530
res.getSpec().setData(INITIAL_DATA_PREFIX + index);
3631
res.getSpec().setTargetNamespace(extension.getNamespace());

Diff for: ‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java

+18-32
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,9 @@ public abstract class AbstractTestReconciler<P extends CustomResource<BoundedCac
3737
public static final String DATA_KEY = "dataKey";
3838

3939
@Override
40-
public UpdateControl<P> reconcile(
41-
P resource,
42-
Context<P> context) {
40+
public UpdateControl<P> reconcile(P resource, Context<P> context) {
4341
var maybeConfigMap = context.getSecondaryResource(ConfigMap.class);
44-
maybeConfigMap.ifPresentOrElse(
45-
cm -> updateConfigMapIfNeeded(cm, resource, context),
42+
maybeConfigMap.ifPresentOrElse(cm -> updateConfigMapIfNeeded(cm, resource, context),
4643
() -> createConfigMap(resource, context));
4744
ensureStatus(resource);
4845
log.info("Reconciled: {}", resource.getMetadata().getName());
@@ -59,32 +56,24 @@ protected void updateConfigMapIfNeeded(ConfigMap cm, P resource, Context<P> cont
5956

6057
protected void createConfigMap(P resource, Context<P> context) {
6158
var cm = new ConfigMapBuilder()
62-
.withMetadata(new ObjectMetaBuilder()
63-
.withName(resource.getMetadata().getName())
64-
.withNamespace(resource.getSpec().getTargetNamespace())
65-
.build())
66-
.withData(Map.of(DATA_KEY, resource.getSpec().getData()))
67-
.build();
59+
.withMetadata(new ObjectMetaBuilder().withName(resource.getMetadata().getName())
60+
.withNamespace(resource.getSpec().getTargetNamespace()).build())
61+
.withData(Map.of(DATA_KEY, resource.getSpec().getData())).build();
6862
cm.addOwnerReference(resource);
6963
context.getClient().configMaps().resource(cm).create();
7064
}
7165

7266
@Override
73-
public List<EventSource<?, P>> prepareEventSources(
74-
EventSourceContext<P> context) {
75-
76-
var boundedItemStore =
77-
boundedItemStore(new KubernetesClientBuilder().build(),
78-
ConfigMap.class, Duration.ofMinutes(1), 1); // setting max size for testing purposes
79-
80-
var es = new InformerEventSource<>(
81-
InformerEventSourceConfiguration.from(ConfigMap.class, primaryClass())
82-
.withItemStore(boundedItemStore)
83-
.withSecondaryToPrimaryMapper(
84-
Mappers.fromOwnerReferences(context.getPrimaryResourceClass(),
85-
this instanceof BoundedCacheClusterScopeTestReconciler))
86-
.build(),
87-
context);
67+
public List<EventSource<?, P>> prepareEventSources(EventSourceContext<P> context) {
68+
69+
var boundedItemStore = boundedItemStore(new KubernetesClientBuilder().build(), ConfigMap.class,
70+
Duration.ofMinutes(1), 1); // setting max size for testing purposes
71+
72+
var es = new InformerEventSource<>(InformerEventSourceConfiguration
73+
.from(ConfigMap.class, primaryClass()).withItemStore(boundedItemStore)
74+
.withSecondaryToPrimaryMapper(Mappers.fromOwnerReferences(context.getPrimaryResourceClass(),
75+
this instanceof BoundedCacheClusterScopeTestReconciler))
76+
.build(), context);
8877

8978
return List.of(es);
9079
}
@@ -96,14 +85,11 @@ private void ensureStatus(P resource) {
9685
}
9786

9887
public static <R extends HasMetadata> BoundedItemStore<R> boundedItemStore(
99-
KubernetesClient client, Class<R> rClass,
100-
Duration accessExpireDuration,
88+
KubernetesClient client, Class<R> rClass, Duration accessExpireDuration,
10189
// max size is only for testing purposes
10290
long cacheMaxSize) {
103-
Cache<String, R> cache = Caffeine.newBuilder()
104-
.expireAfterAccess(accessExpireDuration)
105-
.maximumSize(cacheMaxSize)
106-
.build();
91+
Cache<String, R> cache = Caffeine.newBuilder().expireAfterAccess(accessExpireDuration)
92+
.maximumSize(cacheMaxSize).build();
10793
return CaffeineBoundedItemStores.boundedItemStore(client, rClass, cache);
10894
}
10995

Diff for: ‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/clusterscope/BoundedCacheClusterScopeTestReconciler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler;
55

66
@ControllerConfiguration
7-
public class BoundedCacheClusterScopeTestReconciler extends
8-
AbstractTestReconciler<BoundedCacheClusterScopeTestCustomResource> {
7+
public class BoundedCacheClusterScopeTestReconciler
8+
extends AbstractTestReconciler<BoundedCacheClusterScopeTestCustomResource> {
99

1010
@Override
1111
protected Class<BoundedCacheClusterScopeTestCustomResource> primaryClass() {

Diff for: ‎contributing/eclipse-google-style.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
6666
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
6767
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
68-
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
68+
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
6969
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
7070
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
7171
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>

Diff for: ‎contributing/eclipse.importorder

-7
This file was deleted.

Diff for: ‎micrometer-support/src/main/java/io/javaoperatorsdk/operator/monitoring/micrometer/MicrometerMetrics.java

+11-21
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,8 @@ public <T> T timeControllerExecution(ControllerExecution<T> execution) {
137137
final var tags = new ArrayList<Tag>(16);
138138
tags.add(Tag.of(CONTROLLER, name));
139139
addMetadataTags(resourceID, metadata, tags, true);
140-
final var timer =
141-
Timer.builder(execName)
142-
.tags(tags)
143-
.publishPercentiles(0.3, 0.5, 0.95)
144-
.publishPercentileHistogram()
145-
.register(registry);
140+
final var timer = Timer.builder(execName).tags(tags).publishPercentiles(0.3, 0.5, 0.95)
141+
.publishPercentileHistogram().register(registry);
146142
try {
147143
final var result = timer.record(() -> {
148144
try {
@@ -152,14 +148,11 @@ public <T> T timeControllerExecution(ControllerExecution<T> execution) {
152148
}
153149
});
154150
final var successType = execution.successTypeName(result);
155-
registry
156-
.counter(execName + SUCCESS_SUFFIX, CONTROLLER, name, TYPE, successType)
157-
.increment();
151+
registry.counter(execName + SUCCESS_SUFFIX, CONTROLLER, name, TYPE, successType).increment();
158152
return result;
159153
} catch (Exception e) {
160154
final var exception = e.getClass().getSimpleName();
161-
registry
162-
.counter(execName + FAILURE_SUFFIX, CONTROLLER, name, EXCEPTION, exception)
155+
registry.counter(execName + FAILURE_SUFFIX, CONTROLLER, name, EXCEPTION, exception)
163156
.increment();
164157
throw e;
165158
}
@@ -168,13 +161,11 @@ public <T> T timeControllerExecution(ControllerExecution<T> execution) {
168161
@Override
169162
public void receivedEvent(Event event, Map<String, Object> metadata) {
170163
if (event instanceof ResourceEvent) {
171-
incrementCounter(event.getRelatedCustomResourceID(), EVENTS_RECEIVED,
172-
metadata,
164+
incrementCounter(event.getRelatedCustomResourceID(), EVENTS_RECEIVED, metadata,
173165
Tag.of(EVENT, event.getClass().getSimpleName()),
174166
Tag.of(ACTION, ((ResourceEvent) event).getAction().toString()));
175167
} else {
176-
incrementCounter(event.getRelatedCustomResourceID(), EVENTS_RECEIVED,
177-
metadata,
168+
incrementCounter(event.getRelatedCustomResourceID(), EVENTS_RECEIVED, metadata,
178169
Tag.of(EVENT, event.getClass().getSimpleName()));
179170
}
180171
}
@@ -190,8 +181,7 @@ public void cleanupDoneFor(ResourceID resourceID, Map<String, Object> metadata)
190181
public void reconcileCustomResource(HasMetadata resource, RetryInfo retryInfoNullable,
191182
Map<String, Object> metadata) {
192183
Optional<RetryInfo> retryInfo = Optional.ofNullable(retryInfoNullable);
193-
incrementCounter(ResourceID.fromResource(resource), RECONCILIATIONS_STARTED,
194-
metadata,
184+
incrementCounter(ResourceID.fromResource(resource), RECONCILIATIONS_STARTED, metadata,
195185
Tag.of(RECONCILIATIONS_RETRIES_NUMBER,
196186
String.valueOf(retryInfo.map(RetryInfo::getAttemptCount).orElse(0))),
197187
Tag.of(RECONCILIATIONS_RETRIES_LAST,
@@ -244,8 +234,8 @@ public void failedReconciliation(HasMetadata resource, Exception exception,
244234
}
245235

246236

247-
private void addMetadataTags(ResourceID resourceID, Map<String, Object> metadata,
248-
List<Tag> tags, boolean prefixed) {
237+
private void addMetadataTags(ResourceID resourceID, Map<String, Object> metadata, List<Tag> tags,
238+
boolean prefixed) {
249239
if (collectPerResourceMetrics) {
250240
addTag(NAME, resourceID.getName(), tags, prefixed);
251241
addTagOmittingOnEmptyValue(NAMESPACE, resourceID.getNamespace().orElse(null), tags, prefixed);
@@ -432,8 +422,8 @@ private DelayedCleaner(MeterRegistry registry, int cleanUpDelayInSeconds,
432422
@Override
433423
public void removeMetersFor(ResourceID resourceID) {
434424
// schedule deletion of meters associated with ResourceID
435-
metersCleaner.schedule(() -> super.removeMetersFor(resourceID),
436-
cleanUpDelayInSeconds, TimeUnit.SECONDS);
425+
metersCleaner.schedule(() -> super.removeMetersFor(resourceID), cleanUpDelayInSeconds,
426+
TimeUnit.SECONDS);
437427
}
438428
}
439429
}

Diff for: ‎micrometer-support/src/test/java/io/javaoperatorsdk/operator/monitoring/micrometer/AbstractMicrometerMetricsTestFixture.java

+7-12
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,22 @@ public abstract class AbstractMicrometerMetricsTestFixture {
2727

2828

2929
@RegisterExtension
30-
LocallyRunOperatorExtension operator =
31-
LocallyRunOperatorExtension.builder()
32-
.withConfigurationService(overrider -> overrider.withMetrics(metrics))
33-
.withReconciler(new MetricsCleaningTestReconciler())
34-
.build();
30+
LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder()
31+
.withConfigurationService(overrider -> overrider.withMetrics(metrics))
32+
.withReconciler(new MetricsCleaningTestReconciler()).build();
3533

3634

3735
protected abstract MicrometerMetrics getMetrics();
3836

3937
@Test
4038
void properlyHandlesResourceDeletion() throws Exception {
41-
var testResource = new ConfigMapBuilder()
42-
.withNewMetadata()
43-
.withName(testResourceName)
44-
.endMetadata()
45-
.build();
39+
var testResource =
40+
new ConfigMapBuilder().withNewMetadata().withName(testResourceName).endMetadata().build();
4641
final var created = operator.create(testResource);
4742

4843
// make sure the resource is created
49-
await().until(() -> !operator.get(ConfigMap.class, testResourceName)
50-
.getMetadata().getFinalizers().isEmpty());
44+
await().until(() -> !operator.get(ConfigMap.class, testResourceName).getMetadata()
45+
.getFinalizers().isEmpty());
5146

5247
final var resourceID = ResourceID.fromResource(created);
5348
final var meters = preDeleteChecks(resourceID);

Diff for: ‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AggregatedOperatorException.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ public Map<String, Exception> getAggregatedExceptions() {
2424

2525
@Override
2626
public String getMessage() {
27-
return super.getMessage() + " " + causes.entrySet().stream()
28-
.map(entry -> entry.getKey() + " -> " + exceptionDescription(entry))
29-
.collect(Collectors.joining("\n - ", "Details:\n - ", ""));
27+
return super.getMessage() + " "
28+
+ causes.entrySet().stream()
29+
.map(entry -> entry.getKey() + " -> " + exceptionDescription(entry))
30+
.collect(Collectors.joining("\n - ", "Details:\n - ", ""));
3031
}
3132

3233
private static String exceptionDescription(Entry<String, Exception> entry) {

0 commit comments

Comments
 (0)