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>

1 files changed, 8 insertions, 9 deletions

diff --git a/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java b/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
index ffb2a2f..e0c9705 100644
--- a/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
+++ b/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
@@ -15,8 +15,12 @@
  * limitations under the License.
  * ============LICENSE_END=====================================================
  */
+
 package org.onap.pomba.contextaggregator.datatypes;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,13 +30,10 @@ import org.onap.pomba.contextaggregator.config.EventHeaderConfig;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
-public class AggregatedModelsTest
-{
+public class AggregatedModelsTest {
+
     AggregatedModels aggregatedModels;
 
     private String domain;
@@ -50,8 +51,7 @@ public class AggregatedModelsTest
     POAEvent pOAEvent = new POAEvent();
 
     @Before
-    public void setUp()
-    {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
         pOAEvent.setServiceInstanceId("a");
         pOAEvent.setModelVersionId("b");
@@ -61,8 +61,7 @@ public class AggregatedModelsTest
     }
 
     @Test
-    public void testGenerateJsonPayload() throws Exception
-    {
+    public void testGenerateJsonPayload() throws Exception {
         aggregatedModels = new AggregatedModels(eventHeaderConfig,jsonContextMap,pOAEvent);
         Assert.assertNotNull(aggregatedModels.generateJsonPayload());
         Assert.assertNotNull(aggregatedModels.getEntityHeader());