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 e7b3f1b..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
@@ -5,6 +5,8 @@
  * 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.
@@ -30,42 +32,23 @@ 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 {