diff --git a/currency-converter-connector-demo/.classpath b/currency-converter-connector-demo/.classpath index f582689..d76a1ef 100644 --- a/currency-converter-connector-demo/.classpath +++ b/currency-converter-connector-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/currency-converter-connector-demo/.project b/currency-converter-connector-demo/.project index c5e6f83..2a7cce9 100644 --- a/currency-converter-connector-demo/.project +++ b/currency-converter-connector-demo/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/currency-converter-connector-demo/.settings/.jsdtscope b/currency-converter-connector-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/currency-converter-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/currency-converter-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/currency-converter-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index 921c6c6..73045d7 100644 --- a/currency-converter-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/currency-converter-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,3 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.currency.converter.connector.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.currency.converter.connector.demo -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/currency-converter-connector-demo/.settings/org.eclipse.jdt.core.prefs b/currency-converter-connector-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/currency-converter-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/currency-converter-connector-demo/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.common.component b/currency-converter-connector-demo/.settings/org.eclipse.wst.common.component index 5e204f0..399f9af 100644 --- a/currency-converter-connector-demo/.settings/org.eclipse.wst.common.component +++ b/currency-converter-connector-demo/.settings/org.eclipse.wst.common.component @@ -1,21 +1,10 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/currency-converter-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/currency-converter-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/currency-converter-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/currency-converter-connector-demo/config/variables.yaml b/currency-converter-connector-demo/config/variables.yaml new file mode 100644 index 0000000..e96d3ef --- /dev/null +++ b/currency-converter-connector-demo/config/variables.yaml @@ -0,0 +1,2 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json +Variables: diff --git a/currency-converter-connector-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.d.json b/currency-converter-connector-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.d.json new file mode 100644 index 0000000..3847e30 --- /dev/null +++ b/currency-converter-connector-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.currency.converter.connector.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/currency-converter-connector-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.ivyClass b/currency-converter-connector-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.ivyClass deleted file mode 100644 index 562ffa4..0000000 --- a/currency-converter-connector-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.currency.converter.connector.demo #namespace diff --git a/currency-converter-connector-demo/processes/currency_converter_connector/CurrencyConverterDemo.p.json b/currency-converter-connector-demo/processes/currency_converter_connector/CurrencyConverterDemo.p.json index d02f0b1..ec7ac4e 100644 --- a/currency-converter-connector-demo/processes/currency_converter_connector/CurrencyConverterDemo.p.json +++ b/currency-converter-connector-demo/processes/currency_converter_connector/CurrencyConverterDemo.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "17D7B9CE272367D5", "config" : { "data" : "com.axonivy.connector.currency.converter.connector.demo.Data" @@ -9,25 +9,28 @@ "type" : "RequestStart", "name" : "Demo Start", "config" : { - "callSignature" : "convertDemo", - "case" : { - "name" : "Währungsrechner" + "signature" : "convertDemo", + "request" : { + "name" : "Currency Converter", + "description" : "Example of a Currency Converter", + "customFields" : [ + { "name" : "cssIcon", "value" : "si si-monetization-approve" } + ] }, - "outLink" : "convertDemo.ivp", - "startDescription" : "Example of a Currency Converter", - "startCustomFields" : [ - { "name" : "cssIcon", "value" : "si si-monetization-approve" } - ], "task" : { "name" : "Währungsrechner" }, - "startName" : "Currency Converter" + "case" : { + "name" : "Währungsrechner" + } }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 22, "y" : 37 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -39,13 +42,14 @@ "type" : "DialogCall", "name" : "CurrencyConverterInput", "config" : { - "dialogId" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput", - "startMethod" : "start()" + "dialog" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput:start()" }, "visual" : { "at" : { "x" : 256, "y" : 64 }, - "size" : { "width" : 160, "height" : 60 } + "size" : { "width" : 160 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInput.rddescriptor b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInput.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInput.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.d.json b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.d.json new file mode 100644 index 0000000..abe3454 --- /dev/null +++ b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "CurrencyConverterInputData", + "namespace" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "convert", + "type" : "com.axonivy.connector.currency.converter.connector.CurrencyConverterData", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.ivyClass b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.ivyClass deleted file mode 100644 index 6c97142..0000000 --- a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -CurrencyConverterInputData #class -com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput #namespace -convert com.axonivy.connector.currency.converter.connector.CurrencyConverterData #field -convert PERSISTENT #fieldModifier diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputProcess.p.json b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputProcess.p.json index 7cbd1a8..3066ee2 100644 --- a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputProcess.p.json +++ b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "17801C4C33DC6518", "kind" : "HTML_DIALOG", "config" : { @@ -10,14 +10,16 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "17801C4C34134211" }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 11, "y" : 47 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -35,7 +37,9 @@ "at" : { "x" : 96, "y" : 280 }, "labelOffset" : { "x" : 9, "y" : 35 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -53,36 +57,35 @@ "at" : { "x" : 96, "y" : 192 }, "labelOffset" : { "x" : 21, "y" : 35 } }, - "connect" : { "id" : "f10", "to" : "f8" } + "connect" : [ + { "id" : "f10", "to" : "f8" } + ] }, { "id" : "f8", "type" : "SubProcessCall", "name" : "CurrencyConverter", "config" : { "processCall" : "CurrencyConverter:convert(Number,app.frankfurter.api.client.CurCodes,app.frankfurter.api.client.CurCodes)", - "output" : { - "map" : { - "out" : "in", - "out.convert.ToAmount" : "result.ToAmount" - } - }, "call" : { - "params" : [ - { "name" : "FromAmount", "type" : "Number" }, - { "name" : "FromCurrency", "type" : "app.frankfurter.api.client.CurCodes" }, - { "name" : "ToCurrency", "type" : "app.frankfurter.api.client.CurCodes" } - ], "map" : { "param.FromAmount" : "in.convert.FromAmount", "param.FromCurrency" : "in.convert.FromCurrency", "param.ToCurrency" : "in.convert.ToCurrency" } + }, + "output" : { + "map" : { + "out" : "in", + "out.convert.ToAmount" : "result.ToAmount" + } } }, "visual" : { "at" : { "x" : 296, "y" : 192 }, - "size" : { "width" : 128, "height" : 60 } + "size" : { "width" : 128 } }, - "connect" : { "id" : "f11", "to" : "f1", "via" : [ { "x" : 608, "y" : 192 } ] } + "connect" : [ + { "id" : "f11", "to" : "f1", "via" : [ { "x" : 608, "y" : 192 } ] } + ] } ] } \ No newline at end of file diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdown.rddescriptor b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdown.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdown.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownData.d.json b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownData.d.json new file mode 100644 index 0000000..ef89f5a --- /dev/null +++ b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "CurrencyDropdownData", + "namespace" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "selectedCurrency", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownData.ivyClass b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownData.ivyClass deleted file mode 100644 index 4c98e4e..0000000 --- a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -CurrencyDropdownData #class -com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown #namespace -selectedCurrency String #field -selectedCurrency PERSISTENT #fieldModifier diff --git a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownProcess.p.json b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownProcess.p.json index 86d6760..dae1d13 100644 --- a/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownProcess.p.json +++ b/currency-converter-connector-demo/src_hd/com/axonivy/connector/currency/converter/connector/demo/CurrencyDropdown/CurrencyDropdownProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "177F7F92D5088614", "kind" : "HTML_DIALOG", "config" : { @@ -10,21 +10,21 @@ "type" : "HtmlDialogStart", "name" : "start(String)", "config" : { - "callSignature" : "start", - "result" : { + "signature" : "start", + "input" : { "params" : [ - { "name" : "currency", "type" : "String" } + { "name" : "currency", "type" : "String", "desc" : "" } ], "map" : { - "result.currency" : "in.selectedCurrency" + "out.selectedCurrency" : "param.currency" } }, - "input" : { + "result" : { "params" : [ - { "name" : "currency", "type" : "String" } + { "name" : "currency", "type" : "String", "desc" : "" } ], "map" : { - "out.selectedCurrency" : "param.currency" + "result.currency" : "in.selectedCurrency" } }, "guid" : "177F7F92D7E12DAF" @@ -33,7 +33,9 @@ "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 30, "y" : 35 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -51,7 +53,9 @@ "at" : { "x" : 96, "y" : 160 }, "labelOffset" : { "x" : 9, "y" : 35 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/currency-converter-connector-test/.classpath b/currency-converter-connector-test/.classpath index 81c1c3f..988ea57 100644 --- a/currency-converter-connector-test/.classpath +++ b/currency-converter-connector-test/.classpath @@ -4,12 +4,7 @@ - - - - - - + diff --git a/currency-converter-connector-test/.project b/currency-converter-connector-test/.project index d1e2e9f..6178c02 100644 --- a/currency-converter-connector-test/.project +++ b/currency-converter-connector-test/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/currency-converter-connector-test/.settings/.jsdtscope b/currency-converter-connector-test/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/currency-converter-connector-test/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/currency-converter-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/currency-converter-connector-test/.settings/ch.ivyteam.ivy.designer.prefs index 58ad878..8304c07 100644 --- a/currency-converter-connector-test/.settings/ch.ivyteam.ivy.designer.prefs +++ b/currency-converter-connector-test/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,3 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.currency.test.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.currency.test -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/currency-converter-connector-test/.settings/org.eclipse.jdt.core.prefs b/currency-converter-connector-test/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/currency-converter-connector-test/.settings/org.eclipse.jdt.core.prefs +++ b/currency-converter-connector-test/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/currency-converter-connector-test/.settings/org.eclipse.wst.common.component b/currency-converter-connector-test/.settings/org.eclipse.wst.common.component index 8f9e63e..75991ea 100644 --- a/currency-converter-connector-test/.settings/org.eclipse.wst.common.component +++ b/currency-converter-connector-test/.settings/org.eclipse.wst.common.component @@ -1,23 +1,11 @@ - - - - - - - - - - - - - + \ No newline at end of file diff --git a/currency-converter-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml b/currency-converter-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/currency-converter-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/currency-converter-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/currency-converter-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container b/currency-converter-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/currency-converter-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/currency-converter-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name b/currency-converter-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/currency-converter-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/currency-converter-connector-test/config/variables.yaml b/currency-converter-connector-test/config/variables.yaml new file mode 100644 index 0000000..e96d3ef --- /dev/null +++ b/currency-converter-connector-test/config/variables.yaml @@ -0,0 +1,2 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json +Variables: diff --git a/currency-converter-connector-test/dataclasses/com/axonivy/connector/currency/test/Data.d.json b/currency-converter-connector-test/dataclasses/com/axonivy/connector/currency/test/Data.d.json new file mode 100644 index 0000000..4f221e2 --- /dev/null +++ b/currency-converter-connector-test/dataclasses/com/axonivy/connector/currency/test/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.currency.test", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/currency-converter-connector-test/dataclasses/com/axonivy/connector/currency/test/Data.ivyClass b/currency-converter-connector-test/dataclasses/com/axonivy/connector/currency/test/Data.ivyClass deleted file mode 100644 index b12140e..0000000 --- a/currency-converter-connector-test/dataclasses/com/axonivy/connector/currency/test/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.currency.test #namespace diff --git a/currency-converter-connector/.classpath b/currency-converter-connector/.classpath index 5550277..52333ff 100644 --- a/currency-converter-connector/.classpath +++ b/currency-converter-connector/.classpath @@ -4,12 +4,7 @@ - - - - - - + diff --git a/currency-converter-connector/.project b/currency-converter-connector/.project index 2d2b123..54ee7ae 100644 --- a/currency-converter-connector/.project +++ b/currency-converter-connector/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/currency-converter-connector/.settings/.jsdtscope b/currency-converter-connector/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/currency-converter-connector/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/currency-converter-connector/.settings/ch.ivyteam.ivy.designer.prefs b/currency-converter-connector/.settings/ch.ivyteam.ivy.designer.prefs index 1e76f83..f1afdef 100644 --- a/currency-converter-connector/.settings/ch.ivyteam.ivy.designer.prefs +++ b/currency-converter-connector/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,3 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.currency.converter.connector.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.currency.converter.connector -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/currency-converter-connector/.settings/org.eclipse.jdt.core.prefs b/currency-converter-connector/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/currency-converter-connector/.settings/org.eclipse.jdt.core.prefs +++ b/currency-converter-connector/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/currency-converter-connector/.settings/org.eclipse.wst.common.component b/currency-converter-connector/.settings/org.eclipse.wst.common.component index 398cd2f..9f7d0ff 100644 --- a/currency-converter-connector/.settings/org.eclipse.wst.common.component +++ b/currency-converter-connector/.settings/org.eclipse.wst.common.component @@ -1,21 +1,10 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/currency-converter-connector/.settings/org.eclipse.wst.common.project.facet.core.xml b/currency-converter-connector/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/currency-converter-connector/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/currency-converter-connector/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/currency-converter-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container b/currency-converter-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/currency-converter-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/currency-converter-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name b/currency-converter-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/currency-converter-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/currency-converter-connector/config/variables.yaml b/currency-converter-connector/config/variables.yaml new file mode 100644 index 0000000..e96d3ef --- /dev/null +++ b/currency-converter-connector/config/variables.yaml @@ -0,0 +1,2 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json +Variables: diff --git a/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/CurrencyConverterData.d.json b/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/CurrencyConverterData.d.json new file mode 100644 index 0000000..faf003a --- /dev/null +++ b/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/CurrencyConverterData.d.json @@ -0,0 +1,23 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "CurrencyConverterData", + "namespace" : "com.axonivy.connector.currency.converter.connector", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "FromAmount", + "type" : "Number", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "FromCurrency", + "type" : "app.frankfurter.api.client.CurCodes", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "ToAmount", + "type" : "Number", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "ToCurrency", + "type" : "app.frankfurter.api.client.CurCodes", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/CurrencyConverterData.ivyClass b/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/CurrencyConverterData.ivyClass deleted file mode 100644 index aef4dd9..0000000 --- a/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/CurrencyConverterData.ivyClass +++ /dev/null @@ -1,10 +0,0 @@ -CurrencyConverterData #class -com.axonivy.connector.currency.converter.connector #namespace -FromAmount Number #field -FromAmount PERSISTENT #fieldModifier -FromCurrency app.frankfurter.api.client.CurCodes #field -FromCurrency PERSISTENT #fieldModifier -ToAmount Number #field -ToAmount PERSISTENT #fieldModifier -ToCurrency app.frankfurter.api.client.CurCodes #field -ToCurrency PERSISTENT #fieldModifier diff --git a/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/Data.d.json b/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/Data.d.json new file mode 100644 index 0000000..3cccba5 --- /dev/null +++ b/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.currency.converter.connector", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/Data.ivyClass b/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/Data.ivyClass deleted file mode 100644 index 46df30a..0000000 --- a/currency-converter-connector/dataclasses/com/axonivy/connector/currency/converter/connector/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.currency.converter.connector #namespace diff --git a/currency-converter-connector/processes/CurrencyConverter.p.json b/currency-converter-connector/processes/CurrencyConverter.p.json index 82072dd..a2434a0 100644 --- a/currency-converter-connector/processes/CurrencyConverter.p.json +++ b/currency-converter-connector/processes/CurrencyConverter.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "17D7F8306CB80A4D", "kind" : "CALLABLE_SUB", "config" : { @@ -10,12 +10,12 @@ "type" : "CallSubStart", "name" : "convert(Number,CurCodes,CurCodes)", "config" : { - "callSignature" : "convert", + "signature" : "convert", "input" : { "params" : [ - { "name" : "FromAmount", "type" : "Number" }, - { "name" : "FromCurrency", "type" : "app.frankfurter.api.client.CurCodes" }, - { "name" : "ToCurrency", "type" : "app.frankfurter.api.client.CurCodes" } + { "name" : "FromAmount", "type" : "Number", "desc" : "" }, + { "name" : "FromCurrency", "type" : "app.frankfurter.api.client.CurCodes", "desc" : "" }, + { "name" : "ToCurrency", "type" : "app.frankfurter.api.client.CurCodes", "desc" : "" } ], "map" : { "out.FromAmount" : "param.FromAmount", @@ -25,20 +25,24 @@ }, "result" : { "params" : [ - { "name" : "ToAmount", "type" : "Number" } + { "name" : "ToAmount", "type" : "Number", "desc" : "" } ], "map" : { "result.ToAmount" : "in.ToAmount" } - }, - "tags" : "CONNECTOR" + } }, + "tags" : [ + "CONNECTOR" + ], "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 32, "y" : 44 }, "icon" : "res:/webContent/icons/curConverterSmall.png?small" }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -50,25 +54,31 @@ "type" : "RestClientCall", "name" : "Currency Converter API (CurrencyConverter)", "config" : { - "path" : "/latest", - "clientId" : "f6097886-ec23-421a-8264-e8782f59723e", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "amount" : "in.FromAmount", - "from" : "in.FromCurrency", - "to" : "in.ToCurrency" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.ToAmount" : "result.rates.get(in.ToCurrency.toString()) as Double" + "target" : { + "clientId" : "f6097886-ec23-421a-8264-e8782f59723e", + "path" : "/latest", + "queryParams" : { + "amount" : "in.FromAmount", + "from" : "in.FromCurrency", + "to" : "in.ToCurrency" + } }, - "resultType" : "app.frankfurter.api.client.Rate" + "response" : { + "entity" : { + "type" : "app.frankfurter.api.client.Rate", + "map" : { + "out.ToAmount" : "result.rates.get(in.ToCurrency.toString()) as Double" + } + } + } }, "visual" : { "at" : { "x" : 344, "y" : 64 }, - "size" : { "width" : 288, "height" : 60 }, + "size" : { "width" : 288 }, "icon" : "res:/webContent/icons/curConverterSmall.png" }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file