Rename discriminatedBy into discriminatorValue

Author: Antoine Pelisse

merge/union_test.go

@@ -50,14 +50,14 @@ var unionFieldsParser = func() typed.ParseableType {
       deduceInvalidDiscriminator: true
       fields:
       - fieldName: numeric
-        discriminatedBy: Numeric
+        discriminatorValue: Numeric
       - fieldName: string
-        discriminatedBy: String
+        discriminatorValue: String
     - fields:
       - fieldName: fieldA
-        discriminatedBy: FieldA
+        discriminatorValue: FieldA
       - fieldName: fieldB
-        discriminatedBy: FieldB`)
+        discriminatorValue: FieldB`)
 	if err != nil {
 		panic(err)
 	}

schema/elements.go

@@ -126,10 +126,10 @@ type UnionField struct {
 	// FieldName is the name of the field that is part of the union. This
 	// is the serialized form of the field.
 	FieldName string `yaml:"fieldName"`
-	// DiscriminatedBy is the value of the discriminator to select that
-	// field. If the union doesn't have a discriminator, this field is
-	// ignored.
-	DiscriminatedBy string `yaml:"discriminatedBy"`
+	// Discriminatorvalue is the value of the discriminator to
+	// select that field. If the union doesn't have a discriminator,
+	// this field is ignored.
+	DiscriminatorValue string `yaml:"discriminatorValue"`
 }
 
 // Union, or oneof, means that only one of multiple fields of a structure can be

schema/schemaschema.go

@@ -96,7 +96,7 @@ var SchemaSchemaYAML = `types:
     - name: fieldName
       type:
         scalar: string
-    - name: discriminatedBy
+    - name: discriminatorValue
       type:
         scalar: string
 - name: union

typed/union.go

@@ -203,7 +203,7 @@ func newUnion(su *schema.Union) *union {
 	f2d := map[field]discriminated{}
 	for _, f := range su.Fields {
 		u.f = append(u.f, field(f.FieldName))
-		f2d[field(f.FieldName)] = discriminated(f.DiscriminatedBy)
+		f2d[field(f.FieldName)] = discriminated(f.DiscriminatorValue)
 	}
 	u.dn = newDiscriminatedName(f2d)
 	u.deduceInvalidDiscriminator = su.DeduceInvalidDiscriminator

typed/union_test.go

@@ -53,17 +53,17 @@ var unionParser = func() typed.ParseableType {
       deduceInvalidDiscriminator: true
       fields:
       - fieldName: one
-        discriminatedBy: One
+        discriminatorValue: One
       - fieldName: two
-        discriminatedBy: TWO
+        discriminatorValue: TWO
       - fieldName: three
-        discriminatedBy: three
+        discriminatorValue: three
     - discriminator: letter
       fields:
       - fieldName: a
-        discriminatedBy: A
+        discriminatorValue: A
       - fieldName: b
-        discriminatedBy: b`)
+        discriminatorValue: b`)
 	if err != nil {
 		panic(err)
 	}