fix(geofencing-subscriptions): resolve S-015 and S-211 validation warnings

code/API_definitions/geofencing-subscriptions.yaml

@@ -187,7 +187,7 @@
                 content:
                   application/cloudevents+json:
                     schema:
-                      $ref: "#/components/schemas/CloudEvent"
+                      $ref: "#/components/schemas/GeofencingNotificationEvent"
                     examples:
                       CIRCLE_AREA_ENTERED:
                         $ref: "#/components/examples/CIRCLE_AREA_ENTERED"
@@ -374,8 +374,6 @@
       schema:
         $ref: '../common/CAMARA_common.yaml#/components/schemas/XCorrelator'
   schemas:
-    XCorrelator:
-      $ref: '../common/CAMARA_common.yaml#/components/schemas/XCorrelator'
     ErrorInfo:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/ErrorInfo'
 
@@ -509,7 +507,7 @@
         - org.camaraproject.geofencing-subscriptions.v0.area-entered
         - org.camaraproject.geofencing-subscriptions.v0.area-left
 
-    NotificationEventType:
+    GeofencingEventType:
       type: string
       description: |
         area-entered - Event triggered when the device enters the given area
@@ -559,7 +557,7 @@
             $ref: "#/components/schemas/SubscriptionEventType"
         config:
           $ref: "#/components/schemas/ConfigResponse"
         id:
           type: string
           maxLength: 256
           description: The unique identifier of the subscription in the scope of the subscription manager. When this information is contained within an event notification, this concept SHALL be referred as subscriptionId as per Commonalities Event Notification Model.
@@ -612,22 +610,22 @@
     Device:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/Device'
 
     PhoneNumber:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/PhoneNumber'
 
     NetworkAccessIdentifier:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/NetworkAccessIdentifier'
 
     DeviceIpv4Addr:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/DeviceIpv4Address'
 
     SingleIpv4Addr:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/SingleIpv4Address'
 
     Port:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/Port'
 
     DeviceIpv6Address:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/DeviceIpv6Address'
 
     DeviceResponse:
@@ -681,20 +679,14 @@
     Point:
       $ref: '../common/CAMARA_common.yaml#/components/schemas/Point'
 
-    Latitude:
-      $ref: '../common/CAMARA_common.yaml#/components/schemas/Latitude'
-
-    Longitude:
-      $ref: '../common/CAMARA_common.yaml#/components/schemas/Longitude'
-
-    CloudEvent:
+    GeofencingNotificationEvent:
       description: The notification callback.
       allOf:
         - $ref: '../common/CAMARA_event_common.yaml#/components/schemas/CloudEvent'
         - type: object
           properties:
             type:
-              $ref: "#/components/schemas/NotificationEventType"
+              $ref: "#/components/schemas/GeofencingEventType"
       discriminator:
         propertyName: "type"
         mapping:
@@ -704,24 +696,12 @@
           org.camaraproject.geofencing-subscriptions.v0.subscription-updated: "#/components/schemas/EventSubscriptionUpdated"
           org.camaraproject.geofencing-subscriptions.v0.subscription-ended: "#/components/schemas/EventSubscriptionEnded"
 
-    Source:
-      $ref: '../common/CAMARA_event_common.yaml#/components/schemas/Source'
-
-    DateTime:
-      $ref: '../common/CAMARA_common.yaml#/components/schemas/DateTime'
-
     SubscriptionId:
       $ref: '../common/CAMARA_event_common.yaml#/components/schemas/SubscriptionId'
 
     SinkCredential:
       $ref: '../common/CAMARA_event_common.yaml#/components/schemas/SinkCredential'
 
-    AccessTokenCredential:
-      $ref: '../common/CAMARA_event_common.yaml#/components/schemas/AccessTokenCredential'
-
-    PrivateKeyJWTCredential:
-      $ref: '../common/CAMARA_event_common.yaml#/components/schemas/PrivateKeyJWTCredential'
-
     HTTPSettings:
       $ref: '../common/CAMARA_event_common.yaml#/components/schemas/HTTPSettings'
 
@@ -734,7 +714,7 @@
     EventAreaLeft:
       description: Event structure for event when the device leaves the area.
       allOf:
-        - $ref: "#/components/schemas/CloudEvent"
+        - $ref: "#/components/schemas/GeofencingNotificationEvent"
         - type: object
           properties:
             data:
@@ -743,7 +723,7 @@
     EventAreaEntered:
       description: Event structure for event when the device enters the area.
       allOf:
-        - $ref: "#/components/schemas/CloudEvent"
+        - $ref: "#/components/schemas/GeofencingNotificationEvent"
         - type: object
           properties:
             data:
@@ -752,7 +732,7 @@
     EventSubscriptionStarted:
       description: Event structure for event subscription started
       allOf:
-        - $ref: "#/components/schemas/CloudEvent"
+        - $ref: "#/components/schemas/GeofencingNotificationEvent"
         - type: object
           properties:
             data:
@@ -782,7 +762,7 @@
     EventSubscriptionUpdated:
       description: Event structure for event subscription updated
       allOf:
-        - $ref: "#/components/schemas/CloudEvent"
+        - $ref: "#/components/schemas/GeofencingNotificationEvent"
         - type: object
           properties:
             data:
@@ -812,7 +792,7 @@
     EventSubscriptionEnded:
       description: Event structure for event subscription ends.
       allOf:
-        - $ref: "#/components/schemas/CloudEvent"
+        - $ref: "#/components/schemas/GeofencingNotificationEvent"
         - type: object
           properties:
             data:
@@ -994,7 +974,7 @@
                 message: "Expected property is missing: subscriptionId"
     Generic401:
       $ref: '../common/CAMARA_common.yaml#/components/responses/Generic401'
     SubscriptionPermissionDenied403:
       description: Client does not have sufficient permission.
       headers:
         x-correlator:

code/Test_definitions/geofencing-subscriptions.feature

@@ -1,3 +1,3 @@
 Feature: Camara Geofencing Subscriptions API, vwip - Operations on subscriptions
 
   # Input to be provided by the implementation to the tester
@@ -155,7 +155,7 @@
     When the request "createGeofencingSubscription" is sent
     Then the response code is 201 or 202
     And an event notification of the subscribed type is received on callback-url
-    And notification body complies with the OAS schema at "#/components/schemas/CloudEvent"
+    And notification body complies with the OAS schema at "#/components/schemas/GeofencingNotificationEvent"
 
   @geofencing_subscriptions_receive_notification_when_subscription_is_updated
   Scenario: Receive notification for subscription-updated event