Change vCPE example to use POJOs

This review uses POJOs rather than Avro schema to unmarshal
and marshal events from and to DMaaP.

The POJO classes for interacting with DMaaP have been moved into
a common policy module.

This review is now ready for full review (finally!).

Issue-ID: POLICY-954
Change-Id: Ibb89d8af5b9006821e6a0a756e16bbe3815af15a
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Signed-off-by: liamfallon <liam.fallon@est.tech>
Signed-off-by: Liam Fallon <liam.fallon@est.tech>
Signed-off-by: liamfallon <liam.fallon@est.tech>

8 files changed, 13 insertions, 446 deletions

diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/AAIInstanceFiltersType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/AAIInstanceFiltersType.avsc
deleted file mode 100644
index 621372d2f..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/AAIInstanceFiltersType.avsc
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "type": "record",
-    "name": "AAIInstanceFilters_Type",
-    "namespace": "org.onap.policy.apex.onap.vcpe",
-    "fields": [
-        {
-            "type": "record",
-            "name": "instance_DasH_filters",
-            "namespace": "org.onap.policy.apex.onap.vcpe",
-            "fields": [
-                {
-                    "name": "instance_DasH_filter",
-                    "type": {
-                        "type": "array",
-                        "items": {
-                            "type": "record",
-                            "name": "generic_DasH_vnf",
-                            "fields": [
-                                {
-                                    "name": "vnf_DasH_id",
-                                    "type": "string"
-                                }
-                            ]
-                        }
-                    }
-                }
-            ]
-        }
-    ]
-}
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/AAIInventoryResponseItemType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/AAIInventoryResponseItemType.avsc
deleted file mode 100644
index e64d0e36a..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/AAIInventoryResponseItemType.avsc
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "type": "array",
-    "items": {
-        "type": "record",
-        "name": "AAIInventoryResponseItem_Type",
-        "fields": [
-            {
-                "name": "model_DasH_name",
-                "type": "string"
-            },
-            {
-                "name": "extra_DasH_properties",
-                "type": {
-                    "type": "record",
-                    "name": "AAIInventoryResponseItemExtraProperties_Type",
-                    "fields": []
-                }
-            },
-            {
-                "name": "generic_DasH_vnf",
-                "type": {
-                    "type": "record",
-                    "name": "AAIInventoryResponseItemGenericVNF_Type",
-                    "fields": [
-                        {
-                            "name": "vnf_DasH_id",
-                            "type": "string"
-                        },
-                        {
-                            "name": "vnf_DasH_name",
-                            "type": "string"
-                        },
-                        {
-                            "name": "vnf_DasH_type",
-                            "type": "string"
-                        },
-                        {
-                            "name": "service_DasH_id",
-                            "type": "string"
-                        },
-                        {
-                            "name": "orchestration_DasH_status",
-                            "type": "string"
-                        },
-                        {
-                            "name": "in_DasH_maint",
-                            "type": "boolean"
-                        },
-                        {
-                            "name": "is_DasH_closed_DasH_loop_DasH_disabled",
-                            "type": "boolean"
-                        },
-                        {
-                            "name": "resource_DasH_version",
-                            "type": "string"
-                        },
-                        {
-                            "name": "model_DasH_invariant_DasH_id",
-                            "type": "string"
-                        },
-                        {
-                            "name": "model_DasH_version_DasH_id",
-                            "type": "string"
-                        }
-                    ]
-                }
-            }
-        ]
-    }
-}
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/AAINamedQueryType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/AAINamedQueryType.avsc
deleted file mode 100644
index ffa3ca534..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/AAINamedQueryType.avsc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "type": "record",
-    "name": "AAINamedQuery_Type",
-    "namespace": "org.onap.policy.apex.onap.vcpe",
-    "fields": [
-        {
-            "name": "named_DasH_query_DasH_uuid",
-            "type": "string"
-        }
-    ]
-}
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/APPCInputBodyType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/APPCInputBodyType.avsc
deleted file mode 100644
index 3acf96e7f..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/APPCInputBodyType.avsc
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "type"      : "record",
-    "name"      : "APPCInputBody_Type",
-    "namespace" : "org.onap.policy.apex.onap.vcpe",
-    "fields"    : [
-        {
-            "name": "input",
-            "type": {
-                "type" : "record",
-                "name" : "InputRecord",
-                "fields" : [
-                    {
-                        "name": "action", "type": "string"
-                    },
-                    {
-                        "name": "action_DasH_identifiers",
-                        "type": {
-                            "type" : "record",
-                            "name" : "ActionIdentifiersRecord",
-                            "fields" : [
-                                {
-                                    "name": "vnf_DasH_id", "type": "string"
-                                }
-                                ]
-                        }
-                    },
-                    {
-                        "name": "common_DasH_header",
-                        "type": {
-                            "type" : "record",
-                            "name" : "InputCommonHeaderRecord",
-                            "fields" : [
-                                {
-                                    "name": "request_DasH_id", "type": "string"
-                                },
-                                {
-                                    "name": "originator_DasH_id", "type": "string"
-                                },
-                                {
-                                    "name": "api_DasH_ver", "type": "string"
-                                },
-                                {
-                                    "name": "sub_DasH_request_DasH_id", "type": "string"
-                                },
-                                {
-                                    "name": "timestamp", "type": "string"
-                                },
-                                {
-                                    "name": "flags",
-                                    "type": {
-                                        "type" : "record",
-                                        "name" : "FlagsRecord",
-                                        "fields" : [
-                                            {
-                                                "name": "ttl", "type": "string"
-                                            },
-                                            {
-                                                "name": "force", "type": "string"
-                                            },
-                                            {
-                                                "name": "mode", "type": "string"
-                                            }
-                                            ]
-                                    }
-                                }
-                                ]
-                        }
-                    },
-                    {
-                        "name": "payload", "type": "string"
-                    }
-                    ]
-            }
-        }
-        ]
-}
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/APPCOutputBodyType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/APPCOutputBodyType.avsc
deleted file mode 100644
index 2c110170a..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/APPCOutputBodyType.avsc
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "type"      : "record",
-    "name"      : "APPCOutputBody_Type",
-    "namespace" : "org.onap.policy.apex.onap.vcpe",
-    "fields"    : [
-        {
-            "name": "output",
-            "type": {
-                "type" : "record",
-                "name" : "OutputRecord",
-                "fields" : [
-                    {
-                        "name": "status",
-                        "type": {
-                            "type" : "record",
-                            "name" : "StatusRecord",
-                            "fields" : [
-                                {
-                                    "name": "code", "type": "int"
-                                },
-                                {
-                                    "name": "message", "type": "string"
-                                }
-                                ]
-                        }
-                    },
-                    {
-                        "name": "common_DasH_header",
-                        "type": {
-                            "type" : "record",
-                            "name" : "OutputCommonHeaderRecord",
-                            "fields" : [
-                                {
-                                    "name": "request_DasH_id", "type": "string"
-                                },
-                                {
-                                    "name": "originator_DasH_id", "type": "string"
-                                },
-                                {
-                                    "name": "api_DasH_ver", "type": "string"
-                                },
-                                {
-                                    "name": "sub_DasH_request_DasH_id", "type": "string"
-                                },
-                                {
-                                    "name": "timestamp", "type": "string"
-                                }
-                                ]
-                        }
-                    }
-                    ]
-            }
-        }
-        ]
-}
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEAAIInfoType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEAAIInfoType.avsc
deleted file mode 100644
index ff7cad18a..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEAAIInfoType.avsc
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "type": "record",
-    "name": "AAI_Type",
-    "namespace": "org.onap.policy.apex.onap.vcpe",
-    "fields": [
-        {
-            "name": "generic_DasH_vnf_DoT_resource_DasH_version",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_vnf_DasH_name",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_prov_DasH_status",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_is_DasH_closed_DasH_loop_DasH_disabled",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_orchestration_DasH_status",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_vnf_DasH_type",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_in_DasH_maint",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_service_DasH_id",
-            "type": "string"
-        },
-        {
-            "name": "generic_DasH_vnf_DoT_vnf_DasH_id",
-            "type": "string"
-        }
-    ]
-}
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
index e628c23d9..cc83c5219 100644
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
+++ b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
@@ -10,39 +10,39 @@
                 "namespace": "org.onap.policy.apex.onap.vcpe",
                 "fields": [
                     {
-                        "name": "generic_DasH_vnf_DoT_resource_DasH_version",
+                        "name": "genericVnfResourceVersion",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_vnf_DasH_name",
+                        "name": "genericVnfVnfName",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_prov_DasH_status",
+                        "name": "genericVnfProvStatus",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_is_DasH_closed_DasH_loop_DasH_disabled",
+                        "name": "genericVnfIsClosedLoopDisabled",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_orchestration_DasH_status",
+                        "name": "genericVnfOrchestrationStatus",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_vnf_DasH_type",
+                        "name": "genericVnfVnfType",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_in_DasH_maint",
+                        "name": "genericVnfInMaint",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_service_DasH_id",
+                        "name": "genericVnfServiceId",
                         "type": "string"
                     },
                     {
-                        "name": "generic_DasH_vnf_DoT_vnf_DasH_id",
+                        "name": "genericVnfVnfId",
                         "type": "string"
                     }
                 ]
@@ -106,6 +106,10 @@
         },
         {
             "name": "notificationTime",
+            "type": "long"
+        },
+        {
+            "name": "message",
             "type": "string"
         }
     ]
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusTypeWithHistory.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusTypeWithHistory.avsc
deleted file mode 100644
index 9b76f9440..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusTypeWithHistory.avsc
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-    "type": "record",
-    "name": "VCPEClosedLoopStatus",
-    "fields": [
-        {
-            "name": "AAI",
-            "type": {
-                "type": "record",
-                "name": "VCPE_AAI_Type",
-                "namespace": "org.onap.policy.apex.onap.vcpe",
-                "fields": [
-                    {
-                        "name": "generic_DasH_vnf_DoT_resource_DasH_version",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_vnf_DasH_name",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_prov_DasH_status",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_is_DasH_closed_DasH_loop_DasH_disabled",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_orchestration_DasH_status",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_vnf_DasH_type",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_in_DasH_maint",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_service_DasH_id",
-                        "type": "string"
-                    },
-                    {
-                        "name": "generic_DasH_vnf_DoT_vnf_DasH_id",
-                        "type": "string"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "closedLoopAlarmStart",
-            "type": "long"
-        },
-        {
-            "name": "closedLoopControlName",
-            "type": "string"
-        },
-        {
-            "name": "version",
-            "type": "string"
-        },
-        {
-            "name": "requestID",
-            "type": "string"
-        },
-        {
-            "name": "closedLoopEventClient",
-            "type": "string"
-        },
-        {
-            "name": "closedLoopEventStatus",
-            "type": "string"
-        },
-        {
-            "name": "target_type",
-            "type": "string"
-        },
-        {
-            "name": "target",
-            "type": "string"
-        },
-        {
-            "name": "from",
-            "type": "string"
-        },
-        {
-            "name": "policyScope",
-            "type": "string"
-        },
-        {
-            "name": "policyName",
-            "type": "string"
-        },
-        {
-            "name": "policyVersion",
-            "type": "string"
-        },
-        {
-            "name": "notification",
-            "type": "string"
-        },
-        {
-            "name": "history",
-            "type": [
-                {
-                    "type": "record",
-                    "name": "VCPE_History_Type",
-                    "namespace": "org.onap.policy.apex.onap.vcpe",
-                    "fields": [
-                        {
-                            "name": "generic_DasH_vnf_DoT_resource_DasH_version",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_vnf_DasH_name",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_prov_DasH_status",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_is_DasH_closed_DasH_loop_DasH_disabled",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_orchestration_DasH_status",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_vnf_DasH_type",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_in_DasH_maint",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_service_DasH_id",
-                            "type": "string"
-                        },
-                        {
-                            "name": "generic_DasH_vnf_DoT_vnf_DasH_id",
-                            "type": "string"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file