diff options
5 files changed, 50 insertions, 42 deletions
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java index 5f0209b6..967059a3 100755 --- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java +++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java @@ -209,7 +209,7 @@ public abstract class BaseDBConfiguration { * <code>Integer</code>. */ public int getDbMinLimit() throws NumberFormatException { - String value = properties.getProperty(MIN_LIMIT); + String value = properties.getProperty(MIN_LIMIT, "-1"); return Integer.parseInt(value); } @@ -222,7 +222,7 @@ public abstract class BaseDBConfiguration { * <code>Integer</code>. */ public int getDbMaxLimit() throws NumberFormatException { - String value = properties.getProperty(MAX_LIMIT); + String value = properties.getProperty(MAX_LIMIT, "-1"); return Integer.parseInt(value); } @@ -235,7 +235,7 @@ public abstract class BaseDBConfiguration { * <code>Integer</code>. */ public int getDbInitialLimit() throws NumberFormatException { - String value = properties.getProperty(INIT_LIMIT); + String value = properties.getProperty(INIT_LIMIT, "-1"); return Integer.parseInt(value); } diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java index 80ca577c..09c1c202 100755 --- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java +++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java @@ -42,6 +42,9 @@ public class JdbcDBCachedDataSource extends CachedDataSource { private int initialLimit; private static final String AS_CONF_ERROR = "AS_CONF_ERROR: "; + private static final int MIN_LIMIT = 5; + private static final int MAX_LIMIT = 10; + private static final int INITIAL_LIMIT = 10; private static final Logger LOGGER = LoggerFactory.getLogger(JdbcDBCachedDataSource.class); @@ -88,26 +91,26 @@ public class JdbcDBCachedDataSource extends CachedDataSource { } minLimit = jdbcConfig.getDbMinLimit(); -// if (minLimit == null) -// { -// String errorMsg = "Invalid XML contents: JDBC Connection missing minLimit attribute"; -// LOGGER.error(AS_CONF_ERROR + errorMsg); -// throw new DBConfigException(errorMsg); -// } + if (minLimit == -1) + { + String errorMsg = "Invalid XML contents: JDBC Connection missing minLimit attribute"; + LOGGER.error(AS_CONF_ERROR + errorMsg); + minLimit = MIN_LIMIT; + } maxLimit = jdbcConfig.getDbMaxLimit(); -// if (maxLimit == null) -// { -// String errorMsg = "Invalid XML contents: JDBC Connection missing maxLimit attribute"; -// LOGGER.error(AS_CONF_ERROR + errorMsg); -// throw new DBConfigException(errorMsg); -// } + if (maxLimit == -1) + { + String errorMsg = "Invalid XML contents: JDBC Connection missing maxLimit attribute"; + LOGGER.error(AS_CONF_ERROR + errorMsg); + maxLimit = MAX_LIMIT; + } initialLimit = jdbcConfig.getDbInitialLimit(); -// if (initialLimit == null) -// { -// String errorMsg = "Invalid XML contents: JDBC Connection missing initialLimit attribute"; -// LOGGER.error(AS_CONF_ERROR + errorMsg); -// throw new DBConfigException(errorMsg); -// } + if (initialLimit == -1) + { + String errorMsg = "Invalid XML contents: JDBC Connection missing initialLimit attribute"; + LOGGER.error(AS_CONF_ERROR + errorMsg); + initialLimit = INITIAL_LIMIT; + } dbUrl = jdbcConfig.getDbUrl(); if (dbUrl == null) { diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/PrintYangToProp.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/PrintYangToProp.java index e22f3925..c4b76793 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/PrintYangToProp.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/PrintYangToProp.java @@ -57,7 +57,8 @@ public class PrintYangToProp { private static Properties properties; private static final String BUILDER="-builder"; private static final String IMPL="-impl"; - + private static final String TO_PROPERTIES_STRING="() to Properties entry"; + private static final String CAUGHT_EXCEPTION_MSG="Caught exception trying to convert value returned by "; public static Properties prop = new Properties(); public static ArrayList<String> propList = new ArrayList<>(); @@ -178,7 +179,7 @@ public class PrintYangToProp { "Caught exception trying to convert Yang-generated enum returned by " + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } else if (isIpv4Address(returnType)) { // Save its value @@ -194,7 +195,7 @@ public class PrintYangToProp { } if (retValue != null) { - String propVal = retValue.getValue().toString(); + String propVal = retValue.getValue(); //LOG.debug("Setting property " + propName // + " to " + propVal); props.setProperty(propName, propVal); @@ -202,10 +203,10 @@ public class PrintYangToProp { } } catch (Exception e) { LOG.error( - "Caught exception trying to convert value returned by " + CAUGHT_EXCEPTION_MSG + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } else if (isIpv6Address(returnType)) { // Save its value @@ -229,10 +230,10 @@ public class PrintYangToProp { } } catch (Exception e) { LOG.error( - "Caught exception trying to convert value returned by " + CAUGHT_EXCEPTION_MSG + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } else if (isIpv4Prefix(returnType)) { //System.out.println("isIpv4Prefix"); @@ -257,10 +258,10 @@ public class PrintYangToProp { } } catch (Exception e) { LOG.error( - "Caught exception trying to convert value returned by " + CAUGHT_EXCEPTION_MSG + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } else if (isIpv6Prefix(returnType)) { //System.out.println("isIpv6Prefix"); @@ -285,10 +286,10 @@ public class PrintYangToProp { } } catch (Exception e) { LOG.error( - "Caught exception trying to convert value returned by " + CAUGHT_EXCEPTION_MSG + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } else { try { @@ -308,7 +309,7 @@ public class PrintYangToProp { "Caught exception trying to convert Yang-generated class returned by" + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } } else if (returnType.equals(Class.class)) { @@ -339,7 +340,7 @@ public class PrintYangToProp { "Caught exception trying to convert List returned by " + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } else { @@ -367,10 +368,10 @@ public class PrintYangToProp { } } catch (Exception e) { LOG.error( - "Caught exception trying to convert value returned by " + CAUGHT_EXCEPTION_MSG + fromClass.getName() + "." + m.getName() - + "() to Properties entry", e); + + TO_PROPERTIES_STRING, e); } } @@ -783,7 +784,7 @@ public class PrintYangToProp { + toClass.getName() + "." + m.getName() - + "() to Properties entry", + + TO_PROPERTIES_STRING, e); } } @@ -835,7 +836,7 @@ public class PrintYangToProp { "Caught exception trying to convert List returned by" + toClass.getName() + "." + m.getName() - + "() to Properties entry", + + TO_PROPERTIES_STRING, e); } } @@ -925,7 +926,7 @@ public class PrintYangToProp { + toClass.getName() + "." + m.getName() - + "() to Properties entry", + + TO_PROPERTIES_STRING, e); } } diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java index 5ee138a3..c6fd8b6a 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java @@ -5,6 +5,8 @@ * Copyright (C) 2017 AT&T Intellectual Property. All rights * reserved. * ================================================================================ + * Modifications Copyright (C) 2018 IBM. + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -37,8 +39,8 @@ public class SvcLogicCrawler extends SimpleFileVisitor<Path> { private List<Path> activationFilePathList; public SvcLogicCrawler() { - xmlGraphPathList = new ArrayList<Path>(); - activationFilePathList = new ArrayList<Path>(); + xmlGraphPathList = new ArrayList<>(); + activationFilePathList = new ArrayList<>(); } @Override diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java index 2a40e7a1..e96b702e 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java @@ -5,6 +5,8 @@ * Copyright (C) 2017 AT&T Intellectual Property. All rights * reserved. * ================================================================================ + * Modifications Copyright (C) 2018 IBM. + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -55,7 +57,7 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener public SvcLogicExprListener() { - exprStack = new LinkedList<SvcLogicExpression>(); + exprStack = new LinkedList<>(); } public SvcLogicExpression getParsedExpr() |