use jackson

Author: millotp

generators/src/main/java/com/algolia/codegen/AlgoliaCSharpGenerator.java

@@ -9,6 +9,7 @@
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.servers.Server;
 import java.io.IOException;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.CSharpClientCodegen;
@@ -134,7 +135,7 @@ private String escapeGenericForDoc(String type) {
   public void processOpenAPI(OpenAPI openAPI) {
     super.processOpenAPI(openAPI);
     Helpers.generateServers(super.fromServers(openAPI.getServers()), additionalProperties);
-    Timeouts.enrichBundle((HashMap<String, Object>) openAPI.getExtensions().get("x-timeouts"), additionalProperties, 1000);
+    Timeouts.enrichBundle(openAPI, additionalProperties, ChronoUnit.SECONDS);
   }
 
   @Override

generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java

@@ -71,7 +71,7 @@ public void processOpts() {
   public void processOpenAPI(OpenAPI openAPI) {
     super.processOpenAPI(openAPI);
     Helpers.generateServers(super.fromServers(openAPI.getServers()), additionalProperties);
-    Timeouts.enrichBundle((HashMap<String, Object>) openAPI.getExtensions().get("x-timeouts"), additionalProperties);
+    Timeouts.enrichBundle(openAPI, additionalProperties);
   }
 
   @Override

generators/src/main/java/com/algolia/codegen/AlgoliaJavascriptGenerator.java

@@ -203,7 +203,7 @@ private void setDefaultGeneratorOptions() {
   public void processOpenAPI(OpenAPI openAPI) {
     super.processOpenAPI(openAPI);
     Helpers.generateServers(super.fromServers(openAPI.getServers()), additionalProperties);
-    Timeouts.enrichBundle((HashMap<String, Object>) openAPI.getExtensions().get("x-timeouts"), additionalProperties);
+    Timeouts.enrichBundle(openAPI, additionalProperties);
   }
 
   @Override

generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java

@@ -5,6 +5,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.servers.Server;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.SupportingFile;
@@ -68,7 +69,7 @@ public void processOpts() {
   public void processOpenAPI(OpenAPI openAPI) {
     super.processOpenAPI(openAPI);
     Helpers.generateServers(super.fromServers(openAPI.getServers()), additionalProperties);
-    Timeouts.enrichBundle((HashMap<String, Object>) openAPI.getExtensions().get("x-timeouts"), additionalProperties, 1000);
+    Timeouts.enrichBundle(openAPI, additionalProperties, ChronoUnit.SECONDS);
   }
 
   @Override

generators/src/main/java/com/algolia/codegen/AlgoliaPythonGenerator.java

@@ -94,7 +94,7 @@ public void processOpts() {
   public void processOpenAPI(OpenAPI openAPI) {
     super.processOpenAPI(openAPI);
     Helpers.generateServers(super.fromServers(openAPI.getServers()), additionalProperties);
-    Timeouts.enrichBundle((HashMap<String, Object>) openAPI.getExtensions().get("x-timeouts"), additionalProperties);
+    Timeouts.enrichBundle(openAPI, additionalProperties);
   }
 
   @Override

generators/src/main/java/com/algolia/codegen/AlgoliaRubyGenerator.java

@@ -72,7 +72,7 @@ public void processOpts() {
   public void processOpenAPI(OpenAPI openAPI) {
     super.processOpenAPI(openAPI);
     Helpers.generateServers(super.fromServers(openAPI.getServers()), additionalProperties);
-    Timeouts.enrichBundle((HashMap<String, Object>) openAPI.getExtensions().get("x-timeouts"), additionalProperties);
+    Timeouts.enrichBundle(openAPI, additionalProperties);
   }
 
   @Override

generators/src/main/java/com/algolia/codegen/utils/Timeouts.java

@@ -2,58 +2,69 @@
 
 import com.algolia.codegen.exceptions.*;
 import com.fasterxml.jackson.databind.*;
+import io.swagger.v3.oas.models.OpenAPI;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 
+class TimeoutsValues {
+
+  private ChronoUnit unit = ChronoUnit.MILLIS;
+  public long connect;
+  public long read;
+  public long write;
+
+  void toUnit(ChronoUnit unit) {
+    if (this.unit == ChronoUnit.MILLIS && unit == ChronoUnit.SECONDS) {
+      connect /= 1000;
+      read /= 1000;
+      write /= 1000;
+    }
+  }
+}
+
+class TimeoutsBundle {
+
+  public TimeoutsValues browser = new TimeoutsValues();
+  public TimeoutsValues server = new TimeoutsValues();
+}
+
 public class Timeouts {
 
-  public static void enrichBundle(HashMap<String, Object> timeouts, Map<String, Object> bundle) throws ConfigException {
-    enrichBundle(timeouts, bundle, 1);
+  public static void enrichBundle(OpenAPI spec, Map<String, Object> bundle) throws ConfigException {
+    enrichBundle(spec, bundle, ChronoUnit.MILLIS);
   }
 
   /**
    * Inject timeouts (in miliseconds / divider) into the given bundle, under the x-timeouts property
    * *
    */
-  public static void enrichBundle(HashMap<String, Object> timeouts, Map<String, Object> bundle, int divider) throws ConfigException {
-    HashMap<String, Object> xtimeouts = new HashMap<>();
+  public static void enrichBundle(OpenAPI spec, Map<String, Object> bundle, ChronoUnit unit) throws ConfigException {
+    TimeoutsBundle defaults = new TimeoutsBundle();
+    // the default below are what the search API expect, which was previously used for any client
+    defaults.browser.connect = 1000;
+    defaults.browser.read = 2000;
+    defaults.browser.write = 30000;
 
-    HashMap<String, Object> browser = new HashMap<>();
-    HashMap<String, Object> server = new HashMap<>();
+    defaults.server.connect = 2000;
+    defaults.server.read = 5000;
+    defaults.server.write = 30000;
 
-    if (timeouts != null) {
-      browser = (HashMap<String, Object>) timeouts.getOrDefault("browser", new HashMap<>());
-      server = (HashMap<String, Object>) timeouts.getOrDefault("server", new HashMap<>());
+    TimeoutsBundle specTimeouts = new ObjectMapper().convertValue(spec.getExtensions().get("x-timeouts"), TimeoutsBundle.class);
+    if (specTimeouts == null) {
+      specTimeouts = new TimeoutsBundle();
+      specTimeouts.browser = defaults.browser;
+      specTimeouts.server = defaults.server;
     }
-
-    // the default below are what the search API expect, which was previously used for any client
-    HashMap<String, Object> defaultBrowser = new HashMap<>();
-    defaultBrowser.put("connect", 1000);
-    defaultBrowser.put("read", 2000);
-    defaultBrowser.put("write", 30000);
-
-    HashMap<String, Object> defaultServer = new HashMap<>();
-    defaultServer.put("connect", 2000);
-    defaultServer.put("read", 5000);
-    defaultServer.put("write", 30000);
-
-    if (browser == null) {
-      xtimeouts.put("browser", defaultBrowser);
-    } else {
-      browser.put("connect", ((int) browser.getOrDefault("connect", defaultBrowser.get("connect"))) / divider);
-      browser.put("read", ((int) browser.getOrDefault("read", defaultBrowser.get("read"))) / divider);
-      browser.put("write", ((int) browser.getOrDefault("write", defaultBrowser.get("write"))) / divider);
-      xtimeouts.put("browser", browser);
+    if (specTimeouts.browser == null) {
+      specTimeouts.browser = defaults.browser;
     }
-
-    if (server == null) {
-      xtimeouts.put("server", defaultServer);
-    } else {
-      server.put("connect", ((int) server.getOrDefault("connect", defaultServer.get("connect"))) / divider);
-      server.put("read", ((int) server.getOrDefault("read", defaultServer.get("read"))) / divider);
-      server.put("write", ((int) server.getOrDefault("write", defaultServer.get("write"))) / divider);
-      xtimeouts.put("server", server);
+    if (specTimeouts.server == null) {
+      specTimeouts.server = defaults.server;
     }
 
-    bundle.put("x-timeouts", xtimeouts);
+    specTimeouts.browser.toUnit(unit);
+    specTimeouts.server.toUnit(unit);
+
+    bundle.put("x-timeouts", specTimeouts);
   }
 }