Skip to content

Commit 9be6e0a

Browse files
mingjie-liMingjieAmadeus
authored andcommitted
fix src format
1 parent 5d1bfc2 commit 9be6e0a

File tree

3 files changed

+21
-55
lines changed

3 files changed

+21
-55
lines changed

examples/src/main/java/io/kubernetes/client/examples/springfactorybean/SpringControllerFactoryBeanExample.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@
2525
import io.kubernetes.client.openapi.models.V1Pod;
2626
import io.kubernetes.client.openapi.models.V1PodList;
2727
import io.kubernetes.client.spring.extended.controller.KubernetesInformerConfigurer;
28-
import io.kubernetes.client.spring.extended.controller.KubernetesReconcilerConfigurer;
2928
import io.kubernetes.client.spring.extended.controller.annotation.*;
3029
import io.kubernetes.client.spring.extended.controller.factory.KubernetesControllerFactory;
3130
import io.kubernetes.client.util.ClientBuilder;
3231
import java.io.IOException;
3332
import java.time.Duration;
34-
3533
import org.springframework.beans.factory.annotation.Autowired;
3634
import org.springframework.beans.factory.annotation.Qualifier;
3735
import org.springframework.beans.factory.annotation.Value;
@@ -132,14 +130,11 @@ public static class NodePrintingReconciler implements Reconciler {
132130

133131
@Value("${namespace}")
134132
private String namespace;
135-
@Autowired
136-
private SharedInformer<V1Node> nodeInformer;
137-
@Autowired
138-
private SharedInformer<V1Pod> podInformer;
139-
@Autowired
140-
private Lister<V1Node> nodeLister;
141-
@Autowired
142-
private Lister<V1Pod> podLister;
133+
134+
@Autowired private SharedInformer<V1Node> nodeInformer;
135+
@Autowired private SharedInformer<V1Pod> podInformer;
136+
@Autowired private Lister<V1Node> nodeLister;
137+
@Autowired private Lister<V1Pod> podLister;
143138

144139
// *OPTIONAL*
145140
// If you feed like hold the controller from running util some condition..
@@ -152,10 +147,11 @@ public boolean informerReady() {
152147
public Result reconcile(Request request) {
153148
V1Node node = nodeLister.get(request.getName());
154149

155-
System.out.println("get all pods in namespace "+namespace);
150+
System.out.println("get all pods in namespace " + namespace);
156151
podLister.namespace(namespace).list().stream()
157-
.map(pod->pod.getMetadata().getName()).forEach(System.out::println);
158-
152+
.map(pod -> pod.getMetadata().getName())
153+
.forEach(System.out::println);
154+
159155
System.out.println("triggered reconciling " + node.getMetadata().getName());
160156
return new Result(false);
161157
}

spring/src/main/java/io/kubernetes/client/spring/extended/controller/KubernetesReconcilerProcessor.java

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,17 @@
1212
*/
1313
package io.kubernetes.client.spring.extended.controller;
1414

15-
import io.kubernetes.client.common.KubernetesObject;
1615
import io.kubernetes.client.extended.controller.Controller;
1716
import io.kubernetes.client.extended.controller.ControllerManager;
18-
import io.kubernetes.client.extended.controller.builder.ControllerBuilder;
19-
import io.kubernetes.client.extended.controller.builder.DefaultControllerBuilder;
2017
import io.kubernetes.client.extended.controller.reconciler.Reconciler;
21-
import io.kubernetes.client.extended.controller.reconciler.Request;
22-
import io.kubernetes.client.extended.workqueue.DefaultRateLimitingQueue;
23-
import io.kubernetes.client.extended.workqueue.RateLimitingQueue;
24-
import io.kubernetes.client.extended.workqueue.WorkQueue;
2518
import io.kubernetes.client.informer.SharedInformerFactory;
2619
import io.kubernetes.client.spring.extended.controller.annotation.*;
2720
import io.kubernetes.client.spring.extended.controller.factory.KubernetesControllerFactory;
28-
29-
import java.lang.reflect.InvocationTargetException;
30-
import java.lang.reflect.Method;
31-
import java.time.Duration;
32-
import java.util.ArrayList;
33-
import java.util.HashMap;
34-
import java.util.HashSet;
35-
import java.util.List;
36-
import java.util.Map;
37-
import java.util.Set;
3821
import java.util.concurrent.ExecutorService;
3922
import java.util.concurrent.Executors;
40-
import java.util.function.BiPredicate;
41-
import java.util.function.Function;
42-
import java.util.function.Predicate;
43-
import java.util.function.Supplier;
44-
import org.apache.commons.lang3.StringUtils;
4523
import org.slf4j.Logger;
4624
import org.slf4j.LoggerFactory;
4725
import org.springframework.beans.BeansException;
48-
import org.springframework.beans.factory.BeanCreationException;
4926
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
5027
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
5128
import org.springframework.core.Ordered;
@@ -90,9 +67,10 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
9067
KubernetesReconciler kubernetesReconciler =
9168
reconciler.getClass().getAnnotation(KubernetesReconciler.class);
9269
String reconcilerName = kubernetesReconciler.value();
93-
94-
KubernetesControllerFactory controllerFactory = new KubernetesControllerFactory(sharedInformerFactory, reconciler);
95-
70+
71+
KubernetesControllerFactory controllerFactory =
72+
new KubernetesControllerFactory(sharedInformerFactory, reconciler);
73+
9674
Controller controller = controllerFactory.getObject();
9775
beanFactory.registerSingleton(reconcilerName, controller);
9876
}

spring/src/main/java/io/kubernetes/client/spring/extended/controller/factory/KubernetesControllerFactory.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import io.kubernetes.client.common.KubernetesObject;
1616
import io.kubernetes.client.extended.controller.Controller;
17-
import io.kubernetes.client.extended.controller.ControllerManager;
1817
import io.kubernetes.client.extended.controller.builder.ControllerBuilder;
1918
import io.kubernetes.client.extended.controller.builder.DefaultControllerBuilder;
2019
import io.kubernetes.client.extended.controller.reconciler.Reconciler;
@@ -33,8 +32,6 @@
3332
import java.util.List;
3433
import java.util.Map;
3534
import java.util.Set;
36-
import java.util.concurrent.ExecutorService;
37-
import java.util.concurrent.Executors;
3835
import java.util.function.BiPredicate;
3936
import java.util.function.Function;
4037
import java.util.function.Predicate;
@@ -44,12 +41,7 @@
4441
import org.slf4j.LoggerFactory;
4542
import org.springframework.beans.BeansException;
4643
import org.springframework.beans.factory.BeanCreationException;
47-
import org.springframework.beans.factory.BeanFactory;
4844
import org.springframework.beans.factory.FactoryBean;
49-
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
50-
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
51-
import org.springframework.core.Ordered;
52-
import org.springframework.stereotype.Component;
5345

5446
/**
5547
* Scans and processes {@link
@@ -62,19 +54,19 @@ public class KubernetesControllerFactory implements FactoryBean<Controller> {
6254

6355
private static final Logger log = LoggerFactory.getLogger(KubernetesControllerFactory.class);
6456

65-
6657
private SharedInformerFactory sharedInformerFactory;
67-
58+
6859
private Reconciler reconciler;
6960

70-
public KubernetesControllerFactory(SharedInformerFactory sharedInformerFactory, Reconciler reconciler) {
61+
public KubernetesControllerFactory(
62+
SharedInformerFactory sharedInformerFactory, Reconciler reconciler) {
7163
this.sharedInformerFactory = sharedInformerFactory;
7264
this.reconciler = reconciler;
7365
}
7466

7567
@Override
7668
public Controller getObject() throws BeansException {
77-
return buildController(this.sharedInformerFactory, reconciler);
69+
return buildController(this.sharedInformerFactory, reconciler);
7870
}
7971

8072
private Controller buildController(SharedInformerFactory sharedInformerFactory, Reconciler r)
@@ -301,8 +293,8 @@ public Boolean get() {
301293
}
302294
}
303295

304-
@Override
305-
public Class<?> getObjectType() {
306-
return Controller.class;
307-
}
296+
@Override
297+
public Class<?> getObjectType() {
298+
return Controller.class;
299+
}
308300
}

0 commit comments

Comments
 (0)