From 93377fd7dd29bff116bd03a1a1c630324fa5583a Mon Sep 17 00:00:00 2001 From: Xiaofei Cao <92354331+XiaofeiCao@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:57:34 +0800 Subject: [PATCH] java generator, fix generator-test when running from main (#4334) - Part of https://github.com/microsoft/typespec/pull/4315, though before TypeSpec ARM fix, we'll probably will not merge that PR --- .../microsoft/typespec/http/client/generator/Main.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java index a7326a7ea6..8ee1ea2176 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java @@ -43,14 +43,14 @@ public class Main { private static final Logger LOGGER = LoggerFactory.getLogger(Main.class); - + private static final String DEFAULT_OUTPUT_DIR = "http-client-generator-test/tsp-output/"; private static Yaml yaml = null; // java -jar target/azure-typespec-extension-jar-with-dependencies.jar public static void main(String[] args) throws IOException { // parameters - String inputYamlFileName = "typespec-tests/tsp-output/code-model.yaml"; + String inputYamlFileName = DEFAULT_OUTPUT_DIR + "code-model.yaml"; if (args.length >= 1) { inputYamlFileName = args[0]; } @@ -201,7 +201,7 @@ private static EmitterOptions loadEmitterOptions(CodeModel codeModel) { // output path if (CoreUtils.isNullOrEmpty(options.getOutputDir())) { - options.setOutputDir("typespec-tests/tsp-output/"); + options.setOutputDir(DEFAULT_OUTPUT_DIR); } else if (!options.getOutputDir().endsWith("/")) { options.setOutputDir(options.getOutputDir() + "/"); } @@ -213,7 +213,7 @@ private static EmitterOptions loadEmitterOptions(CodeModel codeModel) { if (options == null) { // default if emitterOptions fails options = new EmitterOptions(); - options.setOutputDir("typespec-tests/tsp-output/"); + options.setOutputDir(DEFAULT_OUTPUT_DIR); if (codeModel.getLanguage().getJava() != null && !CoreUtils.isNullOrEmpty( codeModel.getLanguage().getJava().getNamespace())) { options.setNamespace(codeModel.getLanguage().getJava().getNamespace());