diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93dc08b..8dc89c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,4 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c2fee37..ae5e6c3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,4 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab5b0d7..bc801b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,4 +4,4 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/axonivy-intellix-connector/.classpath b/axonivy-intellix-connector/.classpath index 855629c..5551cda 100644 --- a/axonivy-intellix-connector/.classpath +++ b/axonivy-intellix-connector/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/axonivy-intellix-connector/.project b/axonivy-intellix-connector/.project index 1d445ff..2735e70 100644 --- a/axonivy-intellix-connector/.project +++ b/axonivy-intellix-connector/.project @@ -30,6 +30,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.m2e.core.maven2Nature 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/axonivy-intellix-connector/.settings/.jsdtscope b/axonivy-intellix-connector/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/axonivy-intellix-connector/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/axonivy-intellix-connector/.settings/ch.ivyteam.ivy.designer.prefs b/axonivy-intellix-connector/.settings/ch.ivyteam.ivy.designer.prefs index 5fcd2af..2caf015 100644 --- a/axonivy-intellix-connector/.settings/ch.ivyteam.ivy.designer.prefs +++ b/axonivy-intellix-connector/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.intellix.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.intellix -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/axonivy-intellix-connector/.settings/org.eclipse.core.resources.prefs b/axonivy-intellix-connector/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/axonivy-intellix-connector/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/axonivy-intellix-connector/.settings/org.eclipse.jdt.core.prefs b/axonivy-intellix-connector/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/axonivy-intellix-connector/.settings/org.eclipse.jdt.core.prefs +++ b/axonivy-intellix-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/axonivy-intellix-connector/.settings/org.eclipse.wst.common.component b/axonivy-intellix-connector/.settings/org.eclipse.wst.common.component index e536501..8d3e178 100644 --- a/axonivy-intellix-connector/.settings/org.eclipse.wst.common.component +++ b/axonivy-intellix-connector/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/axonivy-intellix-connector/.settings/org.eclipse.wst.common.project.facet.core.xml b/axonivy-intellix-connector/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/axonivy-intellix-connector/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/axonivy-intellix-connector/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/axonivy-intellix-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container b/axonivy-intellix-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/axonivy-intellix-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/axonivy-intellix-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name b/axonivy-intellix-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/axonivy-intellix-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/axonivy-intellix-connector/config/variables.yaml b/axonivy-intellix-connector/config/variables.yaml index b6d2a8d..99878c6 100644 --- a/axonivy-intellix-connector/config/variables.yaml +++ b/axonivy-intellix-connector/config/variables.yaml @@ -1,11 +1,12 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == Variables: intellix-connector: - host: - username: + host: '' + username: '' # [password] - password: - msName: + password: '' + msName: '' # The Logon URL will be automatically determined. # If this variable is set (not-empty), this URL diff --git a/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/Data.d.json b/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/Data.d.json new file mode 100644 index 0000000..f507194 --- /dev/null +++ b/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/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.intellix", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/Data.ivyClass b/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/Data.ivyClass deleted file mode 100644 index 3c67901..0000000 --- a/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.intellix #namespace diff --git a/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.d.json b/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.d.json new file mode 100644 index 0000000..c997da9 --- /dev/null +++ b/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.d.json @@ -0,0 +1,13 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "intellixData", + "namespace" : "com.axonivy.connector.intellix", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "file", + "type" : "java.io.File" + }, { + "name" : "indexData", + "type" : "com.docuware.dev._public.services.intellix.IndexData" + } ] +} \ No newline at end of file diff --git a/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.ivyClass b/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.ivyClass deleted file mode 100644 index 4a1c939..0000000 --- a/axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -intellixData #class -com.axonivy.connector.intellix #namespace -file java.io.File #field -indexData com.docuware.dev._public.services.intellix.IndexData #field diff --git a/axonivy-intellix-connector/pom.xml b/axonivy-intellix-connector/pom.xml index b49209c..1413d9b 100644 --- a/axonivy-intellix-connector/pom.xml +++ b/axonivy-intellix-connector/pom.xml @@ -3,10 +3,11 @@ 4.0.0 com.axonivy.connector.intellix axonivy-intellix-connector - 10.0.8-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 + UTF-8 diff --git a/axonivy-intellix-connector/processes/intellix.p.json b/axonivy-intellix-connector/processes/intellix.p.json index 4519e2f..6f00b59 100644 --- a/axonivy-intellix-connector/processes/intellix.p.json +++ b/axonivy-intellix-connector/processes/intellix.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18166227E0841472", "kind" : "CALLABLE_SUB", "config" : { @@ -10,7 +10,7 @@ "type" : "CallSubStart", "name" : "identify(File)", "config" : { - "callSignature" : "call", + "signature" : "call", "input" : { "params" : [ { "name" : "file", "type" : "java.io.File", "desc" : "The file (PDF) to process" } @@ -26,15 +26,19 @@ "map" : { "result.indexData" : "in.indexData" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 20, "y" : 37 }, "icon" : "res:/webContent/logos/intellix.png?small" }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -46,32 +50,40 @@ "type" : "RestClientCall", "name" : "intellix", "config" : { - "clientId" : "a3fb2ba0-71ab-49a6-82fe-bb0c202b38bd", "method" : "POST", - "queryParams" : { - "extract" : "true" - }, - "statusErrorCode" : "ivy:error:rest:client", - "bodyInputType" : "FORM", - "responseCode" : "ivy.log.info(\"recognized field count: \"+result.indexData.getField().size());", - "bodyForm" : { - "file" : "in.file", - "msName" : "ivy.var.get(\"intellix-connector.msName\")" - }, - "path" : "documents", - "clientErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.indexData" : "result.indexData;" + "target" : { + "clientId" : "a3fb2ba0-71ab-49a6-82fe-bb0c202b38bd", + "path" : "documents", + "templateParams" : { + "host" : "" + }, + "queryParams" : { + "extract" : "true" + } }, - "templateParams" : { - "host" : "" + "body" : { + "type" : "FORM", + "mediaType" : "multipart/form-data", + "form" : { + "file" : [ "in.file" ], + "msName" : [ "ivy.var.get(\"intellix-connector.msName\")" ] + } }, - "resultType" : "com.docuware.dev._public.services.intellix.FeedbackMessage", - "bodyMediaType" : "multipart/form-data" + "response" : { + "entity" : { + "type" : "com.docuware.dev._public.services.intellix.FeedbackMessage", + "map" : { + "out.indexData" : "result.indexData;" + }, + "code" : "ivy.log.info(\"recognized field count: \"+result.indexData.getField().size());" + } + } }, "visual" : { "at" : { "x" : 224, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/axonivy-intellix-connector/src/com/axonivy/connector/intellix/connector/IntellixAuthFeature.java b/axonivy-intellix-connector/src/com/axonivy/connector/intellix/connector/IntellixAuthFeature.java index c6c21e4..1ef515b 100644 --- a/axonivy-intellix-connector/src/com/axonivy/connector/intellix/connector/IntellixAuthFeature.java +++ b/axonivy-intellix-connector/src/com/axonivy/connector/intellix/connector/IntellixAuthFeature.java @@ -202,7 +202,8 @@ public static class DocuWareCookies { public static final String DW_COOKIES_CACHE_ID = "cookies"; public static final String DW_COOKIES_CACHE_GROUP_ID = "com.docuware.cookies"; public static final int DW_COOKIES_EXPIRY_SECONDS = 86400; - private final Map cookies; + @SuppressWarnings("unused") + private final Map cookies; private DocuWareCookies(Map cookies) { diff --git a/axonivy-intellix-demo/.classpath b/axonivy-intellix-demo/.classpath index cdf5ab4..8228714 100644 --- a/axonivy-intellix-demo/.classpath +++ b/axonivy-intellix-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/axonivy-intellix-demo/.project b/axonivy-intellix-demo/.project index 04baed4..4adabda 100644 --- a/axonivy-intellix-demo/.project +++ b/axonivy-intellix-demo/.project @@ -30,6 +30,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.m2e.core.maven2Nature 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/axonivy-intellix-demo/.settings/.jsdtscope b/axonivy-intellix-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/axonivy-intellix-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/axonivy-intellix-demo/.settings/ch.ivyteam.ivy.designer.prefs b/axonivy-intellix-demo/.settings/ch.ivyteam.ivy.designer.prefs index 592e7a0..cd7de4b 100644 --- a/axonivy-intellix-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/axonivy-intellix-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.intellix.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.intellix.demo -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/axonivy-intellix-demo/.settings/org.eclipse.core.resources.prefs b/axonivy-intellix-demo/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/axonivy-intellix-demo/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/axonivy-intellix-demo/.settings/org.eclipse.jdt.core.prefs b/axonivy-intellix-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/axonivy-intellix-demo/.settings/org.eclipse.jdt.core.prefs +++ b/axonivy-intellix-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/axonivy-intellix-demo/.settings/org.eclipse.wst.common.component b/axonivy-intellix-demo/.settings/org.eclipse.wst.common.component index 1306422..da5d850 100644 --- a/axonivy-intellix-demo/.settings/org.eclipse.wst.common.component +++ b/axonivy-intellix-demo/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/axonivy-intellix-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/axonivy-intellix-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/axonivy-intellix-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/axonivy-intellix-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/axonivy-intellix-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/axonivy-intellix-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/axonivy-intellix-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/axonivy-intellix-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/axonivy-intellix-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/axonivy-intellix-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/axonivy-intellix-demo/config/variables.yaml b/axonivy-intellix-demo/config/variables.yaml index 64c8fa0..4448394 100644 --- a/axonivy-intellix-demo/config/variables.yaml +++ b/axonivy-intellix-demo/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == # # You can define here your project Variables. diff --git a/axonivy-intellix-demo/dataclasses/com/axonivy/connector/intellix/demo/Data.d.json b/axonivy-intellix-demo/dataclasses/com/axonivy/connector/intellix/demo/Data.d.json new file mode 100644 index 0000000..3f30ded --- /dev/null +++ b/axonivy-intellix-demo/dataclasses/com/axonivy/connector/intellix/demo/Data.d.json @@ -0,0 +1,13 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.intellix.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "file", + "type" : "File" + }, { + "name" : "indexed", + "type" : "com.docuware.dev._public.services.intellix.FeedbackMessage" + } ] +} \ No newline at end of file diff --git a/axonivy-intellix-demo/dataclasses/com/axonivy/connector/intellix/demo/Data.ivyClass b/axonivy-intellix-demo/dataclasses/com/axonivy/connector/intellix/demo/Data.ivyClass deleted file mode 100644 index 867dd9a..0000000 --- a/axonivy-intellix-demo/dataclasses/com/axonivy/connector/intellix/demo/Data.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -Data #class -com.axonivy.connector.intellix.demo #namespace -file File #field -indexed com.docuware.dev._public.services.intellix.FeedbackMessage #field diff --git a/axonivy-intellix-demo/pom.xml b/axonivy-intellix-demo/pom.xml index 26923cd..c22d2cb 100644 --- a/axonivy-intellix-demo/pom.xml +++ b/axonivy-intellix-demo/pom.xml @@ -3,10 +3,11 @@ 4.0.0 com.axonivy.connector.intellix axonivy-intellix-demo - 10.0.8-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 + UTF-8 diff --git a/axonivy-intellix-demo/processes/intellixDemo.p.json b/axonivy-intellix-demo/processes/intellixDemo.p.json index 288ab21..ace95c4 100644 --- a/axonivy-intellix-demo/processes/intellixDemo.p.json +++ b/axonivy-intellix-demo/processes/intellixDemo.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1816266FC8F333CC", "config" : { "data" : "com.axonivy.connector.intellix.demo.Data" @@ -9,15 +9,18 @@ "type" : "RequestStart", "name" : "uploadSampleInvoice.ivp", "config" : { - "callSignature" : "uploadSampleInvoice", - "outLink" : "uploadSampleInvoice.ivp", - "tags" : "demo" + "signature" : "uploadSampleInvoice" }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 21, "y" : 40 } }, - "connect" : { "id" : "f7", "to" : "f6" } + "connect" : [ + { "id" : "f7", "to" : "f6" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -42,7 +45,9 @@ "visual" : { "at" : { "x" : 224, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f5", "type" : "Script", @@ -68,54 +73,55 @@ }, "visual" : { "at" : { "x" : 384, "y" : 192 }, - "size" : { "width" : 128, "height" : 60 } + "size" : { "width" : 128 } }, - "connect" : { "id" : "f14", "to" : "f13" } + "connect" : [ + { "id" : "f14", "to" : "f13" } + ] }, { "id" : "f3", "type" : "SubProcessCall", "name" : "intellix", "config" : { "processCall" : "intellix:call(java.io.File)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.indexed.indexData" : "result.indexData" + "param.file" : "in.file.getJavaFile()" } }, - "call" : { - "params" : [ - { "name" : "file", "type" : "java.io.File" } - ], + "output" : { "map" : { - "param.file" : "in.file.getJavaFile()" + "out" : "in", + "out.indexed.indexData" : "result.indexData" } } }, "visual" : { "at" : { "x" : 384, "y" : 64 } }, - "connect" : { "id" : "f8", "to" : "f5" } + "connect" : [ + { "id" : "f8", "to" : "f5" } + ] }, { "id" : "f9", "type" : "RequestStart", "name" : "uploadInvoice.ivp", "config" : { - "callSignature" : "uploadInvoice", - "outLink" : "uploadInvoice.ivp" + "signature" : "uploadInvoice" }, "visual" : { "at" : { "x" : 96, "y" : 192 }, - "labelOffset" : { "x" : 9, "y" : 35 } + "labelOffset" : { "x" : 9 } }, - "connect" : { "id" : "f11", "to" : "f10" } + "connect" : [ + { "id" : "f11", "to" : "f10" } + ] }, { "id" : "f10", "type" : "DialogCall", "name" : "DocUploader", "config" : { - "dialogId" : "com.axonivy.connector.intellix.demo.DocUploader", - "startMethod" : "start()", + "dialog" : "com.axonivy.connector.intellix.demo.DocUploader:start()", "output" : { "map" : { "out" : "in", @@ -126,18 +132,16 @@ "visual" : { "at" : { "x" : 224, "y" : 192 } }, - "connect" : { "id" : "f12", "to" : "f3" } + "connect" : [ + { "id" : "f12", "to" : "f3" } + ] }, { "id" : "f13", "type" : "DialogCall", "name" : "DocumentViewer", "config" : { - "dialogId" : "com.axonivy.connector.intellix.demo.InvoiceViewer", - "startMethod" : "start(com.axonivy.connector.intellix.demo.Data)", + "dialog" : "com.axonivy.connector.intellix.demo.InvoiceViewer:start(com.axonivy.connector.intellix.demo.Data)", "call" : { - "params" : [ - { "name" : "invoice", "type" : "com.axonivy.connector.intellix.demo.Data" } - ], "map" : { "param.invoice" : "in" } @@ -146,6 +150,8 @@ "visual" : { "at" : { "x" : 384, "y" : 288 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploader.rddescriptor b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploader.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploader.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderData.d.json b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderData.d.json new file mode 100644 index 0000000..03eaa43 --- /dev/null +++ b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderData.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "DocUploaderData", + "namespace" : "com.axonivy.connector.intellix.demo.DocUploader", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "ivyFile", + "type" : "File", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "showContent", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "filePath", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderData.ivyClass b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderData.ivyClass deleted file mode 100644 index 0c4c227..0000000 --- a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderData.ivyClass +++ /dev/null @@ -1,8 +0,0 @@ -DocUploaderData #class -com.axonivy.connector.intellix.demo.DocUploader #namespace -ivyFile File #field -ivyFile PERSISTENT #fieldModifier -showContent Boolean #field -showContent PERSISTENT #fieldModifier -filePath String #field -filePath PERSISTENT #fieldModifier diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderProcess.p.json b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderProcess.p.json index 03748ec..4760be2 100644 --- a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderProcess.p.json +++ b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/DocUploader/DocUploaderProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "181662ECBD4C4BD8", "kind" : "HTML_DIALOG", "config" : { @@ -10,10 +10,10 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "result" : { "params" : [ - { "name" : "file", "type" : "File" } + { "name" : "file", "type" : "File", "desc" : "" } ], "map" : { "result.file" : "in.ivyFile" @@ -25,7 +25,9 @@ "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 8, "y" : 35 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -43,7 +45,9 @@ "at" : { "x" : 96, "y" : 160 }, "labelOffset" : { "x" : 8, "y" : 35 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -65,9 +69,11 @@ }, "visual" : { "at" : { "x" : 264, "y" : 240 }, - "size" : { "width" : 144, "height" : 60 } + "size" : { "width" : 144 } }, - "connect" : { "id" : "f6", "to" : "f4" } + "connect" : [ + { "id" : "f6", "to" : "f4" } + ] }, { "id" : "f13", "type" : "HtmlDialogEventStart", @@ -79,7 +85,9 @@ "at" : { "x" : 104, "y" : 240 }, "labelOffset" : { "x" : 11, "y" : 32 } }, - "connect" : { "id" : "f17", "to" : "f16" } + "connect" : [ + { "id" : "f17", "to" : "f16" } + ] }, { "id" : "f14", "type" : "HtmlDialogEnd", diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewer.rddescriptor b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewer.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewer.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerData.d.json b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerData.d.json new file mode 100644 index 0000000..59443b7 --- /dev/null +++ b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "InvoiceViewerData", + "namespace" : "com.axonivy.connector.intellix.demo.InvoiceViewer", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "invoice", + "type" : "com.axonivy.connector.intellix.demo.Data", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerData.ivyClass b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerData.ivyClass deleted file mode 100644 index d9a669b..0000000 --- a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -InvoiceViewerData #class -com.axonivy.connector.intellix.demo.InvoiceViewer #namespace -invoice com.axonivy.connector.intellix.demo.Data #field -invoice PERSISTENT #fieldModifier diff --git a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerProcess.p.json b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerProcess.p.json index fa3cde7..8648e24 100644 --- a/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerProcess.p.json +++ b/axonivy-intellix-demo/src_hd/com/axonivy/connector/intellix/demo/InvoiceViewer/InvoiceViewerProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "181666A7D6D4BAF2", "kind" : "HTML_DIALOG", "config" : { @@ -10,10 +10,10 @@ "type" : "HtmlDialogStart", "name" : "start(Data)", "config" : { - "callSignature" : "start", + "signature" : "start", "input" : { "params" : [ - { "name" : "invoice", "type" : "com.axonivy.connector.intellix.demo.Data" } + { "name" : "invoice", "type" : "com.axonivy.connector.intellix.demo.Data", "desc" : "" } ], "map" : { "out.invoice" : "param.invoice" @@ -25,7 +25,9 @@ "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 8, "y" : 35 } }, - "connect" : { "id" : "f7", "to" : "f6" } + "connect" : [ + { "id" : "f7", "to" : "f6" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -43,7 +45,9 @@ "at" : { "x" : 96, "y" : 160 }, "labelOffset" : { "x" : 8, "y" : 35 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -56,6 +60,8 @@ "visual" : { "at" : { "x" : 224, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/axonivy-intellix-product/.settings/org.eclipse.core.resources.prefs b/axonivy-intellix-product/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/axonivy-intellix-product/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/axonivy-intellix-product/pom.xml b/axonivy-intellix-product/pom.xml index 98d445e..54bdc85 100644 --- a/axonivy-intellix-product/pom.xml +++ b/axonivy-intellix-product/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.connector.intellix axonivy-intellix-product - 10.0.8-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/axonivy-intellix-test/.classpath b/axonivy-intellix-test/.classpath index e183d8d..a7c4476 100644 --- a/axonivy-intellix-test/.classpath +++ b/axonivy-intellix-test/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/axonivy-intellix-test/.project b/axonivy-intellix-test/.project index a9caea9..cff1cca 100644 --- a/axonivy-intellix-test/.project +++ b/axonivy-intellix-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.m2e.core.maven2Nature 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/axonivy-intellix-test/.settings/.jsdtscope b/axonivy-intellix-test/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/axonivy-intellix-test/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/axonivy-intellix-test/.settings/ch.ivyteam.ivy.designer.prefs b/axonivy-intellix-test/.settings/ch.ivyteam.ivy.designer.prefs index 5fcd2af..f16faf6 100644 --- a/axonivy-intellix-test/.settings/ch.ivyteam.ivy.designer.prefs +++ b/axonivy-intellix-test/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,3 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.intellix.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.intellix -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/axonivy-intellix-test/.settings/org.eclipse.core.resources.prefs b/axonivy-intellix-test/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/axonivy-intellix-test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/axonivy-intellix-test/.settings/org.eclipse.jdt.core.prefs b/axonivy-intellix-test/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/axonivy-intellix-test/.settings/org.eclipse.jdt.core.prefs +++ b/axonivy-intellix-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/axonivy-intellix-test/.settings/org.eclipse.wst.common.component b/axonivy-intellix-test/.settings/org.eclipse.wst.common.component index 89dab85..5a80e14 100644 --- a/axonivy-intellix-test/.settings/org.eclipse.wst.common.component +++ b/axonivy-intellix-test/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/axonivy-intellix-test/.settings/org.eclipse.wst.common.project.facet.core.xml b/axonivy-intellix-test/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/axonivy-intellix-test/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/axonivy-intellix-test/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/axonivy-intellix-test/.settings/org.eclipse.wst.jsdt.ui.superType.container b/axonivy-intellix-test/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/axonivy-intellix-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/axonivy-intellix-test/.settings/org.eclipse.wst.jsdt.ui.superType.name b/axonivy-intellix-test/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/axonivy-intellix-test/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/axonivy-intellix-test/config/variables.yaml b/axonivy-intellix-test/config/variables.yaml index 64c8fa0..4448394 100644 --- a/axonivy-intellix-test/config/variables.yaml +++ b/axonivy-intellix-test/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == # # You can define here your project Variables. diff --git a/axonivy-intellix-test/dataclasses/com/axonivy/connector/intellix/Data.d.json b/axonivy-intellix-test/dataclasses/com/axonivy/connector/intellix/Data.d.json new file mode 100644 index 0000000..f507194 --- /dev/null +++ b/axonivy-intellix-test/dataclasses/com/axonivy/connector/intellix/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.intellix", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/axonivy-intellix-test/dataclasses/com/axonivy/connector/intellix/Data.ivyClass b/axonivy-intellix-test/dataclasses/com/axonivy/connector/intellix/Data.ivyClass deleted file mode 100644 index 3c67901..0000000 --- a/axonivy-intellix-test/dataclasses/com/axonivy/connector/intellix/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.intellix #namespace diff --git a/axonivy-intellix-test/pom.xml b/axonivy-intellix-test/pom.xml index 6456307..0cdae54 100644 --- a/axonivy-intellix-test/pom.xml +++ b/axonivy-intellix-test/pom.xml @@ -3,11 +3,12 @@ 4.0.0 com.axonivy.connector.intellix axonivy-intellix-test - 10.0.8-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 - 10.0.16 + 12.0.0 + UTF-8 + 12.0.1 diff --git a/axonivy-intellix-test/src_test/com/axonivy/connector/intellix/IntellixProcessTest.java b/axonivy-intellix-test/src_test/com/axonivy/connector/intellix/IntellixProcessTest.java index 633a9b7..905472c 100644 --- a/axonivy-intellix-test/src_test/com/axonivy/connector/intellix/IntellixProcessTest.java +++ b/axonivy-intellix-test/src_test/com/axonivy/connector/intellix/IntellixProcessTest.java @@ -18,6 +18,7 @@ import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; import ch.ivyteam.ivy.rest.client.RestClient; import ch.ivyteam.ivy.rest.client.RestClient.Builder; +import ch.ivyteam.ivy.rest.client.RestClientFeature; import ch.ivyteam.ivy.rest.client.RestClients; import ch.ivyteam.ivy.rest.client.security.CsrfHeaderFeature; @@ -53,11 +54,11 @@ private static void setupMockRestClient(IApplication app) { .description(restClient.description()) .properties(restClient.properties()); - for (String feature : restClient.features()) { - if (feature.contains(IntellixAuthFeature.class.getName())) { + for (RestClientFeature feature : restClient.features()) { + if (feature.clazz().contains(IntellixAuthFeature.class.getName())) { continue; // do not auth } - builder.feature(feature); + builder.feature(feature.clazz()); } builder.feature(CsrfHeaderFeature.class.getName()); // call backend diff --git a/pom.xml b/pom.xml index e8f5e57..e177b8b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.connector.intellix axonivy-intellix axonivy-intellix-modules - 10.0.8-SNAPSHOT + 12.0.0-SNAPSHOT pom