summaryrefslogtreecommitdiffstats
path: root/appc-config/appc-config-generator/provider/src/main
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 (cherry picked from commit fc2018739d072a0287b84ff78c94572bce5aba7c)
2019-05-03Add method to escape json stringsPatrick Brady2-0/+44
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-05-03Fix 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-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 Armstrong1-16/+16
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-02-26Fix for timeout error when logging >1MB dataJoss Armstrong1-1/+16
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>
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 McClung15-30/+15
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 McClung2-4/+2
Remove ECOMP trademark license header in miscellaneous files. Change-Id: I76e386462402cb959de377b56997ecf7986ffd6b Issue-ID: APPC-931 Signed-off-by: John McClung <jm1364@att.com>
2018-02-26appc-config-generator-provider sonar fixes part 2Jakub Dudycz16-131/+112
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-15JSONTool sonar fixesJakub Dudycz1-37/+39
Change-Id: I457ac55fa17475a19a2e511a6e7813070ffd6d2e Issue-ID: APPC-634 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
2018-02-14MergeNode sonar fixesJakub Dudycz2-46/+46
Change-Id: I436feb6a4b42c9a1a5a5c887204e745bd09928f1 Issue-ID: APPC-632 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
2018-02-14ConvertNode sonar fixesJakub Dudycz3-76/+93
Change-Id: I1b8f19f57e90c1be5cec2bdd37d7db4216221710 Issue-ID: APPC-631 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
2018-02-14EscapeUtils sonar fixesJakub Dudycz1-35/+24
Change-Id: I77e46ec0e71cd37071c725877621fa28c092bfa9 Issue-ID: APPC-633 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
2018-02-07Removing old name referencesPatrick Brady2-2/+2
Removing references to bvc, att Change-Id: I794861fe40b96c922f6e5c011b2fe5d2c4bc515b Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-292
2018-01-26Fixes in ConfigGeneratorConstantburdziak1-33/+33
Change-Id: I1c825fe403721ce9c47a95edb77475a3bd95b46c Issue-ID: APPC-541 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
2017-12-19Update bundle names from openecomp to onapTakamune Cho1-1/+1
Change-Id: Ib0cf4edbab87a32c9d83cc9473412feb77b27a0e Issue-ID: APPC-13 Signed-off-by: Takamune Cho <tc012c@att.com>
2017-12-19Update appc-config-generator to use onap packagingTakamune Cho18-509/+581
Change-Id: Ia89d9eb8f56c8ac0e46cbe1b473f7cfced32228a Issue-ID: APPC-13 Signed-off-by: Takamune Cho <tc012c@att.com>
2017-12-13Second part of onap renamePatrick Brady17-0/+0
This is the second commit of the rename. The folder structure is renamed for appc-adapters and appc-config in this commit. Change-Id: Iaa2b8c937ff1ca1b5d1178128961fb115ee65d9b Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-13
2017-10-10Change for Quote IssueSonali Das2-2/+17
Issue-ID : APPC-221 Change in appc-config-generator appc-artifact-handler Change-Id: I9abaef2839ca60f10855a61c48fa696be012db5f Signed-off-by: Sonali Das <sd394g@att.com>
2017-09-07Fix dblib DBResourceManager instantiationMarcus G K Williams1-1/+1
Fix APPC Build, failing upstream and locally due to change in CCSDK that changes dblib to use service injection via Aries Blueprint. The change causing this in CCSDK is https://gerrit.onap.org/r/#/c/7931/ Issue-Id: APPC-196 Change-Id: I9bcfb6d87b7527fd07cb76a242b272a5bc0ad07c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2017-09-07Change to CCSDK and ODL CarbonPatrick Brady7-20/+20
Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc Signed-off-by: Patrick Brady <pb071s@att.com> Issue-Id: [APPC-91] Issue-Id: [APPC-158]
2017-08-17Initial commit for config-generator bundleSkip Wonnell18-0/+1529
This bundle contains logic for creating the configuration, reading templates, and merging the data together Issue-ID: APPC-59 Change-Id: Ifd745964f659f075250d6acaf1b5f033da28e1c4 Signed-off-by: Skip Wonnell <kw5258@att.com>