From 2ede5ea59c6791ff11ca6d785dd35def4aef7626 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 16 Oct 2023 14:24:34 +0800 Subject: [PATCH 1/2] mgmt, add graalvm-config-suffix option --- .../main/java/com/azure/autorest/fluent/FluentGen.java | 6 +++++- .../azure/autorest/fluent/util/FluentJavaSettings.java | 8 ++++++++ .../src/main/java/com/azure/autorest/TypeSpecPlugin.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fluentgen/src/main/java/com/azure/autorest/fluent/FluentGen.java b/fluentgen/src/main/java/com/azure/autorest/fluent/FluentGen.java index 098172b5e0..551b21ea97 100755 --- a/fluentgen/src/main/java/com/azure/autorest/fluent/FluentGen.java +++ b/fluentgen/src/main/java/com/azure/autorest/fluent/FluentGen.java @@ -274,7 +274,11 @@ FluentJavaPackage handleTemplate(Client client) { // GraalVM config if (javaSettings.isGenerateGraalVmConfig()) { - javaPackage.addGraalVmConfig("com.azure.resourcemanager", FluentUtils.getArtifactId(), client.getGraalVmConfig()); + String artifactId = FluentUtils.getArtifactId(); + if (fluentJavaSettings.getGraalVmConfigSuffix().isPresent()) { + artifactId = artifactId + "_" + fluentJavaSettings.getGraalVmConfigSuffix().get(); + } + javaPackage.addGraalVmConfig("com.azure.resourcemanager", artifactId, client.getGraalVmConfig()); } // Samples diff --git a/fluentnamer/src/main/java/com/azure/autorest/fluent/util/FluentJavaSettings.java b/fluentnamer/src/main/java/com/azure/autorest/fluent/util/FluentJavaSettings.java index 1a7b880d79..7763d4cfed 100644 --- a/fluentnamer/src/main/java/com/azure/autorest/fluent/util/FluentJavaSettings.java +++ b/fluentnamer/src/main/java/com/azure/autorest/fluent/util/FluentJavaSettings.java @@ -81,6 +81,8 @@ public class FluentJavaSettings { private SampleGeneration generateSamples = SampleGeneration.NONE; + private String graalVmConfigSuffix = null; + private boolean sdkIntegration = false; private enum SampleGeneration { @@ -165,6 +167,10 @@ public boolean isGenerateSamples() { return generateSamples != SampleGeneration.NONE; } + public Optional getGraalVmConfigSuffix() { + return Optional.ofNullable(graalVmConfigSuffix); + } + public boolean isSdkIntegration() { return sdkIntegration; } @@ -227,6 +233,8 @@ private void loadSettings() { loadBooleanSetting("generate-samples", s -> generateSamples = (s ? SampleGeneration.AGGREGATED : SampleGeneration.NONE)); + loadStringSetting("graalvm-config-suffix", s -> graalVmConfigSuffix = s); + loadBooleanSetting("sdk-integration", b -> sdkIntegration = b); Map namingOverride = host.getValue(new TypeReference>() {}.getType(), "pipeline.fluentnamer.naming.override"); diff --git a/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java b/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java index 7698c44ad0..cc769194be 100644 --- a/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java +++ b/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java @@ -123,7 +123,7 @@ public String handlePartialUpdate(String filePath, String generatedContent) { SETTINGS_MAP.put("generate-client-as-impl", true); SETTINGS_MAP.put("generate-sync-async-clients", true); SETTINGS_MAP.put("generate-builder-per-client", false); - SETTINGS_MAP.put("sync-methods", "all"); + SETTINGS_MAP.put("sync-methods", "sync-only"); SETTINGS_MAP.put("enable-sync-stack", true); SETTINGS_MAP.put("enable-page-size", true); From 5fcd2cc3db4be7b93a6721b726a6bce498e98b89 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 16 Oct 2023 14:43:08 +0800 Subject: [PATCH 2/2] Update TypeSpecPlugin.java --- .../src/main/java/com/azure/autorest/TypeSpecPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java b/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java index cc769194be..7698c44ad0 100644 --- a/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java +++ b/typespec-extension/src/main/java/com/azure/autorest/TypeSpecPlugin.java @@ -123,7 +123,7 @@ public String handlePartialUpdate(String filePath, String generatedContent) { SETTINGS_MAP.put("generate-client-as-impl", true); SETTINGS_MAP.put("generate-sync-async-clients", true); SETTINGS_MAP.put("generate-builder-per-client", false); - SETTINGS_MAP.put("sync-methods", "sync-only"); + SETTINGS_MAP.put("sync-methods", "all"); SETTINGS_MAP.put("enable-sync-stack", true); SETTINGS_MAP.put("enable-page-size", true);