diff options
author | Dan Timoney <dtimoney@att.com> | 2020-12-03 11:05:19 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2020-12-03 12:02:07 -0500 |
commit | bf926edb33ca32e5c0c26054383d27312c2f8151 (patch) | |
tree | ed399ac147cbb074507abbb4efaca88d3a751be8 /adaptors/aai-service/provider/src/main/java/org | |
parent | 8f2fcdaf36cc05480d0d8c03d0d54368e7a851f6 (diff) |
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 <dtimoney@att.com>
Change-Id: I0f167680d04e65069fd2c0ba0a01681a9b334f0b
Diffstat (limited to 'adaptors/aai-service/provider/src/main/java/org')
2 files changed, 2 insertions, 17 deletions
diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java index 9facab82c..0515218b3 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java +++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java @@ -162,11 +162,8 @@ public abstract class AAIRequest { AAIRequest.configProperties = props; AAIRequest.aaiService = aaiService; - InputStream in = null; - try { - LOG.info("Loading aai-path.properties via OSGi"); URL url = null; Bundle bundle = FrameworkUtil.getBundle(AAIService.class); if(bundle != null) { @@ -179,19 +176,7 @@ public abstract class AAIRequest { url = aaiService.getClass().getResource("/aai-path.properties"); } - in = url.openStream(); - } - catch (NoClassDefFoundError|Exception e) { - LOG.info("Loading aai-path.properties from jar"); - in = AAIRequest.class.getResourceAsStream("/aai-path.properties"); - - } - - if (in == null) { - return; - } - - try { + InputStream in = url.openStream(); Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8); Properties properties = new Properties(); diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java index 743f975b6..9888c838b 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java +++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java @@ -157,7 +157,7 @@ public class AAIServiceProvider implements UtilsProvider { Object unmasked = gs2Method.invoke(encrSvc, new Object[] { value }); return unmasked.toString(); - } catch (Exception|NoClassDefFoundError exc) { + } catch (Exception exc) { LOG.error("Failure", exc); return value; } |