http-client-java, option metadata-suffix, use it for metadata files (#8756)

Rename flag `graalvm-config-suffix` to `metadata-suffix`.

Use this for metadata.json file.

I will update SDK api-specs.json after release.

Author: weidongxu-microsoft

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/javamodel/JavaPackage.java

@@ -370,8 +370,9 @@ public void addJsonMergePatchHelper(List<ClientModel> models) {
         addJavaFile(javaFile);
     }
 
-    public void addTypeSpecMetadata(TypeSpecMetadata typeSpecMetadata) {
-        String filePath = "src/main/resources/META-INF/" + typeSpecMetadata.getArtifactId() + "_metadata.json";
+    public void addTypeSpecMetadata(TypeSpecMetadata typeSpecMetadata, String suffix) {
+        String filePath = "src/main/resources/META-INF/" + typeSpecMetadata.getArtifactId() + "_metadata"
+            + (suffix == null ? "" : "_" + suffix) + ".json";
         try {
             TextFile textFile = new TextFile(filePath, typeSpecMetadata.toJsonString());
             this.checkDuplicateFile(textFile.getFilePath());

packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentGen.java

@@ -255,8 +255,8 @@ protected FluentJavaPackage handleTemplate(Client client) {
         // GraalVM config
         if (javaSettings.isGenerateGraalVmConfig()) {
             String artifactId = FluentUtils.getArtifactId();
-            if (fluentJavaSettings.getGraalVmConfigSuffix().isPresent()) {
-                artifactId = artifactId + "_" + fluentJavaSettings.getGraalVmConfigSuffix().get();
+            if (fluentJavaSettings.getMetadataSuffix().isPresent()) {
+                artifactId = artifactId + "_" + fluentJavaSettings.getMetadataSuffix().get();
             }
             javaPackage.addGraalVmConfig("com.azure.resourcemanager", artifactId, client.getGraalVmConfig());
         }

packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentJavaSettings.java

@@ -78,7 +78,7 @@ public class FluentJavaSettings {
 
     private SampleGeneration generateSamples = SampleGeneration.NONE;
 
-    private String graalVmConfigSuffix = null;
+    private String metadataSuffix = null;
 
     private boolean sdkIntegration = false;
 
@@ -165,8 +165,8 @@ public boolean isGenerateSamples() {
         return generateSamples != SampleGeneration.NONE;
     }
 
-    public Optional<String> getGraalVmConfigSuffix() {
-        return Optional.ofNullable(graalVmConfigSuffix);
+    public Optional<String> getMetadataSuffix() {
+        return Optional.ofNullable(metadataSuffix);
     }
 
     public boolean isSdkIntegration() {
@@ -216,7 +216,7 @@ private void loadSettings() {
         loadBooleanSetting("generate-samples",
             s -> generateSamples = (s ? SampleGeneration.AGGREGATED : SampleGeneration.NONE));
 
-        loadStringSetting("graalvm-config-suffix", s -> graalVmConfigSuffix = s);
+        loadStringSetting("metadata-suffix", s -> metadataSuffix = s);
 
         loadBooleanSetting("sdk-integration", b -> sdkIntegration = b);
 

packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/Main.java

@@ -18,6 +18,7 @@
 import com.microsoft.typespec.http.client.generator.core.postprocessor.Postprocessor;
 import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil;
 import com.microsoft.typespec.http.client.generator.fluent.TypeSpecFluentPlugin;
+import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.FluentStatic;
 import com.microsoft.typespec.http.client.generator.mgmt.model.javamodel.FluentJavaPackage;
 import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils;
 import com.microsoft.typespec.http.client.generator.model.EmitterOptions;
@@ -118,7 +119,8 @@ private static void handleFluent(CodeModel codeModel, EmitterOptions emitterOpti
         FluentJavaPackage javaPackage = fluentPlugin.processTemplates(codeModel, client);
 
         // delete generated Java files
-        deleteGeneratedJavaFiles(emitterOptions.getOutputDir(), javaPackage.getJavaFiles(), JavaSettings.getInstance());
+        deleteGeneratedJavaFiles(emitterOptions.getOutputDir(), javaPackage.getJavaFiles(), JavaSettings.getInstance(),
+            FluentStatic.getFluentJavaSettings().getMetadataSuffix().orElse(null));
 
         // write java files
 
@@ -162,7 +164,7 @@ private static void handleDPG(CodeModel codeModel, EmitterOptions emitterOptions
         LOGGER.info("Count of text files: {}", javaPackage.getTextFiles().size());
 
         // delete generated Java files
-        deleteGeneratedJavaFiles(outputDir, javaPackage.getJavaFiles(), settings);
+        deleteGeneratedJavaFiles(outputDir, javaPackage.getJavaFiles(), settings, null);
 
         Map<String, String> javaFiles = new ConcurrentHashMap<>();
         javaPackage.getJavaFiles()
@@ -197,12 +199,14 @@ private static void handleDPG(CodeModel codeModel, EmitterOptions emitterOptions
      * @param javaFiles the list of Java files to be generated
      * @param settings the Java settings
      */
-    private static void deleteGeneratedJavaFiles(String outputDir, List<JavaFile> javaFiles, JavaSettings settings) {
+    private static void deleteGeneratedJavaFiles(String outputDir, List<JavaFile> javaFiles, JavaSettings settings,
+        String suffix) {
         Set<String> filesToDelete = new HashSet<>();
 
         // clean up source code, based on metadata
         String metadataFilename = "src/main/resources/META-INF/"
-            + (settings.isFluent() ? FluentUtils.getArtifactId() : ClientModelUtil.getArtifactId()) + "_metadata.json";
+            + (settings.isFluent() ? FluentUtils.getArtifactId() : ClientModelUtil.getArtifactId()) + "_metadata"
+            + (suffix == null ? "" : "_" + suffix) + ".json";
         Path metadataFilePath = Paths.get(outputDir, metadataFilename).toAbsolutePath();
         if (Files.isRegularFile(metadataFilePath) && metadataFilePath.toFile().canRead()) {
             try (BufferedReader reader = Files.newBufferedReader(metadataFilePath, StandardCharsets.UTF_8);

packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/TypeSpecPlugin.java

@@ -66,7 +66,7 @@ public JavaPackage processTemplates(CodeModel codeModel, Client client, JavaSett
                         : emitterOptions.getApiVersion(),
                     collectCrossLanguageDefinitions(client),
                     FileUtil.filterForJavaSourceFiles(javaPackage.getJavaFiles().stream().map(JavaFile::getFilePath)));
-            javaPackage.addTypeSpecMetadata(metadata);
+            javaPackage.addTypeSpecMetadata(metadata, null);
         }
 
         return javaPackage;

packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java

@@ -101,6 +101,9 @@ public TypeSpecFluentPlugin(EmitterOptions options, boolean sdkIntegration, Stri
         if (options.getResourceCollectionAssociations() != null) {
             SETTINGS_MAP.put("resource-collection-associations", options.getResourceCollectionAssociations());
         }
+        if (options.getMetadataSuffix() != null) {
+            SETTINGS_MAP.put("metadata-suffix", options.getMetadataSuffix());
+        }
 
         if (options.getCustomizationClass() != null) {
             SETTINGS_MAP.put("customization-class",
@@ -135,7 +138,7 @@ public FluentJavaPackage processTemplates(CodeModel codeModel, Client client) {
             TypeSpecMetadata metadata = new TypeSpecMetadata(FluentUtils.getArtifactId(), emitterOptions.getFlavor(),
                 apiVersion, collectCrossLanguageDefinitions(client),
                 FileUtil.filterForJavaSourceFiles(javaPackage.getJavaFiles().stream().map(JavaFile::getFilePath)));
-            javaPackage.addTypeSpecMetadata(metadata);
+            javaPackage.addTypeSpecMetadata(metadata, getFluentJavaSettings().getMetadataSuffix().orElse(null));
         }
 
         return javaPackage;

packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/EmitterOptions.java

@@ -51,6 +51,7 @@ public class EmitterOptions implements JsonSerializable<EmitterOptions> {
     private Boolean generateAsyncMethods;
     private String propertyIncludeAlways;
     private List<ResourceCollectionAssociation> resourceCollectionAssociations = new ArrayList<>();
+    private String metadataSuffix;
 
     // internal
     private String outputDir;
@@ -199,6 +200,10 @@ public List<ResourceCollectionAssociation> getResourceCollectionAssociations() {
         return resourceCollectionAssociations;
     }
 
+    public String getMetadataSuffix() {
+        return metadataSuffix;
+    }
+
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         // it does not need to be written to JSON
@@ -273,6 +278,8 @@ public static EmitterOptions fromJson(JsonReader jsonReader) throws IOException
                 options.premium = reader.getNullable(EmitterOptions::getBoolean);
             } else if ("client-side-validations".equals(fieldName)) {
                 options.clientSideValidations = reader.getNullable(EmitterOptions::getBoolean);
+            } else if ("metadata-suffix".equals(fieldName)) {
+                options.metadataSuffix = emptyToNull(reader.getString());
             } else {
                 reader.skipChildren();
             }