From 34445a97233549a0ebaf4359a733e11112063bc1 Mon Sep 17 00:00:00 2001
From: "mark.j.leonard" <mark.j.leonard@gmail.com>
Date: Fri, 9 Nov 2018 11:27:01 +0000
Subject: [PATCH] Minor formatting fixes

Non-functional changes addressing whitespace inconsistencies.

Change-Id: Ife84f6b04bf8ce0204409d2f3708ab85b3a3caff
Issue-ID: AAI-1884
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
---
 .../csar/vnfcatalog/VnfVendorImageExtractor.java    |   1 -
 .../xml/generator/api/AaiArtifactGenerator.java     |   1 -
 .../java/org/onap/aai/babel/logging/LogReader.java  |   1 -
 .../aai/babel/xml/generator/model/TestVfModule.java |   1 -
 .../service_NetworkCollection.csar                  | Bin 32286 -> 31786 bytes
 5 files changed, 4 deletions(-)

diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
index 97d69f8..c272b35 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
@@ -31,7 +31,6 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.commons.lang3.tuple.ImmutablePair;
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
index 505378e..19a08f2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
@@ -26,7 +26,6 @@ import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.aai.babel.logging.ApplicationMsgs;
diff --git a/src/test/java/org/onap/aai/babel/logging/LogReader.java b/src/test/java/org/onap/aai/babel/logging/LogReader.java
index 1e84b62..f18fb6d 100644
--- a/src/test/java/org/onap/aai/babel/logging/LogReader.java
+++ b/src/test/java/org/onap/aai/babel/logging/LogReader.java
@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.lang3.time.StopWatch;
 import org.junit.Assert;
 
diff --git a/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java b/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
index a07a68f..e9c8c1b 100644
--- a/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
+++ b/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
@@ -33,7 +33,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
diff --git a/src/test/resources/compressedArtifacts/service_NetworkCollection.csar b/src/test/resources/compressedArtifacts/service_NetworkCollection.csar
index 7a1189966cae1e939d1eb26bdb3ac4091eb728bb..bdac973627300d7ff15ea33fbdf41657a32f10d2 100644
GIT binary patch
delta 2896
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
I{gvDQ0CF5FGynhq

delta 3488
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
UC;qr<->bO8AZZE%^zV264~c|fKmY&$

-- 
2.16.6