Eliminate oneOf

maasglobal · Aug 17, 2023 · 97a9390 · 97a9390
1 parent 853ab19
commit 97a9390
Show file tree

Hide file tree

Showing 36 changed files with 48 additions and 48 deletions.
diff --git a/maas-schemas/schemas/core/balances.json b/maas-schemas/schemas/core/balances.json
@@ -5,7 +5,7 @@
   "definitions": {
     "balanceName": {
       "description": "Uniqued name for a currency",
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/currency"
         },

diff --git a/maas-schemas/schemas/core/booking-option.json b/maas-schemas/schemas/core/booking-option.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schemas.maas.global/core/booking-option.json",
   "description": "MaaS single TSP adapter option",
-  "oneOf": [
+  "anyOf": [
     {
       "$ref": "#/definitions/contentWithCost"
     },

diff --git a/maas-schemas/schemas/core/booking.json b/maas-schemas/schemas/core/booking.json
@@ -8,7 +8,7 @@
       "$ref": "#/definitions/id"
     },
     "tspId": {
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "#/definitions/tspId"
         },
@@ -27,7 +27,7 @@
       "$ref": "#/definitions/fares"
     },
     "cost": {
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "#/definitions/cost"
         },

diff --git a/maas-schemas/schemas/core/components/ajv.json b/maas-schemas/schemas/core/components/ajv.json
@@ -4,7 +4,7 @@
   "definitions": {
     "stringCoarsedNull": {
       "description": "Ajv type coarsing replaces null with empty string",
-      "oneOf": [
+      "anyOf": [
         {
           "type": "null"
         },

diff --git a/maas-schemas/schemas/core/components/car-rental.json b/maas-schemas/schemas/core/components/car-rental.json
@@ -70,7 +70,7 @@
           "enum": ["manual", "automatic", null]
         },
         "fuel": {
-          "oneOf": [
+          "anyOf": [
             {
               "enum": [
                 "diesel",
@@ -90,7 +90,7 @@
           ]
         },
         "classification": {
-          "oneOf": [
+          "anyOf": [
             {
               "$ref": "https://schemas.maas.global/core/components/ACRISS.json"
             },

diff --git a/maas-schemas/schemas/core/components/cost.json b/maas-schemas/schemas/core/components/cost.json
@@ -29,7 +29,7 @@
       "description": "A flag indicating whether TSP price is fixed"
     },
     "currency": {
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/currency"
         },

diff --git a/maas-schemas/schemas/core/components/fare.json b/maas-schemas/schemas/core/components/fare.json
@@ -27,7 +27,7 @@
       "minimum": 0
     },
     "currency": {
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/currency"
         },

diff --git a/maas-schemas/schemas/core/components/geometry.json b/maas-schemas/schemas/core/components/geometry.json
@@ -5,7 +5,7 @@
   "description": "GeoJSON geometry, forked from https://github.com/fge/sample-json-schemas/ under BSD license",
   "type": "object",
   "required": ["type", "coordinates"],
-  "oneOf": [
+  "anyOf": [
     {
       "title": "Point",
       "type": "object",

diff --git a/maas-schemas/schemas/core/customer.json b/maas-schemas/schemas/core/customer.json
@@ -151,7 +151,7 @@
           "type": "object",
           "properties": {
             "currency": {
-              "oneOf": [
+              "anyOf": [
                 {
                   "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/currency"
                 },
@@ -173,7 +173,7 @@
           "description": "key would typically match tokenId",
           "properties": {
             "currency": {
-              "oneOf": [
+              "anyOf": [
                 {
                   "$ref": "https://schemas.maas.global/core/components/common.json#/definitions/metaCurrencyTOKEN"
                 },

diff --git a/maas-schemas/schemas/core/personal-document.json b/maas-schemas/schemas/core/personal-document.json
@@ -74,7 +74,7 @@
       "examples": ["2020-01-01"]
     },
     "validTo": {
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/isoDate"
         },
@@ -180,7 +180,7 @@
       "$ref": "#/definitions/kycServiceId"
     },
     "firstName": {
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "#/definitions/firstName"
         },
@@ -190,7 +190,7 @@
       ]
     },
     "lastName": {
-      "oneOf": [
+      "anyOf": [
         {
           "$ref": "#/definitions/lastName"
         },

diff --git a/maas-schemas/schemas/core/plan.json b/maas-schemas/schemas/core/plan.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schemas.maas.global/core/plan.json",
   "description": "OpenTripPlanner compatible format for plans, extended with id for legs and itineraries",
-  "oneOf": [{ "$ref": "#/definitions/plan1" }, { "$ref": "#/definitions/plan2" }],
+  "anyOf": [{ "$ref": "#/definitions/plan1" }, { "$ref": "#/definitions/plan2" }],
   "definitions": {
     "plan1": {
       "type": "object",

diff --git a/maas-schemas/schemas/core/product-option.json b/maas-schemas/schemas/core/product-option.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schemas.maas.global/core/product-option.json",
   "description": "Product option for an itinerary, is either an existing booking pointer or a new booking instruction",
-  "oneOf": [
+  "anyOf": [
     { "$ref": "#/definitions/withConfigurator" },
     { "$ref": "#/definitions/withFares" },
     { "$ref": "#/definitions/withCost" }

diff --git a/maas-schemas/schemas/core/product-optionV2.json b/maas-schemas/schemas/core/product-optionV2.json
@@ -84,7 +84,7 @@
           "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/identityId"
         },
         "type": {
-          "oneOf": [{ "const": "BOOKING_BOOKABLE" }, { "const": "BOOKING_ESTIMATABLE" }]
+          "anyOf": [{ "const": "BOOKING_BOOKABLE" }, { "const": "BOOKING_ESTIMATABLE" }]
         },
         "product": {
           "$ref": "https://schemas.maas.global/core/product.json"

diff --git a/maas-schemas/schemas/core/product.json b/maas-schemas/schemas/core/product.json
@@ -54,7 +54,7 @@
       "maxLength": 255
     },
     "preAuthBuffer": {
-      "oneOf": [
+      "anyOf": [
         {
           "type": "object",
           "properties": {

diff --git a/maas-schemas/schemas/core/profile.json b/maas-schemas/schemas/core/profile.json
@@ -129,7 +129,7 @@
       "properties": {
         "id": {
           "description": "Refers several seemingly unrelated things. Use is discouraged.",
-          "oneOf": [
+          "anyOf": [
             { "$ref": "#/definitions/bookingOptionsReference" },
             {
               "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/identityId"

diff --git a/maas-schemas/schemas/environments/synopsis.json b/maas-schemas/schemas/environments/synopsis.json
@@ -29,7 +29,7 @@
     },
     "group": { "$ref": "#/definitions/groupMeta" },
     "account": {
-      "oneOf": [
+      "anyOf": [
         { "$ref": "#/definitions/unknownAccount" },
         {
           "$ref": "https://schemas.maas.global/environments/accounts.json#/definitions/account"

diff --git a/maas-schemas/schemas/geojson/geometry.json b/maas-schemas/schemas/geojson/geometry.json
@@ -5,7 +5,7 @@
   "description": "GeoJSON geometry, forked from https://github.com/fge/sample-json-schemas/ under BSD license",
   "type": "object",
   "required": ["type", "coordinates"],
-  "oneOf": [
+  "anyOf": [
     {
       "title": "Point",
       "type": "object",

diff --git a/maas-schemas/schemas/maas-backend/bookings/bookings-agency-options/response.json b/maas-schemas/schemas/maas-backend/bookings/bookings-agency-options/response.json
@@ -63,7 +63,7 @@
           }
         },
         {
-          "oneOf": [
+          "anyOf": [
             {
               "type": "object",
               "required": ["leg", "terms", "product", "fares"]

diff --git a/maas-schemas/schemas/maas-backend/bookings/bookings-options/response.json b/maas-schemas/schemas/maas-backend/bookings/bookings-options/response.json
@@ -63,7 +63,7 @@
           }
         },
         {
-          "oneOf": [
+          "anyOf": [
             {
               "required": ["leg", "terms", "product", "fares"]
             },

diff --git a/maas-schemas/schemas/maas-backend/customers/personal-documents/consent/request.json b/maas-schemas/schemas/maas-backend/customers/personal-documents/consent/request.json
@@ -25,7 +25,7 @@
           "$ref": "https://schemas.maas.global/core/components/common.json#/definitions/agencyId"
         }
       },
-      "oneOf": [{ "required": ["partyId", "partyType"] }, { "required": ["agencyId"] }]
+      "anyOf": [{ "required": ["partyId", "partyType"] }, { "required": ["agencyId"] }]
     },
     "headers": {
       "$ref": "https://schemas.maas.global/core/components/api-common.json#/definitions/headers"

diff --git a/maas-schemas/schemas/maas-backend/customers/personal-documents/update/request.json b/maas-schemas/schemas/maas-backend/customers/personal-documents/update/request.json
@@ -46,7 +46,7 @@
           "$ref": "https://schemas.maas.global/core/personal-document.json#/definitions/kycServiceId"
         },
         "firstName": {
-          "oneOf": [
+          "anyOf": [
             {
               "$ref": "https://schemas.maas.global/core/personal-document.json#/definitions/firstName"
             },
@@ -56,7 +56,7 @@
           ]
         },
         "lastName": {
-          "oneOf": [
+          "anyOf": [
             {
               "$ref": "https://schemas.maas.global/core/personal-document.json#/definitions/lastName"
             },

diff --git a/maas-schemas/schemas/maas-backend/customers/verification/initiate/request.json b/maas-schemas/schemas/maas-backend/customers/verification/initiate/request.json
@@ -31,7 +31,7 @@
               "maxLength": 255
             }
           },
-          "oneOf": [{ "required": ["planId"] }, { "required": ["agencyId"] }]
+          "anyOf": [{ "required": ["planId"] }, { "required": ["agencyId"] }]
         }
       },
       "required": ["location"]

diff --git a/maas-schemas/schemas/maas-backend/customers/verification/webhooks/decision/request.json b/maas-schemas/schemas/maas-backend/customers/verification/webhooks/decision/request.json
@@ -25,7 +25,7 @@
               "type": "object",
               "properties": {
                 "firstName": {
-                  "oneOf": [
+                  "anyOf": [
                     {
                       "$ref": "https://schemas.maas.global/core/components/common.json#/definitions/personalName"
                     },
@@ -35,7 +35,7 @@
                   ]
                 },
                 "lastName": {
-                  "oneOf": [
+                  "anyOf": [
                     {
                       "$ref": "https://schemas.maas.global/core/components/common.json#/definitions/personalName"
                     },
@@ -51,7 +51,7 @@
               "type": "object",
               "properties": {
                 "number": {
-                  "oneOf": [
+                  "anyOf": [
                     {
                       "type": "string",
                       "minLength": 2
@@ -68,7 +68,7 @@
                   "$ref": "https://schemas.maas.global/core/components/address.json#/definitions/country"
                 },
                 "validFrom": {
-                  "oneOf": [
+                  "anyOf": [
                     {
                       "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/isoDate"
                     },
@@ -78,7 +78,7 @@
                   ]
                 },
                 "validUntil": {
-                  "oneOf": [
+                  "anyOf": [
                     {
                       "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/isoDate"
                     },
@@ -93,7 +93,7 @@
               "type": "string"
             },
             "reasonCode": {
-              "oneOf": [
+              "anyOf": [
                 {
                   "type": "integer",
                   "minimum": 100,

diff --git a/maas-schemas/schemas/maas-backend/itineraries/itinerary-create/response.json b/maas-schemas/schemas/maas-backend/itineraries/itinerary-create/response.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://schemas.maas.global/maas-backend/itineraries/itinerary-create/response.json",
   "description": "Response schema for itineraries-create",
-  "oneOf": [
+  "anyOf": [
     {
       "type": "object",
       "properties": {
@@ -76,7 +76,7 @@
     },
     "paymentParameters": {
       "description": "Payment parameters for asynchronous payment methods",
-      "oneOf": [
+      "anyOf": [
         { "$ref": "#/definitions/paymentParameter" },
         {
           "type": "array",

diff --git a/maas-schemas/schemas/maas-backend/itineraries/itinerary-list/response.json b/maas-schemas/schemas/maas-backend/itineraries/itinerary-list/response.json
@@ -8,7 +8,7 @@
       "type": "array",
       "minItems": 0,
       "items": {
-        "oneOf": [
+        "anyOf": [
           { "$ref": "https://schemas.maas.global/core/itinerary.json" },
           { "$ref": "https://schemas.maas.global/core/itineraryV2.json" }
         ]

diff --git a/maas-schemas/schemas/maas-backend/itineraries/itinerary-retrieve/response.json b/maas-schemas/schemas/maas-backend/itineraries/itinerary-retrieve/response.json
@@ -5,7 +5,7 @@
   "type": "object",
   "properties": {
     "itinerary": {
-      "oneOf": [
+      "anyOf": [
         { "$ref": "https://schemas.maas.global/core/itinerary.json" },
         { "$ref": "https://schemas.maas.global/core/itineraryV2.json" }
       ]

diff --git a/maas-schemas/schemas/maas-backend/itineraries/itinerary-update/response.json b/maas-schemas/schemas/maas-backend/itineraries/itinerary-update/response.json
@@ -5,7 +5,7 @@
   "type": "object",
   "properties": {
     "itinerary": {
-      "oneOf": [
+      "anyOf": [
         { "$ref": "https://schemas.maas.global/core/itinerary.json" },
         { "$ref": "https://schemas.maas.global/core/itineraryV2.json" }
       ]

diff --git a/maas-schemas/schemas/maas-backend/products/provider.json b/maas-schemas/schemas/maas-backend/products/provider.json
@@ -99,7 +99,7 @@
             },
             "fixedFareCurrency": {
               "description": "The currency of the maximum fixed fare",
-              "oneOf": [
+              "anyOf": [
                 {
                   "$ref": "https://schemas.maas.global/core/components/units.json#/definitions/currency"
                 },

diff --git a/maas-schemas/schemas/maas-backend/provider/routes/response.json b/maas-schemas/schemas/maas-backend/provider/routes/response.json
@@ -5,7 +5,7 @@
   "type": "object",
   "properties": {
     "plan": {
-      "oneOf": [{ "$ref": "#/definitions/plan1" }, { "$ref": "#/definitions/plan2" }]
+      "anyOf": [{ "$ref": "#/definitions/plan1" }, { "$ref": "#/definitions/plan2" }]
     }
   },
   "definitions": {

diff --git a/maas-schemas/schemas/maas-backend/push-notification/request.json b/maas-schemas/schemas/maas-backend/push-notification/request.json
@@ -25,7 +25,7 @@
       ]
     },
     "data": {
-      "oneOf": [
+      "anyOf": [
         {
           "type": "object",
           "properties": {

diff --git a/maas-schemas/schemas/maas-backend/stations/stations-list/request.json b/maas-schemas/schemas/maas-backend/stations/stations-list/request.json
@@ -11,7 +11,7 @@
       "$ref": "https://schemas.maas.global/core/components/common.json#/definitions/agencyId"
     },
     "payload": {
-      "oneOf": [
+      "anyOf": [
         {
           "type": "object",
           "description": "Query by radius",

diff --git a/maas-schemas/schemas/maas-backend/subscriptions/contact.json b/maas-schemas/schemas/maas-backend/subscriptions/contact.json
@@ -136,7 +136,7 @@
       "required": ["type", "number", "expiryMonth", "expiryYear", "cvv"]
     },
     "newPaymentMethod": {
-      "oneOf": [
+      "anyOf": [
         { "$ref": "#/definitions/stripePaymentMethod" },
         { "$ref": "#/definitions/creditCardPaymentMethod" }
       ]