Skip to content

Commit 0ba02a3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1425 from yue9944882/fails-fmt-upon-wildcard-import
Breaking sources when wildcard or guava imports present
2 parents 60cc2a9 + 96ac59a commit 0ba02a3

File tree

21 files changed

+149
-23
lines changed

21 files changed

+149
-23
lines changed

‎examples/examples-release-10/src/main/java/io/kubernetes/client/examples/InformerExample.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
*/
1313
package io.kubernetes.client.examples;
1414

15-
import io.kubernetes.client.informer.*;
15+
import io.kubernetes.client.informer.ResourceEventHandler;
16+
import io.kubernetes.client.informer.SharedIndexInformer;
17+
import io.kubernetes.client.informer.SharedInformerFactory;
1618
import io.kubernetes.client.informer.cache.Lister;
1719
import io.kubernetes.client.openapi.ApiClient;
1820
import io.kubernetes.client.openapi.apis.CoreV1Api;

‎examples/examples-release-10/src/main/java/io/kubernetes/client/examples/SpringControllerExample.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
import io.kubernetes.client.openapi.models.V1NodeList;
2525
import io.kubernetes.client.openapi.models.V1Pod;
2626
import io.kubernetes.client.openapi.models.V1PodList;
27-
import io.kubernetes.client.spring.extended.controller.annotation.*;
27+
import io.kubernetes.client.spring.extended.controller.annotation.GroupVersionResource;
28+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer;
29+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformers;
30+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconciler;
31+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconcilerReadyFunc;
32+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconcilerWatch;
33+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconcilerWatches;
2834
import io.kubernetes.client.util.ClientBuilder;
2935
import java.io.IOException;
3036
import java.time.Duration;

‎examples/examples-release-11/src/main/java/io/kubernetes/client/examples/InformerExample.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
*/
1313
package io.kubernetes.client.examples;
1414

15-
import io.kubernetes.client.informer.*;
15+
import io.kubernetes.client.informer.ResourceEventHandler;
16+
import io.kubernetes.client.informer.SharedIndexInformer;
17+
import io.kubernetes.client.informer.SharedInformerFactory;
1618
import io.kubernetes.client.informer.cache.Lister;
1719
import io.kubernetes.client.openapi.ApiClient;
1820
import io.kubernetes.client.openapi.apis.CoreV1Api;

‎examples/examples-release-11/src/main/java/io/kubernetes/client/examples/SpringControllerExample.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@
2525
import io.kubernetes.client.openapi.models.V1NodeList;
2626
import io.kubernetes.client.openapi.models.V1Pod;
2727
import io.kubernetes.client.openapi.models.V1PodList;
28-
import io.kubernetes.client.spring.extended.controller.annotation.*;
28+
import io.kubernetes.client.spring.extended.controller.annotation.GroupVersionResource;
29+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer;
30+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformers;
31+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconciler;
32+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconcilerReadyFunc;
33+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconcilerWatch;
34+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconcilerWatches;
2935
import io.kubernetes.client.spring.extended.controller.factory.KubernetesControllerFactory;
3036
import org.springframework.beans.factory.annotation.Autowired;
3137
import org.springframework.beans.factory.annotation.Qualifier;

‎extended/src/test/java/io/kubernetes/client/extended/controller/builder/DefaultControllerBuilderTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
import io.kubernetes.client.openapi.ApiClient;
2626
import io.kubernetes.client.openapi.JSON;
2727
import io.kubernetes.client.openapi.apis.CoreV1Api;
28-
import io.kubernetes.client.openapi.models.*;
28+
import io.kubernetes.client.openapi.models.V1ListMeta;
29+
import io.kubernetes.client.openapi.models.V1ObjectMeta;
30+
import io.kubernetes.client.openapi.models.V1Pod;
31+
import io.kubernetes.client.openapi.models.V1PodList;
32+
import io.kubernetes.client.openapi.models.V1PodSpec;
2933
import io.kubernetes.client.util.CallGeneratorParams;
3034
import io.kubernetes.client.util.ClientBuilder;
3135
import java.util.ArrayList;

‎extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlGetTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525
import io.kubernetes.client.extended.kubectl.exception.KubectlException;
2626
import io.kubernetes.client.openapi.ApiClient;
2727
import io.kubernetes.client.openapi.ApiException;
28-
import io.kubernetes.client.openapi.models.*;
28+
import io.kubernetes.client.openapi.models.V1Node;
29+
import io.kubernetes.client.openapi.models.V1NodeList;
30+
import io.kubernetes.client.openapi.models.V1ObjectMeta;
31+
import io.kubernetes.client.openapi.models.V1Pod;
32+
import io.kubernetes.client.openapi.models.V1PodList;
33+
import io.kubernetes.client.openapi.models.V1Status;
2934
import io.kubernetes.client.util.ClientBuilder;
3035
import io.kubernetes.client.util.ModelMapper;
3136
import java.io.IOException;

‎kubernetes/src/main/java/io/kubernetes/client/openapi/ApiClient.java

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,35 @@
2929
import java.security.cert.CertificateException;
3030
import java.security.cert.CertificateFactory;
3131
import java.text.DateFormat;
32-
import java.util.*;
32+
import java.util.ArrayList;
33+
import java.util.Collection;
34+
import java.util.Collections;
35+
import java.util.Date;
36+
import java.util.HashMap;
37+
import java.util.List;
38+
import java.util.Map;
3339
import java.util.Map.Entry;
40+
import java.util.Objects;
3441
import java.util.concurrent.TimeUnit;
3542
import java.util.regex.Matcher;
3643
import java.util.regex.Pattern;
37-
import javax.net.ssl.*;
38-
import okhttp3.*;
44+
import javax.net.ssl.HostnameVerifier;
45+
import javax.net.ssl.KeyManager;
46+
import javax.net.ssl.SSLContext;
47+
import javax.net.ssl.SSLSession;
48+
import javax.net.ssl.TrustManager;
49+
import javax.net.ssl.TrustManagerFactory;
50+
import javax.net.ssl.X509TrustManager;
51+
import okhttp3.Call;
52+
import okhttp3.Callback;
53+
import okhttp3.Headers;
54+
import okhttp3.Interceptor;
55+
import okhttp3.MediaType;
56+
import okhttp3.MultipartBody;
57+
import okhttp3.OkHttpClient;
58+
import okhttp3.Request;
59+
import okhttp3.RequestBody;
60+
import okhttp3.Response;
3961
import okhttp3.internal.http.HttpMethod;
4062
import okhttp3.internal.tls.OkHostnameVerifier;
4163
import okhttp3.logging.HttpLoggingInterceptor;

‎kubernetes/src/main/java/io/kubernetes/client/openapi/GzipRequestInterceptor.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
package io.kubernetes.client.openapi;
1414

1515
import java.io.IOException;
16-
import okhttp3.*;
16+
import okhttp3.Interceptor;
17+
import okhttp3.MediaType;
18+
import okhttp3.Request;
19+
import okhttp3.RequestBody;
20+
import okhttp3.Response;
1721
import okio.Buffer;
1822
import okio.BufferedSink;
1923
import okio.GzipSink;

‎pom.xml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@
449449
<version>2.6.1</version>
450450
<configuration>
451451
<formats>
452+
<!-- common settings -->
452453
<format>
453454
<includes>
454455
<include>examples/**/*.java</include>
@@ -461,10 +462,42 @@
461462
<trimTrailingWhitespace />
462463
<endWithNewline />
463464
</format>
465+
<!-- removes wildcard imports -->
466+
<format>
467+
<includes>
468+
<include>examples/**/*.java</include>
469+
<include>extended/**/*.java</include>
470+
<include>kubernetes/**/*.java</include>
471+
<include>proto/**/*.java</include>
472+
<include>spring/**/*.java</include>
473+
<include>util/**/*.java</include>
474+
</includes>
475+
<replaceRegex>
476+
<name>Remove wildcard imports</name>
477+
<searchRegex>import (static )?\s+\S+\.\*;$</searchRegex>
478+
<replacement>INVALID IMPORTS (WILDCARD)</replacement>
479+
</replaceRegex>
480+
</format>
481+
<!-- removes guava imports -->
482+
<format>
483+
<includes>
484+
<include>examples/**/*.java</include>
485+
<include>extended/**/*.java</include>
486+
<include>kubernetes/**/*.java</include>
487+
<include>proto/**/*.java</include>
488+
<include>spring/**/*.java</include>
489+
<include>util/**/*.java</include>
490+
</includes>
491+
<replaceRegex>
492+
<name>Forbids guava imports</name>
493+
<searchRegex>^import (static )?com\.google\.guava\..*;$</searchRegex>
494+
<replacement>INVALID IMPORTS (GUAVA)</replacement>
495+
</replaceRegex>
496+
</format>
464497
</formats>
465498
<java>
466499
<removeUnusedImports /> <!-- self-explanatory -->
467-
<googleJavaFormat />
500+
<googleJavaFormat/>
468501
</java>
469502
<licenseHeader>
470503
<content>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.kubernetes.client.extended.controller.ControllerManager;
1717
import io.kubernetes.client.extended.controller.reconciler.Reconciler;
1818
import io.kubernetes.client.informer.SharedInformerFactory;
19-
import io.kubernetes.client.spring.extended.controller.annotation.*;
19+
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconciler;
2020
import io.kubernetes.client.spring.extended.controller.factory.KubernetesControllerFactory;
2121
import java.util.concurrent.ExecutorService;
2222
import java.util.concurrent.Executors;

0 commit comments

Comments
 (0)