diff options
3 files changed, 58 insertions, 55 deletions
diff --git a/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java index 6b4f1ebc..f272dbbc 100644 --- a/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java +++ b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java @@ -127,7 +127,7 @@ public class DataChangeProvider implements AutoCloseable, DataChangeService { { try { - dataChangeClient.execute("DataChange", svcOperation, null, "sync", serviceDataBuilder, parms); + dataChangeClient.execute(APPLICATION_NAME, svcOperation, null, "sync", serviceDataBuilder, parms); } catch (Exception e) { diff --git a/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java b/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java index e441bda5..570e89ec 100644 --- a/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java +++ b/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java @@ -75,6 +75,8 @@ public class LcmProvider implements AutoCloseable, LCMService { private static final Logger LOG = LoggerFactory.getLogger(LcmProvider.class); + private static final String exceptionMessage = "Caught exception"; + private static final String APPLICATION_NAME = "LCM"; private final ExecutorService executor; @@ -138,7 +140,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -160,7 +162,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -182,7 +184,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -203,7 +205,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -224,7 +226,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -245,7 +247,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -266,7 +268,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -287,7 +289,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -308,7 +310,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -329,7 +331,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -350,7 +352,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -371,7 +373,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -392,7 +394,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -413,7 +415,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -434,7 +436,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -455,7 +457,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -476,7 +478,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -497,7 +499,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -518,7 +520,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -539,7 +541,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -560,7 +562,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -581,7 +583,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -602,7 +604,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -623,7 +625,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -644,7 +646,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -665,7 +667,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -686,7 +688,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -707,7 +709,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -728,7 +730,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -749,7 +751,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -770,7 +772,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -791,7 +793,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -812,7 +814,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -833,7 +835,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -854,7 +856,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -875,7 +877,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -896,7 +898,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -917,7 +919,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -938,7 +940,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } @@ -959,7 +961,7 @@ public class LcmProvider implements AutoCloseable, LCMService { oBuilder.setStatus(retval.getStatusBuilder().build()); oBuilder.setCommonHeader(retval.getCommonHeaderBuilder().build()); } catch (LcmRpcInvocationException e) { - LOG.debug("Caught exception", e); + LOG.debug(exceptionMessage, e); oBuilder.setCommonHeader(e.getCommonHeader()); oBuilder.setStatus(e.getStatus()); } diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java index 671d47a9..601569a1 100644 --- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights * reserved. + * Modifications Copyright © 2018 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,6 +42,16 @@ public class SdncArtifactMap { private String rpc; private int pass; + private SdncArtifactType(String tag, String rpc, String pass) { + this.tag = tag; + this.rpc = rpc; + try { + this.pass = Integer.parseInt(pass); + } catch (Exception e) { + LOG.error("Invalid pass value for artifact map entry ({} {} {})", tag, rpc, pass, e); + } + } + public String getTag() { return tag; } @@ -58,26 +69,16 @@ public class SdncArtifactMap { public String getRpcUrl(String base) { return base+rpc; } - - private SdncArtifactType(String tag, String rpc, String pass) { - this.tag = tag; - this.rpc = rpc; - try { - this.pass = Integer.parseInt(pass); - } catch (Exception e) { - LOG.error("Invalid pass value for artifact map entry ({} {} {})", tag, rpc, pass, e); - } - } } private Map<String, SdncArtifactType> mapItems = new HashMap<>(); - private int NumPasses = 1; + private int numPasses = 1; public int getNumPasses() { - return NumPasses; + return numPasses; } public void load(String fileName) { @@ -93,8 +94,8 @@ public class SdncArtifactMap { if (lnFields.length == 3) { SdncArtifactType entry = new SdncArtifactType(lnFields[0], lnFields[1], lnFields[2]); mapItems.put(entry.getTag(), entry); - if (entry.getPass() + 1 > NumPasses ) { - NumPasses = entry.getPass() + 1; + if (entry.getPass() + 1 > numPasses ) { + numPasses = entry.getPass() + 1; } } } |