diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87d78f0..bd4b9c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,4 +9,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/open-weather-connector-demo/.classpath b/open-weather-connector-demo/.classpath index 45a97e4..8228714 100644 --- a/open-weather-connector-demo/.classpath +++ b/open-weather-connector-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/open-weather-connector-demo/.project b/open-weather-connector-demo/.project index e02505b..e135084 100644 --- a/open-weather-connector-demo/.project +++ b/open-weather-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.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/open-weather-connector-demo/.settings/.jsdtscope b/open-weather-connector-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/open-weather-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/open-weather-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/open-weather-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index f337e04..60c73f2 100644 --- a/open-weather-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/open-weather-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.openweather.open.weather.connector.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.openweather.open.weather.connector.demo -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -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 diff --git a/open-weather-connector-demo/.settings/org.eclipse.jdt.core.prefs b/open-weather-connector-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/open-weather-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/open-weather-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/open-weather-connector-demo/.settings/org.eclipse.wst.common.component b/open-weather-connector-demo/.settings/org.eclipse.wst.common.component index b35704f..3565176 100644 --- a/open-weather-connector-demo/.settings/org.eclipse.wst.common.component +++ b/open-weather-connector-demo/.settings/org.eclipse.wst.common.component @@ -2,11 +2,10 @@ - - + \ No newline at end of file diff --git a/open-weather-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/open-weather-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/open-weather-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/open-weather-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/open-weather-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/open-weather-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/open-weather-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/open-weather-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/open-weather-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/open-weather-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/open-weather-connector-demo/config/variables.yaml b/open-weather-connector-demo/config/variables.yaml index 688502a..8cf55f0 100644 --- a/open-weather-connector-demo/config/variables.yaml +++ b/open-weather-connector-demo/config/variables.yaml @@ -1,7 +1,8 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json Variables: openWeatherConnectorDemo: # Default city for searching weather defaultSearchedCity: 'New York' # Default units for searching weather - defaultUnits: 'metric' \ No newline at end of file + defaultUnits: 'metric' diff --git a/open-weather-connector-demo/dataclasses/com/axonivy/connector/openweather/demo/data/Data.d.json b/open-weather-connector-demo/dataclasses/com/axonivy/connector/openweather/demo/data/Data.d.json new file mode 100644 index 0000000..70c4532 --- /dev/null +++ b/open-weather-connector-demo/dataclasses/com/axonivy/connector/openweather/demo/data/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.openweather.demo.data", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/open-weather-connector-demo/dataclasses/com/axonivy/connector/openweather/demo/data/Data.ivyClass b/open-weather-connector-demo/dataclasses/com/axonivy/connector/openweather/demo/data/Data.ivyClass deleted file mode 100644 index 61c6048..0000000 --- a/open-weather-connector-demo/dataclasses/com/axonivy/connector/openweather/demo/data/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.openweather.demo.data #namespace diff --git a/open-weather-connector-demo/pom.xml b/open-weather-connector-demo/pom.xml index 819d421..c9e44fb 100644 --- a/open-weather-connector-demo/pom.xml +++ b/open-weather-connector-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.openweather open-weather-connector-demo - 10.0.19-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 diff --git a/open-weather-connector-demo/processes/ForecastWeatherDemo.p.json b/open-weather-connector-demo/processes/ForecastWeatherDemo.p.json index f054f28..6c50e80 100644 --- a/open-weather-connector-demo/processes/ForecastWeatherDemo.p.json +++ b/open-weather-connector-demo/processes/ForecastWeatherDemo.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18D69CF66BD221F0", "config" : { "data" : "com.axonivy.connector.openweather.demo.data.Data" @@ -9,18 +9,23 @@ "type" : "RequestStart", "name" : "start.ivp", "config" : { - "callSignature" : "start", + "signature" : "start", + "request" : { + "name" : "<%=ivy.cms.co(\"/Processes/ForecastWeatherDemo/name\")%>" + }, "case" : { "name" : "<%=ivy.cms.co(\"/Processes/ForecastWeatherDemo/Tasks/DisplayForecastWeather/name\")%>" - }, - "outLink" : "start.ivp", - "startName" : "<%=ivy.cms.co(\"/Processes/ForecastWeatherDemo/name\")%>", - "tags" : "demo" + } }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -32,13 +37,14 @@ "type" : "DialogCall", "name" : "ForecastWeatherDemo", "config" : { - "dialogId" : "com.axonivy.connector.openweather.demo.ui.ForecastWeatherDemo", - "startMethod" : "start()" + "dialog" : "com.axonivy.connector.openweather.demo.ui.ForecastWeatherDemo:start()" }, "visual" : { "at" : { "x" : 272, "y" : 63 }, "size" : { "width" : 174, "height" : 57 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/open-weather-connector-demo/src/com/axonivy/connector/openweather/managedbean/ForecastWeatherBean.java b/open-weather-connector-demo/src/com/axonivy/connector/openweather/managedbean/ForecastWeatherBean.java index 83871a7..bde8289 100644 --- a/open-weather-connector-demo/src/com/axonivy/connector/openweather/managedbean/ForecastWeatherBean.java +++ b/open-weather-connector-demo/src/com/axonivy/connector/openweather/managedbean/ForecastWeatherBean.java @@ -382,6 +382,8 @@ private int calculateModelStartX(int index) { private void createTemperatureModel() { temperatureModel = new LineChartModel(); LineChartOptions options = new LineChartOptions(); + options.setResponsive(true); + options.setMaintainAspectRatio(false); temperatureModel.setOptions(options); temperatureModel.setData(prepareTemperatureChartData()); temperatureModel.setExtender(Constants.UiVariable.TEMPERATURE_CHART_EXTENDER_JS_METHOD_NAME); @@ -412,6 +414,8 @@ public ChartData preparePrecipitationChartData() { public void createWindModel() { windModel = new LineChartModel(); LineChartOptions options = new LineChartOptions(); + options.setResponsive(true); + options.setMaintainAspectRatio(false); windModel.setData(prepareWindChartData()); windModel.setOptions(options); windModel.setExtender(Constants.UiVariable.WIND_CHART_EXTENDER_JS_METHOD_NAME); @@ -470,6 +474,8 @@ public List prepareTimeLabels() { public void createPrecipitationModel() { precipitationModel = new BarChartModel(); BarChartOptions options = new BarChartOptions(); + options.setResponsive(true); + options.setMaintainAspectRatio(false); precipitationModel.setOptions(options); precipitationModel.setData(preparePrecipitationChartData()); precipitationModel.setExtender(Constants.UiVariable.PRECIPITATION_CHART_EXTENDER_JS_METHOD_NAME); diff --git a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemo.rddescriptor b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemo.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemo.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemo.xhtml b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemo.xhtml index 03c6c1b..1ff36fe 100644 --- a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemo.xhtml +++ b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemo.xhtml @@ -28,7 +28,7 @@ value="#{forecastWeatherBean.currentChartWindowEndX}" /> + columnClasses="ui-g-4 pl-0, ui-g-3, ui-g-3, ui-g-2 pr-0"> @@ -57,15 +57,15 @@ + columnClasses="ui-g-3 p-0, ui-g-9 py-0"> + styleClass="text-center #{ivyFreyaTheme.getMode() == 'dark' ? 'weather-detail-container-dark-mode' : 'weather-detail-container-light-mode'}"> + columnClasses="ui-g-6 py-3, ui-g-6 py-3"> #{forecastWeatherBean.cityName} - #{forecastWeatherBean.time12HourName} + #{forecastWeatherBean.time12HourName}
#{forecastWeatherBean.currentWeatherDetail}
#{ivy.cms.co('/Dialogs/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/HumidityLabel')}
@@ -107,7 +107,7 @@
#{forecastWeatherBean.currentWindSpeed}#{forecastWeatherBean.speedUnit}
 - #{forecastWeatherBean.dateName} + #{forecastWeatherBean.dateName} @@ -116,7 +116,7 @@ title="#{ivy.cms.co('/Dialogs/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/TemperatureLabel')}"> @@ -124,15 +124,14 @@ title="#{ivy.cms.co('/Dialogs/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/PrecipitationLabel')}"> - @@ -149,11 +148,11 @@ - + #{status.first ? 'Today' : dailyForecastDisplayInfo.shortDateName} - + diff --git a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoData.d.json b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoData.d.json new file mode 100644 index 0000000..8abfec2 --- /dev/null +++ b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ForecastWeatherDemoData", + "namespace" : "com.axonivy.connector.openweather.demo.ui.ForecastWeatherDemo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoData.ivyClass b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoData.ivyClass deleted file mode 100644 index e2efe3b..0000000 --- a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoData.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -ForecastWeatherDemoData #class -com.axonivy.connector.openweather.demo.ui.ForecastWeatherDemo #namespace diff --git a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoProcess.p.json b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoProcess.p.json index 74c4600..2887e97 100644 --- a/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoProcess.p.json +++ b/open-weather-connector-demo/src_hd/com/axonivy/connector/openweather/demo/ui/ForecastWeatherDemo/ForecastWeatherDemoProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18D69D45CF17FC2E", "kind" : "HTML_DIALOG", "config" : { @@ -10,13 +10,15 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "18D69D45CF2DCB22" }, "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -33,7 +35,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/open-weather-connector-demo/webContent/layouts/frame-10.xhtml b/open-weather-connector-demo/webContent/layouts/frame-10.xhtml index ff0baa5..98fe008 100644 --- a/open-weather-connector-demo/webContent/layouts/frame-10.xhtml +++ b/open-weather-connector-demo/webContent/layouts/frame-10.xhtml @@ -33,7 +33,7 @@ and refence it below in the head part. - + diff --git a/open-weather-connector-product/pom.xml b/open-weather-connector-product/pom.xml index be318ba..41e5ae1 100644 --- a/open-weather-connector-product/pom.xml +++ b/open-weather-connector-product/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.connector.openweather open-weather-connector-product - 10.0.19-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/open-weather-connector-test/.classpath b/open-weather-connector-test/.classpath index e938886..a7c4476 100644 --- a/open-weather-connector-test/.classpath +++ b/open-weather-connector-test/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/open-weather-connector-test/.project b/open-weather-connector-test/.project index 009b7a1..4b551d7 100644 --- a/open-weather-connector-test/.project +++ b/open-weather-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.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/open-weather-connector-test/.settings/.jsdtscope b/open-weather-connector-test/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/open-weather-connector-test/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/open-weather-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/open-weather-connector-test/.settings/ch.ivyteam.ivy.designer.prefs index 8253ef2..dce67fa 100644 --- a/open-weather-connector-test/.settings/ch.ivyteam.ivy.designer.prefs +++ b/open-weather-connector-test/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.openweather.test.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.openweather.test -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -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 diff --git a/open-weather-connector-test/.settings/org.eclipse.jdt.core.prefs b/open-weather-connector-test/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/open-weather-connector-test/.settings/org.eclipse.jdt.core.prefs +++ b/open-weather-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/open-weather-connector-test/.settings/org.eclipse.wst.common.component b/open-weather-connector-test/.settings/org.eclipse.wst.common.component index 977def2..b73f686 100644 --- a/open-weather-connector-test/.settings/org.eclipse.wst.common.component +++ b/open-weather-connector-test/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/open-weather-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml b/open-weather-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/open-weather-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/open-weather-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/open-weather-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container b/open-weather-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/open-weather-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/open-weather-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name b/open-weather-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/open-weather-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/open-weather-connector-test/config/variables.yaml b/open-weather-connector-test/config/variables.yaml index 3469f1b..4448394 100644 --- a/open-weather-connector-test/config/variables.yaml +++ b/open-weather-connector-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. @@ -6,4 +7,4 @@ # '/Config/_/variables.yaml # Variables: -# myVariable: value \ No newline at end of file +# myVariable: value diff --git a/open-weather-connector-test/dataclasses/com/axonivy/connector/openweather/test/Data.d.json b/open-weather-connector-test/dataclasses/com/axonivy/connector/openweather/test/Data.d.json new file mode 100644 index 0000000..943ac2f --- /dev/null +++ b/open-weather-connector-test/dataclasses/com/axonivy/connector/openweather/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.openweather.test", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/open-weather-connector-test/dataclasses/com/axonivy/connector/openweather/test/Data.ivyClass b/open-weather-connector-test/dataclasses/com/axonivy/connector/openweather/test/Data.ivyClass deleted file mode 100644 index 869a287..0000000 --- a/open-weather-connector-test/dataclasses/com/axonivy/connector/openweather/test/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.openweather.test #namespace diff --git a/open-weather-connector-test/pom.xml b/open-weather-connector-test/pom.xml index e05a5f6..8084c55 100644 --- a/open-weather-connector-test/pom.xml +++ b/open-weather-connector-test/pom.xml @@ -3,11 +3,11 @@ 4.0.0 com.axonivy.connector.openweather open-weather-connector-test - 10.0.19-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 - 10.0.16 + 12.0.0 + 12.0.0 diff --git a/open-weather-connector/.classpath b/open-weather-connector/.classpath index 4b4bf5a..ef0eca0 100644 --- a/open-weather-connector/.classpath +++ b/open-weather-connector/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/open-weather-connector/.project b/open-weather-connector/.project index 68360ec..529b171 100644 --- a/open-weather-connector/.project +++ b/open-weather-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.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/open-weather-connector/.settings/.jsdtscope b/open-weather-connector/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/open-weather-connector/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/open-weather-connector/.settings/ch.ivyteam.ivy.designer.prefs b/open-weather-connector/.settings/ch.ivyteam.ivy.designer.prefs index d10a514..2e2c21a 100644 --- a/open-weather-connector/.settings/ch.ivyteam.ivy.designer.prefs +++ b/open-weather-connector/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.openweather.open.weather.connector.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.openweather.open.weather.connector -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -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 diff --git a/open-weather-connector/.settings/org.eclipse.jdt.core.prefs b/open-weather-connector/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/open-weather-connector/.settings/org.eclipse.jdt.core.prefs +++ b/open-weather-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/open-weather-connector/.settings/org.eclipse.wst.common.component b/open-weather-connector/.settings/org.eclipse.wst.common.component index cef438e..8a45c60 100644 --- a/open-weather-connector/.settings/org.eclipse.wst.common.component +++ b/open-weather-connector/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/open-weather-connector/.settings/org.eclipse.wst.common.project.facet.core.xml b/open-weather-connector/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/open-weather-connector/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/open-weather-connector/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/open-weather-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container b/open-weather-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/open-weather-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/open-weather-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name b/open-weather-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/open-weather-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/open-weather-connector/config/variables.yaml b/open-weather-connector/config/variables.yaml index 334a652..3d905c1 100644 --- a/open-weather-connector/config/variables.yaml +++ b/open-weather-connector/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json Variables: openWeatherConnector: # Open Weather Data endpoint diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionData.d.json b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionData.d.json new file mode 100644 index 0000000..fbaad71 --- /dev/null +++ b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionData.d.json @@ -0,0 +1,16 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "AirPollutionData", + "namespace" : "com.axonivy.connector.openweather.data", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "result", + "type" : "org.openweathermap.api.data2_5.client.AirPollution" + }, { + "name" : "param", + "type" : "com.axonivy.connector.openweather.data.AirPollutionParams" + }, { + "name" : "error", + "type" : "ch.ivyteam.ivy.bpm.error.BpmError" + } ] +} \ No newline at end of file diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionData.ivyClass b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionData.ivyClass deleted file mode 100644 index 4ce45b7..0000000 --- a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionData.ivyClass +++ /dev/null @@ -1,5 +0,0 @@ -AirPollutionData #class -com.axonivy.connector.openweather.data #namespace -result org.openweathermap.api.data2_5.client.AirPollution #field -param com.axonivy.connector.openweather.data.AirPollutionParams #field -error ch.ivyteam.ivy.bpm.error.BpmError #field diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionParams.d.json b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionParams.d.json new file mode 100644 index 0000000..fa97468 --- /dev/null +++ b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionParams.d.json @@ -0,0 +1,37 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "AirPollutionParams", + "namespace" : "com.axonivy.connector.openweather.data", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "startDate", + "type" : "java.time.OffsetDateTime" + }, { + "name" : "endDate", + "type" : "java.time.OffsetDateTime" + }, { + "name" : "lat", + "type" : "Double" + }, { + "name" : "lon", + "type" : "Double" + }, { + "name" : "start", + "type" : "Long" + }, { + "name" : "end", + "type" : "Long" + }, { + "name" : "cityName", + "type" : "String" + }, { + "name" : "countryCode", + "type" : "String" + }, { + "name" : "stateCode", + "type" : "String" + }, { + "name" : "zipCode", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionParams.ivyClass b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionParams.ivyClass deleted file mode 100644 index 405c9fe..0000000 --- a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/AirPollutionParams.ivyClass +++ /dev/null @@ -1,12 +0,0 @@ -AirPollutionParams #class -com.axonivy.connector.openweather.data #namespace -startDate java.time.OffsetDateTime #field -endDate java.time.OffsetDateTime #field -lat Double #field -lon Double #field -start Long #field -end Long #field -cityName String #field -countryCode String #field -stateCode String #field -zipCode String #field diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/CurrentWeatherData.d.json b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/CurrentWeatherData.d.json new file mode 100644 index 0000000..f037341 --- /dev/null +++ b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/CurrentWeatherData.d.json @@ -0,0 +1,16 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "CurrentWeatherData", + "namespace" : "com.axonivy.connector.openweather.data", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "result", + "type" : "org.openweathermap.api.data2_5.client.Current" + }, { + "name" : "param", + "type" : "com.axonivy.connector.openweather.data.WeatherParams" + }, { + "name" : "error", + "type" : "ch.ivyteam.ivy.bpm.error.BpmError" + } ] +} \ No newline at end of file diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/CurrentWeatherData.ivyClass b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/CurrentWeatherData.ivyClass deleted file mode 100644 index 962c1ae..0000000 --- a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/CurrentWeatherData.ivyClass +++ /dev/null @@ -1,5 +0,0 @@ -CurrentWeatherData #class -com.axonivy.connector.openweather.data #namespace -result org.openweathermap.api.data2_5.client.Current #field -param com.axonivy.connector.openweather.data.WeatherParams #field -error ch.ivyteam.ivy.bpm.error.BpmError #field diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/ForecastWeatherData.d.json b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/ForecastWeatherData.d.json new file mode 100644 index 0000000..6a10784 --- /dev/null +++ b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/ForecastWeatherData.d.json @@ -0,0 +1,16 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ForecastWeatherData", + "namespace" : "com.axonivy.connector.openweather.data", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "result", + "type" : "org.openweathermap.api.data2_5.client.Forecast" + }, { + "name" : "param", + "type" : "com.axonivy.connector.openweather.data.WeatherParams" + }, { + "name" : "error", + "type" : "ch.ivyteam.ivy.bpm.error.BpmError" + } ] +} \ No newline at end of file diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/ForecastWeatherData.ivyClass b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/ForecastWeatherData.ivyClass deleted file mode 100644 index 25b9f45..0000000 --- a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/ForecastWeatherData.ivyClass +++ /dev/null @@ -1,5 +0,0 @@ -ForecastWeatherData #class -com.axonivy.connector.openweather.data #namespace -result org.openweathermap.api.data2_5.client.Forecast #field -param com.axonivy.connector.openweather.data.WeatherParams #field -error ch.ivyteam.ivy.bpm.error.BpmError #field diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingLocationData.d.json b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingLocationData.d.json new file mode 100644 index 0000000..c7e66e9 --- /dev/null +++ b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingLocationData.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "GeocodingLocationData", + "namespace" : "com.axonivy.connector.openweather.data", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "results", + "type" : "java.util.List" + }, { + "name" : "param", + "type" : "com.axonivy.connector.openweather.data.GeocodingParams" + }, { + "name" : "error", + "type" : "ch.ivyteam.ivy.bpm.error.BpmError" + }, { + "name" : "result", + "type" : "org.openweathermap.api.geo1_0.client.GeoLocation" + } ] +} \ No newline at end of file diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingLocationData.ivyClass b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingLocationData.ivyClass deleted file mode 100644 index 26cf32e..0000000 --- a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingLocationData.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -GeocodingLocationData #class -com.axonivy.connector.openweather.data #namespace -results java.util.List #field -param com.axonivy.connector.openweather.data.GeocodingParams #field -error ch.ivyteam.ivy.bpm.error.BpmError #field -result org.openweathermap.api.geo1_0.client.GeoLocation #field diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingParams.d.json b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingParams.d.json new file mode 100644 index 0000000..87f0069 --- /dev/null +++ b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingParams.d.json @@ -0,0 +1,34 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "GeocodingParams", + "namespace" : "com.axonivy.connector.openweather.data", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "cityName", + "type" : "String" + }, { + "name" : "limit", + "type" : "Integer" + }, { + "name" : "lat", + "type" : "Double" + }, { + "name" : "lon", + "type" : "Double" + }, { + "name" : "countryCode", + "type" : "String" + }, { + "name" : "stateCode", + "type" : "String" + }, { + "name" : "zipCode", + "type" : "String" + }, { + "name" : "q", + "type" : "String" + }, { + "name" : "zip", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingParams.ivyClass b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingParams.ivyClass deleted file mode 100644 index 73d47fb..0000000 --- a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/GeocodingParams.ivyClass +++ /dev/null @@ -1,11 +0,0 @@ -GeocodingParams #class -com.axonivy.connector.openweather.data #namespace -cityName String #field -limit Integer #field -lat Double #field -lon Double #field -countryCode String #field -stateCode String #field -zipCode String #field -q String #field -zip String #field diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/WeatherParams.d.json b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/WeatherParams.d.json new file mode 100644 index 0000000..9042e04 --- /dev/null +++ b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/WeatherParams.d.json @@ -0,0 +1,34 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "WeatherParams", + "namespace" : "com.axonivy.connector.openweather.data", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "lat", + "type" : "Double" + }, { + "name" : "lon", + "type" : "Double" + }, { + "name" : "lang", + "type" : "String" + }, { + "name" : "units", + "type" : "String" + }, { + "name" : "cnt", + "type" : "Integer" + }, { + "name" : "cityName", + "type" : "String" + }, { + "name" : "stateCode", + "type" : "String" + }, { + "name" : "countryCode", + "type" : "String" + }, { + "name" : "zipCode", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/WeatherParams.ivyClass b/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/WeatherParams.ivyClass deleted file mode 100644 index 74a81d1..0000000 --- a/open-weather-connector/dataclasses/com/axonivy/connector/openweather/data/WeatherParams.ivyClass +++ /dev/null @@ -1,11 +0,0 @@ -WeatherParams #class -com.axonivy.connector.openweather.data #namespace -lat Double #field -lon Double #field -lang String #field -units String #field -cnt Integer #field -cityName String #field -stateCode String #field -countryCode String #field -zipCode String #field diff --git a/open-weather-connector/pom.xml b/open-weather-connector/pom.xml index 0c50b66..e6b0cdd 100644 --- a/open-weather-connector/pom.xml +++ b/open-weather-connector/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.openweather open-weather-connector - 10.0.19-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 diff --git a/open-weather-connector/processes/connector/AirPollution.p.json b/open-weather-connector/processes/connector/AirPollution.p.json index 07ac344..8e3f260 100644 --- a/open-weather-connector/processes/connector/AirPollution.p.json +++ b/open-weather-connector/processes/connector/AirPollution.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18D5F959C5356687", "kind" : "CALLABLE_SUB", "config" : { @@ -10,11 +10,11 @@ "type" : "CallSubStart", "name" : "getCurrentAirPollution(Double,Double)", "config" : { - "callSignature" : "getCurrentAirPollution", + "signature" : "getCurrentAirPollution", "input" : { "params" : [ - { "name" : "lat", "type" : "Double" }, - { "name" : "lon", "type" : "Double" } + { "name" : "lat", "type" : "Double", "desc" : "" }, + { "name" : "lon", "type" : "Double", "desc" : "" } ], "map" : { "out.param.lat" : "param.lat", @@ -23,21 +23,25 @@ }, "result" : { "params" : [ - { "name" : "airPollution", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "airPollution", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.airPollution" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 64 }, "labelOffset" : { "x" : 57, "y" : 33 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -49,19 +53,23 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/air_pollution", - "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "lat" : "in.param.lat is initialized ? in.param.lat : null", - "lon" : "in.param.lon is initialized ? in.param.lon : null", - "appid" : "" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.result" : "result" + "target" : { + "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", + "path" : "/air_pollution", + "queryParams" : { + "lat" : "in.param.lat is initialized ? in.param.lat : null", + "lon" : "in.param.lon is initialized ? in.param.lon : null", + "appid" : "" + } }, - "resultType" : "org.openweathermap.api.data2_5.client.AirPollution" + "response" : { + "entity" : { + "type" : "org.openweathermap.api.data2_5.client.AirPollution", + "map" : { + "out.result" : "result" + } + } + } }, "visual" : { "at" : { "x" : 576, "y" : 64 } @@ -80,19 +88,23 @@ "visual" : { "at" : { "x" : 608, "y" : 106 } }, - "connect" : { "id" : "f35", "to" : "f34", "via" : [ { "x" : 608, "y" : 128 } ] } + "connect" : [ + { "id" : "f35", "to" : "f34", "via" : [ { "x" : 608, "y" : 128 } ] } + ] } ], - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f7", "type" : "CallSubStart", "name" : "getForecastAirPollution(Double,Double)", "config" : { - "callSignature" : "getForecastAirPollution", + "signature" : "getForecastAirPollution", "input" : { "params" : [ - { "name" : "lat", "type" : "Double" }, - { "name" : "lon", "type" : "Double" } + { "name" : "lat", "type" : "Double", "desc" : "" }, + { "name" : "lon", "type" : "Double", "desc" : "" } ], "map" : { "out.param.lat" : "param.lat", @@ -101,21 +113,25 @@ }, "result" : { "params" : [ - { "name" : "airPollution", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "airPollution", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.airPollution" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 384 }, "labelOffset" : { "x" : 57, "y" : 33 } }, - "connect" : { "id" : "f12", "to" : "f9" } + "connect" : [ + { "id" : "f12", "to" : "f9" } + ] }, { "id" : "f8", "type" : "CallSubEnd", @@ -127,19 +143,23 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/air_pollution/forecast", - "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "lat" : "in.param.lat is initialized ? in.param.lat : null", - "lon" : "in.param.lon is initialized ? in.param.lon : null", - "appid" : "" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.result" : "result" + "target" : { + "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", + "path" : "/air_pollution/forecast", + "queryParams" : { + "lat" : "in.param.lat is initialized ? in.param.lat : null", + "lon" : "in.param.lon is initialized ? in.param.lon : null", + "appid" : "" + } }, - "resultType" : "org.openweathermap.api.data2_5.client.AirPollution" + "response" : { + "entity" : { + "type" : "org.openweathermap.api.data2_5.client.AirPollution", + "map" : { + "out.result" : "result" + } + } + } }, "visual" : { "at" : { "x" : 584, "y" : 384 } @@ -158,21 +178,25 @@ "visual" : { "at" : { "x" : 624, "y" : 426 } }, - "connect" : { "id" : "f13", "to" : "f47", "via" : [ { "x" : 624, "y" : 448 } ] } + "connect" : [ + { "id" : "f13", "to" : "f47", "via" : [ { "x" : 624, "y" : 448 } ] } + ] } ], - "connect" : { "id" : "f11", "to" : "f8" } + "connect" : [ + { "id" : "f11", "to" : "f8" } + ] }, { "id" : "f14", "type" : "CallSubStart", "name" : "getHistoricalAirPollution(Double,Double,OffsetDateTime,OffsetDateTime)", "config" : { - "callSignature" : "getHistoricalAirPollution", + "signature" : "getHistoricalAirPollution", "input" : { "params" : [ - { "name" : "lat", "type" : "Double" }, - { "name" : "lon", "type" : "Double" }, - { "name" : "startDate", "type" : "java.time.OffsetDateTime" }, - { "name" : "endDate", "type" : "java.time.OffsetDateTime" } + { "name" : "lat", "type" : "Double", "desc" : "" }, + { "name" : "lon", "type" : "Double", "desc" : "" }, + { "name" : "startDate", "type" : "java.time.OffsetDateTime", "desc" : "" }, + { "name" : "endDate", "type" : "java.time.OffsetDateTime", "desc" : "" } ], "map" : { "out.param.endDate" : "param.#endDate", @@ -192,21 +216,25 @@ }, "result" : { "params" : [ - { "name" : "airPollution", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "airPollution", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.airPollution" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 704 }, "labelOffset" : { "x" : -31, "y" : 33 } }, - "connect" : { "id" : "f19", "to" : "f16" } + "connect" : [ + { "id" : "f19", "to" : "f16" } + ] }, { "id" : "f15", "type" : "CallSubEnd", @@ -218,21 +246,25 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/air_pollution/history", - "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "lat" : "in.param.lat is initialized ? in.param.lat : null", - "lon" : "in.param.lon is initialized ? in.param.lon : null", - "appid" : "", - "start" : "in.param.start is initialized ? in.param.start : null", - "end" : "in.param.end is initialized ? in.param.end : null" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.result" : "result" + "target" : { + "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", + "path" : "/air_pollution/history", + "queryParams" : { + "lat" : "in.param.lat is initialized ? in.param.lat : null", + "lon" : "in.param.lon is initialized ? in.param.lon : null", + "appid" : "", + "start" : "in.param.start is initialized ? in.param.start : null", + "end" : "in.param.end is initialized ? in.param.end : null" + } }, - "resultType" : "org.openweathermap.api.data2_5.client.AirPollution" + "response" : { + "entity" : { + "type" : "org.openweathermap.api.data2_5.client.AirPollution", + "map" : { + "out.result" : "result" + } + } + } }, "visual" : { "at" : { "x" : 600, "y" : 704 } @@ -251,20 +283,24 @@ "visual" : { "at" : { "x" : 632, "y" : 746 } }, - "connect" : { "id" : "f73", "to" : "f65", "via" : [ { "x" : 632, "y" : 768 } ] } + "connect" : [ + { "id" : "f73", "to" : "f65", "via" : [ { "x" : 632, "y" : 768 } ] } + ] } ], - "connect" : { "id" : "f20", "to" : "f15" } + "connect" : [ + { "id" : "f20", "to" : "f15" } + ] }, { "id" : "f21", "type" : "CallSubStart", "name" : "getCurrentAirPollutionByLocationName(String,Double,String,String,String)", "config" : { - "callSignature" : "getCurrentAirPollutionByLocationName", + "signature" : "getCurrentAirPollutionByLocationName", "input" : { "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" } + { "name" : "cityName", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "stateCode", "type" : "String", "desc" : "" } ], "map" : { "out.param.cityName" : "param.cityName", @@ -274,31 +310,35 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 160 }, "labelOffset" : { "x" : -39, "y" : 33 } }, - "connect" : { "id" : "f38", "to" : "f23" } + "connect" : [ + { "id" : "f38", "to" : "f23" } + ] }, { "id" : "f22", "type" : "CallSubStart", "name" : "getCurrentAirPollutionByZipCode(String,Double,String,String,String)", "config" : { - "callSignature" : "getCurrentAirPollutionByZipCode", + "signature" : "getCurrentAirPollutionByZipCode", "input" : { "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } + { "name" : "zipCode", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" } ], "map" : { "out.param.countryCode" : "param.countryCode", @@ -307,61 +347,67 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 272 }, "labelOffset" : { "x" : -23, "y" : 33 } }, - "connect" : { "id" : "f33", "to" : "f25" } + "connect" : [ + { "id" : "f33", "to" : "f25" } + ] }, { "id" : "f23", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByLocationName(String,String,String,Integer)", - "output" : { - "map" : { - "out" : "in", - "out.error" : "result.#error", - "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", - "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" - } - }, "call" : { - "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "limit", "type" : "Integer" } - ], "map" : { "param.cityName" : "in.param.cityName", "param.countryCode" : "in.param.countryCode", "param.stateCode" : "in.param.stateCode", "param.limit" : "1" } + }, + "output" : { + "map" : { + "out" : "in", + "out.error" : "result.#error", + "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", + "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" + } } }, "visual" : { "at" : { "x" : 320, "y" : 160 }, "size" : { "width" : 192, "height" : 68 } }, - "connect" : { "id" : "f31", "to" : "f27" } + "connect" : [ + { "id" : "f31", "to" : "f27" } + ] }, { "id" : "f25", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByZipCode(String,String)", + "call" : { + "map" : { + "param.zipCode" : "in.param.zipCode", + "param.countryCode" : "in.param.countryCode" + } + }, "output" : { "map" : { "out" : "in", @@ -369,33 +415,30 @@ "out.param.lat" : "result.geoLocation.lat", "out.param.lon" : "result.geoLocation.lon" } - }, - "call" : { - "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } - ], - "map" : { - "param.zipCode" : "in.param.zipCode", - "param.countryCode" : "in.param.countryCode" - } } }, "visual" : { "at" : { "x" : 320, "y" : 272 }, "size" : { "width" : 194, "height" : 68 } }, - "connect" : { "id" : "f30", "to" : "f27", "via" : [ { "x" : 576, "y" : 272 } ] } + "connect" : [ + { "id" : "f30", "to" : "f27", "via" : [ { "x" : 576, "y" : 272 } ] } + ] }, { "id" : "f27", "type" : "Alternative", + "config" : { + "conditions" : { + "f28" : "in.#error is initialized" + } + }, "visual" : { "at" : { "x" : 576, "y" : 160 } }, "connect" : [ { "id" : "f28", "to" : "f34", "via" : [ { "x" : 784, "y" : 160 } ], "label" : { "name" : "fail" - }, "condition" : "in.#error is initialized" }, + } }, { "id" : "f24", "to" : "f3", "label" : { "name" : "success" } } @@ -414,12 +457,12 @@ "type" : "CallSubStart", "name" : "getForecastAirPollutionByLocationName(String,Double,String,String,String)", "config" : { - "callSignature" : "getForecastAirPollutionByLocationName", + "signature" : "getForecastAirPollutionByLocationName", "input" : { "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" } + { "name" : "cityName", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "stateCode", "type" : "String", "desc" : "" } ], "map" : { "out.param.cityName" : "param.cityName", @@ -429,31 +472,35 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 480 }, "labelOffset" : { "x" : -39, "y" : 33 } }, - "connect" : { "id" : "f48", "to" : "f41" } + "connect" : [ + { "id" : "f48", "to" : "f41" } + ] }, { "id" : "f40", "type" : "CallSubStart", "name" : "getForecastAirPollutionByZipCode(String,Double,String,String,String)", "config" : { - "callSignature" : "getForecastAirPollutionByZipCode", + "signature" : "getForecastAirPollutionByZipCode", "input" : { "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } + { "name" : "zipCode", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" } ], "map" : { "out.param.countryCode" : "param.countryCode", @@ -462,61 +509,67 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 592 }, "labelOffset" : { "x" : -23, "y" : 33 } }, - "connect" : { "id" : "f49", "to" : "f43" } + "connect" : [ + { "id" : "f49", "to" : "f43" } + ] }, { "id" : "f41", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByLocationName(String,String,String,Integer)", - "output" : { - "map" : { - "out" : "in", - "out.error" : "result.#error", - "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", - "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" - } - }, "call" : { - "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "limit", "type" : "Integer" } - ], "map" : { "param.cityName" : "in.param.cityName", "param.countryCode" : "in.param.countryCode", "param.stateCode" : "in.param.stateCode", "param.limit" : "1" } + }, + "output" : { + "map" : { + "out" : "in", + "out.error" : "result.#error", + "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", + "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" + } } }, "visual" : { "at" : { "x" : 320, "y" : 480 }, "size" : { "width" : 192, "height" : 68 } }, - "connect" : { "id" : "f50", "to" : "f45" } + "connect" : [ + { "id" : "f50", "to" : "f45" } + ] }, { "id" : "f43", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByZipCode(String,String)", + "call" : { + "map" : { + "param.zipCode" : "in.param.zipCode", + "param.countryCode" : "in.param.countryCode" + } + }, "output" : { "map" : { "out" : "in", @@ -524,33 +577,30 @@ "out.param.lat" : "result.geoLocation.lat", "out.param.lon" : "result.geoLocation.lon" } - }, - "call" : { - "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } - ], - "map" : { - "param.zipCode" : "in.param.zipCode", - "param.countryCode" : "in.param.countryCode" - } } }, "visual" : { "at" : { "x" : 320, "y" : 592 }, "size" : { "width" : 194, "height" : 68 } }, - "connect" : { "id" : "f52", "to" : "f45", "via" : [ { "x" : 584, "y" : 592 } ] } + "connect" : [ + { "id" : "f52", "to" : "f45", "via" : [ { "x" : 584, "y" : 592 } ] } + ] }, { "id" : "f45", "type" : "Alternative", + "config" : { + "conditions" : { + "f29" : "in.#error is initialized" + } + }, "visual" : { "at" : { "x" : 584, "y" : 480 } }, "connect" : [ { "id" : "f29", "to" : "f47", "via" : [ { "x" : 784, "y" : 480 } ], "label" : { "name" : "fail" - }, "condition" : "in.#error is initialized" }, + } }, { "id" : "f32", "to" : "f9", "label" : { "name" : "success" } } @@ -569,14 +619,14 @@ "type" : "CallSubStart", "name" : "getHistoricalAirPollutionByLocationName(String,Double,String,String,String)", "config" : { - "callSignature" : "getHistoricalAirPollutionByLocationName", + "signature" : "getHistoricalAirPollutionByLocationName", "input" : { "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "startDate", "type" : "java.time.OffsetDateTime" }, - { "name" : "endDate", "type" : "java.time.OffsetDateTime" } + { "name" : "cityName", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "stateCode", "type" : "String", "desc" : "" }, + { "name" : "startDate", "type" : "java.time.OffsetDateTime", "desc" : "" }, + { "name" : "endDate", "type" : "java.time.OffsetDateTime", "desc" : "" } ], "map" : { "out.param.cityName" : "param.cityName", @@ -597,33 +647,37 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 800 }, "labelOffset" : { "x" : -39, "y" : 33 } }, - "connect" : { "id" : "f66", "to" : "f59" } + "connect" : [ + { "id" : "f66", "to" : "f59" } + ] }, { "id" : "f58", "type" : "CallSubStart", "name" : "getHistoricalAirPollutionByZipCode(String,Double,String,String,String)", "config" : { - "callSignature" : "getHistoricalAirPollutionByZipCode", + "signature" : "getHistoricalAirPollutionByZipCode", "input" : { "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "startDate", "type" : "java.time.OffsetDateTime" }, - { "name" : "endDate", "type" : "java.time.OffsetDateTime" } + { "name" : "zipCode", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "startDate", "type" : "java.time.OffsetDateTime", "desc" : "" }, + { "name" : "endDate", "type" : "java.time.OffsetDateTime", "desc" : "" } ], "map" : { "out.param.countryCode" : "param.countryCode", @@ -643,61 +697,67 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.AirPollution", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 64, "y" : 904 }, "labelOffset" : { "x" : -23, "y" : 33 } }, - "connect" : { "id" : "f72", "to" : "f61" } + "connect" : [ + { "id" : "f72", "to" : "f61" } + ] }, { "id" : "f59", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByLocationName(String,String,String,Integer)", - "output" : { - "map" : { - "out" : "in", - "out.error" : "result.#error", - "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", - "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" - } - }, "call" : { - "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "limit", "type" : "Integer" } - ], "map" : { "param.cityName" : "in.param.cityName", "param.countryCode" : "in.param.countryCode", "param.stateCode" : "in.param.stateCode", "param.limit" : "1" } + }, + "output" : { + "map" : { + "out" : "in", + "out.error" : "result.#error", + "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", + "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" + } } }, "visual" : { "at" : { "x" : 320, "y" : 800 }, "size" : { "width" : 192, "height" : 68 } }, - "connect" : { "id" : "f69", "to" : "f63" } + "connect" : [ + { "id" : "f69", "to" : "f63" } + ] }, { "id" : "f61", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByZipCode(String,String)", + "call" : { + "map" : { + "param.zipCode" : "in.param.zipCode", + "param.countryCode" : "in.param.countryCode" + } + }, "output" : { "map" : { "out" : "in", @@ -705,33 +765,30 @@ "out.param.lat" : "result.geoLocation.lat", "out.param.lon" : "result.geoLocation.lon" } - }, - "call" : { - "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } - ], - "map" : { - "param.zipCode" : "in.param.zipCode", - "param.countryCode" : "in.param.countryCode" - } } }, "visual" : { "at" : { "x" : 320, "y" : 904 }, "size" : { "width" : 194, "height" : 68 } }, - "connect" : { "id" : "f71", "to" : "f63", "via" : [ { "x" : 600, "y" : 904 } ] } + "connect" : [ + { "id" : "f71", "to" : "f63", "via" : [ { "x" : 600, "y" : 904 } ] } + ] }, { "id" : "f63", "type" : "Alternative", + "config" : { + "conditions" : { + "f36" : "in.#error is initialized" + } + }, "visual" : { "at" : { "x" : 600, "y" : 800 } }, "connect" : [ { "id" : "f36", "to" : "f65", "via" : [ { "x" : 784, "y" : 800 } ], "label" : { "name" : "fail" - }, "condition" : "in.#error is initialized" }, + } }, { "id" : "f26", "to" : "f16", "label" : { "name" : "success" } } diff --git a/open-weather-connector/processes/connector/CurrentWeather.p.json b/open-weather-connector/processes/connector/CurrentWeather.p.json index b29e315..fa3c03a 100644 --- a/open-weather-connector/processes/connector/CurrentWeather.p.json +++ b/open-weather-connector/processes/connector/CurrentWeather.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18D5E5D311C7C5FE", "kind" : "CALLABLE_SUB", "config" : { @@ -10,13 +10,13 @@ "type" : "CallSubStart", "name" : "getCurrentWeather(Double,Double,String,String)", "config" : { - "callSignature" : "getCurrentWeather", + "signature" : "getCurrentWeather", "input" : { "params" : [ - { "name" : "lat", "type" : "Double" }, - { "name" : "lon", "type" : "Double" }, - { "name" : "units", "type" : "String" }, - { "name" : "lang", "type" : "String" } + { "name" : "lat", "type" : "Double", "desc" : "" }, + { "name" : "lon", "type" : "Double", "desc" : "" }, + { "name" : "units", "type" : "String", "desc" : "" }, + { "name" : "lang", "type" : "String", "desc" : "" } ], "map" : { "out.param.lang" : "param.lang", @@ -28,21 +28,25 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.Current" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.Current", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 176, "y" : 32 }, "labelOffset" : { "x" : 1, "y" : 33 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -54,22 +58,26 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/weather", - "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "lat" : "in.param.#lat is initialized ? in.param.lat : null", - "lon" : "in.param.#lon is initialized ? in.param.lon : null", - "appid" : "", - "lang" : "in.param.#lang is initialized ? in.param.lang : null", - "units" : "in.param.#units is initialized ? in.param.units : null", - "mode" : "null" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.result" : "result" + "target" : { + "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", + "path" : "/weather", + "queryParams" : { + "lat" : "in.param.#lat is initialized ? in.param.lat : null", + "lon" : "in.param.#lon is initialized ? in.param.lon : null", + "appid" : "", + "lang" : "in.param.#lang is initialized ? in.param.lang : null", + "units" : "in.param.#units is initialized ? in.param.units : null", + "mode" : "null" + } }, - "resultType" : "org.openweathermap.api.data2_5.client.Current" + "response" : { + "entity" : { + "type" : "org.openweathermap.api.data2_5.client.Current", + "map" : { + "out.result" : "result" + } + } + } }, "visual" : { "at" : { "x" : 624, "y" : 32 } @@ -88,22 +96,26 @@ "visual" : { "at" : { "x" : 656, "y" : 74 } }, - "connect" : { "id" : "f23", "to" : "f20", "via" : [ { "x" : 656, "y" : 96 } ] } + "connect" : [ + { "id" : "f23", "to" : "f20", "via" : [ { "x" : 656, "y" : 96 } ] } + ] } ], - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f7", "type" : "CallSubStart", "name" : "getCurrentWeatherByLocationName(String,Double,String,String,String)", "config" : { - "callSignature" : "getCurrentWeatherByLocation", + "signature" : "getCurrentWeatherByLocation", "input" : { "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "lang", "type" : "String" }, - { "name" : "units", "type" : "String" } + { "name" : "cityName", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "stateCode", "type" : "String", "desc" : "" }, + { "name" : "lang", "type" : "String", "desc" : "" }, + { "name" : "units", "type" : "String", "desc" : "" } ], "map" : { "out.param.cityName" : "param.cityName", @@ -115,8 +127,8 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.Current" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.Current", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", @@ -128,53 +140,51 @@ "at" : { "x" : 176, "y" : 128 }, "labelOffset" : { "x" : -55, "y" : 33 } }, - "connect" : { "id" : "f9", "to" : "f8" } + "connect" : [ + { "id" : "f9", "to" : "f8" } + ] }, { "id" : "f8", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByLocationName(String,String,String,Integer)", - "output" : { - "map" : { - "out" : "in", - "out.error" : "result.#error", - "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", - "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" - } - }, "call" : { - "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "limit", "type" : "Integer" } - ], "map" : { "param.cityName" : "in.param.cityName", "param.countryCode" : "in.param.countryCode", "param.stateCode" : "in.param.stateCode", "param.limit" : "1" } + }, + "output" : { + "map" : { + "out" : "in", + "out.error" : "result.#error", + "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", + "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" + } } }, "visual" : { "at" : { "x" : 408, "y" : 128 }, "size" : { "width" : 192, "height" : 68 } }, - "connect" : { "id" : "f15", "to" : "f14" } + "connect" : [ + { "id" : "f15", "to" : "f14" } + ] }, { "id" : "f11", "type" : "CallSubStart", "name" : "getCurrentWeatherByZipCode(String,Double,String,String,String)", "config" : { - "callSignature" : "call", + "signature" : "call", "input" : { "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "lang", "type" : "String" }, - { "name" : "units", "type" : "String" } + { "name" : "zipCode", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "lang", "type" : "String", "desc" : "" }, + { "name" : "units", "type" : "String", "desc" : "" } ], "map" : { "out.param.countryCode" : "param.countryCode", @@ -185,27 +195,37 @@ }, "result" : { "params" : [ - { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.Current" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "currentWeather", "type" : "org.openweathermap.api.data2_5.client.Current", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.currentWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 176, "y" : 240 }, "labelOffset" : { "x" : -39, "y" : 33 } }, - "connect" : { "id" : "f13", "to" : "f12" } + "connect" : [ + { "id" : "f13", "to" : "f12" } + ] }, { "id" : "f12", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByZipCode(String,String)", + "call" : { + "map" : { + "param.zipCode" : "in.param.zipCode", + "param.countryCode" : "in.param.countryCode" + } + }, "output" : { "map" : { "out" : "in", @@ -213,33 +233,30 @@ "out.param.lat" : "result.geoLocation.lat", "out.param.lon" : "result.geoLocation.lon" } - }, - "call" : { - "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } - ], - "map" : { - "param.zipCode" : "in.param.zipCode", - "param.countryCode" : "in.param.countryCode" - } } }, "visual" : { "at" : { "x" : 408, "y" : 240 }, "size" : { "width" : 194, "height" : 68 } }, - "connect" : { "id" : "f16", "to" : "f14", "via" : [ { "x" : 624, "y" : 240 } ] } + "connect" : [ + { "id" : "f16", "to" : "f14", "via" : [ { "x" : 624, "y" : 240 } ] } + ] }, { "id" : "f14", "type" : "Alternative", + "config" : { + "conditions" : { + "f18" : "in.#error is initialized" + } + }, "visual" : { "at" : { "x" : 624, "y" : 128 } }, "connect" : [ { "id" : "f18", "to" : "f20", "via" : [ { "x" : 808, "y" : 128 } ], "label" : { "name" : "fail" - }, "condition" : "in.#error is initialized" }, + } }, { "id" : "f17", "to" : "f3", "label" : { "name" : "success", "offset" : { "x" : 1, "y" : 7 } diff --git a/open-weather-connector/processes/connector/ForecastWeather.p.json b/open-weather-connector/processes/connector/ForecastWeather.p.json index 5aaeffa..9532cb8 100644 --- a/open-weather-connector/processes/connector/ForecastWeather.p.json +++ b/open-weather-connector/processes/connector/ForecastWeather.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18D5E5542F83C562", "kind" : "CALLABLE_SUB", "config" : { @@ -16,23 +16,27 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/forecast", - "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "lat" : "in.param.#lat is initialized ? in.param.lat : null", - "lon" : "in.param.#lon is initialized ? in.param.lon : null", - "appid" : "", - "lang" : "in.param.#lang is initialized ? in.param.lang : null", - "units" : "in.param.#units is initialized ? in.param.units : null", - "mode" : "null", - "cnt" : "in.param.#cnt is initialized ? in.param.cnt : null" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.result" : "result" + "target" : { + "clientId" : "c7415148-b288-475b-8d2f-e532ddae4472", + "path" : "/forecast", + "queryParams" : { + "lat" : "in.param.#lat is initialized ? in.param.lat : null", + "lon" : "in.param.#lon is initialized ? in.param.lon : null", + "appid" : "", + "lang" : "in.param.#lang is initialized ? in.param.lang : null", + "units" : "in.param.#units is initialized ? in.param.units : null", + "mode" : "null", + "cnt" : "in.param.#cnt is initialized ? in.param.cnt : null" + } }, - "resultType" : "org.openweathermap.api.data2_5.client.Forecast" + "response" : { + "entity" : { + "type" : "org.openweathermap.api.data2_5.client.Forecast", + "map" : { + "out.result" : "result" + } + } + } }, "visual" : { "at" : { "x" : 552, "y" : 80 } @@ -51,22 +55,26 @@ "visual" : { "at" : { "x" : 584, "y" : 122 } }, - "connect" : { "id" : "f16", "to" : "f15", "via" : [ { "x" : 584, "y" : 144 } ] } + "connect" : [ + { "id" : "f16", "to" : "f15", "via" : [ { "x" : 584, "y" : 144 } ] } + ] } ], - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f0", "type" : "CallSubStart", "name" : "getForecastWeather(Double,Double,Integer,String,String)", "config" : { - "callSignature" : "getForecastWeather", + "signature" : "getForecastWeather", "input" : { "params" : [ - { "name" : "lat", "type" : "Double" }, - { "name" : "lon", "type" : "Double" }, - { "name" : "cnt", "type" : "Integer" }, - { "name" : "lang", "type" : "String" }, - { "name" : "units", "type" : "String" } + { "name" : "lat", "type" : "Double", "desc" : "" }, + { "name" : "lon", "type" : "Double", "desc" : "" }, + { "name" : "cnt", "type" : "Integer", "desc" : "" }, + { "name" : "lang", "type" : "String", "desc" : "" }, + { "name" : "units", "type" : "String", "desc" : "" } ], "map" : { "out.param.cnt" : "param.cnt", @@ -78,35 +86,39 @@ }, "result" : { "params" : [ - { "name" : "forecastWeather", "type" : "org.openweathermap.api.data2_5.client.Forecast" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "forecastWeather", "type" : "org.openweathermap.api.data2_5.client.Forecast", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.forecastWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 32, "y" : 80 }, "labelOffset" : { "x" : 81, "y" : 33 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f9", "type" : "CallSubStart", "name" : "getForecastWeatherByLocationName(String,String,String,String,String,Integer)", "config" : { - "callSignature" : "getForecastWeatherByLocationName", + "signature" : "getForecastWeatherByLocationName", "input" : { "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "lang", "type" : "String" }, - { "name" : "units", "type" : "String" }, - { "name" : "cnt", "type" : "Integer" } + { "name" : "cityName", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "stateCode", "type" : "String", "desc" : "" }, + { "name" : "lang", "type" : "String", "desc" : "" }, + { "name" : "units", "type" : "String", "desc" : "" }, + { "name" : "cnt", "type" : "Integer", "desc" : "" } ], "map" : { "out.param.cityName" : "param.cityName", @@ -119,34 +131,38 @@ }, "result" : { "params" : [ - { "name" : "forecastWeather", "type" : "org.openweathermap.api.data2_5.client.Forecast" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "forecastWeather", "type" : "org.openweathermap.api.data2_5.client.Forecast", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.forecastWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 32, "y" : 176 }, "labelOffset" : { "x" : 25, "y" : 33 } }, - "connect" : { "id" : "f7", "to" : "f21" } + "connect" : [ + { "id" : "f7", "to" : "f21" } + ] }, { "id" : "f13", "type" : "CallSubStart", "name" : "getForecastWeatherByZipCode(String,String,Integer,String,String)", "config" : { - "callSignature" : "getForecastWeatherByZipCode", + "signature" : "getForecastWeatherByZipCode", "input" : { "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "cnt", "type" : "Integer" }, - { "name" : "lang", "type" : "String" }, - { "name" : "units", "type" : "String" } + { "name" : "zipCode", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "cnt", "type" : "Integer", "desc" : "" }, + { "name" : "lang", "type" : "String", "desc" : "" }, + { "name" : "units", "type" : "String", "desc" : "" } ], "map" : { "out.param.cnt" : "param.cnt", @@ -158,21 +174,25 @@ }, "result" : { "params" : [ - { "name" : "forecastWeather", "type" : "org.openweathermap.api.data2_5.client.Forecast" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "forecastWeather", "type" : "org.openweathermap.api.data2_5.client.Forecast", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.forecastWeather" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 32, "y" : 280 }, "labelOffset" : { "x" : 57, "y" : 33 } }, - "connect" : { "id" : "f14", "to" : "f12" } + "connect" : [ + { "id" : "f14", "to" : "f12" } + ] }, { "id" : "f15", "type" : "Alternative", @@ -188,40 +208,42 @@ "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByLocationName(String,String,String,Integer)", - "output" : { - "map" : { - "out" : "in", - "out.error" : "result.#error", - "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", - "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" - } - }, "call" : { - "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "limit", "type" : "Integer" } - ], "map" : { "param.cityName" : "in.param.cityName", "param.countryCode" : "in.param.countryCode", "param.stateCode" : "in.param.stateCode", "param.limit" : "1" } + }, + "output" : { + "map" : { + "out" : "in", + "out.error" : "result.#error", + "out.param.lat" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lat : null", + "out.param.lon" : "result.geoLocations.size() != 0 ? result.geoLocations.get(0).lon : null" + } } }, "visual" : { "at" : { "x" : 360, "y" : 176 }, "size" : { "width" : 192, "height" : 68 } }, - "connect" : { "id" : "f22", "to" : "f20" } + "connect" : [ + { "id" : "f22", "to" : "f20" } + ] }, { "id" : "f12", "type" : "SubProcessCall", "name" : "connector/GeocodingLocation", "config" : { "processCall" : "connector/GeocodingLocation:getCoordinatesByZipCode(String,String)", + "call" : { + "map" : { + "param.zipCode" : "in.param.zipCode", + "param.countryCode" : "in.param.countryCode" + } + }, "output" : { "map" : { "out" : "in", @@ -229,33 +251,30 @@ "out.param.lat" : "result.geoLocation.lat", "out.param.lon" : "result.geoLocation.lon" } - }, - "call" : { - "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } - ], - "map" : { - "param.zipCode" : "in.param.zipCode", - "param.countryCode" : "in.param.countryCode" - } } }, "visual" : { "at" : { "x" : 360, "y" : 280 }, "size" : { "width" : 194, "height" : 68 } }, - "connect" : { "id" : "f23", "to" : "f20", "via" : [ { "x" : 552, "y" : 280 } ] } + "connect" : [ + { "id" : "f23", "to" : "f20", "via" : [ { "x" : 552, "y" : 280 } ] } + ] }, { "id" : "f20", "type" : "Alternative", + "config" : { + "conditions" : { + "f11" : "in.#error is initialized" + } + }, "visual" : { "at" : { "x" : 552, "y" : 176 } }, "connect" : [ { "id" : "f11", "to" : "f15", "via" : [ { "x" : 792, "y" : 176 } ], "label" : { "name" : "fail" - }, "condition" : "in.#error is initialized" }, + } }, { "id" : "f10", "to" : "f3", "label" : { "name" : "success" } } diff --git a/open-weather-connector/processes/connector/GeocodingLocation.p.json b/open-weather-connector/processes/connector/GeocodingLocation.p.json index 5bffc7d..b2d10e5 100644 --- a/open-weather-connector/processes/connector/GeocodingLocation.p.json +++ b/open-weather-connector/processes/connector/GeocodingLocation.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18D5F6F109062548", "kind" : "CALLABLE_SUB", "config" : { @@ -10,13 +10,13 @@ "type" : "CallSubStart", "name" : "getCoordinatesByLocationName(String,String,String,Integer)", "config" : { - "callSignature" : "getCoordinatesByLocationName", + "signature" : "getCoordinatesByLocationName", "input" : { "params" : [ - { "name" : "cityName", "type" : "String" }, - { "name" : "countryCode", "type" : "String" }, - { "name" : "stateCode", "type" : "String" }, - { "name" : "limit", "type" : "Integer" } + { "name" : "cityName", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" }, + { "name" : "stateCode", "type" : "String", "desc" : "" }, + { "name" : "limit", "type" : "Integer", "desc" : "" } ], "map" : { "out.param.cityName" : "param.cityName", @@ -32,21 +32,25 @@ }, "result" : { "params" : [ - { "name" : "geoLocations", "type" : "java.util.List" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "geoLocations", "type" : "java.util.List", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.geoLocations" : "in.#results", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 208, "y" : 120 }, "labelOffset" : { "x" : -23, "y" : 33 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -58,19 +62,23 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/direct", - "clientId" : "550bf66e-4811-47e6-b1ca-1942196a3487", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "q" : "in.param.q is initialized ? in.param.q : null", - "appid" : "", - "limit" : "in.param.limit is initialized ? in.param.limit : null" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.results" : "result" + "target" : { + "clientId" : "550bf66e-4811-47e6-b1ca-1942196a3487", + "path" : "/direct", + "queryParams" : { + "q" : "in.param.q is initialized ? in.param.q : null", + "appid" : "", + "limit" : "in.param.limit is initialized ? in.param.limit : null" + } }, - "resultType" : "java.util.List" + "response" : { + "entity" : { + "type" : "java.util.List", + "map" : { + "out.results" : "result" + } + } + } }, "visual" : { "at" : { "x" : 408, "y" : 120 } @@ -89,19 +97,23 @@ "visual" : { "at" : { "x" : 440, "y" : 162 } }, - "connect" : { "id" : "f6", "to" : "f1", "via" : [ { "x" : 552, "y" : 160 } ] } + "connect" : [ + { "id" : "f6", "to" : "f1", "via" : [ { "x" : 552, "y" : 160 } ] } + ] } ], - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f7", "type" : "CallSubStart", "name" : "getCoordinatesByZipCode(String,String)", "config" : { - "callSignature" : "getCoordinatesByZipCode", + "signature" : "getCoordinatesByZipCode", "input" : { "params" : [ - { "name" : "zipCode", "type" : "String" }, - { "name" : "countryCode", "type" : "String" } + { "name" : "zipCode", "type" : "String", "desc" : "" }, + { "name" : "countryCode", "type" : "String", "desc" : "" } ], "map" : { "out.param.countryCode" : "param.countryCode", @@ -116,21 +128,25 @@ }, "result" : { "params" : [ - { "name" : "geoLocation", "type" : "org.openweathermap.api.geo1_0.client.GeoLocation" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "geoLocation", "type" : "org.openweathermap.api.geo1_0.client.GeoLocation", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.geoLocation" : "in.#result", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 208, "y" : 232 }, "labelOffset" : { "x" : 33, "y" : 33 } }, - "connect" : { "id" : "f12", "to" : "f9" } + "connect" : [ + { "id" : "f12", "to" : "f9" } + ] }, { "id" : "f8", "type" : "CallSubEnd", @@ -142,18 +158,22 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/zip", - "clientId" : "550bf66e-4811-47e6-b1ca-1942196a3487", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "appid" : "", - "zip" : "in.param.zip is initialized ? in.param.zip : null" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.result" : "result" + "target" : { + "clientId" : "550bf66e-4811-47e6-b1ca-1942196a3487", + "path" : "/zip", + "queryParams" : { + "appid" : "", + "zip" : "in.param.zip is initialized ? in.param.zip : null" + } }, - "resultType" : "org.openweathermap.api.geo1_0.client.GeoLocation" + "response" : { + "entity" : { + "type" : "org.openweathermap.api.geo1_0.client.GeoLocation", + "map" : { + "out.result" : "result" + } + } + } }, "visual" : { "at" : { "x" : 408, "y" : 232 } @@ -172,20 +192,24 @@ "visual" : { "at" : { "x" : 440, "y" : 274 } }, - "connect" : { "id" : "f13", "to" : "f8", "via" : [ { "x" : 552, "y" : 272 } ] } + "connect" : [ + { "id" : "f13", "to" : "f8", "via" : [ { "x" : 552, "y" : 272 } ] } + ] } ], - "connect" : { "id" : "f11", "to" : "f8" } + "connect" : [ + { "id" : "f11", "to" : "f8" } + ] }, { "id" : "f14", "type" : "CallSubStart", "name" : "reverse(Double,Double,Integer)", "config" : { - "callSignature" : "reverse", + "signature" : "reverse", "input" : { "params" : [ - { "name" : "lat", "type" : "Double" }, - { "name" : "lon", "type" : "Double" }, - { "name" : "limit", "type" : "Integer" } + { "name" : "lat", "type" : "Double", "desc" : "" }, + { "name" : "lon", "type" : "Double", "desc" : "" }, + { "name" : "limit", "type" : "Integer", "desc" : "" } ], "map" : { "out.param.lat" : "param.lat", @@ -195,21 +219,25 @@ }, "result" : { "params" : [ - { "name" : "geoLocation", "type" : "List" }, - { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError" } + { "name" : "geoLocation", "type" : "List", "desc" : "" }, + { "name" : "error", "type" : "ch.ivyteam.ivy.bpm.error.BpmError", "desc" : "" } ], "map" : { "result.geoLocation" : "in.#results", "result.error" : "in.#error" } - }, - "tags" : "connector" + } }, + "tags" : [ + "connector" + ], "visual" : { "at" : { "x" : 208, "y" : 344 }, "labelOffset" : { "x" : 57, "y" : 33 } }, - "connect" : { "id" : "f18", "to" : "f16" } + "connect" : [ + { "id" : "f18", "to" : "f16" } + ] }, { "id" : "f15", "type" : "CallSubEnd", @@ -221,19 +249,23 @@ "type" : "RestClientCall", "name" : "call rest", "config" : { - "path" : "/reverse", - "clientId" : "550bf66e-4811-47e6-b1ca-1942196a3487", - "clientErrorCode" : "ivy:error:rest:client", - "queryParams" : { - "limit" : "in.param.limit is initialized ? in.param.limit : null", - "lat" : "in.param.lat is initialized ? in.param.lat : null", - "lon" : "in.param.lon is initialized ? in.param.lon : null" - }, - "statusErrorCode" : "ivy:error:rest:client", - "responseMapping" : { - "out.results" : "result" + "target" : { + "clientId" : "550bf66e-4811-47e6-b1ca-1942196a3487", + "path" : "/reverse", + "queryParams" : { + "limit" : "in.param.limit is initialized ? in.param.limit : null", + "lat" : "in.param.lat is initialized ? in.param.lat : null", + "lon" : "in.param.lon is initialized ? in.param.lon : null" + } }, - "resultType" : "java.util.List" + "response" : { + "entity" : { + "type" : "java.util.List", + "map" : { + "out.results" : "result" + } + } + } }, "visual" : { "at" : { "x" : 408, "y" : 344 } @@ -252,8 +284,12 @@ "visual" : { "at" : { "x" : 440, "y" : 386 } }, - "connect" : { "id" : "f20", "to" : "f15", "via" : [ { "x" : 552, "y" : 384 } ] } + "connect" : [ + { "id" : "f20", "to" : "f15", "via" : [ { "x" : 552, "y" : 384 } ] } + ] } ], - "connect" : { "id" : "f19", "to" : "f15" } + "connect" : [ + { "id" : "f19", "to" : "f15" } + ] } ] } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 96dfda7..042420d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.connector.openweather open-weather-connector open-weather-connector-modules - 10.0.19-SNAPSHOT + 12.0.0-SNAPSHOT pom