Skip to content

Commit

Permalink
# **json2puml v2.2.11.107** - 01.01.2024
Browse files Browse the repository at this point in the history
## All Editions
### Changed Feature
- Inputlist.description.curlparameter.name handling improved
  - Not the names will automatically converted into the ${<name>} format
  - This fixes the wrong check if the parameter is defined at runtime which could lead to duplicate curlparameters
- All property name filters which are supporting wildcards are supporting now to exclude a property from a previous found by supporting a remove with a leading "-".
  E.g.
  "product*"
  "-productOffering"
  This will allow product and productCharacteristic but not productOffering.
- Internal performance optimization (by caching) when searching in the definition configurations
- Performance optimization by doing one plantuml call to convert all files of the same output format
- Installation uses now PlantUml v1.2023.13
  • Loading branch information
jfudickar committed Jan 1, 2024
1 parent 825c02e commit b14afae
Show file tree
Hide file tree
Showing 36 changed files with 4,161 additions and 663 deletions.
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
*.formatted.json
/samples-local
*.mes
/source/json2pumltest.dpr
/source/json2pumltest.dproj
/source/json2pumltest.dsk
/source/json2pumltest.res
*.log
*.dsv


17 changes: 16 additions & 1 deletion documentation/changelog.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
# **json2puml v2.2.11.107** - 01.01.2024
## All Editions
### Changed Feature
- Inputlist.description.curlparameter.name handling improved
- Not the names will automatically converted into the ${<name>} format
- This fixes the wrong check if the parameter is defined at runtime which could lead to duplicate curlparameters
- All property name filters which are supporting wildcards are supporting now to exclude a property from a previous found by supporting a remove with a leading "-".
E.g.
"product*"
"-productOffering"
This will allow product and productCharacteristic but not productOffering.
- Internal performance optimization (by caching) when searching in the definition configurations
- Performance optimization by doing one plantuml call to convert all files of the same output format
- Installation uses now PlantUml v1.2023.13

# **json2puml v2.2.10.106** - 05.09.2023
## All Editions
### Changed Feature
- Inputlistfile.curlFileNameSuffix handling improved
- Inputlistfile.curlFileNameSuffix handling improved (#12)
- Curl Variables with "." are now supported
- if the first character is not ".", "-" or "_" a "." will be added

Expand Down
Binary file modified documentation/json2puml documentation.docx
Binary file not shown.
Binary file modified documentation/json2puml documentation.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions installation/json2pumlsetup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#define MyAppVersion GetVersionNumbersString("..\source\Win64\Release\json2puml.exe")
#define MyAppPublisher "Jens Fudickar"
#define MyAppExeName "json2puml.exe"
#define plantumljarversion "1.2023.11"
#define plantumljarlink "https://github.com/plantuml/plantuml/releases/download/v1.2023.11/"
#define plantumljarfile "plantuml-1.2023.11.jar"
#define plantumljarversion "1.2023.13"
#define plantumljarlink "https://github.com/plantuml/plantuml/releases/download/v1.2023.13/"
#define plantumljarfile "plantuml-1.2023.13.jar"

[Setup]
; NOTE: The value of AppId uniquely identifies this application.
Expand All @@ -30,7 +30,7 @@ UsePreviousGroup=true
WizardStyle=modern
AlwaysShowGroupOnReadyPage=True
AlwaysShowDirOnReadyPage=True
AppCopyright=(c) by Jens Fudickar in 2023
AppCopyright=(c) by Jens Fudickar in 2023-2024
VersionInfoVersion={#MyAppVersion}
VersionInfoCompany=Softwaredevelopment Jens Fudickar
VersionInfoDescription=Json2Puml Installation File
Expand Down
136 changes: 47 additions & 89 deletions samples/tmf/tmf-definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"legendShowInfo": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": {
"attributeProperties": {
"operation": "replace",
"list": [
"id",
Expand Down Expand Up @@ -50,27 +50,7 @@
"metadata*"
],
"pumlHeaderLines": [
],
"objectFormats": {
"baseFormat": {
"objectFilter": [],
"iconColor": null,
"skinParams": [],
"captionShowIdent": null,
"captionShowTitle": null,
"captionShowType": null,
"captionSplitCharacter": null,
"captionSplitLength": null,
"showAttributes": null,
"showCharacteristics": null,
"showFromRelations": null,
"showIfEmpty": null,
"showNullValues": null,
"showToRelations": null,
"sortAttributes": null,
"valueSplitLength": null
}
}
]
}
},
{
Expand All @@ -83,13 +63,13 @@
"legendShowInfo": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": {
"attributeProperties": {
"operation": "replace",
"list": [
"*"
]
},
"objectProperties": {
"objectProperties": {
"operation": "replace",
"list": [
"geographicAddress",
Expand Down Expand Up @@ -125,27 +105,7 @@
"metadata*"
],
"pumlHeaderLines": [
],
"objectFormats": {
"baseFormat": {
"objectFilter": [],
"iconColor": null,
"skinParams": [],
"captionShowIdent": null,
"captionShowTitle": null,
"captionShowType": null,
"captionSplitCharacter": null,
"captionSplitLength": null,
"showAttributes": null,
"showCharacteristics": null,
"showFromRelations": null,
"showIfEmpty": null,
"showNullValues": null,
"showToRelations": null,
"sortAttributes": null,
"valueSplitLength": null
}
}
]
}
},
{
Expand Down Expand Up @@ -222,7 +182,7 @@
"attributeProperties": [
"*"
],
"objectProperties": {
"objectProperties": {
"operation": "replace",
"list": [
{"objectName": "*","generateWithoutIdentifier": "true"}
Expand Down Expand Up @@ -284,15 +244,15 @@
"legendShowInfo": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": {
"attributeProperties": {
"operation": "replace",
"list": [
"id",
"*name",
"status"
]
},
"objectProperties": {
"objectProperties": {
"operation": "replace",
"list": [
"product",
Expand All @@ -307,7 +267,7 @@
],
"objectTitleProperties": [
],
"objectDetailProperties": {
"objectDetailProperties": {
"operation": "replace",
"list": [
]
Expand Down Expand Up @@ -358,17 +318,19 @@
"legendShowInfo": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": {
"attributeProperties": {
"operation": "replace",
"list": [
"*"
]
},
"objectProperties": {
"objectProperties": {
"operation": "replace",
"list": [
"product",
"productPrice",
"productOffering",
"productSpecification",
"customer"
]
},
Expand All @@ -380,7 +342,7 @@
],
"objectTitleProperties": [
],
"objectDetailProperties": {
"objectDetailProperties": {
"operation": "replace",
"list": [
]
Expand All @@ -398,27 +360,7 @@
"hiddenProperties": [
],
"pumlHeaderLines": [
],
"objectFormats": {
"baseFormat": {
"objectFilter": [],
"iconColor": null,
"skinParams": [],
"captionShowIdent": null,
"captionShowTitle": null,
"captionShowType": null,
"captionSplitCharacter": null,
"captionSplitLength": null,
"showAttributes": null,
"showCharacteristics": null,
"showFromRelations": null,
"showIfEmpty": null,
"showNullValues": null,
"showToRelations": null,
"sortAttributes": null,
"valueSplitLength": null
}
}
]
}
},
{
Expand All @@ -431,15 +373,15 @@
"legendShowInfo": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": {
"attributeProperties": {
"operation": "replace",
"list": [
"id",
"*name",
"status"
]
},
"objectProperties": {
"objectProperties": {
"operation": "replace",
"list": [
{"objectName": "*","generateWithoutIdentifier": "true"}
Expand Down Expand Up @@ -502,7 +444,7 @@
"legendShowInfo": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": {
"attributeProperties": {
"operation": "replace",
"list": [
"id",
Expand Down Expand Up @@ -603,6 +545,7 @@
"itemPrice",
"productPrice",
"productOffering",
"productSpecification",
"agreement",
"agreementItem",
"paymentMethod",
Expand All @@ -621,8 +564,7 @@
"billsummary",
"billsummaryItem",
"subscription",
"PartyPrivacyProfile",
"partyPrivacyProfileSpecification"
"partyPrivacyProfile"
],
"objectTypeProperties": [
"refType",
Expand Down Expand Up @@ -725,6 +667,7 @@
{"parentProperty": "troubleticket.statusChange", "type": "list", "propertyList": ["changeDate", "status", "*"]},
{"parentProperty": "note", "type": "list", "propertyList": ["date", "author", "text", "*"]},
{"parentProperty": "historyChange", "type": "list", "propertyList": ["operation", "path", "oldValue", "newValue", "*"]},
{"parentProperty": "actionReason", "type": "list", "propertyList": ["action", "reason", "*"]},
{"parentProperty": "*characteristic", "type": "list", "propertyList": ["name", "value", "*", "-metadataType", "-valueMetadata"]},
"tax*Amount",
"exemptAmount",
Expand All @@ -736,6 +679,7 @@
"presentationMedia",
"format",
"cycleSpecification",
"partyPrivacyProfileSpecification",
"periodCoverage",
"taxDefinition",
"immediatePayOption",
Expand Down Expand Up @@ -831,14 +775,6 @@
"skinParams": ["BackgroundColor=deepskyBlue"]
}
},
{
"formatName": "productOffering",
"definition": {
"objectFilter": ["productOffering"],
"iconColor": "IndianRed",
"skinParams": ["BackgroundColor=DarkSalmon"]
}
},
{
"formatName": "productOrder",
"definition": {
Expand All @@ -852,21 +788,43 @@
"orderTotalPrice"
],
"iconColor": "DarkGreen",
"skinParams": ["BackgroundColor=Lime"]
"skinParams": ["BackgroundColor=LimeGreen"]
}
},
{
"formatName": "product",
"definition": {
"objectFilter": ["product"],
"iconColor": "Green",
"skinParams": ["BackgroundColor=LawnGreen"]
}
},
{
"formatName": "productDetails",
"definition": {
"objectFilter": [
"product*",
"product.*",
"-productOffering",
"-productSpecification",
"Price",
"appliedCustomerBillingRate"
],
"iconColor": "Green",
"skinParams": ["BackgroundColor=LightGreen"]
}
},
{
"formatName": "productCatalogue",
"definition": {
"objectFilter": [
"productOffering",
"productSpecification"
],
"iconColor": "IndianRed",
"skinParams": ["BackgroundColor=DarkSalmon"]
}
},
{
"formatName": "customer",
"definition": {
Expand All @@ -883,8 +841,8 @@
"agreementItem",
"commitment"
],
"iconColor": "Crimson",
"skinParams": ["BackgroundColor=red"]
"iconColor": "LimeGreen",
"skinParams": ["BackgroundColor=lime"]
}
},
{
Expand Down
6 changes: 4 additions & 2 deletions source/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# IDE files
*.~*~
*.~*
*.local
*.identcache
__history
Expand All @@ -19,9 +19,11 @@ __recovery
*.dcp
*.o
*.
*.dsk

# Output Folder
/Win32
/Win64
/Linux64
/*.~dsk

json2pumltest.*
Loading

0 comments on commit b14afae

Please sign in to comment.