Skip to content

Commit 1676aef

Browse files
authored
[Java] Update okhttp version to the latest (#1897)
* update okhttp to latest version * update templates to use okhttp3 * update java samples * fix tests * update tests under CI/samples.ci * add tests to java client * fix bin script to restore test files * fix debugging * add more tests and minor fixes * update samples
1 parent 192e366 commit 1676aef

Some content is hidden

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

48 files changed

+1747
-1173
lines changed

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/ApiClientTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ public void testSetApiKeyAndPrefix() {
157157
public void testGetAndSetConnectTimeout() {
158158
// connect timeout defaults to 10 seconds
159159
assertEquals(10000, apiClient.getConnectTimeout());
160-
assertEquals(10000, apiClient.getHttpClient().getConnectTimeout());
160+
assertEquals(10000, apiClient.getHttpClient().connectTimeoutMillis());
161161

162162
apiClient.setConnectTimeout(0);
163163
assertEquals(0, apiClient.getConnectTimeout());
164-
assertEquals(0, apiClient.getHttpClient().getConnectTimeout());
164+
assertEquals(0, apiClient.getHttpClient().connectTimeoutMillis());
165165

166166
apiClient.setConnectTimeout(10000);
167167
}
@@ -170,11 +170,11 @@ public void testGetAndSetConnectTimeout() {
170170
public void testGetAndSetReadTimeout() {
171171
// read timeout defaults to 10 seconds
172172
assertEquals(10000, apiClient.getReadTimeout());
173-
assertEquals(10000, apiClient.getHttpClient().getReadTimeout());
173+
assertEquals(10000, apiClient.getHttpClient().readTimeoutMillis());
174174

175175
apiClient.setReadTimeout(0);
176176
assertEquals(0, apiClient.getReadTimeout());
177-
assertEquals(0, apiClient.getHttpClient().getReadTimeout());
177+
assertEquals(0, apiClient.getHttpClient().readTimeoutMillis());
178178

179179
apiClient.setReadTimeout(10000);
180180
}
@@ -183,11 +183,11 @@ public void testGetAndSetReadTimeout() {
183183
public void testGetAndSetWriteTimeout() {
184184
// write timeout defaults to 10 seconds
185185
assertEquals(10000, apiClient.getWriteTimeout());
186-
assertEquals(10000, apiClient.getHttpClient().getWriteTimeout());
186+
assertEquals(10000, apiClient.getHttpClient().writeTimeoutMillis());
187187

188188
apiClient.setWriteTimeout(0);
189189
assertEquals(0, apiClient.getWriteTimeout());
190-
assertEquals(0, apiClient.getHttpClient().getWriteTimeout());
190+
assertEquals(0, apiClient.getHttpClient().writeTimeoutMillis());
191191

192192
apiClient.setWriteTimeout(10000);
193193
}

0 commit comments

Comments
 (0)