[Java] Update okhttp version to the latest (OpenAPITools#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
ihsmarkitoss · Jan 16, 2019 · 519bcf1 · 519bcf1
1 parent f6a686c
commit 519bcf1
Show file tree

Hide file tree

Showing 48 changed files with 1,747 additions and 1,173 deletions.
diff --git a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/ApiClientTest.java
@@ -157,11 +157,11 @@ public void testSetApiKeyAndPrefix() {
     public void testGetAndSetConnectTimeout() {
         // connect timeout defaults to 10 seconds
         assertEquals(10000, apiClient.getConnectTimeout());
-        assertEquals(10000, apiClient.getHttpClient().getConnectTimeout());
+        assertEquals(10000, apiClient.getHttpClient().connectTimeoutMillis());
 
         apiClient.setConnectTimeout(0);
         assertEquals(0, apiClient.getConnectTimeout());
-        assertEquals(0, apiClient.getHttpClient().getConnectTimeout());
+        assertEquals(0, apiClient.getHttpClient().connectTimeoutMillis());
 
         apiClient.setConnectTimeout(10000);
     }
@@ -170,11 +170,11 @@ public void testGetAndSetConnectTimeout() {
     public void testGetAndSetReadTimeout() {
         // read timeout defaults to 10 seconds
         assertEquals(10000, apiClient.getReadTimeout());
-        assertEquals(10000, apiClient.getHttpClient().getReadTimeout());
+        assertEquals(10000, apiClient.getHttpClient().readTimeoutMillis());
 
         apiClient.setReadTimeout(0);
         assertEquals(0, apiClient.getReadTimeout());
-        assertEquals(0, apiClient.getHttpClient().getReadTimeout());
+        assertEquals(0, apiClient.getHttpClient().readTimeoutMillis());
 
         apiClient.setReadTimeout(10000);
     }
@@ -183,11 +183,11 @@ public void testGetAndSetReadTimeout() {
     public void testGetAndSetWriteTimeout() {
         // write timeout defaults to 10 seconds
         assertEquals(10000, apiClient.getWriteTimeout());
-        assertEquals(10000, apiClient.getHttpClient().getWriteTimeout());
+        assertEquals(10000, apiClient.getHttpClient().writeTimeoutMillis());
 
         apiClient.setWriteTimeout(0);
         assertEquals(0, apiClient.getWriteTimeout());
-        assertEquals(0, apiClient.getHttpClient().getWriteTimeout());
+        assertEquals(0, apiClient.getHttpClient().writeTimeoutMillis());
 
         apiClient.setWriteTimeout(10000);
     }