Introduced metrics to logging API

Metrics data can now be passed to logger. Also general cleanup,
refactoring, simpler implementation, javadocs.

Change-Id: I037101aa9626b3e011737ec2e3497ab348319e4c
Issue-ID: SDC-772
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

2 files changed, 77 insertions, 5 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java
index 1889f3e172..a1fe8c2b0f 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java
@@ -16,14 +16,15 @@
 
 package org.openecomp.sdc.logging.api;
 
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Field;
-
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
+import java.lang.reflect.Field;
+import org.testng.annotations.Test;
+
 /**
+ * Unit-test creation of a logger via factory, assuming not default binding.
+ *
  * @author evitaliy
  * @since 14/09/2016.
  */
@@ -71,6 +72,6 @@ public class LoggerFactoryTest {
         logger.info("");
         logger.debug("");
         logger.audit(null);
-        logger.metrics("");
+        logger.metrics(MetricsData.builder().build());
     }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/MetricsDataTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/MetricsDataTest.java
new file mode 100644
index 0000000000..a3c8b1039a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/MetricsDataTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ */
+
+package org.openecomp.sdc.logging.api;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+import org.testng.annotations.Test;
+
+/**
+ * Unit-testing metrics builder and structure.
+ *
+ * @author evitaliy
+ * @since 04 Mar 18
+ */
+public class MetricsDataTest {
+
+    @Test
+    public void allMetricsPropertiesReadWhenPopulated() {
+
+        final long start = System.currentTimeMillis();
+        final long end = start + 1000;
+        final String responseCode = "Metrics-Response-Code";
+        final String responseDescription = "Metrics-Response-Description";
+        final String ipAddress = "10.56.20.72";
+        final String targetEntity = "Metrics-Target-Entity";
+        final String targetVirtualEntity = "Metrics-Target-Virtual-Entity";
+
+        MetricsData data = MetricsData.builder().startTime(start).endTime(end).statusCode(StatusCode.COMPLETE)
+                                      .responseCode(responseCode).responseDescription(responseDescription)
+                                      .clientIpAddress(ipAddress).targetEntity(targetEntity)
+                                      .targetVirtualEntity(targetVirtualEntity).build();
+
+        assertEquals(data.getClientIpAddress(), ipAddress);
+        assertEquals(data.getEndTime(), end);
+        assertEquals(data.getStartTime(), start);
+        assertEquals(data.getResponseCode(), responseCode);
+        assertEquals(data.getResponseDescription(), responseDescription);
+        assertEquals(data.getStatusCode(), StatusCode.COMPLETE);
+        assertEquals(data.getTargetEntity(), targetEntity);
+        assertEquals(data.getTargetVirtualEntity(), targetVirtualEntity);
+
+    }
+
+    @Test
+    public void allMetricsPropertiesEmptyWhenUnpopulated() {
+        MetricsData data = MetricsData.builder().build();
+        assertEquals(data.getStartTime(), 0);
+        assertEquals(data.getEndTime(), 0);
+        assertNull(data.getClientIpAddress());
+        assertNull(data.getResponseCode());
+        assertNull(data.getResponseDescription());
+        assertNull(data.getStatusCode());
+        assertNull(data.getTargetEntity());
+        assertNull(data.getTargetVirtualEntity());
+    }
+}
\ No newline at end of file