summaryrefslogtreecommitdiffstats
path: root/appc-config/appc-config-generator
AgeCommit message (Collapse)AuthorFilesLines
2019-05-22Fix escapeInternalJson methodPatrick Brady1-8/+23
The method incorrectly handled cases where the json string contained json objects internally. These cases should be handled correctly now. Change-Id: I43b40414526bcb6577242ab737097dfb9119e618 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1576
2019-05-20Update parent versionPatrick Brady6-6/+6
Update the parent version to match the new 2.* parent versioning. Change-Id: I77280d8cf12de1de20c01249491dc85243f5d655 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1601
2019-05-02Add method to escape json stringsPatrick Brady3-0/+86
All backslash escape characters are being stripped out of strings. They need to be added back to strings containing json data. Change-Id: Ic8d9ba95da904b96f65598752133971f8c324694 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1576
2019-04-30Fix for extra json quotesPatrick Brady1-1/+1
Substring method output was being lost, causing extra quotes to stay in the String. Change-Id: I35e9eee60756b7b743386600e3ab1d203cca036a Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1576
2019-04-26Increment snapshot versionPatrick Brady6-7/+7
Change from 1.5.0-SNAPSHOT to 1.6.0-SNAPSHOT to prepare for next development cycle. Change-Id: I187785ab4b11a37815289d20ba802c48e86cee7f Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1585
2019-04-22Escape quotes in json stringsPatrick Brady1-2/+11
The JSONObject parser strips all text of backslash escape characters, even if it is treaing the object as a string and not a series of json keys. If a string contains a json object within it, the removal of these escape characters causes problems. Adding the JSONObject.quote method on all strings to automatically add escape characters to any strings which contain characters requiring escapes. Change-Id: Ifac68844dd132971ba35803f1b9c03a5372bd500 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1576
2019-04-10Fix for Ansible Healthcheck bugJoss Armstrong2-18/+18
Update to directed graph and merge JSON template code Issue-ID: APPC-1472 Change-Id: I4332ad74d34f455261b1c001339d0542be4514fc Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>
2019-03-15Revert "upgrade databind artifact"Patrick Brady4-37/+0
Fasterxml databind is being brought in to karaf by opendaylight and trying to force a different version for the appc components is causing class errors. This reverts commit 52cf1a81d591efb2b1ee4b8c5a70b137dfb6c212. Change-Id: I6d0da2ed081e4abd4b83e8b11935ba43bee0e1aa Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1533
2019-03-13upgrade databind artifactTaka Cho4-0/+37
upgrade jackson's databind from 2.8.11.2 to 2.8.11.3 Change-Id: I9bf3ab8021f91f6ed36bdffdacbaeeac78d2e87c Issue-ID: APPC-1533 Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-02-26Fix for timeout error when logging >1MB dataJoss Armstrong2-4/+40
Potentially large logs moved to TRACE level, INFO level logs limited in size and related tests updated Issue-ID: APPC-1489 Change-Id: I9ea85e64380479d835da03ed2af3e4ab96ece67e Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>
2019-02-15Added test case for Config GeneratorLathishbabu Ganesan1-0/+63
Increased the coverage from 0% to 97% Issue-ID: APPC-1426 Change-Id: I667845ef9b36a85e5be51fd624028063b0f2ea77 Signed-off-by: Lathishbabu Ganesan <lathishbabu.ganesan@ericsson.com>
2019-02-07added test case to TestDataTool.javaSandeep J1-1/+11
to increase code coverage Issue-ID: APPC-1086 Change-Id: I1602078de42c9815fe81b76425939752610446aa Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2019-01-18Update install-feature for pre-installPatrick Brady1-3/+1
Since the feature zip files will be extracted during docker build, the install-features scripts need to be modified so that the script will not fail when the zip file does not exist, since the zip file will have already been unzipped. Change-Id: I441064226db956addae5c2f238114ce3965c13ef Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1337
2019-01-08Change parent version to appc snapshotPatrick Brady6-6/+6
Changing to the current release snapshot version of the appc parents instead of the previous release version. This allows updated changes to parents to be in builds. Change-Id: I6cec484012c2cb48ee1ea7f10fd058d017f00947 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1304
2019-01-07Update parent pom versionPatrick Brady6-6/+6
Update the parent version to appc parent 1.4.1 Change-Id: I185d086595bed6410f7fd6b8c139cc6300e4467e Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1304
2018-12-03Fix for APPC-1264Joss Armstrong20-406/+298
Fixed broken unit tests. Improved unit testing and increased line and branch coverage. Deleted unused and duplicated files used in tests. Issue-ID: APPC-1264 Change-Id: Idea7d46f4a6c9c591617fb973a8d33e5275e4579 Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>
2018-11-29added test cases to TestMergeNode.javaSandeep J1-0/+40
to increase code coverage Issue-ID: APPC-1086 Change-Id: I7113c096993247135d54dcb9b686f1006907ca33 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-11-28added test case to TestXSLTTransformerNodeSandeep J1-1/+11
to increase code coverage Issue-ID: APPC-1086 Change-Id: I4e185d1c1117f0bab6a63618621b55aef376a2c9 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-11-28added test case to TestDataTool.javaSandeep J1-2/+9
to increase code coverage Issue-ID: APPC-1086 Change-Id: If4e5bacbfe63bca2d0859f2f86623044c6cba3a2 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-11-28added test case to TestPatternNode.javaSandeep J1-1/+16
to increase code coverage Issue-ID: APPC-1086 Change-Id: I4b0ac6e586245c532a2a698b2907d518ce4d6adb Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-11-28added test case to TestConvertNode.javaSandeep J1-1/+52
to increase code coverage Issue-ID: APPC-1086 Change-Id: Ia5890e45849fad0a17753fe03c217a60777a8945 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-11-12Increment version numberPatrick Brady6-7/+7
Changing to version 1.5.0-SNAPSHOT Change-Id: I1e0773d16cb058ac2fb96718581cfbf8d716a2e0 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1212
2018-10-11Roll to next version after releasePatrick Brady6-7/+7
Change to version 1.4.1-SNAPSHOT Change-Id: Ie6238743cbe2bebeb122ce3985fb2488d9a6c62e Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1212
2018-10-09Change to released parent pomsPatrick Brady6-6/+6
Change-Id: I298b1ac52c849320b67c649017b3604490a5063b Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1212
2018-10-01Last few pom files missing versionPatrick Brady1-0/+1
Change-Id: I8fbf26f06ea770bae85d0ad4943148225895a885 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1208
2018-09-24Add version to pom filesPatrick Brady2-0/+2
Change-Id: Ia7eaffdb1391b0b836a2911395c2b768b4926ef3 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1208
2018-09-21Remove logback 1.1.3 security issuePatrick Brady1-1/+11
cdp-pal and eelf are the dependencies using logback-classic 1.1.3. Need to use exclusions option in pom file Change-Id: Id8f5817ec955e2b7b486bc0215c35541086606aa Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1018
2018-09-11Misplaced shebangs and missing exec flagsNicolas Edel1-2/+2
patch description: Restore of valid shebang lines and exec flags Change-Id: Id44c9d4ac9f2243f478213b34f61a30576ca2235 Issue-ID: APPC-1203 Signed-off-by: Nicolas Edel <nicolas.edel@orange.com>
2018-08-31Remove excess feature filesPatrick Brady1-27/+0
These feature stub files were accidently created, they should not be in these projects. Change-Id: Ib710d4d9be3d2f323ba2e4cfca31b2951777825f Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1185
2018-08-21Revert "resolving logback-classic 1.13"Patrick Brady1-11/+1
Temporary revert to fix failing bundles. This reverts commit 76b6ff1ce84d4c2ab4518dd5f154083b91680245. Change-Id: Ibce5eee91ad8f1bec9b458a52a7f5d25ada85da9 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1018 Signed-off-by: Patrick Brady <pb071s@att.com>
2018-08-20resolving logback-classic 1.13 from security issueTaka Cho1-1/+11
cdp-pal and eelf are the jar using logback-classic 1.1.3. need to use exclusions option in pom file Issue-ID: APPC-1018 Change-Id: I00b41f9c366a5ead3f4205cd6fa6b9eb74599767 Signed-off-by: Taka Cho <tc012c@att.com>
2018-08-17added test xml data to xml_data.xmlSandeep J1-0/+6
the code coverage for isXML method in CheckDataTool.java in appc-config-generator was failing because there was no data in xml_data.xml. So, added some test data. Now the coverage is happening properly. Issue-ID: APPC-1086 Change-Id: Iab203d502b145a83e7479dfaabfe8474ec629d90 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-17added test cases to TestXSLTTransformerNode.javaSandeep J1-1/+19
to increase code coverage Issue-ID: APPC-1086 Change-Id: If07e899b03ba416b94675dfdcf1e45c5c365822d Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-17added test case to TestFileWriterNode.javaSandeep J1-1/+12
to increase code coverage Issue-ID: APPC-1086 Change-Id: I4665f2da142c4f5aaf01af8275ae480542a84cec Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-14Karaf 4 for appc-configPatrick Brady9-120/+211
Change-Id: I3059bf9bca4320d29432b749df6c55aecbdb22e9 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1144
2018-08-09added test case to testDataTool.javaSandeep J1-0/+10
to increase code coverage Issue-ID: APPC-1086 Change-Id: If736ff2d7cd30f6762ecb6bdc267b4a7c7f51c07 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-09added test case to TestPatternNode.javaSandeep J1-0/+13
to increase code coverage Issue-ID: APPC-1086 Change-Id: I4d035ffb81367fd4de4004d4aefa8a6433e4fd7d Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-09added test case to TestMergeNode.javaSandeep J1-0/+19
to increase code coverage Issue-ID: APPC-1086 Change-Id: If9a93361b275df98412dc23410a2094e340b7c9c Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-09added test case to TestConvertNode.javaSandeep J1-1/+17
to increase code coverage Issue-ID: APPC-1086 Change-Id: If2320397a735dd4f510350802df631cb132145e8 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-06-14Update license header in appc xml filesJohn McClung4-8/+4
More license header changes to miscellaneous appc xml files to reflect the 2018 changes. Change-Id: Ia71a0711235ab56bf2cd83719964bc12d7aa420b Issue-ID: APPC-1004 Signed-off-by: John McClung <jm1364@att.com>
2018-06-14Update lic header in appc client and config xmlJohn McClung6-13/+6
Modify license header in appc-adapter xml, appc-client xml and appc-config xml files to reflect 2018 changes. Change-Id: I1b7bd41a43ca5662ed4d293a33f468e443551fd7 Issue-ID: APPC-1000 Signed-off-by: John McClung <jm1364@att.com>
2018-06-13More updates to lic header in appc propertiesJohn McClung1-2/+1
License header fixes to reflect 2018 changes in various appc-adapters, appc-client, appc-common, appc-config, appc-dg and appc-directed-graph java and properties files. Change-Id: Idbe000f175e11ba42f6e83689a2b2d3d353be008 Issue-ID: APPC-996 Signed-off-by: John McClung <jm1364@att.com>
2018-06-05Update license header in appc-config filesJohn McClung19-38/+19
Modify license header in appc-config-audit and appc-config-generator java files to reflect 2018 changes. Change-Id: I85f7e62a9f2d9fe2b00461baf32eb735325a8a9b Issue-ID: APPC-971 Signed-off-by: John McClung <jm1364@att.com>
2018-06-01Continue removing ECOMP trademark from lic header.John McClung5-10/+5
Remove ECOMP trademark license header in miscellaneous files. Change-Id: I76e386462402cb959de377b56997ecf7986ffd6b Issue-ID: APPC-931 Signed-off-by: John McClung <jm1364@att.com>
2018-05-22Increment version for new branchPatrick Brady4-5/+5
Change from version 1.3.0-SNAPSHOT to 1.4.0-SNAPSHOT and update version file. Change-Id: I6b54c3e3b97c3ef0a554fb173d0dd261ca2107d3 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-916
2018-04-11ODL Upgrade Method 2Patrick Brady4-50/+29
Changes necessary to support upgrade to ODL Nitrogen, while continuing to use Karaf 3 style features Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-403
2018-02-27security issue: commons-collectionsTaka Cho1-1/+12
Change-Id: I74a56640065ae6c6a470835ab1022ed0f266fc09 Issue-ID: APPC-665 Signed-off-by: Taka Cho <tc012c@att.com>
2018-02-26appc-config-generator-provider sonar fixes part 2Jakub Dudycz17-153/+134
Sonar fixes in whole module Change-Id: I55856a6ce73a73098dadb2c5b9428437349ed8a8 Issue-ID: APPC-671 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
2018-02-26appc-config-generator-provider sonar fixes part 1Jakub Dudycz9-66/+69
Initial code reformat and import rearrangement Change-Id: I0a808bc3043d8558d96f15e0b695fddf5333bab1 Issue-ID: APPC-671 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
2018-02-20Update .gitignore with license textSkip Wonnell3-0/+67
Update .gitignore with license text Remove IDE generated files from repository Update .gitignore to ignore IDE Generated files Issue-ID: APPC-637 Change-Id: Ie650e2c6d46d55d06dcc54877533cb3e14be66d6 Signed-off-by: Skip Wonnell <skip@att.com>