ccsdk/sli/core.git
6 years agoAdd unit tests for dblib 25/17025/1
Dan Timoney [Tue, 3 Oct 2017 12:17:38 +0000 (08:17 -0400)]
Add unit tests for dblib

Add unit test case for dblib/provider, using MariaDB4J as database.

Change-Id: I18492595a9d54999c3d52b56ecfe33d0d2cae019
Issue-ID: CCSDK-106
Signed-off-by: Dan Timoney <dtimoney@att.com>
6 years agoAdd test cases for MdsalHelper 27/16927/1
Dan Timoney [Mon, 2 Oct 2017 21:17:10 +0000 (17:17 -0400)]
Add test cases for MdsalHelper

Fix test case for loadProperties, and added test cases for IpAddress
types

Change-Id: Iabf182d32ae3937871dc9656105fdda0c1a9411f
Issue-ID: CCSDK-106
Signed-off-by: Dan Timoney <dtimoney@att.com>
6 years agoAdd test cases for MdsalHelper 09/16909/1
Dan Timoney [Mon, 2 Oct 2017 19:48:23 +0000 (15:48 -0400)]
Add test cases for MdsalHelper

Add test cases for MdsalHelper methods toBuilder() and toProperties().
This requires a Yang model, so added a copy of sliapi/model to sli, since
could not use sliapi directly otherwise would create circular
dependency (since sliapi depends on sli).

Change-Id: I4824afe250f93428c73dbeec9f4a4c36ee4f76e6
Issue-ID: CCSDK-106
Signed-off-by: Dan Timoney <dtimoney@att.com>
6 years agoMerge "Added @Override annotation"
Dan Timoney [Thu, 28 Sep 2017 13:03:22 +0000 (13:03 +0000)]
Merge "Added @Override annotation"

6 years agoMerge "Fix major sonar issue"
Dan Timoney [Thu, 28 Sep 2017 13:03:11 +0000 (13:03 +0000)]
Merge "Fix major sonar issue"

6 years agoSetup ReadTheDocs 71/16371/1
Brian Freeman [Thu, 28 Sep 2017 12:01:42 +0000 (12:01 +0000)]
Setup ReadTheDocs

Issue-ID: CCSDK-107
Change-Id: I6f09524c02f899bd4e6df82e6eda8e94518fe8ec
Signed-off-by: Brian Freeman <bf1936@att.com>
6 years agoMerge "Remove redundant casts"
Dan Timoney [Thu, 28 Sep 2017 07:21:00 +0000 (07:21 +0000)]
Merge "Remove redundant casts"

6 years agoRemove redundant casts 27/16227/1
surya-huawei [Thu, 28 Sep 2017 06:01:42 +0000 (11:31 +0530)]
Remove redundant casts

*Remove unnecessary cast to "CachedDataSource"
These unnecessary casting expressions maked the
code harder to read and understand
*Replace type specification with diamond operator
This is to reduce the verbosity of generics code

Issue-Id: CCSDK-87
Change-Id: I6cd2f7d16886ffa6cc26e5dd300b8376705d9366
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoAdded @Override annotation 35/15935/2
shashikanth [Wed, 27 Sep 2017 11:42:46 +0000 (17:12 +0530)]
Added @Override annotation

Fix major sonar issues in ccsdk/sli/core module
https://sonar.onap.org/component_issues?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#resolved=false|severities=MAJOR|rules=squid%3AS1161

Add the "@Override" annotation above this method signature

Issue-Id:CCSDK-67
Change-Id: I233be3f88547049a5f78c438e87f2f8c0129df78
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
6 years agoRefined DBLIB blueprint configuration 89/16189/1
Rich Tabedzki [Thu, 28 Sep 2017 03:00:10 +0000 (03:00 +0000)]
Refined DBLIB blueprint configuration

Changes made:
1. updated DBLibService definition by registering service on two interfaces:
  a) javax.sql.DataSource
  b) org.onap.ccsdk.sli.core.dblib.DbLibService

Change-Id: If187b07db83ebca5428c809a83f546d9178a2b7f
Issue-ID: CCSDK-102
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
6 years agoMerge "Refinements to core"
Dan Timoney [Wed, 27 Sep 2017 19:31:23 +0000 (19:31 +0000)]
Merge "Refinements to core"

6 years agoAdd unit test for SliStringUtils 85/15385/4
surya-huawei [Tue, 26 Sep 2017 07:31:50 +0000 (13:01 +0530)]
Add unit test for SliStringUtils

*Made quotedOrNull method public
This is done for accessing this in ut
*Added a unit test for the SliStringUtils.quotedOrNull()
This is done for increasing code coverage

Issue-Id: CCSDK-106
Change-Id: I9d74c6645256227b23beded5179fbb28ac3d3c04
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoFix major sonar issue 31/15931/3
shashikanth [Wed, 27 Sep 2017 11:01:12 +0000 (16:31 +0530)]
Fix major sonar issue

Fix major sonar issues in ccsdk/sli/core module
https://sonar.onap.org/component_issues?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#resolved=false|severities=MAJOR|rules=squid%3AS1161

Add the "@Override" annotation above this method signature.

Issue-Id:CCSDK-67
Change-Id: Ie074574c7bbd2ca394d116e73aa6aab47ad5b8de
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
6 years agoRefinements to core 67/15067/2
Gaurav Agrawal [Wed, 27 Sep 2017 10:43:04 +0000 (16:13 +0530)]
Refinements to core

Changes includes:
1. Simplifying the test cases.
2. Critical Sonar issue fix for MdsalHelper
3. Critical sonar issue fix for SvcLogicServiceImpl
4. Use logger in-built formatting.
https://sonar.onap.org/component_issues/index?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#resolved=false|severities=CRITICAL

Change-Id: Ib85637fcd2351970f8d96bf6b855db05cf7d9834
Issue-Id: CCSDK-67
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
6 years agoMerge "Use Long.toString instead"
Dan Timoney [Wed, 27 Sep 2017 07:53:31 +0000 (07:53 +0000)]
Merge "Use Long.toString instead"

6 years agoMerge "Some minor refinements in CCSDK SLI Core module"
Dan Timoney [Wed, 27 Sep 2017 07:47:35 +0000 (07:47 +0000)]
Merge "Some minor refinements in CCSDK SLI Core module"

6 years agoMerge "Remove hardcoded dependency versions"
Dan Timoney [Wed, 27 Sep 2017 07:47:00 +0000 (07:47 +0000)]
Merge "Remove hardcoded dependency versions"

6 years agoMerge "Fixes for SvcLogicActivator"
Dan Timoney [Wed, 27 Sep 2017 07:44:46 +0000 (07:44 +0000)]
Merge "Fixes for SvcLogicActivator"

6 years agoUse Long.toString instead 99/14999/2
surya-huawei [Mon, 25 Sep 2017 09:26:04 +0000 (14:56 +0530)]
Use Long.toString instead

Major sonar issue in sli/core module
*Using static method to reduce
 memory and cycles

Issue-Id: CCSDK-87
Change-Id: Iaf255892a4bd698934f865a707e54f8e740370ab
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoUpdated DBLIB svc definition 59/15659/3
Rich Tabedzki [Tue, 26 Sep 2017 17:19:32 +0000 (17:19 +0000)]
Updated DBLIB svc definition

Changes made:
1. updated DBLibService definition by adding javax.sql.DataSource

Change-Id: I5dd63a81420f451b0ce9bbbc878d351d62ccd819
Issue-ID: CCSDK-102
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
6 years agoSome minor refinements in CCSDK SLI Core module 27/15027/1
ramu.n [Mon, 25 Sep 2017 11:22:45 +0000 (16:52 +0530)]
Some minor refinements in CCSDK SLI Core module

*Remove useless braces while logging exception stack trace
*Register all DG nodes in SvcLogicParser Test file

Change-Id: I7916bec20e36e1def15c24806da2f7e01e79bf4b
Issue-Id: CCSDK-106
Signed-off-by: Ramu N <ramu.n@huawei.com>
6 years agoRemove hardcoded dependency versions 97/14997/1
Gaurav Agrawal [Mon, 25 Sep 2017 09:18:42 +0000 (14:48 +0530)]
Remove hardcoded dependency versions

Remove the hardcoded junit & common-lang version and rather take from parent pom.

Change-Id: Ibc71ff4b86a2fefc89365017f06333776cb2fed3
Issue-Id: CCSDK-105
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
6 years agoFixes for SvcLogicActivator 59/14959/1
Gaurav Agrawal [Mon, 25 Sep 2017 07:28:52 +0000 (12:58 +0530)]
Fixes for SvcLogicActivator

1. Convert tabs to 4 spaces.
2. Break lines to be less than 120 characters
3. Remove extraneous spaces/parenthesis & redundant assignments.
4. Use logger built-in string format.
5. Fix critical sonar issues.
https://sonar.onap.org/component_issues/index?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#resolved=false|severities=CRITICAL

Change-Id: Idb348f125e92f0e9be30847c41b385411220fd96
Issue-Id: CCSDK-67
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
6 years agoSome minor refinements in CCSDK SLI Core module 53/13853/5
ramu.n [Sat, 23 Sep 2017 16:58:03 +0000 (22:28 +0530)]
Some minor refinements in CCSDK SLI Core module

Fix few Critical/Major sonar issues in CCSDK SLI Core module
* Define and throw a dedicated exception instead of using a generic one
* Either log or rethrow the exception
* Change "try" to a try-with-resources
* Remove useless assignment to local variable
* Use built-in logger method string formatting instead of string concatination
* code indentation

Change-Id: I83dc1fb931b8021118e259c722f7dfbc1621dce8
Issue-Id: CCSDK-67
Signed-off-by: Ramu N <ramu.n@huawei.com>
6 years agoChanges to fix failing utils feature 83/14683/1
Patrick Brady [Fri, 22 Sep 2017 16:41:20 +0000 (09:41 -0700)]
Changes to fix failing utils feature

Change-Id: I88d30aaf49da78008c62352d398323fbc0d4dd5b
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-id: CCSDK-102

6 years agoMerge "Add "@Override" annotation"
Dan Timoney [Fri, 22 Sep 2017 12:12:53 +0000 (12:12 +0000)]
Merge "Add "@Override" annotation"

6 years agoMerge "Resolved sonar issue."
Dan Timoney [Fri, 22 Sep 2017 12:09:12 +0000 (12:09 +0000)]
Merge "Resolved sonar issue."

6 years agoMerge "Sql query blocker issue fixed."
Dan Timoney [Fri, 22 Sep 2017 12:07:22 +0000 (12:07 +0000)]
Merge "Sql query blocker issue fixed."

6 years agoAdd "@Override" annotation 71/14571/1
surya-huawei [Fri, 22 Sep 2017 11:10:30 +0000 (16:40 +0530)]
Add "@Override" annotation

Added @Override annotation before method signature
*This is to improve the readability of code

Issue-Id: CCSDK-87
Change-Id: I979eb03ec81b9868012e5c16f48b595c8e53e26e
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoInstall sdnc-core utils as karaf package 47/14347/2
Dan Timoney [Thu, 21 Sep 2017 20:07:02 +0000 (16:07 -0400)]
Install sdnc-core utils as karaf package

New utils jar was added in another change, but wasn't bundled as a karaf
feature and was not being installed in container. This broke odlsli
docker container. This change wraps that util package as a new
feature (sdnc-core-utils).

Change-Id: Ie8c1d608e2c67aa1635837bc400cec942761c81c
Issue-ID: CCSDK-54
Signed-off-by: Dan Timoney <dtimoney@att.com>
6 years agoSql query blocker issue fixed. 89/14189/2
Bharat saraswal [Thu, 21 Sep 2017 09:39:52 +0000 (15:09 +0530)]
Sql query blocker issue fixed.

Rdundant code and complextity of methods reduced.
@override annotaiton added.
Exception handling and logging impoved.

Issue-ID:CCSDK-87

Change-Id: I3907be73a2f6ccdfadeaed79c87705ae7afdb4ab
Signed-off-by: Bharat saraswal <bharat.saraswal@huawei.com>
6 years agoResolved sonar issue. 07/14207/3
Bharat saraswal [Thu, 21 Sep 2017 10:53:11 +0000 (16:23 +0530)]
Resolved sonar issue.

Related to exception handling.
@Override method
Redundant code and resulable parameters

Issue-Id:CCSDK-87

Change-Id: I82e2aad453edf5cd647c87322fc75b2a56c37566
Signed-off-by: Bharat saraswal <bharat.saraswal@huawei.com>
6 years agoMerge "Improve code coverage for MdsalHelper"
Dan Timoney [Thu, 21 Sep 2017 14:49:31 +0000 (14:49 +0000)]
Merge "Improve code coverage for MdsalHelper"

6 years agoMerge "Remove unnecessary parentheses"
Dan Timoney [Thu, 21 Sep 2017 14:48:36 +0000 (14:48 +0000)]
Merge "Remove unnecessary parentheses"

6 years agoImprove code coverage for MdsalHelper 09/14209/1
Gaurav Agrawal [Thu, 21 Sep 2017 10:59:34 +0000 (16:29 +0530)]
Improve code coverage for MdsalHelper

Changes includes
1. Modified pom to take JUNIT version from parent pom.
2. Added basic testcases for MdsalHelper utilities with test YANG.
3. Made necessary pom additions.

Change-Id: Ib46bd9c8a87db33c90aaaf36736d709a7c17cbdd
Issue-Id: CCSDK-101
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
6 years agoRemove unnecessary parentheses 99/14199/1
surya-huawei [Thu, 21 Sep 2017 10:03:03 +0000 (15:33 +0530)]
Remove unnecessary parentheses

*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>
6 years agoFix Sonar Issues in sli/core module 97/14097/3
Bharat saraswal [Thu, 21 Sep 2017 05:47:57 +0000 (11:17 +0530)]
Fix Sonar Issues in sli/core module

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>
6 years agoMerge "Abstract utility classes for re-use"
Dan Timoney [Wed, 20 Sep 2017 20:02:58 +0000 (20:02 +0000)]
Merge "Abstract utility classes for re-use"

6 years agoMerge "Fix Sonar Issues in sli/core module"
Dan Timoney [Wed, 20 Sep 2017 19:59:55 +0000 (19:59 +0000)]
Merge "Fix Sonar Issues in sli/core module"

6 years agoMerge "Fixes for MdsalHelper util"
Dan Timoney [Wed, 20 Sep 2017 19:58:23 +0000 (19:58 +0000)]
Merge "Fixes for MdsalHelper util"

6 years agoMerge "Fix Sonar Issue"
Dan Timoney [Wed, 20 Sep 2017 19:32:15 +0000 (19:32 +0000)]
Merge "Fix Sonar Issue"

6 years agoAbstract utility classes for re-use 03/13503/2
Ryan Goulding [Tue, 19 Sep 2017 15:14:41 +0000 (11:14 -0400)]
Abstract utility classes for re-use

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>
6 years agoFix Sonar Issues in sli/core module 17/13817/1
surya-huawei [Wed, 20 Sep 2017 10:05:23 +0000 (15:35 +0530)]
Fix Sonar Issues in sli/core module

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>
6 years agoFixes for MdsalHelper util 03/13803/1
Gaurav Agrawal [Wed, 20 Sep 2017 09:40:54 +0000 (15:10 +0530)]
Fixes for MdsalHelper util

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>
6 years agoFix Sonar Issue 81/13381/3
surya-huawei [Tue, 19 Sep 2017 09:27:17 +0000 (14:57 +0530)]
Fix Sonar Issue

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>
6 years agoFix few Major sonar issues 81/13681/1
ramu.n [Wed, 20 Sep 2017 05:42:43 +0000 (11:12 +0530)]
Fix few Major sonar issues

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>
6 years agoMerge "Use Junit4 instead of Junit3 in sli/common"
Dan Timoney [Tue, 19 Sep 2017 23:58:10 +0000 (23:58 +0000)]
Merge "Use Junit4 instead of Junit3 in sli/common"

6 years agoRemove mysql dependencies in sli/core 07/13607/1
Dan Timoney [Tue, 19 Sep 2017 21:33:48 +0000 (17:33 -0400)]
Remove mysql dependencies in sli/core

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>
6 years agoUse Junit4 instead of Junit3 in sli/common 91/13591/1
ramu.n [Tue, 19 Sep 2017 20:47:00 +0000 (02:17 +0530)]
Use Junit4 instead of Junit3 in sli/common

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>
6 years agoMerge "Fix few Major sonar issues"
Dan Timoney [Tue, 19 Sep 2017 18:31:36 +0000 (18:31 +0000)]
Merge "Fix few Major sonar issues"

6 years agoMerge "Fix few Major sonar issues"
Dan Timoney [Tue, 19 Sep 2017 18:31:16 +0000 (18:31 +0000)]
Merge "Fix few Major sonar issues"

6 years agoFix mariadb-connector-java references 45/13545/1
Dan Timoney [Tue, 19 Sep 2017 17:34:33 +0000 (13:34 -0400)]
Fix mariadb-connector-java references

Remove mariadb-connector-java reference in dblib features.xml

Change-Id: I29f7466a82b25e35b180eb48911dd553c86460fa
Issue-ID: CCSDK-95
Signed-off-by: Dan Timoney <dtimoney@att.com>
6 years agoFix mariadb-connector-java references 11/13211/1
Dan Timoney [Mon, 18 Sep 2017 19:43:56 +0000 (15:43 -0400)]
Fix mariadb-connector-java references

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>
6 years agoUpdate sli/core to use Mariadb connectori 03/13203/1
Dan Timoney [Mon, 18 Sep 2017 18:56:39 +0000 (14:56 -0400)]
Update sli/core to use Mariadb connectori

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>
6 years agoMerge "Fix few Major sonar issues"
Dan Timoney [Mon, 18 Sep 2017 16:38:43 +0000 (16:38 +0000)]
Merge "Fix few Major sonar issues"

6 years agoExplicitly import com.mysql.jdbc package 71/13171/1
Dan Timoney [Mon, 18 Sep 2017 15:33:49 +0000 (11:33 -0400)]
Explicitly import com.mysql.jdbc package

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>
6 years agoFix few Major sonar issues 65/13165/1
ramu.n [Mon, 18 Sep 2017 14:47:36 +0000 (20:17 +0530)]
Fix few Major sonar issues

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>
6 years agoFix few Major sonar issues 47/13147/4
ramu.n [Mon, 18 Sep 2017 13:37:17 +0000 (19:07 +0530)]
Fix few Major sonar issues

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>
6 years agoFix few Major sonar issues 15/13015/1
ramu.n [Mon, 18 Sep 2017 07:12:25 +0000 (12:42 +0530)]
Fix few Major sonar issues

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>
6 years agoFix Sonar issues in sli/core module 25/12925/1
surya-huawei [Sun, 17 Sep 2017 17:23:41 +0000 (22:53 +0530)]
Fix Sonar issues in sli/core module

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>
6 years agoMerge "Fix few Major sonar issues"
Dan Timoney [Sat, 16 Sep 2017 00:11:21 +0000 (00:11 +0000)]
Merge "Fix few Major sonar issues"

6 years agoFix service tag in sli/recording blueprint 69/12769/1
Dan Timoney [Fri, 15 Sep 2017 18:03:17 +0000 (14:03 -0400)]
Fix service tag in sli/recording blueprint

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>
6 years agoMerge "Log current DG & NodeId using MDC"
Dan Timoney [Fri, 15 Sep 2017 13:52:10 +0000 (13:52 +0000)]
Merge "Log current DG & NodeId using MDC"

6 years agoMerge "Fix Blocker/Critical sonar issues"
Dan Timoney [Fri, 15 Sep 2017 13:42:48 +0000 (13:42 +0000)]
Merge "Fix Blocker/Critical sonar issues"

6 years agoFix few Major sonar issues 25/12725/1
ramu.n [Fri, 15 Sep 2017 13:15:29 +0000 (18:45 +0530)]
Fix few Major sonar issues

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>
6 years agoPrepared DBLIB for multi-verndor JDBC Driver 95/12595/3
Rich Tabedzki [Fri, 15 Sep 2017 01:02:37 +0000 (01:02 +0000)]
Prepared DBLIB for multi-verndor JDBC Driver

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>
6 years agoLog current DG & NodeId using MDC 75/12575/2
Marcus G K Williams [Thu, 14 Sep 2017 22:25:57 +0000 (15:25 -0700)]
Log current DG & NodeId using MDC

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>
6 years agoRemove pom.xml sections inherited from oparent 51/12551/1
Dan Timoney [Thu, 14 Sep 2017 20:16:12 +0000 (16:16 -0400)]
Remove pom.xml sections inherited from oparent

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>
6 years agoMerge "Fix critical issues"
Dan Timoney [Thu, 14 Sep 2017 18:21:17 +0000 (18:21 +0000)]
Merge "Fix critical issues"

6 years agoMerge "Fix SDNC service registration"
Dan Timoney [Thu, 14 Sep 2017 18:15:38 +0000 (18:15 +0000)]
Merge "Fix SDNC service registration"

6 years agoMerge "Fix few sonar issues"
Dan Timoney [Thu, 14 Sep 2017 18:14:59 +0000 (18:14 +0000)]
Merge "Fix few sonar issues"

6 years agoMerge "Clean up public interfaces"
Marcus Williams [Thu, 14 Sep 2017 17:57:40 +0000 (17:57 +0000)]
Merge "Clean up public interfaces"

6 years agoMerge "Use oparent-odlparent in sli/core"
Marcus Williams [Thu, 14 Sep 2017 17:51:03 +0000 (17:51 +0000)]
Merge "Use oparent-odlparent in sli/core"

6 years agoFix SDNC service registration 83/12483/1
Ryan Goulding [Thu, 14 Sep 2017 16:37:10 +0000 (12:37 -0400)]
Fix SDNC service registration

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>
6 years agoMerge "Clean up BaseDBConfiguration class"
Marcus Williams [Thu, 14 Sep 2017 16:28:52 +0000 (16:28 +0000)]
Merge "Clean up BaseDBConfiguration class"

6 years agoClean up public interfaces 77/12477/3
Ryan Goulding [Thu, 14 Sep 2017 16:14:12 +0000 (12:14 -0400)]
Clean up public interfaces

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>
6 years agoFix few sonar issues 71/12471/2
ramu.n [Thu, 14 Sep 2017 15:35:22 +0000 (21:05 +0530)]
Fix few sonar issues

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>
6 years agoFix Blocker/Critical sonar issues 67/11667/4
shashikanth [Mon, 11 Sep 2017 12:51:17 +0000 (18:21 +0530)]
Fix Blocker/Critical sonar issues

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>
6 years agoFix critical issues 65/12365/2
surya-huawei [Thu, 14 Sep 2017 06:08:05 +0000 (11:38 +0530)]
Fix critical issues

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>
6 years agoMerge "Fix Blocker/Critical sonar issues"
Dan Timoney [Wed, 13 Sep 2017 21:18:25 +0000 (21:18 +0000)]
Merge "Fix Blocker/Critical sonar issues"

6 years agoClean up BaseDBConfiguration class 89/12289/2
Ryan Goulding [Wed, 13 Sep 2017 20:58:19 +0000 (16:58 -0400)]
Clean up BaseDBConfiguration class

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>
6 years agoMerge "Fix Blocker/Critical sonar issues"
Dan Timoney [Wed, 13 Sep 2017 20:50:22 +0000 (20:50 +0000)]
Merge "Fix Blocker/Critical sonar issues"

6 years agoUse oparent-odlparent in sli/core 83/12283/1
Dan Timoney [Wed, 13 Sep 2017 20:32:45 +0000 (16:32 -0400)]
Use oparent-odlparent in sli/core

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>
6 years agoMerge "Fix Sonar Issues"
Dan Timoney [Wed, 13 Sep 2017 20:27:07 +0000 (20:27 +0000)]
Merge "Fix Sonar Issues"

6 years agoMerge "Fix Sonar Issues"
Dan Timoney [Wed, 13 Sep 2017 20:26:57 +0000 (20:26 +0000)]
Merge "Fix Sonar Issues"

6 years agoMerge "Fix sonar issues"
Dan Timoney [Wed, 13 Sep 2017 20:25:24 +0000 (20:25 +0000)]
Merge "Fix sonar issues"

6 years agoMerge "Fix Sonar Issues"
Dan Timoney [Wed, 13 Sep 2017 20:20:21 +0000 (20:20 +0000)]
Merge "Fix Sonar Issues"

6 years agoMerge "Fix Sonar Issues"
Dan Timoney [Wed, 13 Sep 2017 20:20:04 +0000 (20:20 +0000)]
Merge "Fix Sonar Issues"

6 years agoRemove unused imports in java files 31/12031/2
Ryan Goulding [Tue, 12 Sep 2017 19:13:44 +0000 (15:13 -0400)]
Remove unused imports in java files

Code sanitation-- remove unused imports.

Issue-Id: SDNC-79
Change-Id: I5306a9b90f302086459fcac98d04f541ba7c79a4
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix Sonar Issues 17/11917/2
surya-huawei [Tue, 12 Sep 2017 09:59:44 +0000 (15:29 +0530)]
Fix Sonar Issues

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>
6 years agoFix Sonar Issues 59/11859/2
surya-huawei [Tue, 12 Sep 2017 06:22:59 +0000 (11:52 +0530)]
Fix Sonar Issues

few major issues in sli/core/filters module

Issue-Id- CCSDK-87
Change-Id: Idbf2b12b866d48161f089271a2403aaee6b8d04f
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoFix sonar issues 21/11921/2
surya-huawei [Tue, 12 Sep 2017 10:20:07 +0000 (15:50 +0530)]
Fix sonar issues

few major issues in dblib module

Issue-Id: CCSDK-87
Change-Id: I6bc1fe2cf04cec0a5ad3bfb65bc3a10e5f488eea
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoFix Sonar Issues 53/11853/2
surya-huawei [Tue, 12 Sep 2017 05:37:35 +0000 (11:07 +0530)]
Fix Sonar Issues

few major issues in sli/core module

Issue-Id: CCSDK-87
Change-Id: I1fb86f084d270906dcf61d33701da54a82f2c3a4
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoFix Sonar Issues 29/11829/2
surya-huawei [Tue, 12 Sep 2017 04:17:40 +0000 (09:47 +0530)]
Fix Sonar Issues

few major issues in sli/core module

Issue-Id: CCSDK-87
Change-Id: Id563cd2fb31f477f96e14b180501feeb37fb24a7
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoFix Sonar issues 47/11647/3
surya-huawei [Mon, 11 Sep 2017 11:06:49 +0000 (16:36 +0530)]
Fix Sonar issues

Few major issues in sli/core module

Issue-id: CCSDK-67
Change-Id: Iad65b30a6b27814c1984d8db42d36f8569c5cb3f
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
6 years agoMerge "Fix Blocker/Critical sonar issues"
Dan Timoney [Mon, 11 Sep 2017 20:25:48 +0000 (20:25 +0000)]
Merge "Fix Blocker/Critical sonar issues"

6 years agoRemove cast to DBResourceManager 99/11699/2
Dan Timoney [Mon, 11 Sep 2017 15:19:51 +0000 (11:19 -0400)]
Remove cast to DBResourceManager

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>
6 years agoMerge "Expose getConnection from DblibSeervice"
Dan Timoney [Mon, 11 Sep 2017 15:15:31 +0000 (15:15 +0000)]
Merge "Expose getConnection from DblibSeervice"

6 years agoExpose getConnection from DblibSeervice 53/11453/2
Dan Timoney [Fri, 8 Sep 2017 22:52:46 +0000 (18:52 -0400)]
Expose getConnection from DblibSeervice

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>
6 years agoFix Blocker/Critical sonar issues 75/11675/1
shashikanth [Mon, 11 Sep 2017 13:22:19 +0000 (18:52 +0530)]
Fix Blocker/Critical sonar issues

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>