From de0c7701a711ac8b3e3ddc2b62e9f25399956f7c Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Wed, 11 May 2022 17:04:57 +0200 Subject: [PATCH] chore: clean up duplicated code --- .../codegen/cts/AlgoliaCtsGenerator.java | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/generators/src/main/java/com/algolia/codegen/cts/AlgoliaCtsGenerator.java b/generators/src/main/java/com/algolia/codegen/cts/AlgoliaCtsGenerator.java index 25eecd13a3..214fd2a89a 100644 --- a/generators/src/main/java/com/algolia/codegen/cts/AlgoliaCtsGenerator.java +++ b/generators/src/main/java/com/algolia/codegen/cts/AlgoliaCtsGenerator.java @@ -2,6 +2,7 @@ import com.algolia.codegen.Utils; import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap.Builder; @@ -64,36 +65,36 @@ public void processOpts() { client = (String) additionalProperties.get("client"); packageName = (String) additionalProperties.get("packageName"); + JsonNode config = Utils.readJsonFile("config/clients.config.json"); + TestConfig testConfig = null; try { - JsonNode config = Json - .mapper() - .readTree(new File("config/clients.config.json")); - TestConfig testConfig = Json - .mapper() - .treeToValue(config.get(language).get("tests"), TestConfig.class); - - setTemplateDir("tests/CTS/methods/requests/templates/" + language); - setOutputDir("tests/output/" + language); - String clientName = language.equals("php") - ? Utils.createClientName(client, language) - : client; - supportingFiles.add( - new SupportingFile( - "requests.mustache", - testConfig.outputFolder + "/methods/requests", - clientName + testConfig.extension - ) - ); - - if (language.equals("javascript")) { - supportingFiles.add( - new SupportingFile("package.mustache", ".", "package.json") - ); - } - } catch (IOException e) { + testConfig = + Json + .mapper() + .treeToValue(config.get(language).get("tests"), TestConfig.class); + } catch (JsonProcessingException e) { e.printStackTrace(); System.exit(1); } + + setTemplateDir("tests/CTS/methods/requests/templates/" + language); + setOutputDir("tests/output/" + language); + String clientName = language.equals("php") + ? Utils.createClientName(client, language) + : client; + supportingFiles.add( + new SupportingFile( + "requests.mustache", + testConfig.outputFolder + "/methods/requests", + clientName + testConfig.extension + ) + ); + + if (language.equals("javascript")) { + supportingFiles.add( + new SupportingFile("package.mustache", ".", "package.json") + ); + } } @Override