Merge pull request #549 from hmrc/MTDSA-27719

MTDSA-27703: Removes confusing oneOf statements in yaml files.
hmrc · Dec 4, 2024 · 324c53a · 324c53a
2 parents 8472b42 + 350cb6b
commit 324c53a
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 52 deletions.
diff --git a/resources/public/api/conf/4.0/foreign_property_annual_submission_create_and_amend.yaml b/resources/public/api/conf/4.0/foreign_property_annual_submission_create_and_amend.yaml
@@ -41,8 +41,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/foreign_property_annual_submission_create_and_amend/def1/request.json'
+        $ref: './schemas/foreign_property_annual_submission_create_and_amend/def1/request.json'
       examples:
         all-other-allowances-request:
           description: All Other Allowances request

diff --git a/resources/public/api/conf/4.0/foreign_property_annual_submission_retrieve.yaml b/resources/public/api/conf/4.0/foreign_property_annual_submission_retrieve.yaml
@@ -52,8 +52,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/foreign_property_annual_submission_retrieve/def1/response.json'
+          $ref: './schemas/foreign_property_annual_submission_retrieve/def1/response.json'
         examples:
           all-other-allowances-response:
             description: All Other Allowances Response

diff --git a/resources/public/api/conf/4.0/historic_uk_fhl_annual_submission_retrieve.yaml b/resources/public/api/conf/4.0/historic_uk_fhl_annual_submission_retrieve.yaml
@@ -40,8 +40,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_fhl_annual_submission_retrieve/def1/response.json'
+          $ref: './schemas/historic_uk_fhl_annual_submission_retrieve/def1/response.json'
         examples:
           example:
             description: Example Response given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_fhl_period_summary_create.yaml b/resources/public/api/conf/4.0/historic_uk_fhl_period_summary_create.yaml
@@ -37,8 +37,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_fhl_period_summary_create/def1/request.json'
+        $ref: './schemas/historic_uk_fhl_period_summary_create/def1/request.json'
       examples:
         full-expense-request:
           description: Full Expenses request given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_fhl_period_summary_list.yaml b/resources/public/api/conf/4.0/historic_uk_fhl_period_summary_list.yaml
@@ -40,8 +40,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_fhl_period_summary_list/def1/response.json'
+          $ref: './schemas/historic_uk_fhl_period_summary_list/def1/response.json'
         examples:
           example-1:
             description: Default Example given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_non_fhl_annual_submission_create_and_amend.yaml b/resources/public/api/conf/4.0/historic_uk_non_fhl_annual_submission_create_and_amend.yaml
@@ -30,8 +30,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_non_fhl_annual_submission_create_and_amend/def1/request.json'
+        $ref: './schemas/historic_uk_non_fhl_annual_submission_create_and_amend/def1/request.json'
       examples:
         property-allowance-request:
           description: Property Allowance request given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_non_fhl_annual_submission_retrieve.yaml b/resources/public/api/conf/4.0/historic_uk_non_fhl_annual_submission_retrieve.yaml
@@ -40,8 +40,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_non_fhl_annual_submission_retrieve/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_annual_submission_retrieve/def1/response.json'
         examples:
           example:
             description: Example response given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_amend.yaml b/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_amend.yaml
@@ -37,8 +37,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
+        $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
       examples:
         full-income-expenses-request:
           description: Full income and expenses request given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_create.yaml b/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_create.yaml
@@ -38,8 +38,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
+        $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
       examples:
         full-income-expenses-request:
           description: Full income and expenses request given any tax year
@@ -65,8 +64,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-           - $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/response.json'
         examples:
           example-response:
             description: Example Response given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_list.yaml b/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_list.yaml
@@ -46,8 +46,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_non_fhl_period_summary_list/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_period_summary_list/def1/response.json'
         examples:
           example-1:
             description: Default Example given any tax year

diff --git a/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_retrieve.yaml b/resources/public/api/conf/4.0/historic_uk_non_fhl_period_summary_retrieve.yaml
@@ -43,8 +43,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_non_fhl_period_summary_retrieve/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_period_summary_retrieve/def1/response.json'
         examples:
           full-response:
             description: Example response given any tax year

diff --git a/resources/public/api/conf/4.0/uk_foreign_property_period_summaries_list.yaml b/resources/public/api/conf/4.0/uk_foreign_property_period_summaries_list.yaml
@@ -39,8 +39,7 @@ get:
       content:
         application/json:
           schema:
-            oneOf:
-              - $ref: './schemas/property_period_summaries_list/def1/response.json'
+            $ref: './schemas/property_period_summaries_list/def1/response.json'
           examples:
             example-response:
               description: Default Example given any tax year

diff --git a/resources/public/api/conf/4.0/uk_property_annual_submission_create_and_amend.yaml b/resources/public/api/conf/4.0/uk_property_annual_submission_create_and_amend.yaml
@@ -37,8 +37,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/uk_property_annual_submission_create_and_amend/def1/request.json'
+        $ref: './schemas/uk_property_annual_submission_create_and_amend/def1/request.json'
       examples:
         property-allowance-request:
           description: Property Allowance request

diff --git a/resources/public/api/conf/4.0/uk_property_annual_submission_retrieve.yaml b/resources/public/api/conf/4.0/uk_property_annual_submission_retrieve.yaml
@@ -50,8 +50,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/uk_property_annual_submission_retrieve/def1/response.json'
+          $ref: './schemas/uk_property_annual_submission_retrieve/def1/response.json'
         examples:
           property-allowance-any-TY:
             description: Property Allowance - any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_fhl_annual_submission_retrieve.yaml b/resources/public/api/conf/5.0/historic_uk_fhl_annual_submission_retrieve.yaml
@@ -40,8 +40,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_fhl_annual_submission_retrieve/def1/response.json'
+          $ref: './schemas/historic_uk_fhl_annual_submission_retrieve/def1/response.json'
         examples:
           example:
             description: Example Response given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_fhl_period_summary_create.yaml b/resources/public/api/conf/5.0/historic_uk_fhl_period_summary_create.yaml
@@ -37,8 +37,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_fhl_period_summary_create/def1/request.json'
+        $ref: './schemas/historic_uk_fhl_period_summary_create/def1/request.json'
       examples:
         full-expense-request:
           description: Full Expenses request given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_fhl_period_summary_list.yaml b/resources/public/api/conf/5.0/historic_uk_fhl_period_summary_list.yaml
@@ -40,8 +40,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_fhl_period_summary_list/def1/response.json'
+          $ref: './schemas/historic_uk_fhl_period_summary_list/def1/response.json'
         examples:
           example-1:
             description: Default Example given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_non_fhl_annual_submission_create_and_amend.yaml b/resources/public/api/conf/5.0/historic_uk_non_fhl_annual_submission_create_and_amend.yaml
@@ -30,8 +30,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_non_fhl_annual_submission_create_and_amend/def1/request.json'
+        $ref: './schemas/historic_uk_non_fhl_annual_submission_create_and_amend/def1/request.json'
       examples:
         property-allowance-request:
           description: Property Allowance request given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_non_fhl_annual_submission_retrieve.yaml b/resources/public/api/conf/5.0/historic_uk_non_fhl_annual_submission_retrieve.yaml
@@ -40,8 +40,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_non_fhl_annual_submission_retrieve/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_annual_submission_retrieve/def1/response.json'
         examples:
           example:
             description: Example response given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_amend.yaml b/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_amend.yaml
@@ -37,8 +37,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
+        $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
       examples:
         full-income-expenses-request:
           description: Full income and expenses request given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_create.yaml b/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_create.yaml
@@ -38,8 +38,7 @@ requestBody:
   content:
     application/json:
       schema:
-        oneOf:
-          - $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
+        $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/request.json'
       examples:
         full-income-expenses-request:
           description: Full income and expenses request given any tax year
@@ -65,8 +64,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-           - $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_period_summary_create/def1/response.json'
         examples:
           example-response:
             description: Example Response given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_list.yaml b/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_list.yaml
@@ -46,8 +46,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_non_fhl_period_summary_list/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_period_summary_list/def1/response.json'
         examples:
           example-1:
             description: Default Example given any tax year

diff --git a/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_retrieve.yaml b/resources/public/api/conf/5.0/historic_uk_non_fhl_period_summary_retrieve.yaml
@@ -43,8 +43,7 @@ responses:
     content:
       application/json:
         schema:
-          oneOf:
-            - $ref: './schemas/historic_uk_non_fhl_period_summary_retrieve/def1/response.json'
+          $ref: './schemas/historic_uk_non_fhl_period_summary_retrieve/def1/response.json'
         examples:
           full-response:
             description: Example response given any tax year

diff --git a/resources/public/api/conf/5.0/uk_foreign_property_period_summaries_list.yaml b/resources/public/api/conf/5.0/uk_foreign_property_period_summaries_list.yaml
@@ -39,8 +39,7 @@ get:
       content:
         application/json:
           schema:
-            oneOf:
-              - $ref: './schemas/property_period_summaries_list/def1/response.json'
+            $ref: './schemas/property_period_summaries_list/def1/response.json'
           examples:
             example-response:
               description: Default Example given any tax year