Code improvement, FilePublishInformation serializing

Updated serializer of FilePublishInformation so that only elements that
should be part of publishing is included.

Change-Id: If5632af8bf9fd26f8bc96b25d8bfbccf63dfec2f
Issue-ID: DCAEGEN2-1488
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

2 files changed, 4 insertions, 57 deletions

diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/model/CommonFunctionsTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/model/CommonFunctionsTest.java
deleted file mode 100644
index 90237c9d..00000000
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/model/CommonFunctionsTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dcaegen2.collectors.datafile.model;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.nio.file.Paths;
-import java.util.HashMap;
-
-import org.junit.jupiter.api.Test;
-
-public class CommonFunctionsTest {
-    @Test
-    public void createJsonBody_success() {
-        ImmutableFilePublishInformation filePublishInformation = ImmutableFilePublishInformation //
-            .builder() //
-            .productName("") //
-            .vendorName("") //
-            .lastEpochMicrosec("") //
-            .sourceName("") //
-            .startEpochMicrosec("") //
-            .timeZoneOffset("") //
-            .name("") //
-            .location("") //
-            .internalLocation(Paths.get("internalLocation")) //
-            .compression("") //
-            .fileFormatType("") //
-            .fileFormatVersion("") //
-            .context(new HashMap<String,String>())
-            .build();
-        String actualBody = CommonFunctions.createJsonBody(filePublishInformation);
-
-        assertTrue(actualBody.contains("\"internalLocation\":\"internalLocation\""));
-    }
-}
diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisherTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisherTest.java
index 03122ea2..8f768d38 100644
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisherTest.java
+++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisherTest.java
@@ -149,10 +149,6 @@ class DataRouterPublisherTest {
         Header[] metaHeaders = actualPut.getHeaders(X_DMAAP_DR_META);
         Map<String, String> metaHash = getMetaDataAsMap(metaHeaders);
 
-        // Note that the following line checks the number of properties that are sent to the data router.
-        // This should be 10 unless the API is updated. The class DataRouterPublisher removes
-        // info that should not be reported.
-        assertEquals(10, metaHash.size());
         assertEquals(PRODUCT_NAME, metaHash.get("productName"));
         assertEquals(VENDOR_NAME, metaHash.get("vendorName"));
         assertEquals(LAST_EPOCH_MICROSEC, metaHash.get("lastEpochMicrosec"));
@@ -163,6 +159,10 @@ class DataRouterPublisherTest {
         assertEquals(FTPES_ADDRESS, metaHash.get("location"));
         assertEquals(FILE_FORMAT_TYPE, metaHash.get("fileFormatType"));
         assertEquals(FILE_FORMAT_VERSION, metaHash.get("fileFormatVersion"));
+
+        // Note that the following line checks the number of properties that are sent to the data router.
+        // This should be 10 unless the API is updated (which is the fields checked above)
+        assertEquals(10, metaHash.size());
     }
 
     @Test