Skip to content

Commit de9168b

Browse files
jfudickarjfudickar
committed
samples and documentation updated
1 parent 7db2f28 commit de9168b

File tree

6 files changed

+130
-33
lines changed

6 files changed

+130
-33
lines changed

‎configuration/json2pumlconfiguration.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"${Json2PumlBaseDir}\\samples\\tvmaze\\*definition*.json"
2929
],
3030
"inputListFileSearchFolder": [
31-
"${Json2PumlBaseDir}\\samples-local\\inputlisttest\\",
3231
"${Json2PumlBaseDir}\\samples-local\\c1\\definition\\*inputlist*.json",
3332
"${Json2PumlBaseDir}\\samples-local\\tmf\\inputlist\\*.json",
3433
"${Json2PumlBaseDir}\\samples\\curl\\*inputlist*.json",

‎documentation/models/buildPumlImages.cmd‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
java -jar ..\..\plantuml\plantuml.jar flow\mainflow.puml -png
2-
java -jar ..\..\plantuml\plantuml.jar flow\mainflow.puml -svg
1+
java -jar ..\..\plantuml\plantuml.jar flow\*.puml -png
2+
java -jar ..\..\plantuml\plantuml.jar flow\*.puml -svg
33

4-
java -jar ..\..\plantuml\plantuml.jar converterdefinition\converterdefinition.puml -png
5-
java -jar ..\..\plantuml\plantuml.jar converterdefinition\converterdefinition.puml -svg
4+
java -jar ..\..\plantuml\plantuml.jar converterdefinition\*.puml -png
5+
java -jar ..\..\plantuml\plantuml.jar converterdefinition\*.puml -svg
66

7-
java -jar ..\..\plantuml\plantuml.jar listfile\listfile.puml -png
8-
java -jar ..\..\plantuml\plantuml.jar listfile\listfile.puml -svg
7+
java -jar ..\..\plantuml\plantuml.jar listfile\*.puml -png
8+
java -jar ..\..\plantuml\plantuml.jar listfile\*.puml -svg
99

10-
java -jar ..\..\plantuml\plantuml.jar curlauthentication\curlauthentication.puml -png
11-
java -jar ..\..\plantuml\plantuml.jar curlauthentication\curlauthentication.puml -svg
10+
java -jar ..\..\plantuml\plantuml.jar curlauthentication\*.puml -png
11+
java -jar ..\..\plantuml\plantuml.jar curlauthentication\*.puml -svg
1212

13-
java -jar ..\..\plantuml\plantuml.jar jsonplaceholder\jsonplaceholdermodel.puml -png
14-
java -jar ..\..\plantuml\plantuml.jar jsonplaceholder\jsonplaceholdermodel.puml -svg
13+
java -jar ..\..\plantuml\plantuml.jar jsonplaceholder\*.puml -png
14+
java -jar ..\..\plantuml\plantuml.jar jsonplaceholder\*.puml -svg
1515

16-
java -jar ..\..\plantuml\plantuml.jar maincomponents\maincomponents.puml -png
17-
java -jar ..\..\plantuml\plantuml.jar maincomponents\maincomponents.puml -svg
16+
java -jar ..\..\plantuml\plantuml.jar maincomponents\*.puml -png
17+
java -jar ..\..\plantuml\plantuml.jar maincomponents\*.puml -svg
1818

19-
java -jar ..\..\plantuml\plantuml.jar globalconfigurationfile\globalconfigurationfile.puml -png
20-
java -jar ..\..\plantuml\plantuml.jar globalconfigurationfile\globalconfigurationfile.puml -svg
19+
java -jar ..\..\plantuml\plantuml.jar globalconfigurationfile\*.puml -png
20+
java -jar ..\..\plantuml\plantuml.jar globalconfigurationfile\*.puml -svg
2121

22-
java -jar ..\..\plantuml\plantuml.jar parameterfile\parameterfile.puml -png
23-
java -jar ..\..\plantuml\plantuml.jar parameterfile\parameterfile.puml -svg
22+
java -jar ..\..\plantuml\plantuml.jar parameterfile\*.puml -png
23+
java -jar ..\..\plantuml\plantuml.jar parameterfile\*.puml -svg
2424

25-
java -jar ..\..\plantuml\plantuml.jar curlparameterfile\curlparameterfile.puml -png
26-
java -jar ..\..\plantuml\plantuml.jar curlparameterfile\curlparameterfile.puml -svg
25+
java -jar ..\..\plantuml\plantuml.jar curlparameterfile\*.puml -png
26+
java -jar ..\..\plantuml\plantuml.jar curlparameterfile\*.puml -svg
2727

28-
java -jar ..\..\plantuml\plantuml.jar getdefinitionfiles\getdefinitionfiles.puml -png
29-
java -jar ..\..\plantuml\plantuml.jar getdefinitionfiles\getdefinitionfiles.puml -svg
28+
java -jar ..\..\plantuml\plantuml.jar getdefinitionfiles\*.puml -png
29+
java -jar ..\..\plantuml\plantuml.jar getdefinitionfiles\*.puml -svg
3030

31-
java -jar ..\..\plantuml\plantuml.jar getinputlistfiles\getinputlistfiles.puml -png
32-
java -jar ..\..\plantuml\plantuml.jar getinputlistfiles\getinputlistfiles.puml -svg
31+
java -jar ..\..\plantuml\plantuml.jar getinputlistfiles\*.puml -png
32+
java -jar ..\..\plantuml\plantuml.jar getinputlistfiles\*.puml -svg
3333

34-
java -jar ..\..\plantuml\plantuml.jar json2pumlrequest\json2pumlrequest.puml -png
35-
java -jar ..\..\plantuml\plantuml.jar json2pumlrequest\json2pumlrequest.puml -svg
34+
java -jar ..\..\plantuml\plantuml.jar json2pumlrequest\*.puml -png
35+
java -jar ..\..\plantuml\plantuml.jar json2pumlrequest\*.puml -svg
3636

37-
java -jar ..\..\plantuml\plantuml.jar getserviceinformation\getserviceinformation.puml -png
38-
java -jar ..\..\plantuml\plantuml.jar getserviceinformation\getserviceinformation.puml -svg
37+
java -jar ..\..\plantuml\plantuml.jar getserviceinformation\*.puml -png
38+
java -jar ..\..\plantuml\plantuml.jar getserviceinformation\*.puml -svg
3939

40-
java -jar ..\..\plantuml\plantuml.jar geterrormessages\geterrormessages.puml -png
41-
java -jar ..\..\plantuml\plantuml.jar geterrormessages\geterrormessages.puml -svg
40+
java -jar ..\..\plantuml\plantuml.jar geterrormessages\*.puml -png
41+
java -jar ..\..\plantuml\plantuml.jar geterrormessages\*.puml -svg

‎documentation/models/converterdefinition/converterdefinition.puml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ class ObjectProperty {
103103
objectName : String
104104
generateWithoutIdentifier : Boolean
105105
}
106+
107+
class OptionDefinitionDescription {
108+
displayName : string
109+
description : string
110+
}
106111
class SingleOption {
107112
continueAfterUnhandledObjects : Boolean
108113
groupDetailObjectsTogether : Boolean
@@ -111,6 +116,8 @@ class SingleOption {
111116
groupDetailObjectsTogether : Boolean
112117
hideDuplicateRelations : Boolean
113118
---
119+
description : OptionDefinitionDescription
120+
---
114121
pumlHeaderLines : Array of String
115122
objectFormats : FormatDefinition
116123
---
@@ -139,6 +146,8 @@ ConverterDefinition::options -down-> "0..*" NamedOption: " "
139146
ConverterDefinition::baseOption -right-> "0..1" SingleOption::option
140147
ConverterDefinition::description -right-> "0..1" ConverterDefinitionDescription
141148
NamedOption::definition --> "0..1" SingleOption
149+
SingleOption::description -left-> "0..1" OptionDefinitionDescription
150+
SingleOption::attributeProperties --> "0..*" PropertyValue::propertyName
142151
SingleOption::characteristicProperties --> "0..*" CharacteristicProperty::parentProperty
143152
SingleOption::objectFormats --> "0..1" FormatDefintion
144153
SingleOption::objectProperties --> "0..*" ObjectProperty

‎documentation/models/getdefinitionfiles/getdefinitionfiles-v2.puml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
@startuml
2+
hide circle
3+
hide methods
4+
hide stereotype
5+
show <<Enumeration>> stereotype
6+
skinparam class {
7+
BackgroundColor<<Enumeration>> #E6F5F7
8+
BackgroundColor<<Ref>> #FFFFE0
9+
BackgroundColor<<Pivot>> #FFFFFFF
10+
BackgroundColor #FCF2E3
11+
}
12+
13+
class DefinitionFile{
14+
name : String
15+
displayName : String
16+
description : String
17+
options : Array of DefinitionOption
18+
}
19+
20+
class DefinitionOption {
21+
option : String
22+
displayName : String
23+
description : String
24+
}
25+
26+
class DefinitionFiles <<pivot>>{
27+
Array of DefinitionFile
28+
}
29+
DefinitionFiles -right-> "0..*" DefinitionFile
30+
DefinitionFile::options -right-> "1..*" DefinitionOption
31+
32+
@enduml

‎documentation/models/getinputlistfiles/getinputlistfiles-v2.puml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
@startuml
2+
hide circle
3+
hide methods
4+
hide stereotype
5+
show <<Enumeration>> stereotype
6+
skinparam class {
7+
BackgroundColor<<Enumeration>> #E6F5F7
8+
BackgroundColor<<Ref>> #FFFFE0
9+
BackgroundColor<<Pivot>> #FFFFFFF
10+
BackgroundColor #FCF2E3
11+
}
12+
13+
class DefinitionFile{
14+
name : String
15+
displayName : String
16+
description : String
17+
options : Array of DefinitionOption
18+
}
19+
class DefinitionOption {
20+
option : String
21+
displayName : String
22+
description : String
23+
}
24+
25+
class CurlParameter{
26+
name : String
27+
displayName : String
28+
description : String
29+
mandatory : Boolean
30+
mandatoryGroup : Boolean
31+
regularExpression : String
32+
defaultValue : String
33+
}
34+
35+
class InputListFile {
36+
name : String
37+
displayName : String
38+
description : String
39+
definitionFile : DefinitionFile
40+
curlParameter : Array of CurlParameter
41+
curlAuthenticationParameter : Array of CurlParameter
42+
}
43+
44+
class InputListFiles <<pivot>>{
45+
Array of InputListFile
46+
}
47+
InputListFiles -right-> "0..*" InputListFile
48+
InputListFile::definitionFile --> "0..1" DefinitionFile
49+
DefinitionFile::options --> "1..*" DefinitionOption
50+
InputListFile::curlParameter --> "0..*" CurlParameter
51+
InputListFile::curlAuthenticationParameter -> "0..*" CurlParameter
52+
53+
CurlParameter -[hidden]up-> DefinitionFile
54+
CurlParameter <-[hidden]left- DefinitionFile
55+
56+
57+
@enduml

‎samples/json2puml/json2puml_inputlist.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"generateOutput": true,
3333
"mandatory": false,
3434
"curlBaseUrl": null,
35-
"curlCache": 0,
35+
"curlCache": 600,
3636
"curlExecuteEvaluation": null,
3737
"curlFileSuffix": null,
3838
"curlFormatOutput": true,
@@ -49,16 +49,16 @@
4949
"generateOutput": true,
5050
"mandatory": false,
5151
"curlBaseUrl": null,
52-
"curlCache": 0,
52+
"curlCache": 600,
5353
"curlExecuteEvaluation": null,
5454
"curlFileSuffix": null,
5555
"curlFormatOutput": true,
5656
"curlOptions": null,
5757
"curlUrl": "inputlistfile",
5858
"curlOutputParameter": [
5959
],
60-
"splitIdentifier": null,
61-
"splitInputFile": false
60+
"splitIdentifier": "name",
61+
"splitInputFile": true
6262
}
6363
]
6464
}

0 commit comments

Comments
 (0)