From dabdb5fe75d50666346596ebf61b3b28128c0e78 Mon Sep 17 00:00:00 2001 From: wes-johnson Date: Wed, 23 Oct 2024 12:24:52 -0700 Subject: [PATCH 1/2] Modified Metric JSON to always include the value even when null --- .../main/java/org/eclipse/tahu/message/model/Metric.java | 3 ++- .../src/main/java/org/eclipse/tahu/mqtt/TahuClient.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/lib/core/src/main/java/org/eclipse/tahu/message/model/Metric.java b/java/lib/core/src/main/java/org/eclipse/tahu/message/model/Metric.java index a0286db..11e7f09 100644 --- a/java/lib/core/src/main/java/org/eclipse/tahu/message/model/Metric.java +++ b/java/lib/core/src/main/java/org/eclipse/tahu/message/model/Metric.java @@ -66,6 +66,7 @@ public class Metric { private Boolean isTransient; @JsonProperty("metaData") + @JsonInclude(Include.NON_EMPTY) private MetaData metaData; @JsonProperty("properties") @@ -73,7 +74,7 @@ public class Metric { private PropertySet properties; @JsonProperty("value") - @JsonInclude(Include.NON_EMPTY) + @JsonInclude(Include.ALWAYS) private Object value; private Boolean isNull = null; diff --git a/java/lib/core/src/main/java/org/eclipse/tahu/mqtt/TahuClient.java b/java/lib/core/src/main/java/org/eclipse/tahu/mqtt/TahuClient.java index d13629e..8351adf 100644 --- a/java/lib/core/src/main/java/org/eclipse/tahu/mqtt/TahuClient.java +++ b/java/lib/core/src/main/java/org/eclipse/tahu/mqtt/TahuClient.java @@ -85,13 +85,13 @@ public class TahuClient implements MqttCallbackExtended { /* * Other standard MQTT parameters. */ - private MqttServerUrl mqttServerUrl; - private MqttServerName mqttServerName; + private final MqttServerUrl mqttServerUrl; + private final MqttServerName mqttServerName; private final MqttClientId clientId; private String username; private String password; - private boolean cleanSession; - private int keepAlive; + private final boolean cleanSession; + private final int keepAlive; /* * The callback client From 3d7a4255e59efc3742da68e66bf6f0a1e751642e Mon Sep 17 00:00:00 2001 From: wes-johnson Date: Tue, 12 Nov 2024 11:39:58 -0800 Subject: [PATCH 2/2] Upticked pom versions to v1.0.12 for release Signed-off-by: wes-johnson --- java/compat_impl/edge/pom.xml | 2 +- java/compat_impl/host/pom.xml | 2 +- java/examples/device_timestamp/pom.xml | 2 +- java/examples/edge_node_control/pom.xml | 2 +- java/examples/host_file/pom.xml | 2 +- java/examples/listener/pom.xml | 2 +- java/examples/pom.xml | 2 +- java/examples/raspberry_pi/pom.xml | 2 +- java/examples/records/pom.xml | 2 +- java/examples/simple/pom.xml | 2 +- java/examples/udt/pom.xml | 2 +- java/lib/core/pom.xml | 2 +- java/lib/edge/pom.xml | 2 +- java/lib/host/pom.xml | 2 +- java/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/java/compat_impl/edge/pom.xml b/java/compat_impl/edge/pom.xml index 3790a47..ffc3c0f 100644 --- a/java/compat_impl/edge/pom.xml +++ b/java/compat_impl/edge/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.12-SNAPSHOT + 1.0.12 ../../pom.xml diff --git a/java/compat_impl/host/pom.xml b/java/compat_impl/host/pom.xml index 6ba9d2c..f3d21a8 100644 --- a/java/compat_impl/host/pom.xml +++ b/java/compat_impl/host/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.12-SNAPSHOT + 1.0.12 ../../pom.xml diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml index 14655a9..827afb9 100644 --- a/java/examples/device_timestamp/pom.xml +++ b/java/examples/device_timestamp/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml index d77d01c..a6a18fd 100644 --- a/java/examples/edge_node_control/pom.xml +++ b/java/examples/edge_node_control/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml index 27c3b16..fe784bd 100644 --- a/java/examples/host_file/pom.xml +++ b/java/examples/host_file/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml index e14c318..e7d6604 100644 --- a/java/examples/listener/pom.xml +++ b/java/examples/listener/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/examples/pom.xml b/java/examples/pom.xml index 0f46de5..02fd839 100644 --- a/java/examples/pom.xml +++ b/java/examples/pom.xml @@ -29,7 +29,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 pom Eclipse Tahu diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml index f5c5068..d181fb7 100644 --- a/java/examples/raspberry_pi/pom.xml +++ b/java/examples/raspberry_pi/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.11-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/examples/records/pom.xml b/java/examples/records/pom.xml index 81aa4ed..7474033 100644 --- a/java/examples/records/pom.xml +++ b/java/examples/records/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml index bb3b41b..0e184d7 100644 --- a/java/examples/simple/pom.xml +++ b/java/examples/simple/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml index 74c622b..e2fb826 100644 --- a/java/examples/udt/pom.xml +++ b/java/examples/udt/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.12-SNAPSHOT + 1.0.12 ../pom.xml diff --git a/java/lib/core/pom.xml b/java/lib/core/pom.xml index a4f2a31..63972bc 100644 --- a/java/lib/core/pom.xml +++ b/java/lib/core/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.12-SNAPSHOT + 1.0.12 ../../pom.xml diff --git a/java/lib/edge/pom.xml b/java/lib/edge/pom.xml index 590abd0..8e6a180 100644 --- a/java/lib/edge/pom.xml +++ b/java/lib/edge/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.12-SNAPSHOT + 1.0.12 ../../pom.xml diff --git a/java/lib/host/pom.xml b/java/lib/host/pom.xml index 1a82ef1..9663080 100644 --- a/java/lib/host/pom.xml +++ b/java/lib/host/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.12-SNAPSHOT + 1.0.12 ../../pom.xml diff --git a/java/pom.xml b/java/pom.xml index eb61323..d4dc411 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tahu tahu - 1.0.12-SNAPSHOT + 1.0.12 pom Eclipse Tahu