Merge pull request #316 from oasis-tcs/csdl2openapi/create-key

Author: HeikoTheissen

tools/V4-CSDL-to-OpenAPI.xsl

@@ -99,6 +99,8 @@
   <xsl:variable name="coreAcceptableMediaTypesAliased" select="concat($coreAlias,'.AcceptableMediaTypes')" />
   <xsl:variable name="coreComputed" select="concat($coreNamespace,'.Computed')" />
   <xsl:variable name="coreComputedAliased" select="concat($coreAlias,'.Computed')" />
+  <xsl:variable name="coreComputedDefaultValue" select="concat($coreNamespace,'.ComputedDefaultValue')" />
+  <xsl:variable name="coreComputedDefaultValueAliased" select="concat($coreAlias,'.ComputedDefaultValue')" />
   <xsl:variable name="coreDefaultNamespace" select="concat($coreNamespace,'.DefaultNamespace')" />
   <xsl:variable name="coreDefaultNamespaceAliased" select="concat($coreAlias,'.DefaultNamespace')" />
   <xsl:variable name="coreDescription" select="concat($coreNamespace,'.Description')" />
@@ -1496,6 +1498,9 @@
     <xsl:variable name="computed" select="$structuredType/edm:Property[edm:Annotation[@Term=$coreComputed or @Term=$coreComputedAliased]]/@Name" />
     <xsl:variable name="computed-ext" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
                                               [edm:Annotation[@Term=$coreComputed or @Term=$coreComputedAliased]]/@Target" />
+    <xsl:variable name="computeddefaultvalue" select="$structuredType/edm:Property[edm:Annotation[@Term=$coreComputedDefaultValue or @Term=$coreComputedDefaultValueAliased]]/@Name" />
+    <xsl:variable name="computeddefaultvalue-ext" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
+                                              [edm:Annotation[@Term=$coreComputedDefaultValue or @Term=$coreComputedDefaultValueAliased]]/@Target" />
 
     <xsl:variable name="immutable" select="$structuredType/edm:Property[edm:Annotation[@Term=$coreImmutable or @Term=$coreImmutableAliased]]/@Name" />
     <xsl:variable name="immutable-ext" select="(key('externalPropertyAnnotations',$qualifiedName)|key('externalPropertyAnnotations',$aliasQualifiedName))
@@ -1577,8 +1582,11 @@
               and not(
                 @Name = $read-only
                 or @Name = $computed
+                or @Name = $computeddefaultvalue
                 or concat($qualifiedName, '/', @Name) = $computed-ext
                 or concat($aliasQualifiedName, '/', @Name) = $computed-ext
+                or concat($qualifiedName, '/', @Name) = $computeddefaultvalue-ext
+                or concat($aliasQualifiedName, '/', @Name) = $computeddefaultvalue-ext
               )
             )
             or concat($qualifiedName, '/', @Name) = $mandatory

tools/tests/csdl-16.1.openapi3.json

@@ -2194,9 +2194,6 @@
                         }
                     }
                 },
-                "required": [
-                    "ID"
-                ],
                 "title": "Supplier (for create)"
             },
             "ODataDemo.Supplier-update": {

tools/tests/csdl-16.1.swagger.json

@@ -1961,9 +1961,6 @@
                     }
                 }
             },
-            "required": [
-                "ID"
-            ],
             "title": "Supplier (for create)"
         },
         "ODataDemo.Supplier-update": {

tools/tests/csdl-16.1.xml

@@ -48,7 +48,9 @@
         <Key>
           <PropertyRef Name="ID" />
         </Key>
-        <Property Name="ID" Type="Edm.String" Nullable="false" />
+        <Property Name="ID" Type="Edm.String" Nullable="false">
+          <Annotation Term="Org.OData.Core.V1.ComputedDefaultValue" />
+        </Property>
         <Property Name="Name" Type="Edm.String" />
         <Property Name="Address" Type="ODataDemo.Address" Nullable="false" />
         <Property Name="Concurrency" Type="Edm.Int32" Nullable="false" />