Skip to content

Commit 9211be5

Browse files
yue9944882yue9944882
committed
move package references to new package
non-generated refactor openapi package reference format yaml yaml test failure replay PR 240,366 to JSON remove dependency exclusion from client-java pom openapi ignore file configuration change use swagger specs from release-1.15 change generated package name to io.kubernetes.client.openapi
1 parent dc180f9 commit 9211be5

File tree

88 files changed

+509
-400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+509
-400
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language: java
2-
script: mvn -q test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
2+
script: travis_wait mvn -q test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
33
after_success:
44
- mvn deploy --settings settings.xml -DskipTests=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ We prepared a few examples for common use-cases which are shown below:
107107
__list all pods__:
108108

109109
```
110-
import io.kubernetes.client.ApiClient;
111-
import io.kubernetes.client.ApiException;
112-
import io.kubernetes.client.Configuration;
113-
import io.kubernetes.client.apis.CoreV1Api;
114-
import io.kubernetes.client.models.V1Pod;
115-
import io.kubernetes.client.models.V1PodList;
110+
import io.kubernetes.client.openapi.ApiClient;
111+
import io.kubernetes.client.openapi.ApiException;
112+
import io.kubernetes.client.openapi.Configuration;
113+
import io.kubernetes.client.openapi.apis.CoreV1Api;
114+
import io.kubernetes.client.openapi.models.V1Pod;
115+
import io.kubernetes.client.openapi.models.V1PodList;
116116
import io.kubernetes.client.util.Config;
117117
118118
import java.io.IOException;
@@ -135,11 +135,11 @@ __watch on namespace object__:
135135

136136
```
137137
import com.google.gson.reflect.TypeToken;
138-
import io.kubernetes.client.ApiClient;
139-
import io.kubernetes.client.ApiException;
140-
import io.kubernetes.client.Configuration;
141-
import io.kubernetes.client.apis.CoreV1Api;
142-
import io.kubernetes.client.models.V1Namespace;
138+
import io.kubernetes.client.openapi.ApiClient;
139+
import io.kubernetes.client.openapi.ApiException;
140+
import io.kubernetes.client.openapi.Configuration;
141+
import io.kubernetes.client.openapi.apis.CoreV1Api;
142+
import io.kubernetes.client.openapi.models.V1Namespace;
143143
import io.kubernetes.client.util.Config;
144144
import io.kubernetes.client.util.Watch;
145145
@@ -209,7 +209,7 @@ Participation in the Kubernetes community is governed by the [CNCF Code of Condu
209209

210210
## Update the generated code.
211211

212-
The code is generated by the [swagger-codegen project](https://github.com/swagger-api/swagger-codegen).
212+
The code is generated by the [openapi-generator project](https://github.com/OpenAPITools/openapi-generator).
213213

214214
We have built general purpose cross-language tools for generating code, it is hosted in the
215215
[kubernetes-client/gen](https://github.com/kubernetes-client/gen) repository.

‎examples/src/main/java/io/kubernetes/client/examples/AttachExample.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
package io.kubernetes.client.examples;
1414

1515
import com.google.common.io.ByteStreams;
16-
import io.kubernetes.client.ApiClient;
17-
import io.kubernetes.client.ApiException;
1816
import io.kubernetes.client.Attach;
19-
import io.kubernetes.client.Configuration;
17+
import io.kubernetes.client.openapi.ApiClient;
18+
import io.kubernetes.client.openapi.ApiException;
19+
import io.kubernetes.client.openapi.Configuration;
2020
import io.kubernetes.client.util.Config;
2121
import java.io.BufferedReader;
2222
import java.io.IOException;

‎examples/src/main/java/io/kubernetes/client/examples/ControllerExample.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.kubernetes.client.examples;
22

3-
import io.kubernetes.client.apis.CoreV1Api;
43
import io.kubernetes.client.extended.controller.Controller;
54
import io.kubernetes.client.extended.controller.ControllerManager;
65
import io.kubernetes.client.extended.controller.LeaderElectingController;
@@ -14,21 +13,24 @@
1413
import io.kubernetes.client.informer.SharedIndexInformer;
1514
import io.kubernetes.client.informer.SharedInformerFactory;
1615
import io.kubernetes.client.informer.cache.Lister;
17-
import io.kubernetes.client.models.V1Node;
18-
import io.kubernetes.client.models.V1NodeList;
16+
import io.kubernetes.client.openapi.ApiClient;
17+
import io.kubernetes.client.openapi.apis.CoreV1Api;
18+
import io.kubernetes.client.openapi.models.V1Node;
19+
import io.kubernetes.client.openapi.models.V1NodeList;
1920
import io.kubernetes.client.util.CallGeneratorParams;
2021
import java.io.IOException;
2122
import java.time.Duration;
2223
import java.util.concurrent.TimeUnit;
24+
import okhttp3.OkHttpClient;
2325

2426
public class ControllerExample {
2527
public static void main(String[] args) throws IOException {
2628

2729
CoreV1Api coreV1Api = new CoreV1Api();
28-
coreV1Api
29-
.getApiClient()
30-
.getHttpClient()
31-
.setReadTimeout(0, TimeUnit.SECONDS); // infinite timeout
30+
ApiClient apiClient = coreV1Api.getApiClient();
31+
OkHttpClient httpClient =
32+
apiClient.getHttpClient().newBuilder().readTimeout(0, TimeUnit.SECONDS).build();
33+
apiClient.setHttpClient(httpClient);
3234

3335
// instantiating an informer-factory, and there should be only one informer-factory globally.
3436
SharedInformerFactory informerFactory = new SharedInformerFactory();
@@ -42,10 +44,10 @@ public static void main(String[] args) throws IOException {
4244
null,
4345
null,
4446
null,
47+
null,
4548
params.resourceVersion,
4649
params.timeoutSeconds,
4750
params.watch,
48-
null,
4951
null);
5052
},
5153
V1Node.class,

‎examples/src/main/java/io/kubernetes/client/examples/CopyExample.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
package io.kubernetes.client.examples;
1414

1515
import com.google.common.io.ByteStreams;
16-
import io.kubernetes.client.ApiClient;
17-
import io.kubernetes.client.ApiException;
18-
import io.kubernetes.client.Configuration;
1916
import io.kubernetes.client.Copy;
17+
import io.kubernetes.client.openapi.ApiClient;
18+
import io.kubernetes.client.openapi.ApiException;
19+
import io.kubernetes.client.openapi.Configuration;
2020
import io.kubernetes.client.util.Config;
2121
import java.io.IOException;
2222
import java.io.InputStream;

‎examples/src/main/java/io/kubernetes/client/examples/Example.java‎

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

15-
import io.kubernetes.client.ApiClient;
16-
import io.kubernetes.client.ApiException;
17-
import io.kubernetes.client.Configuration;
18-
import io.kubernetes.client.apis.CoreV1Api;
19-
import io.kubernetes.client.models.V1Pod;
20-
import io.kubernetes.client.models.V1PodList;
15+
import io.kubernetes.client.openapi.ApiClient;
16+
import io.kubernetes.client.openapi.ApiException;
17+
import io.kubernetes.client.openapi.Configuration;
18+
import io.kubernetes.client.openapi.apis.CoreV1Api;
19+
import io.kubernetes.client.openapi.models.V1Pod;
20+
import io.kubernetes.client.openapi.models.V1PodList;
2121
import io.kubernetes.client.util.Config;
2222
import java.io.IOException;
2323

@@ -35,7 +35,8 @@ public static void main(String[] args) throws IOException, ApiException {
3535
Configuration.setDefaultApiClient(client);
3636

3737
CoreV1Api api = new CoreV1Api();
38-
V1PodList list = api.listPodForAllNamespaces(null, null, null, null, null, null, null, null);
38+
V1PodList list =
39+
api.listPodForAllNamespaces(null, null, null, null, null, null, null, null, null);
3940
for (V1Pod item : list.getItems()) {
4041
System.out.println(item.getMetadata().getName());
4142
}

‎examples/src/main/java/io/kubernetes/client/examples/ExecExample.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
package io.kubernetes.client.examples;
1414

1515
import com.google.common.io.ByteStreams;
16-
import io.kubernetes.client.ApiClient;
17-
import io.kubernetes.client.ApiException;
18-
import io.kubernetes.client.Configuration;
1916
import io.kubernetes.client.Exec;
17+
import io.kubernetes.client.openapi.ApiClient;
18+
import io.kubernetes.client.openapi.ApiException;
19+
import io.kubernetes.client.openapi.Configuration;
2020
import io.kubernetes.client.util.Config;
2121
import java.io.IOException;
2222
import java.util.ArrayList;

‎examples/src/main/java/io/kubernetes/client/examples/ExpandedExample.java‎

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

15-
import io.kubernetes.client.ApiClient;
16-
import io.kubernetes.client.ApiException;
17-
import io.kubernetes.client.Configuration;
18-
import io.kubernetes.client.apis.CoreV1Api;
19-
import io.kubernetes.client.apis.ExtensionsV1beta1Api;
20-
import io.kubernetes.client.models.ExtensionsV1beta1Deployment;
21-
import io.kubernetes.client.models.ExtensionsV1beta1DeploymentList;
22-
import io.kubernetes.client.models.ExtensionsV1beta1DeploymentSpec;
23-
import io.kubernetes.client.models.V1NamespaceList;
24-
import io.kubernetes.client.models.V1PodList;
25-
import io.kubernetes.client.models.V1ServiceList;
15+
import io.kubernetes.client.openapi.ApiClient;
16+
import io.kubernetes.client.openapi.ApiException;
17+
import io.kubernetes.client.openapi.Configuration;
18+
import io.kubernetes.client.openapi.apis.CoreV1Api;
19+
import io.kubernetes.client.openapi.apis.ExtensionsV1beta1Api;
20+
import io.kubernetes.client.openapi.models.ExtensionsV1beta1Deployment;
21+
import io.kubernetes.client.openapi.models.ExtensionsV1beta1DeploymentList;
22+
import io.kubernetes.client.openapi.models.ExtensionsV1beta1DeploymentSpec;
23+
import io.kubernetes.client.openapi.models.V1NamespaceList;
24+
import io.kubernetes.client.openapi.models.V1PodList;
25+
import io.kubernetes.client.openapi.models.V1ServiceList;
2626
import io.kubernetes.client.util.Config;
2727
import java.io.IOException;
2828
import java.util.List;
@@ -103,7 +103,7 @@ public static void main(String[] args) {
103103
public static List<String> getAllNameSpaces() throws ApiException {
104104
V1NamespaceList listNamespace =
105105
COREV1_API.listNamespace(
106-
"true", null, null, null, 0, null, Integer.MAX_VALUE, Boolean.FALSE);
106+
"true", null, null, null, null, 0, null, Integer.MAX_VALUE, Boolean.FALSE);
107107
List<String> list =
108108
listNamespace
109109
.getItems()
@@ -121,7 +121,7 @@ public static List<String> getAllNameSpaces() throws ApiException {
121121
*/
122122
public static List<String> getPods() throws ApiException {
123123
V1PodList v1podList =
124-
COREV1_API.listPodForAllNamespaces(null, null, null, null, null, null, null, null);
124+
COREV1_API.listPodForAllNamespaces(null, null, null, null, null, null, null, null, null);
125125
List<String> podList =
126126
v1podList
127127
.getItems()
@@ -167,6 +167,7 @@ public static List<String> getNamespacedPod(String namespace, String label) thro
167167
null,
168168
null,
169169
null,
170+
null,
170171
label,
171172
Integer.MAX_VALUE,
172173
null,
@@ -195,6 +196,7 @@ public static List<String> getServices() throws ApiException {
195196
null,
196197
null,
197198
null,
199+
null,
198200
Integer.MAX_VALUE,
199201
null,
200202
TIME_OUT_VALUE,
@@ -219,7 +221,7 @@ public static void scaleDeployment(String deploymentName, int numberOfReplicas)
219221
extensionV1Api.setApiClient(COREV1_API.getApiClient());
220222
ExtensionsV1beta1DeploymentList listNamespacedDeployment =
221223
extensionV1Api.listNamespacedDeployment(
222-
DEFAULT_NAME_SPACE, null, null, null, null, null, null, null, Boolean.FALSE);
224+
DEFAULT_NAME_SPACE, null, null, null, null, null, null, null, null, Boolean.FALSE);
223225

224226
List<ExtensionsV1beta1Deployment> extensionsV1beta1DeploymentItems =
225227
listNamespacedDeployment.getItems();

‎examples/src/main/java/io/kubernetes/client/examples/FluentExample.java‎

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

15-
import io.kubernetes.client.ApiClient;
16-
import io.kubernetes.client.ApiException;
17-
import io.kubernetes.client.Configuration;
18-
import io.kubernetes.client.apis.CoreV1Api;
19-
import io.kubernetes.client.models.V1Container;
20-
import io.kubernetes.client.models.V1ObjectMeta;
21-
import io.kubernetes.client.models.V1Pod;
22-
import io.kubernetes.client.models.V1PodBuilder;
23-
import io.kubernetes.client.models.V1PodList;
24-
import io.kubernetes.client.models.V1PodSpec;
15+
import io.kubernetes.client.openapi.ApiClient;
16+
import io.kubernetes.client.openapi.ApiException;
17+
import io.kubernetes.client.openapi.Configuration;
18+
import io.kubernetes.client.openapi.apis.CoreV1Api;
19+
import io.kubernetes.client.openapi.models.V1Container;
20+
import io.kubernetes.client.openapi.models.V1ObjectMeta;
21+
import io.kubernetes.client.openapi.models.V1Pod;
22+
import io.kubernetes.client.openapi.models.V1PodBuilder;
23+
import io.kubernetes.client.openapi.models.V1PodList;
24+
import io.kubernetes.client.openapi.models.V1PodSpec;
2525
import io.kubernetes.client.util.Config;
2626
import java.io.IOException;
2727
import java.util.Arrays;
@@ -66,7 +66,7 @@ public static void main(String[] args) throws IOException, ApiException {
6666
api.createNamespacedPod("default", pod2, null, null, null);
6767

6868
V1PodList list =
69-
api.listNamespacedPod("default", null, null, null, null, null, null, null, null);
69+
api.listNamespacedPod("default", null, null, null, null, null, null, null, null, null);
7070
for (V1Pod item : list.getItems()) {
7171
System.out.println(item.getMetadata().getName());
7272
}

‎examples/src/main/java/io/kubernetes/client/examples/InClusterClientExample.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
package io.kubernetes.client.examples;
1515

16-
import io.kubernetes.client.ApiClient;
17-
import io.kubernetes.client.ApiException;
18-
import io.kubernetes.client.Configuration;
19-
import io.kubernetes.client.apis.CoreV1Api;
20-
import io.kubernetes.client.models.V1Pod;
21-
import io.kubernetes.client.models.V1PodList;
16+
import io.kubernetes.client.openapi.ApiClient;
17+
import io.kubernetes.client.openapi.ApiException;
18+
import io.kubernetes.client.openapi.Configuration;
19+
import io.kubernetes.client.openapi.apis.CoreV1Api;
20+
import io.kubernetes.client.openapi.models.V1Pod;
21+
import io.kubernetes.client.openapi.models.V1PodList;
2222
import io.kubernetes.client.util.ClientBuilder;
2323
import java.io.IOException;
2424

@@ -47,7 +47,8 @@ public static void main(String[] args) throws IOException, ApiException {
4747
CoreV1Api api = new CoreV1Api();
4848

4949
// invokes the CoreV1Api client
50-
V1PodList list = api.listPodForAllNamespaces(null, null, null, null, null, null, null, null);
50+
V1PodList list =
51+
api.listPodForAllNamespaces(null, null, null, null, null, null, null, null, null);
5152
for (V1Pod item : list.getItems()) {
5253
System.out.println(item.getMetadata().getName());
5354
}

0 commit comments

Comments
 (0)