Skip to content

Commit 46233de

Browse files
fix issues
1 parent 50f7bdf commit 46233de

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

examples/src/main/java/io/kubernetes/client/examples/PagerExample.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@ public static void main(String[] args) {
2121
client.getHttpClient().setReadTimeout(60, TimeUnit.SECONDS);
2222
Configuration.setDefaultApiClient(client);
2323
CoreV1Api api = new CoreV1Api();
24+
int i=0;
2425
Call call =
26+
api.listConfigMapForAllNamespacesCall(null, null, null, null, 1, null, null, null, null, null, null);
27+
2528
api.listNamespaceCall(
26-
null, "pretty", null, null, null, null, null, null, null, null, null);
29+
null, "pretty", null, null, null, 20, null, null, null, null, null);
2730

2831
Pager pager = new Pager(client, call, 1, new TypeToken<V1NamespaceList>() {}.getType());
29-
while (pager.hasNext()) {
30-
V1NamespaceList list = pager.next();
32+
while (pager.hasNextPage()) {
33+
V1NamespaceList list = pager.getnextPage();
3134
List<V1Namespace> items = list.getItems();
35+
System.out.println("count:"+items.size());
3236
for (V1Namespace namespace : items) {
3337
System.out.println(namespace.getMetadata().getName());
3438
}
39+
System.out.println("------------------"+(++i));
3540
}
3641
} catch (Exception e) {
3742
e.printStackTrace();

util/src/main/java/io/kubernetes/client/pager/Pager.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@
1414
import java.io.IOException;
1515
import java.lang.reflect.Field;
1616
import java.lang.reflect.Type;
17+
import java.util.function.Function;
1718

1819
public class Pager {
1920
private Request originalRequest;
2021
private String _continue;
2122
private String resourceVersion;
22-
private int limit;
23+
private Integer limit;
2324
private ApiClient client;
2425
private Call call;
2526
private Type listType;
2627

27-
public Pager(ApiClient client, Call call, int limit, Type listType) {
28+
public Pager(ApiClient client, Call call, Integer limit, Type listType) {
2829
this.client = client;
2930
this.call = call;
3031
this.limit = limit;
@@ -51,12 +52,10 @@ public <T> T next()
5152
} else if (_continue == null && originalRequest != null) {
5253
// list was exhausted at server
5354
V1ConfigMapList list =
54-
client.getJSON().deserialize("{}", new TypeToken<V1ConfigMapList>() {}.getType());
55-
} else {
56-
// subsequent calls
55+
client.getJSON().deserialize("{}", listType);
56+
}
5757
Request nextRequest = transFormRequest();
5858
call = client.getHttpClient().newCall(nextRequest);
59-
}
6059
return executeRequest(client, call, listType);
6160
}
6261

@@ -66,9 +65,10 @@ private Request transFormRequest() {
6665
.httpUrl()
6766
.newBuilder()
6867
.setQueryParameter("continue", _continue)
69-
.setQueryParameter("limit", String.valueOf(limit))
68+
.setQueryParameter("limit", (limit==null)?"-1":String.valueOf(limit))
7069
// .addQueryParameter("resourceversion", resourceVersion)
7170
.build();
71+
System.out.println(url);
7272
Request request = new Request.Builder().headers(originalRequest.headers()).url(url).build();
7373
return request;
7474
}

0 commit comments

Comments
 (0)