Skip to content

Commit 41eb901

Browse files
author
Dave Syer
committed
Fix code format and new Guava usage
Signed-off-by: Dave Syer <dsyer@vmware.com>
1 parent 52c6efd commit 41eb901

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
import io.kubernetes.client.extended.controller.reconciler.Request;
1717
import io.kubernetes.client.openapi.models.V1ObjectMeta;
1818
import io.kubernetes.client.util.Threads;
19-
20-
import java.util.concurrent.Executors;
2119
import java.util.concurrent.ThreadFactory;
22-
import java.util.concurrent.atomic.AtomicInteger;
2320
import java.util.function.Function;
2421
import org.slf4j.Logger;
2522
import org.slf4j.LoggerFactory;

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

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

15+
import io.kubernetes.client.openapi.ApiException;
16+
import io.kubernetes.client.util.Threads;
1517
import java.net.HttpURLConnection;
1618
import java.time.Duration;
1719
import java.util.Date;
@@ -28,13 +30,9 @@
2830
import java.util.concurrent.TimeoutException;
2931
import java.util.concurrent.atomic.AtomicBoolean;
3032
import java.util.function.Consumer;
31-
3233
import org.slf4j.Logger;
3334
import org.slf4j.LoggerFactory;
3435

35-
import io.kubernetes.client.openapi.ApiException;
36-
import io.kubernetes.client.util.Threads;
37-
3836
public class LeaderElector implements AutoCloseable {
3937

4038
private static final Logger log = LoggerFactory.getLogger(LeaderElector.class);

spring/src/main/java/io/kubernetes/client/spring/extended/manifests/KubernetesFromYamlProcessor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313
package io.kubernetes.client.spring.extended.manifests;
1414

15-
import com.google.common.io.Resources;
1615
import io.kubernetes.client.spring.extended.manifests.annotation.FromYaml;
1716
import io.kubernetes.client.util.Yaml;
1817
import java.io.IOException;
@@ -91,7 +90,7 @@ private Object loadFromYaml(String targetFilePath) {
9190
Path targetPath = Paths.get(targetFilePath);
9291
if (!Files.exists(Paths.get(targetFilePath))) { // checks if it exists on the machine
9392
// otherwise use load from classpath resources
94-
Path classPath = Paths.get(Resources.getResource(targetFilePath).getPath());
93+
Path classPath = Paths.get(getClass().getClassLoader().getResource(targetFilePath).getPath());
9594
if (Files.exists(classPath)) { // use classpath it works
9695
targetPath = classPath;
9796
} else {

util/src/main/java/io/kubernetes/client/informer/cache/Controller.java

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

15+
import io.kubernetes.client.common.KubernetesListObject;
16+
import io.kubernetes.client.common.KubernetesObject;
17+
import io.kubernetes.client.informer.ListerWatcher;
18+
import io.kubernetes.client.informer.ResyncRunnable;
19+
import io.kubernetes.client.util.Threads;
1520
import java.util.Deque;
1621
import java.util.concurrent.Executors;
1722
import java.util.concurrent.RejectedExecutionException;
@@ -20,17 +25,10 @@
2025
import java.util.concurrent.TimeUnit;
2126
import java.util.function.Consumer;
2227
import java.util.function.Supplier;
23-
2428
import org.apache.commons.lang3.tuple.MutablePair;
2529
import org.slf4j.Logger;
2630
import org.slf4j.LoggerFactory;
2731

28-
import io.kubernetes.client.common.KubernetesListObject;
29-
import io.kubernetes.client.common.KubernetesObject;
30-
import io.kubernetes.client.informer.ListerWatcher;
31-
import io.kubernetes.client.informer.ResyncRunnable;
32-
import io.kubernetes.client.util.Threads;
33-
3432
/**
3533
* Controller is a java port of k/client-go's informer#Controller. It plumbs reflector and the queue
3634
* implementation and it runs re-sync function periodically.
@@ -84,12 +82,12 @@ public Controller(
8482
// starts one daemon thread for reflector
8583
this.reflectExecutor =
8684
Executors.newSingleThreadScheduledExecutor(
87-
Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
85+
Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
8886

8987
// starts one daemon thread for resync
9088
this.resyncExecutor =
9189
Executors.newSingleThreadScheduledExecutor(
92-
Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
90+
Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
9391
}
9492

9593
public Controller(

util/src/main/java/io/kubernetes/client/util/Threads.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.concurrent.atomic.AtomicInteger;
1818

1919
public class Threads {
20-
20+
2121
public static ThreadFactory threadFactory(String format) {
2222
final ThreadFactory defaultFactory = Executors.defaultThreadFactory();
2323
final AtomicInteger threadNumber = new AtomicInteger(1);

0 commit comments

Comments
 (0)