Skip to content

Commit 56e55c7

Browse files
csviricsviri
committed
feat: use spotless plugin
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 00d2e0b commit 56e55c7

File tree

458 files changed

+1829
-2481
lines changed

Some content is hidden

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

458 files changed

+1829
-2481
lines changed

‎.github/workflows/pr.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ jobs:
2626
cache: 'maven'
2727
- name: Check code format
2828
run: |
29-
./mvnw ${MAVEN_ARGS} formatter:validate -Dconfigfile=$PWD/contributing/eclipse-google-style.xml -pl '!operator-framework-bom' --file pom.xml
30-
./mvnw ${MAVEN_ARGS} impsort:check -pl '!operator-framework-bom' --file pom.xml
29+
./mvnw ${MAVEN_ARGS} spotless:check --file pom.xml
3130
- name: Run unit tests
3231
run: ./mvnw ${MAVEN_ARGS} clean install --file pom.xml
3332

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
package io.javaoperatorsdk.boostrapper;
22

3+
import com.github.mustachejava.DefaultMustacheFactory;
4+
import com.github.mustachejava.MustacheFactory;
5+
import io.javaoperatorsdk.bootstrapper.Versions;
36
import java.io.File;
47
import java.io.FileWriter;
58
import java.io.IOException;
69
import java.util.Arrays;
710
import java.util.List;
811
import java.util.Map;
912
import java.util.stream.Collectors;
10-
1113
import org.apache.commons.io.FileUtils;
1214
import org.slf4j.Logger;
1315
import org.slf4j.LoggerFactory;
1416

15-
import io.javaoperatorsdk.bootstrapper.Versions;
16-
17-
import com.github.mustachejava.DefaultMustacheFactory;
18-
import com.github.mustachejava.MustacheFactory;
19-
2017
public class Bootstrapper {
2118

2219
private static final Logger log = LoggerFactory.getLogger(Bootstrapper.class);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.boostrapper;
22

33
import java.io.File;
4-
54
import org.apache.maven.plugin.AbstractMojo;
65
import org.apache.maven.plugin.MojoExecutionException;
76
import org.apache.maven.plugins.annotations.Mojo;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package io.javaoperatorsdk.bootstrapper;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
5+
import io.javaoperatorsdk.boostrapper.Bootstrapper;
36
import java.io.BufferedReader;
47
import java.io.File;
58
import java.io.IOException;
69
import java.io.InputStreamReader;
7-
810
import org.junit.jupiter.api.Test;
911
import org.slf4j.Logger;
1012
import org.slf4j.LoggerFactory;
1113

12-
import io.javaoperatorsdk.boostrapper.Bootstrapper;
13-
14-
import static org.assertj.core.api.Assertions.assertThat;
15-
1614
class BootstrapperTest {
1715

1816
private static final Logger log = LoggerFactory.getLogger(BootstrapperTest.class);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import java.time.Duration;
4-
5-
import io.fabric8.kubernetes.api.model.HasMetadata;
6-
import io.fabric8.kubernetes.client.KubernetesClient;
7-
83
import com.github.benmanes.caffeine.cache.Cache;
94
import com.github.benmanes.caffeine.cache.Caffeine;
5+
import io.fabric8.kubernetes.api.model.HasMetadata;
6+
import io.fabric8.kubernetes.client.KubernetesClient;
7+
import java.time.Duration;
108

119
/**
1210
* A factory for <a href="https://github.com/ben-manes/caffeine">Caffeine</a>-backed

‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/BoundedCacheTestBase.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import java.time.Duration;
4-
import java.util.stream.IntStream;
5-
6-
import org.junit.jupiter.api.Test;
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
3+
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.DATA_KEY;
4+
import static org.assertj.core.api.Assertions.assertThat;
5+
import static org.awaitility.Awaitility.await;
96

107
import io.fabric8.kubernetes.api.model.ConfigMap;
118
import io.fabric8.kubernetes.client.CustomResource;
129
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
1310
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
1411
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestStatus;
15-
16-
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.DATA_KEY;
17-
import static org.assertj.core.api.Assertions.assertThat;
18-
import static org.awaitility.Awaitility.await;
12+
import java.time.Duration;
13+
import java.util.stream.IntStream;
14+
import org.junit.jupiter.api.Test;
15+
import org.slf4j.Logger;
16+
import org.slf4j.LoggerFactory;
1917

2018
public abstract class BoundedCacheTestBase<P extends CustomResource<BoundedCacheTestSpec, BoundedCacheTestStatus>> {
2119

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import java.time.Duration;
4-
5-
import org.junit.jupiter.api.extension.RegisterExtension;
3+
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
64

75
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
86
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
97
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
108
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.clusterscope.BoundedCacheClusterScopeTestCustomResource;
119
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.clusterscope.BoundedCacheClusterScopeTestReconciler;
1210
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
13-
14-
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
11+
import java.time.Duration;
12+
import org.junit.jupiter.api.extension.RegisterExtension;
1513

1614
public class CaffeineBoundedCacheClusterScopeIT
1715
extends BoundedCacheTestBase<BoundedCacheClusterScopeTestCustomResource> {

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import java.time.Duration;
4-
5-
import org.junit.jupiter.api.extension.RegisterExtension;
3+
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
64

75
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
86
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
97
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
108
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestCustomResource;
119
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestReconciler;
1210
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
13-
14-
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
11+
import java.time.Duration;
12+
import org.junit.jupiter.api.extension.RegisterExtension;
1513

1614
class CaffeineBoundedCacheNamespacedIT
1715
extends BoundedCacheTestBase<BoundedCacheTestCustomResource> {

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache.sample;
22

3-
import java.time.Duration;
4-
import java.util.Map;
5-
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
8-
3+
import com.github.benmanes.caffeine.cache.Cache;
4+
import com.github.benmanes.caffeine.cache.Caffeine;
95
import io.fabric8.kubernetes.api.model.ConfigMap;
106
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
117
import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -23,9 +19,10 @@
2319
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestStatus;
2420
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
2521
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
26-
27-
import com.github.benmanes.caffeine.cache.Cache;
28-
import com.github.benmanes.caffeine.cache.Caffeine;
22+
import java.time.Duration;
23+
import java.util.Map;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
2926

3027
public abstract class AbstractTestReconciler<P extends CustomResource<BoundedCacheTestSpec, BoundedCacheTestStatus>>
3128
implements Reconciler<P> {

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import java.util.*;
4-
import java.util.concurrent.ConcurrentHashMap;
5-
import java.util.concurrent.Executors;
6-
import java.util.concurrent.ScheduledExecutorService;
7-
import java.util.concurrent.TimeUnit;
8-
import java.util.concurrent.atomic.AtomicInteger;
3+
import static io.javaoperatorsdk.operator.api.reconciler.Constants.CONTROLLER_NAME;
94

105
import io.fabric8.kubernetes.api.model.HasMetadata;
116
import io.javaoperatorsdk.operator.OperatorException;
@@ -21,8 +16,12 @@
2116
import io.micrometer.core.instrument.MeterRegistry;
2217
import io.micrometer.core.instrument.Tag;
2318
import io.micrometer.core.instrument.Timer;
24-
25-
import static io.javaoperatorsdk.operator.api.reconciler.Constants.CONTROLLER_NAME;
19+
import java.util.*;
20+
import java.util.concurrent.ConcurrentHashMap;
21+
import java.util.concurrent.Executors;
22+
import java.util.concurrent.ScheduledExecutorService;
23+
import java.util.concurrent.TimeUnit;
24+
import java.util.concurrent.atomic.AtomicInteger;
2625

2726
public class MicrometerMetrics implements Metrics {
2827

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import java.util.HashSet;
4-
import java.util.Set;
5-
6-
import org.junit.jupiter.api.Test;
7-
import org.junit.jupiter.api.TestInstance;
8-
import org.junit.jupiter.api.extension.RegisterExtension;
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.awaitility.Awaitility.await;
95

106
import io.fabric8.kubernetes.api.model.ConfigMap;
117
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
@@ -14,9 +10,11 @@
1410
import io.javaoperatorsdk.operator.processing.event.ResourceID;
1511
import io.micrometer.core.instrument.Meter;
1612
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
17-
18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.awaitility.Awaitility.await;
13+
import java.util.HashSet;
14+
import java.util.Set;
15+
import org.junit.jupiter.api.Test;
16+
import org.junit.jupiter.api.TestInstance;
17+
import org.junit.jupiter.api.extension.RegisterExtension;
2018

2119
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2220
public abstract class AbstractMicrometerMetricsTestFixture {

‎micrometer-support/src/test/java/io/javaoperatorsdk/operator/monitoring/micrometer/DefaultBehaviorIT.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import java.util.Collections;
4-
import java.util.Set;
3+
import static org.assertj.core.api.Assertions.assertThat;
54

65
import io.javaoperatorsdk.operator.processing.event.ResourceID;
76
import io.micrometer.core.instrument.Meter;
8-
9-
import static org.assertj.core.api.Assertions.assertThat;
7+
import java.util.Collections;
8+
import java.util.Set;
109

1110
public class DefaultBehaviorIT extends AbstractMicrometerMetricsTestFixture {
1211
@Override

‎micrometer-support/src/test/java/io/javaoperatorsdk/operator/monitoring/micrometer/DelayedMetricsCleaningOnDeleteIT.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import java.time.Duration;
4-
import java.util.Set;
3+
import static org.assertj.core.api.Assertions.assertThat;
54

65
import io.javaoperatorsdk.operator.processing.event.ResourceID;
76
import io.micrometer.core.instrument.Meter;
8-
9-
import static org.assertj.core.api.Assertions.assertThat;
7+
import java.time.Duration;
8+
import java.util.Set;
109

1110
public class DelayedMetricsCleaningOnDeleteIT extends AbstractMicrometerMetricsTestFixture {
1211

‎micrometer-support/src/test/java/io/javaoperatorsdk/operator/monitoring/micrometer/NoPerResourceCollectionIT.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import java.util.Collections;
4-
import java.util.Set;
3+
import static org.assertj.core.api.Assertions.assertThat;
54

65
import io.javaoperatorsdk.operator.processing.event.ResourceID;
76
import io.micrometer.core.instrument.Meter;
8-
9-
import static org.assertj.core.api.Assertions.assertThat;
7+
import java.util.Collections;
8+
import java.util.Set;
109

1110
public class NoPerResourceCollectionIT extends AbstractMicrometerMetricsTestFixture {
1211
@Override

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ControllerManager.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package io.javaoperatorsdk.operator;
22

3+
import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
4+
import io.javaoperatorsdk.operator.processing.Controller;
35
import java.util.Collection;
46
import java.util.HashMap;
57
import java.util.Map;
68
import java.util.Optional;
7-
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011

11-
import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
12-
import io.javaoperatorsdk.operator.processing.Controller;
13-
1412
/**
1513
* Not to be confused with the controller manager concept from Go's controller-runtime project. In
1614
* JOSDK, the equivalent concept is {@link Operator}.

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package io.javaoperatorsdk.operator;
22

3-
import java.util.Arrays;
4-
import java.util.UUID;
5-
import java.util.concurrent.CompletableFuture;
6-
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
9-
103
import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview;
114
import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReviewSpecBuilder;
125
import io.fabric8.kubernetes.client.extended.leaderelection.LeaderCallbacks;
@@ -16,6 +9,11 @@
169
import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.LeaseLock;
1710
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
1811
import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
12+
import java.util.Arrays;
13+
import java.util.UUID;
14+
import java.util.concurrent.CompletableFuture;
15+
import org.slf4j.Logger;
16+
import org.slf4j.LoggerFactory;
1917

2018
public class LeaderElectionManager {
2119

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
package io.javaoperatorsdk.operator;
22

3-
import java.time.Duration;
4-
import java.util.HashSet;
5-
import java.util.Optional;
6-
import java.util.Set;
7-
import java.util.function.Consumer;
8-
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
11-
123
import io.fabric8.kubernetes.api.model.HasMetadata;
134
import io.fabric8.kubernetes.client.KubernetesClient;
145
import io.fabric8.kubernetes.client.Version;
@@ -19,6 +10,13 @@
1910
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
2011
import io.javaoperatorsdk.operator.processing.Controller;
2112
import io.javaoperatorsdk.operator.processing.LifecycleAware;
13+
import java.time.Duration;
14+
import java.util.HashSet;
15+
import java.util.Optional;
16+
import java.util.Set;
17+
import java.util.function.Consumer;
18+
import org.slf4j.Logger;
19+
import org.slf4j.LoggerFactory;
2220

2321
@SuppressWarnings("rawtypes")
2422
public class Operator implements LifecycleAware {

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtils.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package io.javaoperatorsdk.operator;
22

3-
import java.io.IOException;
4-
import java.io.InputStream;
5-
import java.lang.reflect.InvocationTargetException;
6-
import java.lang.reflect.Method;
7-
import java.util.Arrays;
8-
import java.util.Locale;
9-
import java.util.Objects;
10-
import java.util.function.Predicate;
11-
import java.util.regex.Pattern;
12-
import java.util.stream.Collectors;
13-
143
import io.fabric8.kubernetes.api.builder.Builder;
154
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
165
import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -21,6 +10,16 @@
2110
import io.javaoperatorsdk.operator.api.reconciler.Constants;
2211
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
2312
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
13+
import java.io.IOException;
14+
import java.io.InputStream;
15+
import java.lang.reflect.InvocationTargetException;
16+
import java.lang.reflect.Method;
17+
import java.util.Arrays;
18+
import java.util.Locale;
19+
import java.util.Objects;
20+
import java.util.function.Predicate;
21+
import java.util.regex.Pattern;
22+
import java.util.stream.Collectors;
2423

2524
@SuppressWarnings("rawtypes")
2625
public class ReconcilerUtils {

0 commit comments

Comments
 (0)