Skip to content

Commit 49cf295

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1438 from dsyer/guavaspotless
Fix Guava regexp in spotless config
2 parents 6358110 + 028be9d commit 49cf295

File tree

18 files changed

+92
-47
lines changed

18 files changed

+92
-47
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.github.tomakehurst.wiremock.junit.WireMockRule;
2020
import com.github.tomakehurst.wiremock.matching.EqualToPattern;
21-
import com.google.common.io.Resources;
2221
import io.kubernetes.client.custom.V1Patch;
2322
import io.kubernetes.client.extended.kubectl.exception.KubectlException;
2423
import io.kubernetes.client.openapi.ApiClient;
@@ -35,13 +34,14 @@
3534

3635
public class KubectlApplyTest {
3736

38-
private static final String DISCOVERY_API = Resources.getResource("discovery-api.json").getPath();
37+
private static final String DISCOVERY_API =
38+
KubectlApplyTest.class.getClassLoader().getResource("discovery-api.json").getPath();
3939

4040
private static final String DISCOVERY_APIV1 =
41-
Resources.getResource("discovery-api-v1.json").getPath();
41+
KubectlApplyTest.class.getClassLoader().getResource("discovery-api-v1.json").getPath();
4242

4343
private static final String DISCOVERY_APIS =
44-
Resources.getResource("discovery-apis.json").getPath();
44+
KubectlApplyTest.class.getClassLoader().getResource("discovery-apis.json").getPath();
4545

4646
private ApiClient apiClient;
4747

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.junit.Assert.assertNotNull;
1717

1818
import com.github.tomakehurst.wiremock.junit.WireMockRule;
19-
import com.google.common.io.Resources;
2019
import io.kubernetes.client.extended.kubectl.exception.KubectlException;
2120
import io.kubernetes.client.openapi.ApiClient;
2221
import io.kubernetes.client.openapi.models.V1ConfigMap;
@@ -32,13 +31,14 @@
3231

3332
public class KubectlCreateTest {
3433

35-
private static final String DISCOVERY_API = Resources.getResource("discovery-api.json").getPath();
34+
private static final String DISCOVERY_API =
35+
KubectlCreateTest.class.getClassLoader().getResource("discovery-api.json").getPath();
3636

3737
private static final String DISCOVERY_APIV1 =
38-
Resources.getResource("discovery-api-v1.json").getPath();
38+
KubectlCreateTest.class.getClassLoader().getResource("discovery-api-v1.json").getPath();
3939

4040
private static final String DISCOVERY_APIS =
41-
Resources.getResource("discovery-apis.json").getPath();
41+
KubectlCreateTest.class.getClassLoader().getResource("discovery-apis.json").getPath();
4242

4343
private ApiClient apiClient;
4444

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static org.junit.Assert.assertEquals;
2626

2727
import com.github.tomakehurst.wiremock.junit.WireMockRule;
28-
import com.google.common.io.Resources;
2928
import io.kubernetes.client.extended.kubectl.exception.KubectlException;
3029
import io.kubernetes.client.openapi.ApiClient;
3130
import io.kubernetes.client.openapi.models.V1Node;
@@ -41,7 +40,8 @@
4140

4241
public class KubectlDrainTest {
4342

44-
private static final String POD_LIST_API = Resources.getResource("pod-list.json").getPath();
43+
private static final String POD_LIST_API =
44+
KubectlDrainTest.class.getClassLoader().getResource("pod-list.json").getPath();
4545

4646
private ApiClient apiClient;
4747

‎extended/src/test/java/io/kubernetes/client/extended/pager/PagerTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static org.junit.Assert.fail;
2626

2727
import com.github.tomakehurst.wiremock.junit.WireMockRule;
28-
import com.google.common.io.Resources;
2928
import io.kubernetes.client.openapi.ApiClient;
3029
import io.kubernetes.client.openapi.apis.CoreV1Api;
3130
import io.kubernetes.client.openapi.models.V1Namespace;
@@ -47,15 +46,15 @@ public class PagerTest {
4746

4847
private ApiClient client;
4948
private static final String LIST_PAGE0_FILE_PATH =
50-
Resources.getResource("namespace-list-pager0.json").getPath();
49+
PagerTest.class.getClassLoader().getResource("namespace-list-pager0.json").getPath();
5150
private static final String LIST_PAGE1_FILE_PATH =
52-
Resources.getResource("namespace-list-pager1.json").getPath();
51+
PagerTest.class.getClassLoader().getResource("namespace-list-pager1.json").getPath();
5352
private static final String LIST_PAGE2_FILE_PATH =
54-
Resources.getResource("namespace-list-pager2.json").getPath();
53+
PagerTest.class.getClassLoader().getResource("namespace-list-pager2.json").getPath();
5554
private static final String LIST_STATUS_FILE_PATH =
56-
Resources.getResource("status-400.json").getPath();
55+
PagerTest.class.getClassLoader().getResource("status-400.json").getPath();
5756
private static final String STATUS_BAD_TOKEN_FILE_PATH =
58-
Resources.getResource("bad-token-status.json").getPath();
57+
PagerTest.class.getClassLoader().getResource("bad-token-status.json").getPath();
5958
@Rule public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());
6059

6160
@Before

‎pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,6 @@
481481
<!-- removes guava imports -->
482482
<format>
483483
<includes>
484-
<include>examples/**/*.java</include>
485484
<include>extended/**/*.java</include>
486485
<include>kubernetes/**/*.java</include>
487486
<include>proto/**/*.java</include>
@@ -490,7 +489,7 @@
490489
</includes>
491490
<replaceRegex>
492491
<name>Forbids guava imports</name>
493-
<searchRegex>^import (static )?com\.google\.guava\..*;$</searchRegex>
492+
<searchRegex>^import (static )?com\.google\.common\..*;$</searchRegex>
494493
<replacement>INVALID IMPORTS (GUAVA)</replacement>
495494
</replaceRegex>
496495
</format>

‎spring/src/test/java/io/kubernetes/client/spring/extended/manifests/KubernetesManifestTest.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static org.junit.Assert.assertNotNull;
2323

2424
import com.github.tomakehurst.wiremock.junit.WireMockRule;
25-
import com.google.common.io.Resources;
2625
import io.kubernetes.client.openapi.ApiClient;
2726
import io.kubernetes.client.openapi.Configuration;
2827
import io.kubernetes.client.openapi.models.V1Namespace;
@@ -42,19 +41,19 @@
4241
import org.springframework.boot.SpringBootConfiguration;
4342
import org.springframework.boot.test.context.SpringBootTest;
4443
import org.springframework.context.annotation.Bean;
44+
import org.springframework.core.io.ClassPathResource;
45+
import org.springframework.core.io.Resource;
4546
import org.springframework.test.context.junit4.SpringRunner;
4647

4748
@RunWith(SpringRunner.class)
4849
@SpringBootTest(classes = KubernetesManifestTest.App.class)
4950
public class KubernetesManifestTest {
5051

51-
private static final String DISCOVERY_API = Resources.getResource("discovery-api.json").getPath();
52+
private static final Resource DISCOVERY_API = new ClassPathResource("discovery-api.json");
5253

53-
private static final String DISCOVERY_APIV1 =
54-
Resources.getResource("discovery-api-v1.json").getPath();
54+
private static final Resource DISCOVERY_APIV1 = new ClassPathResource("discovery-api-v1.json");
5555

56-
private static final String DISCOVERY_APIS =
57-
Resources.getResource("discovery-apis.json").getPath();
56+
private static final Resource DISCOVERY_APIS = new ClassPathResource("discovery-apis.json");
5857

5958
@ClassRule public static WireMockRule wireMockRule = new WireMockRule(8288);
6059

@@ -175,19 +174,22 @@ public V1Pod testApplyPod(V1Namespace testNamespace) {
175174
.willReturn(
176175
aResponse()
177176
.withStatus(200)
178-
.withBody(new String(Files.readAllBytes(Paths.get(DISCOVERY_API))))));
177+
.withBody(
178+
new String(Files.readAllBytes(Paths.get(DISCOVERY_API.getURI()))))));
179179
wireMockRule.stubFor(
180180
get(urlPathEqualTo("/apis"))
181181
.willReturn(
182182
aResponse()
183183
.withStatus(200)
184-
.withBody(new String(Files.readAllBytes(Paths.get(DISCOVERY_APIS))))));
184+
.withBody(
185+
new String(Files.readAllBytes(Paths.get(DISCOVERY_APIS.getURI()))))));
185186
wireMockRule.stubFor(
186187
get(urlPathEqualTo("/api/v1"))
187188
.willReturn(
188189
aResponse()
189190
.withStatus(200)
190-
.withBody(new String(Files.readAllBytes(Paths.get(DISCOVERY_APIV1))))));
191+
.withBody(
192+
new String(Files.readAllBytes(Paths.get(DISCOVERY_APIV1.getURI()))))));
191193
} catch (IOException e) {
192194
e.printStackTrace();
193195
}

‎util/src/test/java/io/kubernetes/client/ExecTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
import static org.junit.Assert.assertEquals;
2222

2323
import com.github.tomakehurst.wiremock.junit.WireMockRule;
24-
import com.google.common.io.ByteStreams;
2524
import io.kubernetes.client.Exec.ExecProcess;
2625
import io.kubernetes.client.openapi.ApiClient;
2726
import io.kubernetes.client.openapi.ApiException;
2827
import io.kubernetes.client.openapi.models.V1ObjectMeta;
2928
import io.kubernetes.client.openapi.models.V1Pod;
3029
import io.kubernetes.client.util.ClientBuilder;
30+
import io.kubernetes.client.util.Streams;
3131
import java.io.ByteArrayInputStream;
3232
import java.io.ByteArrayOutputStream;
3333
import java.io.IOException;
@@ -88,7 +88,7 @@ public static Thread asyncCopy(final InputStream is, final OutputStream os) {
8888
new Runnable() {
8989
public void run() {
9090
try {
91-
ByteStreams.copy(is, os);
91+
Streams.copy(is, os);
9292
} catch (IOException ex) {
9393
ex.printStackTrace();
9494
}

‎util/src/test/java/io/kubernetes/client/PodLogsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import static org.junit.Assert.assertEquals;
2222

2323
import com.github.tomakehurst.wiremock.junit.WireMockRule;
24-
import com.google.common.io.ByteStreams;
2524
import io.kubernetes.client.openapi.ApiClient;
2625
import io.kubernetes.client.openapi.ApiException;
2726
import io.kubernetes.client.openapi.models.V1Container;
2827
import io.kubernetes.client.openapi.models.V1ObjectMeta;
2928
import io.kubernetes.client.openapi.models.V1Pod;
3029
import io.kubernetes.client.openapi.models.V1PodSpec;
3130
import io.kubernetes.client.util.ClientBuilder;
31+
import io.kubernetes.client.util.Streams;
3232
import java.io.ByteArrayOutputStream;
3333
import java.io.IOException;
3434
import java.io.InputStream;
@@ -124,7 +124,7 @@ public void testStream() throws ApiException, IOException {
124124
.withQueryParam("timestamps", equalTo("false")));
125125

126126
ByteArrayOutputStream bos = new ByteArrayOutputStream();
127-
ByteStreams.copy(is, bos);
127+
Streams.copy(is, bos);
128128
assertEquals(content, bos.toString());
129129
}
130130
}

‎util/src/test/java/io/kubernetes/client/Resources.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
Copyright 2020 The Kubernetes Authors.
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
http://www.apache.org/licenses/LICENSE-2.0
7+
Unless required by applicable law or agreed to in writing, software
8+
distributed under the License is distributed on an "AS IS" BASIS,
9+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
See the License for the specific language governing permissions and
11+
limitations under the License.
12+
*/
13+
package io.kubernetes.client;
14+
15+
import io.kubernetes.client.util.Streams;
16+
import java.io.IOException;
17+
import java.io.InputStreamReader;
18+
import java.net.URL;
19+
import java.nio.charset.Charset;
20+
21+
public class Resources {
22+
23+
public static URL getResource(String name) {
24+
return Resources.class.getClassLoader().getResource(name);
25+
}
26+
27+
public static String toString(URL url, Charset charset) {
28+
try {
29+
return Streams.toString(new InputStreamReader(url.openStream(), charset));
30+
} catch (IOException e) {
31+
throw new IllegalStateException(e);
32+
}
33+
}
34+
}

‎util/src/test/java/io/kubernetes/client/informer/cache/DeltaFIFOTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import static org.junit.Assert.*;
1616
import static org.mockito.Mockito.*;
1717

18-
import com.google.common.collect.Lists;
1918
import io.kubernetes.client.common.KubernetesObject;
2019
import io.kubernetes.client.openapi.models.V1ObjectMeta;
2120
import io.kubernetes.client.openapi.models.V1Pod;
@@ -160,7 +159,7 @@ public void testDeltaFIFOReplaceWithDeleteDeltaIn() throws InterruptedException
160159
DeltaFIFO deltaFIFO = new DeltaFIFO(Caches::deletionHandlingMetaNamespaceKeyFunc, mockCache);
161160

162161
deltaFIFO.delete(oldPod);
163-
deltaFIFO.replace(Lists.newArrayList(newPod), "0");
162+
deltaFIFO.replace(Arrays.asList(newPod), "0");
164163

165164
deltaFIFO.pop(
166165
(deltas) -> {

‎util/src/test/java/io/kubernetes/client/util/ClientBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.mockito.Mockito.mock;
2121
import static org.mockito.Mockito.verify;
2222

23-
import com.google.common.io.Resources;
23+
import io.kubernetes.client.Resources;
2424
import io.kubernetes.client.openapi.ApiClient;
2525
import io.kubernetes.client.util.credentials.Authentication;
2626
import java.io.File;

‎util/src/test/java/io/kubernetes/client/util/FilePersisterTest.java

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

15-
import static org.junit.Assert.*;
15+
import static org.junit.Assert.assertEquals;
1616

17-
import com.google.common.io.Resources;
17+
import io.kubernetes.client.Resources;
1818
import java.io.File;
1919
import java.io.FileReader;
2020
import java.io.IOException;

‎util/src/test/java/io/kubernetes/client/util/SSLUtilsTest.java

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

15-
import com.google.common.io.Resources;
15+
import io.kubernetes.client.Resources;
1616
import java.io.IOException;
1717
import java.nio.file.Files;
1818
import java.nio.file.Paths;

‎util/src/test/java/io/kubernetes/client/util/YamlTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
import static java.nio.charset.StandardCharsets.UTF_8;
1616
import static org.hamcrest.CoreMatchers.equalTo;
17-
import static org.hamcrest.MatcherAssert.assertThat;
1817
import static org.junit.Assert.assertEquals;
1918
import static org.junit.Assert.assertFalse;
2019
import static org.junit.Assert.assertNull;
20+
import static org.junit.Assert.assertThat;
2121
import static org.junit.Assert.assertTrue;
2222

23-
import com.google.common.io.Resources;
23+
import io.kubernetes.client.Resources;
2424
import io.kubernetes.client.common.KubernetesType;
2525
import io.kubernetes.client.openapi.models.V1Deployment;
2626
import io.kubernetes.client.openapi.models.V1ObjectMeta;

‎util/src/test/java/io/kubernetes/client/util/credentials/ClientCertificateAuthenticationTest.java

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

15-
import com.google.common.io.Resources;
15+
import io.kubernetes.client.Resources;
1616
import io.kubernetes.client.openapi.ApiClient;
1717
import java.nio.file.Files;
1818
import java.nio.file.Paths;

‎util/src/test/java/io/kubernetes/client/util/credentials/OpenIDConnectAuthenticationTest.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,19 @@
1212
*/
1313
package io.kubernetes.client.util.credentials;
1414

15-
import static com.github.tomakehurst.wiremock.client.WireMock.*;
16-
import static org.junit.Assert.*;
15+
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
16+
import static com.github.tomakehurst.wiremock.client.WireMock.get;
17+
import static com.github.tomakehurst.wiremock.client.WireMock.matching;
18+
import static com.github.tomakehurst.wiremock.client.WireMock.post;
19+
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
20+
import static org.junit.Assert.assertEquals;
21+
import static org.junit.Assert.assertFalse;
22+
import static org.junit.Assert.assertNull;
23+
import static org.junit.Assert.assertTrue;
1724

1825
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
1926
import com.github.tomakehurst.wiremock.junit.WireMockRule;
20-
import com.google.common.io.Resources;
27+
import io.kubernetes.client.Resources;
2128
import io.kubernetes.client.util.TestUtils;
2229
import io.kubernetes.client.util.authenticators.OpenIDConnectAuthenticator;
2330
import java.io.FileInputStream;

‎util/src/test/java/io/kubernetes/client/util/credentials/TokenFileAuthenticationTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@
1212
*/
1313
package io.kubernetes.client.util.credentials;
1414

15-
import static com.github.tomakehurst.wiremock.client.WireMock.*;
15+
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
16+
import static com.github.tomakehurst.wiremock.client.WireMock.get;
17+
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
18+
import static com.github.tomakehurst.wiremock.client.WireMock.okForContentType;
19+
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
20+
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
1621
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
1722

1823
import com.github.tomakehurst.wiremock.client.WireMock;
1924
import com.github.tomakehurst.wiremock.junit.WireMockRule;
20-
import com.google.common.io.Resources;
25+
import io.kubernetes.client.Resources;
2126
import io.kubernetes.client.openapi.ApiClient;
2227
import io.kubernetes.client.openapi.ApiException;
2328
import io.kubernetes.client.openapi.Configuration;

‎util/src/test/java/io/kubernetes/client/util/credentials/UsernamePasswordAuthenticationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import static org.hamcrest.MatcherAssert.assertThat;
1717
import static org.hamcrest.core.Is.is;
1818

19-
import com.google.common.base.Charsets;
2019
import io.kubernetes.client.openapi.ApiClient;
20+
import java.nio.charset.StandardCharsets;
2121
import okio.ByteString;
2222
import org.junit.Test;
2323

@@ -26,7 +26,7 @@ public class UsernamePasswordAuthenticationTest {
2626
private static final String USERNAME = "username";
2727
private static final String PASSWORD = "password";
2828
public static final byte[] USERNAME_PASSWORD_BYTES =
29-
(USERNAME + ":" + PASSWORD).getBytes(Charsets.ISO_8859_1);
29+
(USERNAME + ":" + PASSWORD).getBytes(StandardCharsets.ISO_8859_1);
3030

3131
@Test
3232
public void testUsernamePasswordProvided() {

0 commit comments

Comments
 (0)