error handling

Author: millotp

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

@@ -45,11 +45,19 @@ public Map<String, Object> postProcessOperationsWithModels(
       allModels
     );
 
-    Utils.generateServer(
-      Utils.getClientNameKebabCase(results),
-      additionalProperties
-    );
-    additionalProperties.put("packageVersion", Utils.getPackageVersion("java"));
+    try {
+      Utils.generateServer(
+        Utils.getClientNameKebabCase(results),
+        additionalProperties
+      );
+      additionalProperties.put(
+        "packageVersion",
+        Utils.getPackageVersion("java")
+      );
+    } catch (GenerationException e) {
+      e.printStackTrace();
+      System.exit(1);
+    }
 
     return results;
   }

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

@@ -76,10 +76,15 @@ public Map<String, Object> postProcessOperationsWithModels(
     CLIENT = Utils.getClientNameCamelCase(results);
 
     setDefaultGeneratorOptions();
-    Utils.generateServer(
-      Utils.getClientNameKebabCase(results),
-      additionalProperties
-    );
+    try {
+      Utils.generateServer(
+        Utils.getClientNameKebabCase(results),
+        additionalProperties
+      );
+    } catch (GenerationException e) {
+      e.printStackTrace();
+      System.exit(1);
+    }
 
     List<CodegenOperation> operations =
       ((Map<String, List<CodegenOperation>>) results.get("operations")).get(

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

@@ -53,8 +53,16 @@ public Map<String, Object> postProcessOperationsWithModels(
     String client = Utils.getClientNameKebabCase(results);
 
     setDefaultGeneratorOptions(client);
-    Utils.generateServer(client, additionalProperties);
-    additionalProperties.put("packageVersion", Utils.getPackageVersion("java"));
+    try {
+      Utils.generateServer(client, additionalProperties);
+      additionalProperties.put(
+        "packageVersion",
+        Utils.getPackageVersion("php")
+      );
+    } catch (GenerationException e) {
+      e.printStackTrace();
+      System.exit(1);
+    }
 
     return results;
   }

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

@@ -5,4 +5,8 @@ public class GenerationException extends Exception {
   public GenerationException(String message) {
     super(message);
   }
+
+  public GenerationException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }

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

@@ -76,7 +76,7 @@ public static String getClientNameCamelCase(Map<String, Object> data) {
   public static void generateServer(
     String clientKebab,
     Map<String, Object> additionalProperties
-  ) {
+  ) throws GenerationException {
     Yaml yaml = new Yaml();
     try {
       Map<String, Object> spec = yaml.load(
@@ -149,13 +149,13 @@ public static void generateServer(
         allowedRegions.toArray(new String[0])
       );
     } catch (Exception e) {
-      e.printStackTrace();
-      System.exit(1);
+      throw new GenerationException("Couldn't generate servers", e);
     }
   }
 
   // Get the package version from clients.config.json (doesn't work for JavaScript)
-  public static String getPackageVersion(String language) {
+  public static String getPackageVersion(String language)
+    throws GenerationException {
     if (language.equals("javascript")) {
       throw new GenerationException(
         "Cannot use getPackageVersion with language=\"javascript\", " +
@@ -168,9 +168,10 @@ public static String getPackageVersion(String language) {
         .readTree(new File("config/clients.config.json"));
       return config.get(language).get("packageVersion").asText();
     } catch (IOException e) {
-      e.printStackTrace();
-      System.exit(1);
+      throw new GenerationException(
+        "Couldn't read packageVersion from clients.config.json",
+        e
+      );
     }
-    return null;
   }
 }