Merge branch 'main' into 481-samm-cli-aas-generation-mapping-of-set-characteristics

Author: Yauhenikapl

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/AbstractSchemaArtifact.java

@@ -29,8 +29,10 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
+import com.fasterxml.jackson.dataformat.yaml.util.StringQuotingChecker;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Streams;
 import io.vavr.control.Try;
@@ -138,10 +140,24 @@ protected Map<Path, String> getContentWithSeparateSchemasAsYaml( final Optional<
 
    protected String jsonToYaml( final JsonNode json ) {
       try {
-         return new YAMLMapper().enable( YAMLGenerator.Feature.MINIMIZE_QUOTES ).writeValueAsString( json );
+         final YAMLFactory yamlFactory = YAMLFactory.builder()
+               .stringQuotingChecker( new OpenApiStringQuotingChecker() ).build();
+         return new YAMLMapper( yamlFactory ).enable( YAMLGenerator.Feature.MINIMIZE_QUOTES )
+               .writeValueAsString( json );
       } catch ( final JsonProcessingException exception ) {
          LOG.error( "JSON could not be converted to YAML", exception );
          return json.toString();
       }
    }
+
+   public static class OpenApiStringQuotingChecker extends StringQuotingChecker.Default {
+
+      @Override
+      protected boolean valueHasQuotableChar( final String inputStr ) {
+         if ( inputStr.contains( "#" ) ) {
+            return true;
+         }
+         return super.valueHasQuotableChar( inputStr );
+      }
+   }
 }

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGeneratorTest.java

@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.esmf.aspectmodel.generator.AbstractGenerator;
+import org.eclipse.esmf.aspectmodel.generator.AbstractSchemaArtifact;
 import org.eclipse.esmf.metamodel.Aspect;
 import org.eclipse.esmf.metamodel.Property;
 import org.eclipse.esmf.test.TestAspect;
@@ -43,6 +44,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import com.google.common.collect.Streams;
@@ -303,7 +305,9 @@ void testInValidParameterName() throws IOException {
    @Test
    void testYamlGenerator() throws IOException {
       final Aspect aspect = TestResources.load( TestAspect.ASPECT_WITHOUT_SEE_ATTRIBUTE ).aspect();
-      final YAMLMapper yamlMapper = new YAMLMapper().enable( YAMLGenerator.Feature.MINIMIZE_QUOTES );
+      final YAMLFactory yamlFactory = YAMLFactory.builder()
+            .stringQuotingChecker( new AbstractSchemaArtifact.OpenApiStringQuotingChecker() ).build();
+      final YAMLMapper yamlMapper = new YAMLMapper( yamlFactory ).enable( YAMLGenerator.Feature.MINIMIZE_QUOTES );
       final OpenApiSchemaGenerationConfig yamlConfig = OpenApiSchemaGenerationConfigBuilder.builder()
             .useSemanticVersion( true )
             .baseUrl( TEST_BASE_URL )