Dan Timoney [Mon, 18 Dec 2017 16:58:35 +0000 (11:58 -0500)]
Service logic logging fixes
Update MetricLogger class to properly escape characters within body
of response. Also, used SvcLogicGraph.toString method to simplify
logging call.
Change-Id: I6bcaaf3c67032df041c6d37372016990ff0199d3
Issue-ID: CCSDK-152
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Tue, 5 Dec 2017 16:50:42 +0000 (11:50 -0500)]
SLI parser improvements
Update SLI parser to remove validation based on NODE_TYPE table, which
is no longer needed (was introduced prior to use of XSD schema
validation). Also, use checksums to avoid needless recompilation
if version being loaded already exists in database.
Change-Id: Idfcba94de8fb71b17d5e0c5e69e04dee266988b1
Issue-ID: CCSDK-152
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Tue, 21 Nov 2017 20:29:19 +0000 (15:29 -0500)]
Fix version.properties
Reset patch version in version.properties to zero
Change-Id: If331cd45026f27b1232621535b2d7facf3bbd387
Issue-ID: CIMAN-120
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Mon, 20 Nov 2017 20:10:26 +0000 (15:10 -0500)]
Update parent version
Parent version should be 1.2.0, not 1.2.1-SNAPSHOT
Change-Id: I678f264135223d45bb632df86d2854bbb51307e3
Issue-ID: CIMAN-120
Signed-off-by: Dan Timoney <dtimoney@att.com>
Jessica Wagantall [Sat, 18 Nov 2017 00:51:44 +0000 (16:51 -0800)]
Bump minor version
Bump minor version in preparation for Amsterdam
branching. (part 2)
Change-Id: Ib9f7cf7f98feb159ce1b136a3cd792820c99e659
Issue-ID: CIMAN-120
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Jessica Wagantall [Fri, 17 Nov 2017 07:48:25 +0000 (23:48 -0800)]
Bump minor version
Bump minor version in preparation for Amsterdam
branching.
Change-Id: Ifa47aa1d818d4a632afb02ec342124678ad855e1
Issue-ID: CIMAN-120
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Rich Bennett [Wed, 15 Nov 2017 11:50:18 +0000 (06:50 -0500)]
Rm docs in repo consolidated w/ ccsdk/distribution
Change-Id: I573779aa46dfbf9f1c7956ecf0e4eedf16184417
Issue-ID: DOC-130
Signed-off-by: Rich Bennett <rb2745@att.com>
Dan Timoney [Thu, 9 Nov 2017 12:47:33 +0000 (12:47 +0000)]
Merge "Update version.properties"
Dan Timoney [Thu, 9 Nov 2017 12:30:49 +0000 (07:30 -0500)]
Update version.properties
Change version.properties to next release
Change-Id: I99fc70938511254d126a9220f4cef71fce551efe
Issue-ID: CCSDK-141
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Thu, 9 Nov 2017 12:14:12 +0000 (12:14 +0000)]
Merge "Roll version to 0.1.3-SNAPSHOT"
Dan Timoney [Wed, 8 Nov 2017 22:10:13 +0000 (17:10 -0500)]
Roll version to 0.1.3-SNAPSHOT
Roll to next snapshot version to prepare for release cut
Change-Id: I2a4c8395630b461314291bc8e0f83bf114a21f61
Issue-ID: CCSDK-141
Signed-off-by: Dan Timoney <dtimoney@att.com>
Morgan Richomme [Wed, 8 Nov 2017 07:53:23 +0000 (08:53 +0100)]
Fix Doc8 errors
JIRA: CCSDK-139
Change-Id: I5b48d4189ae9fdd72bb85a4d98be7798452249df
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Dan Timoney [Wed, 25 Oct 2017 19:21:43 +0000 (15:21 -0400)]
Use version 0.1.0 of parent
Update to use version 0.1.0 (released version) of parent pom
Change-Id: I3b62a0cab11425ae9eb7e074aa1c23585aede1c4
Issue-ID: CCSDK-80
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Wed, 25 Oct 2017 18:08:31 +0000 (14:08 -0400)]
Add unit test case for PrintYangToProp
Add junit testing for PrintYangToProp
Change-Id: I8c377bb51c812ea9ead32d8e9d5ef871157162a8
Issue-ID: CCSDK-129
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Wed, 25 Oct 2017 16:04:26 +0000 (12:04 -0400)]
Fix parent tag in utils/provider
utils/provider parent should be utils, not ccsdk-sli-core. This was
breaking release build.
Change-Id: I3910189f9a989f93a0a8af4cb5a8512f0e9aca7a
Issue-ID: CCSDK-80
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Wed, 25 Oct 2017 00:19:45 +0000 (20:19 -0400)]
Fix release version
version.properties contains wrong setting for release version
Change-Id: Id76da3e2ad9009845e99ac1442cb66514733461c
Issue-ID: CCSDK-80
Signed-off-by: Dan Timoney <dtimoney@att.com>
Sheshi Chinthakayala [Wed, 18 Oct 2017 20:55:47 +0000 (15:55 -0500)]
added code to convert yang to properties
this code is used by dgbuilder to convert the yang to context property names
Change-Id: Ib53f57df6e8bd32a3a1b7ba6fa7854497c1f5c6c
Issue-ID: SDNC-81
Signed-off-by: Sheshi Chinthakayala <sc2914@att.com>
surya-huawei [Thu, 12 Oct 2017 06:18:42 +0000 (11:48 +0530)]
Add @Override annotation
*This is improve readability of source code
Issue-Id: CCSDK-117
Change-Id: I4bb73a6e4b440ae861045c7548a7e985d1fbf02c
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
Dan Timoney [Wed, 11 Oct 2017 15:01:38 +0000 (11:01 -0400)]
Add readthedocs info to sli/core
Add additional information to sli/core readthedocs documentation.
Change-Id: I9fe5e6185061ed6a05f373b6667f686e11d5f0aa
Issue-ID: CCSDK-107
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Tue, 10 Oct 2017 20:59:25 +0000 (16:59 -0400)]
Add readthedocs templates
Add readthedocs templates for sli/core
Change-Id: I2efaad7720997ef51c4dcb9036de5011bc6a1c4b
Issue-ID: CCSDK-107
Signed-off-by: Dan Timoney <dtimoney@att.com>
Dan Timoney [Tue, 3 Oct 2017 23:14:56 +0000 (23:14 +0000)]
Merge "SLI-API northbound add to docs"
Dan Timoney [Tue, 3 Oct 2017 13:35:52 +0000 (13:35 +0000)]
Merge "Add unit tests for dblib"
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>
surya-huawei [Tue, 3 Oct 2017 10:39:04 +0000 (16:09 +0530)]
Add unit test for ccsdk/core
*Add a unit test for SliStringUtils
This is to test substring method of SliStringUtils
and improve code coverage
Issue-Id: CCSDK-106
Change-Id: I73c5af3b036a92fdcb1d3d1be7eb0b3abc44fd5a
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
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>
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>
Brian Freeman [Thu, 28 Sep 2017 20:31:06 +0000 (20:31 +0000)]
SLI-API northbound add to docs
Issue-ID: CCSDK-107
Change-Id: Ic4a41466288229140ae3cad79e650d14c7877cc9
Signed-off-by: Brian Freeman <bf1936@att.com>
Dan Timoney [Thu, 28 Sep 2017 13:03:22 +0000 (13:03 +0000)]
Merge "Added @Override annotation"
Dan Timoney [Thu, 28 Sep 2017 13:03:11 +0000 (13:03 +0000)]
Merge "Fix major sonar issue"
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>
Dan Timoney [Thu, 28 Sep 2017 07:21:00 +0000 (07:21 +0000)]
Merge "Remove redundant casts"
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>
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>
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>
Dan Timoney [Wed, 27 Sep 2017 19:31:23 +0000 (19:31 +0000)]
Merge "Refinements to core"
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>
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>
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>
Dan Timoney [Wed, 27 Sep 2017 07:53:31 +0000 (07:53 +0000)]
Merge "Use Long.toString instead"
Dan Timoney [Wed, 27 Sep 2017 07:47:35 +0000 (07:47 +0000)]
Merge "Some minor refinements in CCSDK SLI Core module"
Dan Timoney [Wed, 27 Sep 2017 07:47:00 +0000 (07:47 +0000)]
Merge "Remove hardcoded dependency versions"
Dan Timoney [Wed, 27 Sep 2017 07:44:46 +0000 (07:44 +0000)]
Merge "Fixes for SvcLogicActivator"
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>
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>
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>
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>
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>
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>
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
Dan Timoney [Fri, 22 Sep 2017 12:12:53 +0000 (12:12 +0000)]
Merge "Add "@Override" annotation"
Dan Timoney [Fri, 22 Sep 2017 12:09:12 +0000 (12:09 +0000)]
Merge "Resolved sonar issue."
Dan Timoney [Fri, 22 Sep 2017 12:07:22 +0000 (12:07 +0000)]
Merge "Sql query blocker issue fixed."
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>
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>
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>
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>
Dan Timoney [Thu, 21 Sep 2017 14:49:31 +0000 (14:49 +0000)]
Merge "Improve code coverage for MdsalHelper"
Dan Timoney [Thu, 21 Sep 2017 14:48:36 +0000 (14:48 +0000)]
Merge "Remove unnecessary parentheses"
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>
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>
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>
Dan Timoney [Wed, 20 Sep 2017 20:02:58 +0000 (20:02 +0000)]
Merge "Abstract utility classes for re-use"
Dan Timoney [Wed, 20 Sep 2017 19:59:55 +0000 (19:59 +0000)]
Merge "Fix Sonar Issues in sli/core module"
Dan Timoney [Wed, 20 Sep 2017 19:58:23 +0000 (19:58 +0000)]
Merge "Fixes for MdsalHelper util"
Dan Timoney [Wed, 20 Sep 2017 19:32:15 +0000 (19:32 +0000)]
Merge "Fix Sonar Issue"
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>
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>
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>
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>
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>
Dan Timoney [Tue, 19 Sep 2017 23:58:10 +0000 (23:58 +0000)]
Merge "Use Junit4 instead of Junit3 in sli/common"
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>
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>
Dan Timoney [Tue, 19 Sep 2017 18:31:36 +0000 (18:31 +0000)]
Merge "Fix few Major sonar issues"
Dan Timoney [Tue, 19 Sep 2017 18:31:16 +0000 (18:31 +0000)]
Merge "Fix few Major sonar issues"
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>
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>
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>
Dan Timoney [Mon, 18 Sep 2017 16:38:43 +0000 (16:38 +0000)]
Merge "Fix few Major sonar issues"
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>
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>
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>
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>
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>
Dan Timoney [Sat, 16 Sep 2017 00:11:21 +0000 (00:11 +0000)]
Merge "Fix few Major sonar issues"
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>
Dan Timoney [Fri, 15 Sep 2017 13:52:10 +0000 (13:52 +0000)]
Merge "Log current DG & NodeId using MDC"
Dan Timoney [Fri, 15 Sep 2017 13:42:48 +0000 (13:42 +0000)]
Merge "Fix Blocker/Critical sonar issues"
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>
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>
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>
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>
Dan Timoney [Thu, 14 Sep 2017 18:21:17 +0000 (18:21 +0000)]
Merge "Fix critical issues"
Dan Timoney [Thu, 14 Sep 2017 18:15:38 +0000 (18:15 +0000)]
Merge "Fix SDNC service registration"
Dan Timoney [Thu, 14 Sep 2017 18:14:59 +0000 (18:14 +0000)]
Merge "Fix few sonar issues"
Marcus Williams [Thu, 14 Sep 2017 17:57:40 +0000 (17:57 +0000)]
Merge "Clean up public interfaces"
Marcus Williams [Thu, 14 Sep 2017 17:51:03 +0000 (17:51 +0000)]
Merge "Use oparent-odlparent in sli/core"
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>
Marcus Williams [Thu, 14 Sep 2017 16:28:52 +0000 (16:28 +0000)]
Merge "Clean up BaseDBConfiguration class"
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>