Context Aggregator L2 Fabric

Upgraded the Context Aggregator to use the latest pomba-audit-common
model.

Also cleaned up a lot of whitespace and import order errors that were
being output by the ONAP audit.

Issue-ID: LOG-920
Change-Id: I0a7e15f19f28775bbd3e9cf4e95c4de176545ae1
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

2 files changed, 0 insertions, 3 deletions

diff --git a/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java b/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java
index 552e4ba..a502425 100644
--- a/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java
+++ b/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java
@@ -53,7 +53,6 @@ public class AggregatedModels {
             ModelContext context = null;
             if (entry.getValue().isEmpty()) {
                 context = new ModelContext();
-                context.setVfs(null);
             } else {
                 context = gson.fromJson(entry.getValue(), ModelContext.class);
             }
diff --git a/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java b/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java
index 83d1065..36b2dc9 100644
--- a/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java
+++ b/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java
@@ -25,8 +25,6 @@ public class POAEvent {
     private String serviceInstanceId;
     private String modelVersionId;
     private String modelInvariantId;
-    private String customerId;
-    private String serviceType;
     private String xFromAppId;
     private String xTransactionId;