This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 1bb37d446ec CAMEL-19100: camel-milo- Fix lost dataChangeFilterTrigger
(#9451)
1bb37d446ec is described below
commit 1bb37d446ecda379be2efcf179eff97ac74d22fe
Author: rangoy <gunnar.ran...@knowit.no>
AuthorDate: Wed Mar 1 09:02:06 2023 +0100
CAMEL-19100: camel-milo- Fix lost dataChangeFilterTrigger (#9451)
Milo component does not use dataChangeFilterTrigger value from route, this
was replaced by StatusValueTimestamp during setup.
Default filter is now set to StatusValueTimestamp as this will keep the
current behaviour.
Ref https://issues.apache.org/jira/browse/CAMEL-19100
---
.../org/apache/camel/component/milo/client/milo-client.json | 2 +-
.../camel/component/milo/client/MonitorFilterConfiguration.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
b/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
index 6bf9754f16f..8540c847e45 100644
---
a/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
+++
b/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
@@ -57,7 +57,7 @@
"clientId": { "kind": "parameter", "displayName": "Client Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "A virtual client id to
force the creation of a new connection instance" },
"dataChangeFilterDeadbandType": { "kind": "parameter", "displayName":
"Data Change Filter Deadband Type", "group": "common", "label": "", "required":
false, "type": "object", "javaType":
"org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "0",
"configurationClass":
"org.apache.camel.component.milo.client.MonitorFilterConfiguration",
"configurationField": "monitorFilterConfiguration", "descripti [...]
"dataChangeFilterDeadbandValue": { "kind": "parameter", "displayName":
"Data Change Filter Deadband Value", "group": "common", "label": "",
"required": false, "type": "number", "javaType": "java.lang.Double",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"0.0", "configurationClass":
"org.apache.camel.component.milo.client.MonitorFilterConfiguration",
"configurationField": "monitorFilterConfiguration", "description": "Deadband
value for MonitorFilterType Da [...]
- "dataChangeFilterTrigger": { "kind": "parameter", "displayName": "Data
Change Filter Trigger", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger", "enum":
[ "Status", "StatusValue", "StatusValueTimestamp" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.milo.client.MonitorFilterConfiguration",
"configurationField": "monitor [...]
+ "dataChangeFilterTrigger": { "kind": "parameter", "displayName": "Data
Change Filter Trigger", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.eclipse.milo.opcua.stack.core.types.enumerated.DataChangeTrigger", "enum":
[ "Status", "StatusValue", "StatusValueTimestamp" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "StatusValueTimestamp",
"configurationClass":
"org.apache.camel.component.milo.client.MonitorFilterConfig [...]
"defaultAwaitWrites": { "kind": "parameter", "displayName": "Default Await
Writes", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Default await setting for writes"
},
"discoveryEndpointSuffix": { "kind": "parameter", "displayName":
"Discovery Endpoint Suffix", "group": "common", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "A suffix for endpoint
URI when discovering" },
"discoveryEndpointUri": { "kind": "parameter", "displayName": "Discovery
Endpoint Uri", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.milo.client.MiloClientConfiguration",
"configurationField": "configuration", "description": "An alternative discovery
URI" },
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MonitorFilterConfiguration.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MonitorFilterConfiguration.java
index 694b49328aa..66feb1d33db 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MonitorFilterConfiguration.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MonitorFilterConfiguration.java
@@ -37,8 +37,8 @@ public class MonitorFilterConfiguration implements Cloneable {
@UriParam(defaultValue = "0.0", description = "Deadband value for
MonitorFilterType DataChangeFilter.")
private Double dataChangeFilterDeadbandValue = 0.0;
- @UriParam(description = "Daata change trigger for data change monitor
filter type.")
- private DataChangeTrigger dataChangeFilterTrigger =
DataChangeTrigger.StatusValue;
+ @UriParam(defaultValue = "StatusValueTimestamp", description = "Data
change trigger for data change monitor filter type.")
+ private DataChangeTrigger dataChangeFilterTrigger =
DataChangeTrigger.StatusValueTimestamp;
public MonitorFilterType getMonitorFilterType() {
return monitorFilterType;
@@ -80,7 +80,8 @@ public class MonitorFilterConfiguration implements Cloneable {
switch (monitorFilterType) {
default:
return new DataChangeFilter(
- DataChangeTrigger.StatusValueTimestamp,
this.getDataChangeFilterDeadbandType(),
+ this.getDataChangeFilterTrigger(),
+ this.getDataChangeFilterDeadbandType(),
this.getDataChangeFilterDeadbandValue());
}
}
