From bf926edb33ca32e5c0c26054383d27312c2f8151 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 3 Dec 2020 11:05:19 -0500 Subject: Sync ccsdk/sli guilin branch Sync ccsdk/sli guilin branch to make contents identical with ccsdk/sli/[core|adaptors|northbound|plugins] repositories Issue-ID: CCSDK-3009 Signed-off-by: Dan Timoney Change-Id: I0f167680d04e65069fd2c0ba0a01681a9b334f0b --- adaptors/netbox-client/provider/pom.xml | 4 +- .../sli/adaptors/netbox/impl/NetboxClientImpl.java | 58 +--------------------- .../adaptors/netbox/property/NetboxProperties.java | 22 +++----- 3 files changed, 10 insertions(+), 74 deletions(-) (limited to 'adaptors/netbox-client/provider') diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index 23e3213a4..ec078a4c6 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -21,13 +21,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.adaptors netbox-client-provider - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/impl/NetboxClientImpl.java b/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/impl/NetboxClientImpl.java index bfb5ee530..4e4761d10 100644 --- a/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/impl/NetboxClientImpl.java +++ b/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/impl/NetboxClientImpl.java @@ -17,23 +17,16 @@ package org.onap.ccsdk.sli.adaptors.netbox.impl; import com.google.common.collect.Lists; import com.google.gson.JsonSyntaxException; - -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; import java.util.Map; -import java.util.Properties; - import javax.sql.rowset.CachedRowSet; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient; import org.onap.ccsdk.sli.adaptors.netbox.model.IPAddress; import org.onap.ccsdk.sli.adaptors.netbox.model.IPStatus; -import org.onap.ccsdk.sli.adaptors.netbox.property.NetboxProperties; -import org.onap.ccsdk.sli.core.dblib.DBResourceManager; import org.onap.ccsdk.sli.core.dblib.DbLibService; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; @@ -80,56 +73,9 @@ public class NetboxClientImpl implements NetboxClient { private final NetboxHttpClient client; private final DbLibService dbLibService; - public NetboxClientImpl() { - this(null, null); - } - public NetboxClientImpl(final NetboxHttpClient client, final DbLibService dbLibService) { - if (client == null) { - this.client = new NetboxHttpClient(new NetboxProperties()); - } else { - this.client = client; - } - - if (dbLibService == null) { - Properties dblibProps = System.getProperties(); - - String cfgDir = dblibProps.getProperty("sdnc.config.dir", System.getenv("SDNC_CONFIG_DIR")); - - if ((cfgDir == null) || (cfgDir.length() == 0)) { - cfgDir = "/opt/sdnc/data/properties"; - } - - File dblibPropFile = new File(cfgDir + "/dblib.properties"); - if (dblibPropFile.exists()) { - try { - LOG.debug("Loading dblib properties from {}", dblibPropFile.getAbsolutePath()); - dblibProps = new Properties(); - dblibProps.load(new FileInputStream(dblibPropFile)); - } catch (Exception e) { - LOG.warn("Could not load properties file {}", dblibPropFile.getAbsolutePath(), e); - - dblibProps = System.getProperties(); - } - } - - DbLibService dbSvc = null; - try { - dbSvc = new DBResourceManager(dblibProps); - } catch (Exception e) { - LOG.error("Caught exception trying to create dblib service", e); - } - - try { - dbSvc = new DBResourceManager(dblibProps); - } catch (Exception e) { - LOG.error("Caught exception trying to create dblib service", e); - } - this.dbLibService = dbSvc; - - } else { - this.dbLibService = dbLibService; - } + this.client = client; + this.dbLibService = dbLibService; } @Override diff --git a/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/property/NetboxProperties.java b/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/property/NetboxProperties.java index 9b4751e64..2eecf6e3a 100644 --- a/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/property/NetboxProperties.java +++ b/adaptors/netbox-client/provider/src/main/java/org/onap/ccsdk/sli/adaptors/netbox/property/NetboxProperties.java @@ -60,24 +60,14 @@ public class NetboxProperties { properties.load(in); LOG.info("Loaded {} properties from file {}", properties.size(), ccsdkConfigDir); } catch (Exception e) { - try { - // Try to load config from jar via OSGi - final Bundle bundle = FrameworkUtil.getBundle(NetboxProperties.class); - final BundleContext ctx = bundle.getBundleContext(); - final URL url = ctx.getBundle().getResource(NETBOX_PROPERTY_FILE_NAME); - InputStream inputStream = url.openStream(); + // Try to load config from jar + final Bundle bundle = FrameworkUtil.getBundle(NetboxProperties.class); + final BundleContext ctx = bundle.getBundleContext(); + final URL url = ctx.getBundle().getResource(NETBOX_PROPERTY_FILE_NAME); + + try (InputStream inputStream = url.openStream()) { properties.load(inputStream); LOG.info("Loaded {} properties from file {}", properties.size(), NETBOX_PROPERTY_FILE_NAME); - } catch (NoClassDefFoundError e1) { - // Try to load config from jar via class loader - try (InputStream inputStream = NetboxProperties.class.getResourceAsStream("/"+NETBOX_PROPERTY_FILE_NAME)) { - properties.load(inputStream); - } catch (Exception e2) { - LOG.error("Failed to load properties for file: {} " + NETBOX_PROPERTY_FILE_NAME, e1); - } - ; - LOG.info("Loaded {} properties from file {}", properties.size(), NETBOX_PROPERTY_FILE_NAME); - } catch (IOException e1) { LOG.error("Failed to load properties for file: {} " + NETBOX_PROPERTY_FILE_NAME, e1); } -- cgit 1.2.3-korg