lowered code smells

[appc.git] / appc-provider / appc-provider-bundle / src / main / java / org / onap / appc / provider / AppcProviderClient.java

diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/AppcProviderClient.java b/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/AppcProviderClient.java
index 965961c..fa417a4 100644 (file)
--- a/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/AppcProviderClient.java
+++ b/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/AppcProviderClient.java
@@ -2,9 +2,11 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modifications (C) 2019 Ericsson
  * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +20,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -26,43 +27,28 @@ package org.onap.appc.provider;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import org.onap.appc.logging.LoggingConstants;
+import org.onap.appc.logging.LoggingUtils;
 import org.onap.appc.util.StringHelper;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
 import org.slf4j.MDC;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.Properties;
-import java.util.TimeZone;
 
 public class AppcProviderClient {
 
     private final EELFLogger LOG = EELFManager.getInstance().getApplicationLogger();
     private final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
 
-    private SvcLogicService svcLogic = null;
-
-    public AppcProviderClient() {
-        BundleContext bctx = FrameworkUtil.getBundle(SvcLogicService.class).getBundleContext();
-        // Handle BundleContext returning null
-        if (bctx == null){
-            LOG.warn("Cannot find bundle context for " + SvcLogicService.NAME);
-        } else {
-            // Get SvcLogicService reference
-            ServiceReference sref = bctx.getServiceReference(SvcLogicService.NAME);
-            if (sref != null) {
-                svcLogic = (SvcLogicService) bctx.getService(sref);
-
-            } else {
-                LOG.warn("Cannot find service reference for " + SvcLogicService.NAME);
+    private final SvcLogicService svcLogic;
 
-            }
-        }
+    public AppcProviderClient(final SvcLogicService svcLogicService) {
+       LOG.info("provider alert: appcprovider client init");
+       this.svcLogic = svcLogicService;
     }
 
     public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException {
@@ -74,21 +60,14 @@ public class AppcProviderClient {
         throws SvcLogicException {
 
         /*
-         * Set End time for Metrics Logger
+         * Set properties for Metrics Logger
          */
-        long startTime = System.currentTimeMillis();
-        TimeZone tz = TimeZone.getTimeZone("UTC");
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
-        df.setTimeZone(tz);
-        long endTime = System.currentTimeMillis();
-        long duration = endTime - startTime;
-        String durationStr = String.valueOf(duration);
-        String endTimeStrUTC = df.format(new Date());
-        MDC.put("EndTimestamp", endTimeStrUTC);
-        MDC.put("ElapsedTime", durationStr);
-        MDC.put("TargetEntity", "sli");
-        MDC.put("TargetServiceName", "execute");
-        MDC.put("ClassName", "org.onap.appc.provider.AppcProviderClient");
+        Date startTimestamp = new Date();
+        Instant startTimestampInstant = startTimestamp.toInstant();
+        String startTimeStr = LoggingUtils.generateTimestampStr(startTimestampInstant);
+        MDC.put(LoggingConstants.MDCKeys.TARGET_ENTITY, "sli");
+        MDC.put(LoggingConstants.MDCKeys.TARGET_SERVICE_NAME, "execute");
+        MDC.put(LoggingConstants.MDCKeys.CLASS_NAME, "org.onap.appc.provider.AppcProviderClient");
 
         LOG.debug("Parameters passed to SLI: " + StringHelper.propertiesToString(parms));
         metricsLogger.info("Parameters passed to SLI: " + StringHelper.propertiesToString(parms));
@@ -98,12 +77,14 @@ public class AppcProviderClient {
         /*
          * Set End time for Metrics Logger
          */
-        endTime = System.currentTimeMillis();
-        duration = endTime - startTime;
-        durationStr = String.valueOf(duration);
-        endTimeStrUTC = df.format(new Date());
-        MDC.put("EndTimestamp", endTimeStrUTC);
-        MDC.put("ElapsedTime", durationStr);
+        Date endTimestamp = new Date();
+        Instant endTimestampInstant = endTimestamp.toInstant();
+        String endTimeStr = LoggingUtils.generateTimestampStr(endTimestampInstant);
+        long duration = ChronoUnit.MILLIS.between(startTimestampInstant, endTimestampInstant);
+        String durationStr = String.valueOf(duration);
+        MDC.put(LoggingConstants.MDCKeys.BEGIN_TIMESTAMP, startTimeStr);
+        MDC.put(LoggingConstants.MDCKeys.END_TIMESTAMP, endTimeStr);
+        MDC.put(LoggingConstants.MDCKeys.ELAPSED_TIME, durationStr);
 
         LOG.debug("Parameters returned by SLI: " + StringHelper.propertiesToString(respProps));
         metricsLogger.info("Parameters returned by SLI: " + StringHelper.propertiesToString(respProps));