aboutsummaryrefslogtreecommitdiffstats
path: root/dblib
AgeCommit message (Collapse)AuthorFilesLines
2017-09-19Remove mysql dependencies in sli/coreDan Timoney3-222/+1
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-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-18Update sli/core to use Mariadb connectoriDan Timoney2-3/+8
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-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-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-14Merge "Clean up public interfaces"Marcus Williams5-32/+32
2017-09-14Merge "Use oparent-odlparent in sli/core"Marcus Williams4-0/+0
2017-09-14Merge "Clean up BaseDBConfiguration class"Marcus Williams1-78/+211
2017-09-14Clean up public interfacesRyan Goulding5-32/+32
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-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 Timoney4-0/+0
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-0/+10
2017-09-13Remove unused imports in java filesRyan Goulding10-20/+1
Code sanitation-- remove unused imports. Issue-Id: SDNC-79 Change-Id: I5306a9b90f302086459fcac98d04f541ba7c79a4 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-13Fix Sonar Issuessurya-huawei2-22/+21
few major issues in sli/core/dblib module Issue-id: CCSDK-87 Change-Id: Ie3b13468d23c1e7dc2228bb7a0cd1bde5cc632e8 Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-13Fix sonar issuessurya-huawei2-5/+10
few major issues in dblib module Issue-Id: CCSDK-87 Change-Id: I6bc1fe2cf04cec0a5ad3bfb65bc3a10e5f488eea Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-12Fix Sonar issuessurya-huawei1-4/+33
Few major issues in sli/core module Issue-id: CCSDK-67 Change-Id: Iad65b30a6b27814c1984d8db42d36f8569c5cb3f Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-11Merge "Fix Blocker/Critical sonar issues"Dan Timoney1-15/+15
2017-09-11Remove cast to DBResourceManagerDan Timoney4-6/+6
Remove cast to DBResourceManager, which no longer works after DbLibService is advertised via Aries Blueprint and which is no longer needed after DbLibService interface exposes getConnection() method. Updated version number - seems like an older 0.1.1-SNAPSHOT without DbLibService change is being used, so trying to see if bumping version will help. Change-Id: Ia411d1514bca396cc052f4f16eda6c79e0d13648 Issue-ID: CCSDK-86 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-11Expose getConnection from DblibSeerviceDan Timoney1-2/+5
Exposed getConnection from DbLibService class so that it can be accessed from OSGi client. Prior to blueprint refactoring, this was accessible by casting DbLibService as DBResourceManager, but that cast no longer works if OSGi service is advertised by blueprint. It's cleaner to expose that method in the interface anyway. Change-Id: I36ed7fe82b0393a952d307a1c79d1d8c0ba11dd4 Issue-ID: CCSDK-86 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-11Fix Blocker/Critical sonar issuesshashikanth1-27/+17
Fix Blocker/Critical sonar issues in ccsdk/core module https://sonar.onap.org/component_issues?id=org.openecomp.sdnc.core%3Asdnc-core#resolved=false|severities=BLOCKER Issue-Id: CCSDK-67 Change-Id: Iec86b90f7085f4b96d4f92adf4064b70640fcf22 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-08Fix Blocker/Critical sonar issuesshashikanth1-15/+15
Fix Blocker/Critical sonar issues in vnfapi module https://sonar.onap.org/component_issues?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#severities=BLOCKER Issue-Id: CCSDK-67 Change-Id: I9f1a7dc8144a2a3a777a2a4f24793bbf9317de33 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-08Fix Blocker/Critical sonar issuesshashikanth1-6/+6
Fix Blocker/Critical sonar issues in vnfapi module https://sonar.onap.org/component_issues?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#severities=BLOCKER Issue-Id: CCSDK-67 Change-Id: I0b779cb0db33f0742776062bd7fa7173f08d5e62 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-06Fix service registration for SDNCRyan Goulding14-174/+620
Addresses the inherit race conditions associated with the BundleActivator abstraction. From lessons learned in OpenDaylight project, dependency injection and service injection via Aries Blueprint is faster, more deterministic, and has better error messaging than using BundleActivator(s). This change addresses several aspects: 1) DBLIBResourceActivator is changed to DBLIBResourceProvider. This was done in order to imply that this is no longer an Activator or subclass of an Activator. The class is a POJO. 2) DBLIBResourceProvider is split from a single monolithic method into several more manageable and better documented methods. 3) Documentation surrounding the resolution of the DB properties is added so that a developer can more easily identify the strategy (priority) used for resolving properties. 4) dblib-blueprint.xml is added. This is used to register the configuration bean (DBLIBResourceProvider), and pass it as an argument to the actual Service (DBLIBResourceManager). 5) Tests are added to test the functionality and resolution of the properties file loading. Issue-Id: SDNC-54 Change-Id: Ie9d5fb423ae7a67e9aec026c78321537399cc308 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-08-30Roll version to rule out staging issueDan Timoney4-6/+6
Behavior observed in the odlsli docker container suggests that it might be picking up an old build of 0.1.0-SNAPSHOT version of sli/core. We have observed this problem before due to issues with the Nexus staging plugin. This change bumps the version of sli/core to 0.1.1-SNAPSHOT and comments out the staging plugin from the sli/core pom.xml to make sure that the current build is picked up. There will be a corresponding change in ccsdk/distribution to change which version of sli/core is used in the odlsli container Change-Id: Ie3c2b4ff66191748df14240a69a7d461fc0d4639 Issue-ID: CCSDK-69 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-29Cleanup artifactId for ccsdk/sli/coreDan Timoney1-1/+1
ArtifactId for ccsdk/sli/core pom.xml should not be identical to that for sdnc/core, otherwise import to Eclipse of both will be confusing. Update parent tag in each module pom under ccsdk/sli/core to new artifactId Change-Id: Ia78a11dc4f82dfda8fd863167daa8e8f4951b6f5 Issue-ID: CCSDK-70 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-15Remove license pluginDan Timoney1-35/+0
Remove license plugin from parent POMs. Change-Id: Ia626a424dbb04511d5e31483134384efbe259fe7 Issue-ID: CCSDK-31 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-11Compile against CarbonDan Timoney4-6/+6
Update sli/core to compile against OpenDaylight Carbon SR1 Change-Id: Ibb4a3a4cfa64f0539b520f56f11d7bf1fce62357 Issue-ID: CCSDK-23 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-01Refactor dblibDan Timoney30-188/+186
Changed openecomp references in dblib, filters and sli to onap. Note: these must be committed together to get a clean compile. Issue: CCSDK-11 Change-Id: Ibe0f64fb20f3ae9cdda2f7ea969ca722bbde0d15 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-07-21Update groupId to org.onap.ccsdk.sliDan Timoney5-11/+11
Update groupIds from org.openecomp.sdnc.core to org.onap.ccsdk.sli.core Issue: CCSDK-11 Change-Id: I0646adab34a88244ab10dc0d2775643ce2bb974d Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-07-20Populate seed codeDan Timoney38-0/+4680
Add seed code for sli/core repository Issue: CCSDK-6 Change-Id: Iaeb54c6135a94a6ffec0c7fd96505d72d18aeb00 Signed-off-by: Dan Timoney <dtimoney@att.com>