Implement validation and hierarchical get

NOTE: This review will require changes to the persistence.xml file in
other policy framework components.

This change brings in two changes:

1) Validation of the references betwen policies, policy types, and data
types

This change mans that additions to and changes to policies, policy
types, and data types must be structurally correct in the change coming
in and with whatever is already in the database

2) Hierarchical return of referenced entitites on policy types,
policies and data types.

When a policy, policy type, or data type is read from the database, the
entities referenced byt the returned policy, policy type, or data type
are returned as well.

Tests are amended for the stricter validation and structure.

Examples are corrected where they are incorrect.

Issue-ID: POLICY-1402
Change-Id: Ie6a4cb7ed336562338924079114df405f0ab889f
Signed-off-by: liamfallon <liam.fallon@est.tech>

1 files changed, 9 insertions, 16 deletions

diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
index 1a394cd7d..8c780f64a 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
@@ -43,15 +43,15 @@ data_types:
                 required: false
                 default: "1.0.0"
             id:
-                type: int
+                type: integer
                 description: Specifies the engine id
                 required: true
             instance_count:
-                type: int
+                type: integer
                 description: Specifies the number of engine threads that should be run
                 required: true
             deployment_port:
-                type: int
+                type: integer
                 description: Specifies the port to connect to for engine administration
                 required: false
                 default: 1
@@ -59,17 +59,14 @@ data_types:
                 type: string
                 description: The name of the file from which to read the APEX policy model
                 required: false
-                default: ""
             policy_type_impl:
                 type: string
                 description: The policy type implementation from which to read the APEX policy model
                 required: false
-                default: ""
             periodic_event_period:
                 type: string
                 description: The time interval in milliseconds for the periodic scanning event, 0 means don't scan
                 required: false
-                default: 0
             engine:
                 type: onap.datatypes.native.apex.engineservice.Engine
                 description: The parameters for all engines in the APEX engine service
@@ -98,7 +95,7 @@ data_types:
                 description: Specifies a filter as a regular expression, events that do not match the filter are dropped, the default is to let all events through
                 required: false
             synchronous_mode:
-                type: bool
+                type: boolean
                 description: Specifies the event handler is syncronous (receive event and send response)
                 required: false
                 default: false
@@ -106,14 +103,12 @@ data_types:
                 type: string
                 description: The peer event handler (output for input or input for output) of this event handler in synchronous mode, this parameter is mandatory if the event handler is in synchronous mode
                 required: false
-                default: ""
             synchronous_timeout:
-                type: int
+                type: integer
                 description: The timeout in milliseconds for responses to be issued by APEX torequests, this parameter is mandatory if the event handler is in synchronous mode
                 required: false
-                default: ""
             requestor_mode:
-                type: bool
+                type: boolean
                 description: Specifies the event handler is in requestor mode (send event and wait for response mode)
                 required: false
                 default: false
@@ -121,12 +116,10 @@ data_types:
                 type: string
                 description: The peer event handler (output for input or input for output) of this event handler in requestor mode, this parameter is mandatory if the event handler is in requestor mode
                 required: false
-                default: ""
             requestor_timeout:
-                type: int
+                type: integer
                 description: The timeout in milliseconds for wait for responses to requests, this parameter is mandatory if the event handler is in requestor mode
                 required: false
-                default: ""
     onap.datatypes.native.apex.CarrierTechnology:
         derived_from: tosca.datatypes.Root
         properties:
@@ -149,7 +142,7 @@ data_types:
                 type: string
                 description: The class name of the class that overrides default handling of the event protocol for this carrier technology, defaults to the supplied event protocol class
                 required: false
-    onap.datatypes.native.apex.Environmental:
+    onap.datatypes.native.apex.Environment:
         derived_from: tosca.datatypes.Root
         properties:
             name:
@@ -188,7 +181,7 @@ data_types:
                 entry_schema:
                     type: onap.datatypes.native.apex.Plugin
             locking:
-                type: onap.datatypes.native.apex.plugin
+                type: onap.datatypes.native.apex.Plugin
                 description: The plugin to be used for locking context in and between APEX PDPs at runtime
                 required: false
             persistence: