Merge pull request #1466 from aneeshafedo/intersection_update

Support new changes in the semantics of intersection
ballerina-platform · Jul 19, 2023 · 1a419e9 · 1a419e9
2 parents 96e88ba + 1589a95
commit 1a419e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...-service/src/main/java/io/ballerina/openapi/converter/service/OpenAPIComponentMapper.java b/...-service/src/main/java/io/ballerina/openapi/converter/service/OpenAPIComponentMapper.java
@@ -314,6 +314,12 @@ private ObjectSchema generateObjectSchemaFromRecordFields(Map<String, Schema> sc
             }
             TypeDescKind fieldTypeKind = field.getValue().typeDescriptor().typeKind();
             String type = fieldTypeKind.toString().toLowerCase(Locale.ENGLISH);
+
+            if (fieldTypeKind == TypeDescKind.INTERSECTION) {
+                TypeSymbol readOnlyExcludedType = excludeReadonlyIfPresent(field.getValue().typeDescriptor());
+                type = readOnlyExcludedType.typeKind().toString().toLowerCase(Locale.ENGLISH);
+            }
+
             Schema property = ConverterCommonUtils.getOpenApiSchema(type);
 
             if (fieldTypeKind == TypeDescKind.TYPE_REFERENCE) {
@@ -406,6 +412,9 @@ private Schema handleUnionType(UnionTypeSymbol unionType, Schema property, Strin
         List<Schema> properties = new ArrayList<>();
         boolean nullable = false;
         for (TypeSymbol union : unionTypes) {
+            if (union.typeKind() == TypeDescKind.INTERSECTION) {
+                union = excludeReadonlyIfPresent(union);
+            }
             if (union.typeKind() == TypeDescKind.NIL) {
                 nullable = true;
             } else if (union.typeKind() == TypeDescKind.TYPE_REFERENCE) {

diff --git a/...l-service/src/main/java/io/ballerina/openapi/converter/service/OpenAPIResponseMapper.java b/...l-service/src/main/java/io/ballerina/openapi/converter/service/OpenAPIResponseMapper.java
@@ -897,6 +897,9 @@ private void handleReferenceResponse(OperationAdaptor operationAdaptor, SimpleNa
         } else if (typeSymbol.typeKind() == TypeDescKind.TYPE_REFERENCE) {
             TypeReferenceTypeSymbol typeReferenceTypeSymbol = (TypeReferenceTypeSymbol) typeSymbol;
             TypeSymbol referredTypeSymbol = typeReferenceTypeSymbol.typeDescriptor();
+            if (referredTypeSymbol.typeKind() == TypeDescKind.INTERSECTION) {
+                referredTypeSymbol = componentMapper.excludeReadonlyIfPresent(referredTypeSymbol);
+            }
             String referenceName = referenceNode.name().toString().trim();
             String referredTypeName = referredTypeSymbol.getName().isPresent() ?
                     referredTypeSymbol.getName().get() : "";