Merge 4fa2aa1 into b75c20c

eclipse · Jul 1, 2022 · c46ef63 · c46ef63
2 parents b75c20c + 4fa2aa1
commit c46ef63
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/rest-api/resources/src/main/resources/openapi/jobTrigger/jobTrigger.yaml b/rest-api/resources/src/main/resources/openapi/jobTrigger/jobTrigger.yaml
@@ -67,7 +67,7 @@ components:
             triggerProperties:
               type: array
               items:
-                $ref: '../triggerDefinition/triggerDefinition.yaml#/components/schemas/triggerDefinitionProperty'
+                $ref: '../triggerDefinition/triggerDefinition.yaml#/components/schemas/triggerProperty'
       example:
         type: triggerCreator
         name: A trigger

diff --git a/rest-api/resources/src/main/resources/openapi/openapi.yaml b/rest-api/resources/src/main/resources/openapi/openapi.yaml
@@ -906,8 +906,8 @@ components:
     tagListResult:
       $ref: './tag/tag.yaml#/components/schemas/tagListResult'
     ### Trigger Definition Entities ###
-    triggerDefinitionProperty:
-      $ref: './triggerDefinition/triggerDefinition.yaml#/components/schemas/triggerDefinitionProperty'
+    triggerProperty:
+      $ref: './triggerDefinition/triggerDefinition.yaml#/components/schemas/triggerProperty'
     triggerDefinition:
       $ref: './triggerDefinition/triggerDefinition.yaml#/components/schemas/triggerDefinition'
     triggerDefinitionListResult:

diff --git a/rest-api/resources/src/main/resources/openapi/triggerDefinition/triggerDefinition.yaml b/rest-api/resources/src/main/resources/openapi/triggerDefinition/triggerDefinition.yaml
@@ -23,7 +23,7 @@ components:
         $ref: '../openapi.yaml#/components/schemas/kapuaId'
       required: true
   schemas:
-    triggerDefinitionProperty:
+    triggerProperty:
       type: object
       properties:
         name:
@@ -32,9 +32,14 @@ components:
           type: string
         propertyValue:
           type: string
+      required:
+        - name
+        - propertyType
+        - propertyValue
       example:
         name: jobId
         propertyType: org.eclipse.kapua.model.id.KapuaId
+        propertyValue: AQ
     triggerDefinition:
       allOf:
         - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntity'
@@ -50,7 +55,7 @@ components:
             triggerProperties:
               type: array
               items:
-                $ref: '#/components/schemas/triggerDefinitionProperty'
+                $ref: '#/components/schemas/triggerProperty'
       example:
         type: triggerDefinition
         id: AQ