Commit 3851063d authored by Walter Featherstone's avatar Walter Featherstone
Browse files

oAuth2Info is not a required parameter & used oneOf for endpoint

parent 39370fa7
Loading
Loading
Loading
Loading
+42 −31
Original line number Diff line number Diff line
@@ -810,14 +810,31 @@
      },
      "EndPointInfo.Addresses": {
        "description": "Entry point information of the service as one or more pairs of IP address and port",
        "type": "object",
        "required": [
          "addresses"
        ],
        "properties": {
          "addresses": {
            "type": "array",
            "minItems": 0,
            "items": {
              "$ref": "#/components/schemas/EndPointInfo.Address"
            }
          }
        }
      },
      "EndPointInfo.Alternative": {
        "description": "Entry point information of the service in a format defined by an implementation, or in an external specification.",
        "type": "object",
        "required": [
          "alternative"
        ],
        "properties": {
          "alternative": {
            "type": "object"
          }
        }
      },
      "EndPointInfo.Uri": {
        "description": "Entry point information of the service",
@@ -827,23 +844,17 @@
      },
      "EndPointInfo.Uris": {
        "description": "Entry point information of the service as string, formatted according to URI syntax",
        "type": "object",
        "required": [
          "uris"
        ],
        "properties": {
          "uris": {
            "type": "array",
            "minItems": 0,
            "items": {
              "$ref": "#/components/schemas/EndPointInfo.Uri"
            }
      },
      "EndPointInfo": {
        "description": "This type represents information about a transport endpoint",
        "type": "object",
        "properties": {
          "uris": {
            "$ref": "#/components/schemas/EndPointInfo.Uris"
          },
          "addresses": {
            "$ref": "#/components/schemas/EndPointInfo.Addresses"
          },
          "alternative": {
            "$ref": "#/components/schemas/EndPointInfo.Alternative"
          }
        }
      },
@@ -993,9 +1004,6 @@
      "SecurityInfo": {
        "description": "This type represents security information related to a transport",
        "type": "object",
        "required": [
          "oAuth2Info"
        ],
        "properties": {
          "oAuth2Info": {
            "$ref": "#/components/schemas/SecurityInfo.OAuth2Info"
@@ -1632,7 +1640,19 @@
            "$ref": "#/components/schemas/TransportInfo.Version"
          },
          "endpoint": {
            "$ref": "#/components/schemas/EndPointInfo"
            "description": "This type represents information about a transport endpoint",
            "type": "object",
            "oneOf": [
              {
                "$ref": "#/components/schemas/EndPointInfo.Uris"
              },
              {
                "$ref": "#/components/schemas/EndPointInfo.Addresses"
              },
              {
                "$ref": "#/components/schemas/EndPointInfo.Alternative"
              }
            ]
          },
          "security": {
            "$ref": "#/components/schemas/SecurityInfo"
@@ -2368,12 +2388,6 @@
            "endpoint": {
              "uris": [
                "/meMp1/service/EntryPoint"
              ],
              "addresses": [
                {
                  "host": "192.0.2.0",
                  "port": 8080
                }
              ]
            },
            "security": {
@@ -2408,9 +2422,6 @@
              "protocol": "HTTP",
              "version": "2.0",
              "endpoint": {
                "uris": [
                  "/meMp1/service/EntryPoint"
                ],
                "addresses": [
                  {
                    "host": "192.0.2.0",
+26 −21
Original line number Diff line number Diff line
@@ -603,7 +603,13 @@ components:
      description: >-
        Entry point information of the service as one or more pairs of IP
        address and port
      type: object
      required:
        - addresses
      properties:
        addresses:
          type: array
          minItems: 0
          items:
            $ref: '#/components/schemas/EndPointInfo.Address'
    EndPointInfo.Alternative:
@@ -611,6 +617,11 @@ components:
        Entry point information of the service in a format defined by an
        implementation, or in an external specification.
      type: object
      required:
        - alternative
      properties: 
        alternative:
          type: object
    EndPointInfo.Uri:
      description: Entry point information of the service
      type: string
@@ -620,19 +631,15 @@ components:
      description: >-
        Entry point information of the service as string, formatted according to
        URI syntax
      type: array
      items:
        $ref: '#/components/schemas/EndPointInfo.Uri'
    EndPointInfo:
      description: This type represents information about a transport endpoint
      type: object
      required:
        - uris
      properties:
        uris:
          $ref: '#/components/schemas/EndPointInfo.Uris'
        addresses:
          $ref: '#/components/schemas/EndPointInfo.Addresses'
        alternative:
          $ref: '#/components/schemas/EndPointInfo.Alternative'
          type: array
          minItems: 0
          items:
            $ref: '#/components/schemas/EndPointInfo.Uri'
    LinkType:
      description: This type represents a type of link and may be referenced from data structures
      type: object
@@ -746,8 +753,6 @@ components:
    SecurityInfo:
      description: This type represents security information related to a transport
      type: object
      required:
        - oAuth2Info
      properties:
        oAuth2Info:
          $ref: '#/components/schemas/SecurityInfo.OAuth2Info'
@@ -1278,7 +1283,12 @@ components:
        version:
          $ref: '#/components/schemas/TransportInfo.Version'
        endpoint:
          $ref: '#/components/schemas/EndPointInfo'
          description: This type represents information about a transport endpoint
          type: object
          oneOf:
            - $ref: '#/components/schemas/EndPointInfo.Uris'
            - $ref: '#/components/schemas/EndPointInfo.Addresses'
            - $ref: '#/components/schemas/EndPointInfo.Alternative'
        security:
          $ref: '#/components/schemas/SecurityInfo'
        implSpecificInfo:
@@ -1824,9 +1834,6 @@ components:
          endpoint:
            uris:
              - '/meMp1/service/EntryPoint'
            addresses:
              - host: '192.0.2.0'
                port: 8080
          security:
            oAuth2Info:
              grantTypes: 'OAUTH2_CLIENT_CREDENTIALS'
@@ -1852,8 +1859,6 @@ components:
            protocol: 'HTTP'
            version: '2.0'
            endpoint:
              uris:
                - '/meMp1/service/EntryPoint'
              addresses:
                - host: '192.0.2.0'
                  port: 8080