summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-09-21Remove unnecessary parenthesessurya-huawei1-18/+18
*Useless parentheses can sometimes be misleading and hence removed Issue-Id: CCSDK-87 Change-Id: I018d791500a42356296d07d04de45517d061bb7f Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-21Fix Sonar Issues in sli/core moduleBharat saraswal4-262/+249
Few major issues *Remove unused variables To increase code readability *Replace the type specification with the diamond operator *Add the "@Override" annotation above this method signature To increase code readability" Issue-Id: CCSDK-87 Change-Id: I2f0c16a83ab10a0a3e39a2a1d4db3c195ec2bba8 Signed-off-by: Bharat saraswal <bharat.saraswal@huawei.com>
2017-09-20Merge "Abstract utility classes for re-use"Dan Timoney15-59/+154
2017-09-20Merge "Fix Sonar Issues in sli/core module"Dan Timoney1-19/+20
2017-09-20Merge "Fixes for MdsalHelper util"Dan Timoney1-1002/+1062
2017-09-20Merge "Fix Sonar Issue"Dan Timoney1-9/+1
2017-09-20Abstract utility classes for re-useRyan Goulding15-59/+154
When looking at the existing uses of BundleActivator(s), it became immediately clear that other parts of the code have a strategy based properties file resolution very similar to those abstracted by dblib. This change aggregates a separate utils bundle for this functionality, which is further abstracted for potential reuse with other use cases. The next use case is in the sli bundle, which will be handled in a follow-up patch. Issue-Id: SDNC-54 Change-Id: Ie4d4bb679617474b1983e6044c08cca1742b9893 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-20Fix Sonar Issues in sli/core modulesurya-huawei1-19/+20
Few major issues *Remove unused imports To increase code readability *Replace the type specification with the diamond operator To reduce the verbosity of generics code *Add the "@Override" annotation above this method signature To increase code readability *Remove this unnecessary cast to "String" Unnecessary casting expressions pollutes code Issue-Id: CCSDK-87 Change-Id: I38952f5026a5c61af73ac16706e8ddc278566b13 Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-20Fixes for MdsalHelper utilGaurav Agrawal1-1002/+1062
1. Convert tabs to 4 spaces. 2. Break lines to be less than 120 characters 3. Remove extraneous spaces and parenthesis 4. Fixed blocker/critical sonar issues. https://sonar.onap.org/component_issues/index?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#resolved=false|severities=BLOCKER%2CCRITICAL Change-Id: I8b40784ecb178409a6fe9a00d28ccd03873044c5 Issue-Id: CCSDK-67 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
2017-09-20Fix Sonar Issuesurya-huawei1-9/+1
One blocker issue in sli/core module *Check for null dereferencing Issue-Id: CCSDK-87 Change-Id: I5ebaef24b3fd6534b5e818c3087e3d8213ed770c Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-20Fix few Major sonar issuesramu.n1-45/+44
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless assignment to local variable * Use built-in logger method string formatting instead of string concatination * code indentation Change-Id: I20fc9d8f4c510f6169e6f989c6f5595371e5f2dd Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-19Merge "Use Junit4 instead of Junit3 in sli/common"Dan Timoney2-54/+85
2017-09-19Remove mysql dependencies in sli/coreDan Timoney7-251/+27
Remove lingering mysql dependencies in sli/core, which prevented odlsli container from starting up clean. Note: tested this using bareodl container and verified that these changes install clean AFTER changing incorrect driver property name in dblib.properties. This patch is fine, but a second patch to ccsdk/distribution is needed to fix that property file. Change-Id: I6a900d1c29998867bfbae29d5e113c4e392a8bb9 Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-20Use Junit4 instead of Junit3 in sli/commonramu.n2-54/+85
Modified sli/common pom.xml file to take Junit version from parent pom file and modified one Testfile as per Junit4 Change-Id: Iee4397125d9873def60c77ba8be5d541e0df62fa Issue-Id: CCSDK-98 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-19Merge "Fix few Major sonar issues"Dan Timoney1-297/+314
2017-09-19Merge "Fix few Major sonar issues"Dan Timoney3-56/+56
2017-09-19Fix mariadb-connector-java referencesDan Timoney1-1/+1
Remove mariadb-connector-java reference in dblib features.xml Change-Id: I29f7466a82b25e35b180eb48911dd553c86460fa Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-18Fix mariadb-connector-java referencesDan Timoney2-2/+2
Correct mariadb JDBC connector artifactId should be mariadb-java-client, not mariadb-connector-java Change-Id: If58a33a1ef22d47e1d5c138bad164b0ad89219eb Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-18Update sli/core to use Mariadb connectoriDan Timoney6-15/+14
Update sli/core (including dblib, notably) to use mariadb-connector for any jUnit tests. Update Import-Package in dblib provider pom.xml to import org.mariadb.jdbc so that org.mariadb.jdbc.Driver will be resolved Change-Id: I39dfe2cafb955ba1bf05b0ecdb0212d766fcc96c Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-18Merge "Fix few Major sonar issues"Dan Timoney2-181/+128
2017-09-18Explicitly import com.mysql.jdbc packageDan Timoney1-0/+1
Need to explicitly add com.mysql.jdbc to Import-Package in dblib/provider pom.xml, so that Class.forName() can resolve com.mysql.jdbc.Driver. Will also need to add org.mariadb.jdbc,but will do that in a separate commit Change-Id: I6a4be5d4e1841690919484940af75a2cb15c357b Issue-ID: CCSDK-94 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-18Fix few Major sonar issuesramu.n1-297/+314
Fix few Major sonar issues in CCSDK SLI Core module * Use logger method's built-in string formatting instead of string concatination * code formatting * Use Integer.toString() instead of concatenating empty string "" to a primitive Change-Id: I5a15c9b0049b71d7b0fa06c6791abe766a035c46 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-18Fix few Major sonar issuesramu.n3-56/+56
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless parentheses * Remove useless assignment to local variable * Use logger method instead of string formatting Change-Id: Ie9958d0bc4e754c36c127d465a1953160c2c3e2b Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-18Fix few Major sonar issuesramu.n2-181/+128
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless parentheses * Either log or rethrow the exception * Add the "@Override" annotation * Change "try" to a try-with-resources * Replace duplicate string literals with constants Change-Id: If52163220d7231ae42ef42b0313d56435f6745e1 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-17Fix Sonar issues in sli/core modulesurya-huawei1-8/+2
One major issue * Use try with resources instead of try Issue-Id: CCSDK-87 Change-Id: Ic30016f70ebc355f80a73c9e4632b7971d2b87be Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-16Merge "Fix few Major sonar issues"Dan Timoney1-94/+41
2017-09-15Fix service tag in sli/recording blueprintDan Timoney1-1/+1
One of the service tags in sli/recording blueprint uses attribute 'class' instead of 'interface' to advertise the service. This is preventing SDNC container from loading sdnc-sli-recording feature. Change-Id: I4f6863d74dd6fb8babd91fde53b9680594aa7a31 Issue-ID: SDNC-54 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-15Merge "Log current DG & NodeId using MDC"Dan Timoney1-216/+221
2017-09-15Merge "Fix Blocker/Critical sonar issues"Dan Timoney1-13/+12
2017-09-15Fix few Major sonar issuesramu.n1-94/+41
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless parentheses * Either log or rethrow the exception * Remove unused variables * Add the "@Override" annotation * Change "try" to a try-with-resources Change-Id: I64c4bd3c746bb2f226f4f58c39f28a8b2d178953 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-15Prepared DBLIB for multi-verndor JDBC DriverRich Tabedzki8-499/+210
Changes made: 1. removed hardcoded JDBC driver's name and made it a property. 2. Optimized connection pool initialization 3. Removed unused factories. Change-Id: Id1d1868f7f1a6ae5a0429a97403042a8f6ee78d3 Issue-ID: CCSDK-92 Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
2017-09-14Log current DG & NodeId using MDCMarcus G K Williams1-216/+221
Uses MDC.put to add current directed graph and current nodeId to MDC context which is then logged into the standard karaf log. Issue-Id: CCSDK-71 Change-Id: Ieeeea6a89761cdf0ee7a3e63f4e58e182f37ff28 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2017-09-14Remove pom.xml sections inherited from oparentDan Timoney1-12/+2
Remove pom.xml sections inherited from oparent. In particular, comment out distributionManagement so that it is inherited from oparent. Change-Id: I702e70eb712ecfcf02f6707830b1268586c34e09 Issue-ID: CCSDK-43 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-14Merge "Fix critical issues"Dan Timoney1-16/+6
2017-09-14Merge "Fix SDNC service registration"Dan Timoney3-77/+20
2017-09-14Merge "Fix few sonar issues"Dan Timoney2-66/+93
2017-09-14Merge "Clean up public interfaces"Marcus Williams7-74/+74
2017-09-14Merge "Use oparent-odlparent in sli/core"Marcus Williams10-231/+264
2017-09-14Fix SDNC service registrationRyan Goulding3-77/+20
Instead of registgering services via BundleActivator(s), use blueprint instead. This change deletes the RecordingActivator, as it was just used to kickstart the service registration using felix dm. The idea here is to instead use blueprint through recording-blueprint.xml. The decision was also made to register the Service(s) using the implementation class name instead of the interface class name for backwards compatibility reasons. In all reality, registering Service(s) under the implementation name is less future proof since clients are no longer able to easily swap in a separate implementation Service. In the future, we should consider finding usages of this Service and ensuring that they poll for the interface rather than the implementation. However, that is separate from this change and is considered future work. Issue-Id: SDNC-54 Change-Id: I757bb90f91d114668c153ec5debb5c65af44452a Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-14Merge "Clean up BaseDBConfiguration class"Marcus Williams1-78/+211
2017-09-14Clean up public interfacesRyan Goulding7-74/+74
The Java programming language assigns certain defaults for methods and constants defined in interfaces. This change removes the unnecessary redundant modifiers appropriately. For example: * interface methods are public by default * interface constants are public by default * interface methods are abstract unless "default" is specifically used (as of JDK8+). This is really just to get rid of annoying warnings present in IDE(s). Issue-Id: SDNC-79 Change-Id: I2e6b3e4fa02bad1beee2cbb49d3766722eff1ba0 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-14Fix few sonar issuesramu.n2-66/+93
Fix few sonar issues in CCSDK SLI Core module Change-Id: I0e2454f7e23e73087ac42880c5e0b1e4c089dde8 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-14Fix Blocker/Critical sonar issuesshashikanth1-13/+12
Fix Blocker/Critical sonar issues in vnfapi module https://sonar.onap.org/component_issues?id=org.openecomp.sdnc.core%3Asdnc-core#resolved=false|severities=BLOCKER Issue-Id: CCSDK-67 Change-Id: Ie2ace1bc30bbb50d2b6f25a56e716c7a952e7ea0 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-14Fix critical issuessurya-huawei1-16/+6
few critical/major issues in core/sli module Issue-Id: CCSDK-87 Change-Id: Ib7ef026ecb7fcf658ea8fc66ad5d9b739f02c55b Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-13Merge "Fix Blocker/Critical sonar issues"Dan Timoney1-25/+17
2017-09-13Clean up BaseDBConfiguration classRyan Goulding1-78/+211
This change isn't too big; it mainly just attempts to clean up the BaseDBConfiguration class using best practices. For example: * documentation is added surrounding public methods, public constants, protected variables, and class headers. * code logic for parsing "optional" integer properties is abstracted into a separate private static function, which returns a default value if the given input property cannot be parsed or is not present. * public functions where the NumberFormatException RuntimeException might be thrown have the appriorate "throws" modifier added to their function signatures to indicate that the consumer is responsible for exception handling. * constants are extracted in place of "magic numbers" This is really just code sanitation work. Change-Id: Ifaf092e10b17f54c7cce0a888aa49bfe8377cdd3 Issue-Id: SDNC-79 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-13Merge "Fix Blocker/Critical sonar issues"Dan Timoney1-5/+6
2017-09-13Use oparent-odlparent in sli/coreDan Timoney10-231/+264
Update sli/core to use oparent-odlparent. To prevent verify builds from failing due to unit test errors, also changed unit tests that require database access to use MariaDB4j to start up a local MariaDB database. Change-Id: I928b7e1e83bdb328ca9e0785c8b81f67f982eeda Issue-ID: CCSDK-43 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-13Merge "Fix Sonar Issues"Dan Timoney2-19/+21
2017-09-13Merge "Fix Sonar Issues"Dan Timoney1-4/+4