Merge pull request #189 from amarzavery/enumStrType

Ensure discriminator property has the correct enum constant while resolving it.

Author: amarzavery

ChangeLog.md

@@ -1,3 +1,6 @@
+### 12/4/2017 0.4.21
+- Remove the enum constraint or reference to an enum on the discriminator property if previously present before making it a constant.
+
 ### 11/20/2017 0.4.20
 - Added support for processing [`"x-ms-parameterized-host": {}`](https://github.com/Azure/autorest/tree/master/docs/extensions#x-ms-parameterized-host) extension if present in the 2.0 swagger spec.
 

lib/validators/specResolver.js

@@ -660,6 +660,18 @@ class SpecResolver {
       if (definitions[name]['x-ms-discriminator-value']) {
         val = definitions[name]['x-ms-discriminator-value'];
       }
+      // Ensure that the property marked as a discriminator has only one value in the enum constraint for that model and it 
+      // should be the one that is the model name or the value indicated by x-ms-discriminator-value. This will make the discriminator
+      // property a constant (in json schema terms).
+      if (definitions[name].properties[discriminator]['$ref']) {
+        delete definitions[name].properties[discriminator]['$ref'];
+      }
+      // We will set "type" to "string". It is safe to assume that properties marked as "discriminator" will be of type "string"
+      // as it needs to refer to a model definition name. Model name would be a key in the definitions object/dictionary in the
+      // swagger spec. keys would always be a string in a JSON object/dictionary. 
+      if (!definitions[name].properties[discriminator].type) {
+        definitions[name].properties[discriminator].type = 'string';
+      }
       definitions[name].properties[discriminator].enum = [`${val}`];
     }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "oav",
-  "version": "0.4.20",
+  "version": "0.4.21",
   "author": {
     "name": "Microsoft Corporation",
     "email": "[email protected]",

package.json

@@ -232,7 +232,7 @@
           "type": "string"
         },
         "animalType": {
-          "type": "string",
+          "$ref": "#/definitions/AnimalType",
           "description": "Type of activity."
         },
         "siblings": {
@@ -292,6 +292,16 @@
         }
       }
     },
+    "AnimalType": {
+      "description": "Animal type.",
+      "type": "string",
+      "enum": [
+        "Tiger",
+        "Cat",
+        "Mouse",
+        "Mammal"
+      ]
+    },
     "Tiger": {
       "description": "class for Tiger.",
       "allOf": [
@@ -315,7 +325,11 @@
         },
         "foodType": {
           "type": "string",
-          "description": "Type of food."
+          "description": "Type of food.",
+          "enum": [
+            "Meat",
+            "Jain"
+          ]
         }
       },
       "required": [