W-13157845: upgrade to AMF 5.3.0 (#442)

Author: juanchib

interface-impl-amf/pom.xml

@@ -17,7 +17,7 @@
         <licensePath>../LICENSE_HEADER.txt</licensePath>
         <formatterConfigPath>../formatter.xml</formatterConfigPath>
         <sonar.jacoco.reportPaths>../target/jacoco.exec</sonar.jacoco.reportPaths>
-        <amf.version>5.2.3</amf.version>
+        <amf.version>5.3.0</amf.version>
         <amf.xml.extension.version>2.0.3</amf.xml.extension.version>
         <json-simple.version>1.1.1</json-simple.version>
     </properties>

interface-impl-amf/src/main/java/org/mule/amf/impl/model/ParameterImpl.java

@@ -35,6 +35,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
@@ -259,20 +260,16 @@ private static Boolean needsQuotes(Shape anyShape) {
   }
 
   private static boolean hasAnArrayVariant(UnionShape unionShape) {
-    boolean hasAnArrayVariant = false;
-    for (Shape shape : unionShape.anyOf()) {
-      if (shape instanceof ArrayShape) {
-        hasAnArrayVariant = true;
-      } else if (!(shape instanceof NilShape)) {
-        return false;
-      }
-    }
-
-    return hasAnArrayVariant;
+    return flatMapUnionShapes(unionShape).noneMatch(shape -> !(shape instanceof ArrayShape || shape instanceof NilShape));
   }
 
   private static boolean hasNilShape(UnionShape unionShape) {
-    return unionShape.anyOf().stream().anyMatch(NilShape.class::isInstance);
+    return flatMapUnionShapes(unionShape).anyMatch(NilShape.class::isInstance);
+  }
+
+  private static Stream<Shape> flatMapUnionShapes(UnionShape unionShape) {
+    return unionShape.anyOf().stream()
+        .flatMap(shape -> shape instanceof UnionShape ? flatMapUnionShapes((UnionShape) shape) : Stream.of(shape));
   }
 
   public static List<String> getDefaultValuesFromSchema(AnyShape schema) {

interface-impl-amf/src/test/resources/org/mule/amf/impl/recursive-shape/examples/post-visit-request.json

@@ -1,45 +1,63 @@
 {
-  "resourceType":"ActivityDefinition",
-  "status":"active",
-  "id": "28d9888a-e91b46a9-a84c-ab2d8e8af457",
-  "title":"TELEMED",
-  "description":"Telemedicine Visit",
-  "subtitle":"1",
-  "extension":[
-    {
-      "url":"http://hl7.org/fhir/StructureDefinition/timing-daysOfCycle",
-      "extension":[
-        {
-          "url":"day",
-          "valueInteger":0
-        }
-      ]
-    }
-  ],
-  "timingRange":{
-    "low":{
-      "value":0,
-      "unit":"day"
-    },
-    "high":{
-      "value":0,
-      "unit":"day"
-    }
-  },
-  "dynamicValue":[
-    {
-      "path":"Questionnaire/62baa9b8-f3d2-11ea-adc1-0242ac120002",
-      "expression":{
-        "language":"text/fhirpath",
-        "name":"Telemedicine Visit"
+  "resource": {
+    "resourceType": "ActivityDefinition",
+    "status": "active",
+    "id": "28d9888a-e91b46a9-a84c-ab2d8e8af457",
+    "title": "TELEMED",
+    "description": "Telemedicine Visit",
+    "subtitle": "1",
+    "observationRequirement": [
+      {
+        "test": "test"
+      }
+    ],
+    "observationResultRequirement": [
+      {
+        "test": "test"
+      }
+    ],
+    "transform": "test",
+    "specimenRequirement": [
+      {
+        "test": "test"
+      }
+    ],
+    "extension": [
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/timing-daysOfCycle",
+        "extension": [
+          {
+            "url": "day",
+            "valueInteger": 0
+          }
+        ]
+      }
+    ],
+    "timingRange": {
+      "low": {
+        "value": 0,
+        "unit": "day"
+      },
+      "high": {
+        "value": 0,
+        "unit": "day"
       }
     },
-    {
-      "path":"Questionnaire/28d9888a-e91b46a9-a84c-ab2d8e8af457",
-      "expression":{
-        "language":"text/fhirpath",
-        "name":"*Investigator - Telemedicine ProgressNote"
+    "dynamicValue": [
+      {
+        "path": "Questionnaire/62baa9b8-f3d2-11ea-adc1-0242ac120002",
+        "expression": {
+          "language": "text/fhirpath",
+          "name": "test"
+        }
+      },
+      {
+        "path": "Questionnaire/28d9888a-e91b46a9-a84c-ab2d8e8af457",
+        "expression": {
+          "language": "text/fhirpath",
+          "name": "test"
+        }
       }
-    }
-  ]
+    ]
+  }
 }

parser-service/src/test/java/org/mule/parser/service/QueryConsistencyTestCase.java

@@ -53,6 +53,8 @@ public class QueryConsistencyTestCase {
   private static final String NON_NULLABLE_UNION_OF_ARRAYS = "nonNullableUnionOfArraysParams";
   private static final String NULLABLE_UNION_OF_NULLABLE_ARRAYS = "nullableUnionOfNullableArraysParams";
   private static final String NON_NULLABLE_UNION_OF_NULLABLE_ARRAYS = "nonNullableUnionOfNullableArraysParams";
+  private static final String REPEATABLE = "repeatableParams";
+  private static final String NOT_REPEATABLE = "notRepeatableParams";
 
   private Map<String, Parameter> queryParameters;
   private QueryString queryString;
@@ -211,10 +213,8 @@ public void testObjectArrayValidation() {
   }
 
   /**
-   * In terms of validation, when the parameter is nullable (for RAML this is a union between nil and something else), a null
-   * value will be considered as a union's value instead of inner type's value. This is because the validator considers the weight
-   * of the outer type to be greater than that of the inner types. Note that a value is considered as null when it is a: - null
-   * Object - "null" String - null Object or "null" String as part of a single element in an array
+   * Note that a value is considered as null when it is a: - null Object - "null" String - null Object or "null" String as part of
+   * a single element in an array.
    */
 
   @Test
@@ -273,6 +273,14 @@ public void testNonNullableUnionOfNullableArraysValidation() {
     }
   }
 
+  @Test
+  public void testRepeatable() {
+    if (parserMode.equals(ParserMode.AMF)) {
+      validateArrayConsistency(true, REPEATABLE, asList("123", "456"));
+      validateArrayConsistency(false, NOT_REPEATABLE, asList("123", "456"));
+    }
+  }
+
   @Test
   public void testDefaultValues() {
     // Java RAML parser is not returning default values

parser-service/src/test/resources/query-validation-consistency/api.raml

@@ -91,6 +91,11 @@ types:
     type: booleanItems | integerItems
   nonNullableUnionOfNullableArrays:
     type: nullableStringItems | nullableIntegerItems
+  repeatable:
+    type: integerItems | booleanItems | nil
+  notRepeatable:
+    type: integerItems | nullableString
+
   query:
     type: object
     additionalProperties: false
@@ -137,6 +142,10 @@ types:
         type: nonNullableUnionOfNullableArrays
       nullableScalarParams?:
         type: nullableStringItems
+      repeatableParams?:
+        type: repeatable
+      notRepeatableParams?:
+        type: notRepeatable
 
 /testQueryParams:
   get:
@@ -183,6 +192,10 @@ types:
         type: nonNullableUnionOfNullableArrays
       nullableScalarParams?:
         type: nullableStringItems
+      repeatableParams?:
+        type: repeatable
+      notRepeatableParams?:
+        type: notRepeatable
     responses:
       200:
 /testQueryString: