Skip to content

Commit 739291b

Browse files
author
Dave Syer
committed
Fix spotless violations
Signed-off-by: Dave Syer <dsyer@vmware.com>
1 parent d850dff commit 739291b

File tree

30 files changed

+271
-272
lines changed

30 files changed

+271
-272
lines changed

examples/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

13-
<version>1.0.0-SNAPSHOT</version>
13+
<version>1.0.0-SNAPSHOT</version>
1414

1515
<artifactId>client-java-examples-parent</artifactId>
1616
<packaging>pom</packaging>
1717
<name>client-java-examples-parent</name>
1818

1919
<properties>
20-
<guava.version>30.0-jre</guava.version>
20+
<guava.version>30.0-jre</guava.version>
2121
<kubernetes.client.version>10.0.1-SNAPSHOT</kubernetes.client.version>
2222
</properties>
2323

@@ -26,15 +26,15 @@
2626
<module>examples-release-10</module>
2727
</modules>
2828

29-
<dependencyManagement>
30-
<dependencies>
31-
<dependency>
32-
<groupId>com.google.guava</groupId>
33-
<artifactId>guava</artifactId>
34-
<version>${guava.version}</version>
35-
</dependency>
36-
</dependencies>
37-
</dependencyManagement>
29+
<dependencyManagement>
30+
<dependencies>
31+
<dependency>
32+
<groupId>com.google.guava</groupId>
33+
<artifactId>guava</artifactId>
34+
<version>${guava.version}</version>
35+
</dependency>
36+
</dependencies>
37+
</dependencyManagement>
3838

3939
<build>
4040
<plugins>

extended/src/main/java/io/kubernetes/client/extended/controller/Controllers.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212
*/
1313
package io.kubernetes.client.extended.controller;
1414

15+
import io.kubernetes.client.common.KubernetesObject;
16+
import io.kubernetes.client.extended.controller.reconciler.Request;
17+
import io.kubernetes.client.openapi.models.V1ObjectMeta;
1518
import java.util.concurrent.Executors;
1619
import java.util.concurrent.ThreadFactory;
1720
import java.util.concurrent.atomic.AtomicInteger;
1821
import java.util.function.Function;
19-
2022
import org.slf4j.Logger;
2123
import org.slf4j.LoggerFactory;
2224

23-
import io.kubernetes.client.common.KubernetesObject;
24-
import io.kubernetes.client.extended.controller.reconciler.Request;
25-
import io.kubernetes.client.openapi.models.V1ObjectMeta;
26-
2725
/** The Controllers is a set of commonly used utility functions for constructing controller. */
2826
public class Controllers {
2927

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventAggregator.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@
1212
*/
1313
package io.kubernetes.client.extended.event.legacy;
1414

15+
import com.github.benmanes.caffeine.cache.Cache;
16+
import com.github.benmanes.caffeine.cache.Caffeine;
1517
import io.kubernetes.client.fluent.Function;
1618
import io.kubernetes.client.openapi.models.CoreV1Event;
1719
import io.kubernetes.client.openapi.models.CoreV1EventBuilder;
1820
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
1921
import java.util.HashSet;
2022
import java.util.Objects;
2123
import java.util.Set;
22-
import java.util.concurrent.ExecutionException;
23-
24-
import com.github.benmanes.caffeine.cache.Cache;
25-
import com.github.benmanes.caffeine.cache.Caffeine;
26-
2724
import org.apache.commons.lang3.tuple.MutablePair;
2825
import org.joda.time.DateTime;
2926

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212
*/
1313
package io.kubernetes.client.extended.event.legacy;
1414

15+
import com.github.benmanes.caffeine.cache.Cache;
16+
import com.github.benmanes.caffeine.cache.Caffeine;
1517
import io.kubernetes.client.custom.V1Patch;
1618
import io.kubernetes.client.openapi.Configuration;
1719
import io.kubernetes.client.openapi.models.CoreV1Event;
1820
import java.util.function.Function;
19-
20-
import com.github.benmanes.caffeine.cache.Cache;
21-
import com.github.benmanes.caffeine.cache.Caffeine;
22-
2321
import org.apache.commons.lang3.tuple.MutablePair;
2422
import org.joda.time.DateTime;
2523

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventSpamFilter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@
1212
*/
1313
package io.kubernetes.client.extended.event.legacy;
1414

15+
import com.github.benmanes.caffeine.cache.Cache;
16+
import com.github.benmanes.caffeine.cache.Caffeine;
1517
import io.github.bucket4j.Bandwidth;
1618
import io.github.bucket4j.Bucket4j;
1719
import io.github.bucket4j.Refill;
1820
import io.github.bucket4j.local.LocalBucket;
1921
import io.github.bucket4j.local.SynchronizationStrategy;
2022
import io.kubernetes.client.openapi.models.CoreV1Event;
2123
import java.time.Duration;
22-
import java.util.concurrent.ExecutionException;
2324
import java.util.function.Function;
2425

25-
import com.github.benmanes.caffeine.cache.Cache;
26-
import com.github.benmanes.caffeine.cache.Caffeine;
27-
2826
public class EventSpamFilter {
2927

3028
public static final Duration DEFAULT_TOKEN_BUCKET_REFILLING_PERIOD = Duration.ofMinutes(5);

extended/src/main/java/io/kubernetes/client/extended/event/legacy/ObjectReferenceResolvingEventRecorder.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@
1212
*/
1313
package io.kubernetes.client.extended.event.legacy;
1414

15-
import java.util.HashMap;
16-
import java.util.Map;
17-
import java.util.concurrent.BlockingQueue;
18-
import java.util.concurrent.TimeUnit;
19-
20-
import org.joda.time.DateTime;
21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
23-
2415
import io.kubernetes.client.common.KubernetesObject;
2516
import io.kubernetes.client.extended.event.EventType;
2617
import io.kubernetes.client.openapi.models.CoreV1Event;
@@ -31,6 +22,13 @@
3122
import io.kubernetes.client.openapi.models.V1ObjectReference;
3223
import io.kubernetes.client.openapi.models.V1ObjectReferenceBuilder;
3324
import io.kubernetes.client.util.Strings;
25+
import java.util.HashMap;
26+
import java.util.Map;
27+
import java.util.concurrent.BlockingQueue;
28+
import java.util.concurrent.TimeUnit;
29+
import org.joda.time.DateTime;
30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
3432

3533
public class ObjectReferenceResolvingEventRecorder implements EventRecorder {
3634

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlExec.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@
1212
*/
1313
package io.kubernetes.client.extended.kubectl;
1414

15-
import java.io.IOException;
16-
import java.io.InputStream;
17-
import java.io.OutputStream;
18-
1915
import io.kubernetes.client.Exec;
2016
import io.kubernetes.client.extended.kubectl.exception.KubectlException;
2117
import io.kubernetes.client.openapi.ApiException;
2218
import io.kubernetes.client.openapi.models.V1ObjectMeta;
2319
import io.kubernetes.client.openapi.models.V1Pod;
2420
import io.kubernetes.client.util.Streams;
21+
import java.io.IOException;
22+
import java.io.InputStream;
23+
import java.io.OutputStream;
2524

2625
public class KubectlExec extends Kubectl.ResourceAndContainerBuilder<V1Pod, KubectlExec>
2726
implements Kubectl.Executable<Integer> {

extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElector.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*/
1313
package io.kubernetes.client.extended.leaderelection;
1414

15+
import io.kubernetes.client.openapi.ApiException;
1516
import java.net.HttpURLConnection;
1617
import java.time.Duration;
1718
import java.util.Date;
@@ -30,12 +31,9 @@
3031
import java.util.concurrent.atomic.AtomicBoolean;
3132
import java.util.concurrent.atomic.AtomicInteger;
3233
import java.util.function.Consumer;
33-
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;
3636

37-
import io.kubernetes.client.openapi.ApiException;
38-
3937
public class LeaderElector implements AutoCloseable {
4038

4139
private static final Logger log = LoggerFactory.getLogger(LeaderElector.class);
@@ -346,16 +344,16 @@ private void maybeReportTransition() {
346344
}
347345

348346
private ThreadFactory makeThreadFactory(String format) {
349-
final ThreadFactory defaultFactory = Executors.defaultThreadFactory();
350-
final AtomicInteger threadNumber = new AtomicInteger(1);
351-
return r -> {
352-
Thread thread = defaultFactory.newThread(r);
353-
if (!thread.isDaemon()) {
354-
thread.setDaemon(true);
355-
}
356-
thread.setName(String.format(format, threadNumber.getAndIncrement()));
357-
return thread;
358-
};
347+
final ThreadFactory defaultFactory = Executors.defaultThreadFactory();
348+
final AtomicInteger threadNumber = new AtomicInteger(1);
349+
return r -> {
350+
Thread thread = defaultFactory.newThread(r);
351+
if (!thread.isDaemon()) {
352+
thread.setDaemon(true);
353+
}
354+
thread.setName(String.format(format, threadNumber.getAndIncrement()));
355+
return thread;
356+
};
359357
}
360358

361359
@Override

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ limitations under the License.
517517
<family>!windows</family>
518518
</os>
519519
<file>
520-
<missing>.google</missing>
520+
<missing>.google</missing>
521521
</file>
522522
</activation>
523523
<build>

spring/src/main/java/io/kubernetes/client/spring/extended/network/endpoints/PollingEndpointsGetter.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,34 @@
1212
*/
1313
package io.kubernetes.client.spring.extended.network.endpoints;
1414

15+
import com.github.benmanes.caffeine.cache.Cache;
16+
import com.github.benmanes.caffeine.cache.Caffeine;
1517
import io.kubernetes.client.apimachinery.NamespaceName;
1618
import io.kubernetes.client.openapi.ApiClient;
1719
import io.kubernetes.client.openapi.ApiException;
1820
import io.kubernetes.client.openapi.apis.CoreV1Api;
1921
import io.kubernetes.client.openapi.models.V1Endpoints;
2022
import java.time.Duration;
21-
22-
import com.github.benmanes.caffeine.cache.Cache;
23-
import com.github.benmanes.caffeine.cache.Caffeine;
24-
2523
import org.springframework.beans.factory.annotation.Autowired;
2624

2725
public class PollingEndpointsGetter implements EndpointsGetter {
2826

29-
private static final Cache<NamespaceName, V1Endpoints> lastObservedEndpoints = Caffeine.newBuilder()
30-
.expireAfterWrite(Duration.ofMinutes(5)).build();
27+
private static final Cache<NamespaceName, V1Endpoints> lastObservedEndpoints =
28+
Caffeine.newBuilder().expireAfterWrite(Duration.ofMinutes(5)).build();
3129

32-
@Autowired
33-
private ApiClient apiClient;
30+
@Autowired private ApiClient apiClient;
3431

3532
@Override
3633
public V1Endpoints get(String namespace, String name) {
3734
CoreV1Api coreV1Api = new CoreV1Api(apiClient);
38-
return lastObservedEndpoints.get(new NamespaceName(namespace, name), k -> {
39-
try {
40-
return coreV1Api.readNamespacedEndpoints(name, namespace, null, null, null);
41-
} catch (ApiException e) {
42-
throw new IllegalStateException(e);
43-
}
44-
});
35+
return lastObservedEndpoints.get(
36+
new NamespaceName(namespace, name),
37+
k -> {
38+
try {
39+
return coreV1Api.readNamespacedEndpoints(name, namespace, null, null, null);
40+
} catch (ApiException e) {
41+
throw new IllegalStateException(e);
42+
}
43+
});
4544
}
4645
}

0 commit comments

Comments
 (0)