diff options
Diffstat (limited to 'sli')
| -rwxr-xr-x | sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java | 22 | ||||
| -rwxr-xr-x | sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java | 7 |
2 files changed, 15 insertions, 14 deletions
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java index eeea80bc..eb4e15e9 100755 --- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java +++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java @@ -56,7 +56,9 @@ public class MdsalHelper { private static final String IPV6_ADDRESS="Ipv6Address"; private static final String IP_PREFIX="IpPrefix"; - + private static final String SETTING_PROPERTY="Setting property "; + private static final String BUILDER="-builder"; + @Deprecated public static void setProperties(Properties input) { setYangMappingProperties(input); @@ -146,7 +148,7 @@ public class MdsalHelper { } else if ("PortNumber".equals(simpleTypeName)) { propVal = String.valueOf((Integer) retValue); } - LOG.debug("Setting property " + pfx + " to " + propVal); + LOG.debug(SETTING_PROPERTY + pfx + " to " + propVal); props.setProperty(pfx, propVal); } } catch (Exception e) { @@ -182,8 +184,8 @@ public class MdsalHelper { propNamePfx = toLowerHyphen(fromClass.getSimpleName()); } - if (propNamePfx.endsWith("-builder")) { - propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-builder".length()); + if (propNamePfx.endsWith(BUILDER)) { + propNamePfx = propNamePfx.substring(0, propNamePfx.length() - BUILDER.length()); } if (propNamePfx.endsWith("-impl")) { @@ -332,7 +334,7 @@ public class MdsalHelper { } else { propVal = propValObj.toString(); } - LOG.debug("Setting property " + propName + " to " + propVal); + LOG.debug(SETTING_PROPERTY + propName + " to " + propVal); props.setProperty(propName, propVal); } @@ -379,7 +381,7 @@ public class MdsalHelper { } else { fromVal = fromObj.toString(); } - LOG.debug("Setting property " + pfx + " to " + fromVal); + LOG.debug(SETTING_PROPERTY + pfx + " to " + fromVal); props.setProperty(pfx, fromVal); } @@ -559,8 +561,8 @@ public class MdsalHelper { propNamePfx = toLowerHyphen(toClass.getSimpleName()); } - if (propNamePfx.endsWith("-builder")) { - propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-builder".length()); + if (propNamePfx.endsWith(BUILDER)) { + propNamePfx = propNamePfx.substring(0, propNamePfx.length() - BUILDER.length()); } if (propNamePfx.endsWith("-impl")) { @@ -1035,8 +1037,8 @@ public class MdsalHelper { propNamePfx = toLowerHyphen(toClass.getSimpleName()); } - if (propNamePfx.endsWith("-builder")) { - propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-builder".length()); + if (propNamePfx.endsWith(BUILDER)) { + propNamePfx = propNamePfx.substring(0, propNamePfx.length() - BUILDER.length()); } if (propNamePfx.endsWith("-impl")) { diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java index b4059ed2..d5c7f3bf 100755 --- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java +++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java @@ -3,7 +3,7 @@ * ONAP : CCSDK * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Modifications Copyright (C) 2018 IBM. * ================================================================================ @@ -27,7 +27,6 @@ import java.util.Properties; import org.onap.ccsdk.sli.core.dblib.DbLibService; import org.onap.ccsdk.sli.core.sli.ConfigurationException; -import org.onap.ccsdk.sli.core.sli.MetricLogger; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicDblibStore; import org.onap.ccsdk.sli.core.sli.SvcLogicException; @@ -44,7 +43,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; -public class SvcLogicServiceImpl extends SvcLogicServiceImplBase implements SvcLogicService { +public class SvcLogicServiceImpl extends SvcLogicServiceImplBase implements SvcLogicService { private static final Logger LOG = LoggerFactory.getLogger(SvcLogicServiceImpl.class); protected BundleContext bctx = null; @@ -113,7 +112,7 @@ public class SvcLogicServiceImpl extends SvcLogicServiceImplBase implements SvcL execute(graph, ctx); return (ctx.toProperties()); } - + @Override public SvcLogicStore getStore() throws SvcLogicException { // Create and initialize SvcLogicStore object - used to access |