Skip to content

Commit 83316fb

Browse files
rjeberhardrjeberhard
committed
spotless
1 parent b796abb commit 83316fb

5 files changed

Lines changed: 60 additions & 44 deletions

File tree

‎kubernetes/src/main/java/io/kubernetes/client/common/PartialObjectMetadata.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
*/
1313
package io.kubernetes.client.common;
1414

15-
import javax.annotation.Nullable;
1615
import io.kubernetes.client.openapi.models.V1ObjectMeta;
17-
import io.kubernetes.client.openapi.models.V1Pod;
18-
1916
import java.util.Objects;
17+
import javax.annotation.Nullable;
2018

2119
public class PartialObjectMetadata implements KubernetesObject {
2220
private String apiVersion;

‎kubernetes/src/main/java/io/kubernetes/client/common/PartialObjectMetadataList.java‎

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

15+
import io.kubernetes.client.openapi.models.V1ListMeta;
1516
import java.util.ArrayList;
1617
import java.util.List;
1718
import java.util.Objects;
1819
import javax.annotation.Nullable;
19-
import io.kubernetes.client.openapi.models.V1ListMeta;
20-
2120

2221
public class PartialObjectMetadataList implements KubernetesListObject {
2322
private String apiVersion;

‎util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -460,22 +460,21 @@ public KubernetesApiResponse<ApiType> get(String name, final GetOptions getOptio
460460

461461
private CallBuilder makeClusterGetCallBuilder(String name, final GetOptions getOptions) {
462462
return () ->
463-
adaptGetCall(customObjectsApi.getApiClient(),
463+
adaptGetCall(
464+
customObjectsApi.getApiClient(),
464465
customObjectsApi.getClusterCustomObjectCall(
465466
this.apiGroup, this.apiVersion, this.resourcePlural, name, null),
466467
getOptions);
467468
}
468469

469470
private Call adaptGetCall(ApiClient apiClient, Call call, GetOptions getOptions) {
470-
if (Optional.ofNullable(getOptions).map(GetOptions::isPartialObjectMetadataRequest).orElse(Boolean.FALSE)) {
471+
if (Optional.ofNullable(getOptions)
472+
.map(GetOptions::isPartialObjectMetadataRequest)
473+
.orElse(Boolean.FALSE)) {
471474
Request request = call.request();
472475
return apiClient
473476
.getHttpClient()
474-
.newCall(
475-
request
476-
.newBuilder()
477-
.header("Accept", PARTIAL_OBJECT_METADATA_HEADER)
478-
.build());
477+
.newCall(request.newBuilder().header("Accept", PARTIAL_OBJECT_METADATA_HEADER).build());
479478
}
480479
return call;
481480
}
@@ -577,33 +576,32 @@ private CallBuilder makeClusterListCallBuilder(final ListOptions listOptions) {
577576
adaptListCall(
578577
customObjectsApi.getApiClient(),
579578
customObjectsApi.listClusterCustomObjectCall(
580-
this.apiGroup,
581-
this.apiVersion,
582-
this.resourcePlural,
583-
null,
584-
false,
585-
listOptions.getContinue(),
586-
listOptions.getFieldSelector(),
587-
listOptions.getLabelSelector(),
588-
listOptions.getLimit(),
589-
listOptions.getResourceVersion(),
590-
null,
591-
listOptions.getTimeoutSeconds(),
592-
false,
593-
null),
579+
this.apiGroup,
580+
this.apiVersion,
581+
this.resourcePlural,
582+
null,
583+
false,
584+
listOptions.getContinue(),
585+
listOptions.getFieldSelector(),
586+
listOptions.getLabelSelector(),
587+
listOptions.getLimit(),
588+
listOptions.getResourceVersion(),
589+
null,
590+
listOptions.getTimeoutSeconds(),
591+
false,
592+
null),
594593
listOptions);
595594
}
596595

597596
private Call adaptListCall(ApiClient apiClient, Call call, ListOptions listOptions) {
598-
if (Optional.ofNullable(listOptions).map(ListOptions::isPartialObjectMetadataListRequest).orElse(Boolean.FALSE)) {
597+
if (Optional.ofNullable(listOptions)
598+
.map(ListOptions::isPartialObjectMetadataListRequest)
599+
.orElse(Boolean.FALSE)) {
599600
Request request = call.request();
600601
return apiClient
601602
.getHttpClient()
602603
.newCall(
603-
request
604-
.newBuilder()
605-
.header("Accept", PARTIAL_OBJECT_METADATA_LIST_HEADER)
606-
.build());
604+
request.newBuilder().header("Accept", PARTIAL_OBJECT_METADATA_LIST_HEADER).build());
607605
}
608606
return call;
609607
}

‎util/src/main/java/io/kubernetes/client/util/generic/options/ListOptions.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ public void setTimeoutSeconds(Integer timeoutSeconds) {
114114
this.timeoutSeconds = timeoutSeconds;
115115
}
116116

117-
public ListOptions isPartialObjectMetadataListRequest(Boolean isPartialObjectMetadataListRequest) {
117+
public ListOptions isPartialObjectMetadataListRequest(
118+
Boolean isPartialObjectMetadataListRequest) {
118119
this.isPartialObjectMetadataListRequest = isPartialObjectMetadataListRequest;
119120
return this;
120121
}

‎util/src/test/java/io/kubernetes/client/util/generic/GenericKubernetesApiTest.java‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,46 +117,66 @@ public void listNamespacedJobReturningObject() {
117117

118118
@Test
119119
public void listNamespacedJobWithPartialMetadataObjectListHeader() {
120-
PartialObjectMetadataList jobList = new PartialObjectMetadataList().kind("JobList").metadata(new V1ListMeta());
120+
PartialObjectMetadataList jobList =
121+
new PartialObjectMetadataList().kind("JobList").metadata(new V1ListMeta());
121122

122123
stubFor(
123124
get(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs"))
124125
.willReturn(aResponse().withStatus(200).withBody(json.serialize(jobList))));
125126

126127
GenericKubernetesApi<PartialObjectMetadata, PartialObjectMetadataList> pomClient =
127-
new GenericKubernetesApi<>(PartialObjectMetadata.class, PartialObjectMetadataList.class,
128-
"batch", "v1", "jobs", jobClient.getApiClient());
128+
new GenericKubernetesApi<>(
129+
PartialObjectMetadata.class,
130+
PartialObjectMetadataList.class,
131+
"batch",
132+
"v1",
133+
"jobs",
134+
jobClient.getApiClient());
129135

130136
KubernetesApiResponse<PartialObjectMetadataList> jobListResp =
131137
pomClient.list("default", new ListOptions().isPartialObjectMetadataListRequest(true));
132138
assertTrue(jobListResp.isSuccess());
133139
assertEquals(jobList, jobListResp.getObject());
134140
assertNull(jobListResp.getStatus());
135-
verify(1, getRequestedFor(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs"))
136-
.withHeader("Accept",
137-
equalTo("application/json;as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json")));
141+
verify(
142+
1,
143+
getRequestedFor(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs"))
144+
.withHeader(
145+
"Accept",
146+
equalTo(
147+
"application/json;as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json")));
138148
}
139149

140150
@Test
141151
public void getNamespacedJobWithPartialMetadataObjectHeader() {
142-
PartialObjectMetadata job = new PartialObjectMetadata().kind("Job").metadata(new V1ObjectMeta());
152+
PartialObjectMetadata job =
153+
new PartialObjectMetadata().kind("Job").metadata(new V1ObjectMeta());
143154

144155
stubFor(
145156
get(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs/noxu"))
146157
.willReturn(aResponse().withStatus(200).withBody(json.serialize(job))));
147158

148159
GenericKubernetesApi<PartialObjectMetadata, PartialObjectMetadataList> pomClient =
149-
new GenericKubernetesApi<>(PartialObjectMetadata.class, PartialObjectMetadataList.class,
150-
"batch", "v1", "jobs", jobClient.getApiClient());
160+
new GenericKubernetesApi<>(
161+
PartialObjectMetadata.class,
162+
PartialObjectMetadataList.class,
163+
"batch",
164+
"v1",
165+
"jobs",
166+
jobClient.getApiClient());
151167

152168
KubernetesApiResponse<PartialObjectMetadata> jobResp =
153169
pomClient.get("default", "noxu", new GetOptions().isPartialObjectMetadataRequest(true));
154170
assertTrue(jobResp.isSuccess());
155171
assertEquals(job, jobResp.getObject());
156172
assertNull(jobResp.getStatus());
157-
verify(1, getRequestedFor(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs/noxu"))
158-
.withHeader("Accept",
159-
equalTo("application/json;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json")));
173+
verify(
174+
1,
175+
getRequestedFor(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs/noxu"))
176+
.withHeader(
177+
"Accept",
178+
equalTo(
179+
"application/json;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json")));
160180
}
161181

162182
@Test

0 commit comments

Comments
 (0)