From 01aa5e626856cf262a301fd7161da17181e42cd0 Mon Sep 17 00:00:00 2001 From: Chad Kienle Date: Mon, 23 Oct 2023 14:09:57 -0700 Subject: [PATCH 1/3] Upticked develop pom versions to v1.0.7-SNAPSHOT Signed-off-by: Chad Kienle --- 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 98c03baf..4fd7c672 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.6 + 1.0.7-SNAPSHOT ../../pom.xml diff --git a/java/compat_impl/host/pom.xml b/java/compat_impl/host/pom.xml index 9b89c868..404d0b3c 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.6 + 1.0.7-SNAPSHOT ../../pom.xml diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml index 9596505f..66ec9ccb 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.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml index a48b8e6d..3ff0b84e 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.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml index 68d8666e..8f6e3387 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.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml index 7b80fe58..bad70a8e 100644 --- a/java/examples/listener/pom.xml +++ b/java/examples/listener/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/examples/pom.xml b/java/examples/pom.xml index ab2b0ea3..1ac75402 100644 --- a/java/examples/pom.xml +++ b/java/examples/pom.xml @@ -29,7 +29,7 @@ org.eclipse.tahu tahu-examples - 1.0.6 + 1.0.7-SNAPSHOT pom Eclipse Tahu diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml index d30b5a69..261560bb 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.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/examples/records/pom.xml b/java/examples/records/pom.xml index 09b3ff77..601ac9c0 100644 --- a/java/examples/records/pom.xml +++ b/java/examples/records/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml index ad92bf36..e3cfcab3 100644 --- a/java/examples/simple/pom.xml +++ b/java/examples/simple/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml index 7162483c..bb3820b8 100644 --- a/java/examples/udt/pom.xml +++ b/java/examples/udt/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.6 + 1.0.7-SNAPSHOT ../pom.xml diff --git a/java/lib/core/pom.xml b/java/lib/core/pom.xml index 9e35082d..b7c212a0 100644 --- a/java/lib/core/pom.xml +++ b/java/lib/core/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.6 + 1.0.7-SNAPSHOT ../../pom.xml diff --git a/java/lib/edge/pom.xml b/java/lib/edge/pom.xml index dc03ad67..af0c6e3d 100644 --- a/java/lib/edge/pom.xml +++ b/java/lib/edge/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.6 + 1.0.7-SNAPSHOT ../../pom.xml diff --git a/java/lib/host/pom.xml b/java/lib/host/pom.xml index b6f775d3..314cc909 100644 --- a/java/lib/host/pom.xml +++ b/java/lib/host/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.6 + 1.0.7-SNAPSHOT ../../pom.xml diff --git a/java/pom.xml b/java/pom.xml index cda51ca3..adf84491 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tahu tahu - 1.0.6 + 1.0.7-SNAPSHOT pom Eclipse Tahu From f91a32cba149240a7a165c4412d6f8871ab8b264 Mon Sep 17 00:00:00 2001 From: wes-johnson Date: Fri, 3 Nov 2023 11:08:07 -0700 Subject: [PATCH 2/3] Modified getMetricDataTypeMap in EdgeNodeMetricMaps to not return a null value --- .../java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java b/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java index 02480a41..9cc83a68 100644 --- a/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java +++ b/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java @@ -122,12 +122,10 @@ public boolean aliasExists(EdgeNodeDescriptor edgeNodeDescriptor, SparkplugDescr public MetricDataTypeMap getMetricDataTypeMap(EdgeNodeDescriptor edgeNodeDescriptor, SparkplugDescriptor sparkplugDescriptor) { - Map edgeNodeMetricMaps = allEdgeNodeMetricMaps.get(edgeNodeDescriptor); - if (edgeNodeMetricMaps != null && edgeNodeMetricMaps.get(sparkplugDescriptor) != null) { - return edgeNodeMetricMaps.get(sparkplugDescriptor).getMetricDataTypeMap(); - } else { - return null; - } + Map edgeNodeMetricMaps = + allEdgeNodeMetricMaps.computeIfAbsent(edgeNodeDescriptor, (k) -> new ConcurrentHashMap<>()); + edgeNodeMetricMaps.computeIfAbsent(sparkplugDescriptor, (k) -> new MetricMap()); + return edgeNodeMetricMaps.get(sparkplugDescriptor).getMetricDataTypeMap(); } public MetricDataType getDataType(EdgeNodeDescriptor edgeNodeDescriptor, SparkplugDescriptor sparkplugDescriptor, From d5812aa1207c2ff1bdee2dde61865b2236f95b20 Mon Sep 17 00:00:00 2001 From: wes-johnson Date: Mon, 6 Nov 2023 10:18:39 -0800 Subject: [PATCH 3/3] Upticked pom versions to v1.0.7 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 4fd7c672..9f2389b4 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.7-SNAPSHOT + 1.0.7 ../../pom.xml diff --git a/java/compat_impl/host/pom.xml b/java/compat_impl/host/pom.xml index 404d0b3c..c551af64 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.7-SNAPSHOT + 1.0.7 ../../pom.xml diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml index 66ec9ccb..a43d0b67 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.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml index 3ff0b84e..1c9c5f68 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.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml index 8f6e3387..705a0798 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.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml index bad70a8e..2423b2fa 100644 --- a/java/examples/listener/pom.xml +++ b/java/examples/listener/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/examples/pom.xml b/java/examples/pom.xml index 1ac75402..58611fca 100644 --- a/java/examples/pom.xml +++ b/java/examples/pom.xml @@ -29,7 +29,7 @@ org.eclipse.tahu tahu-examples - 1.0.7-SNAPSHOT + 1.0.7 pom Eclipse Tahu diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml index 261560bb..ef46886a 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.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/examples/records/pom.xml b/java/examples/records/pom.xml index 601ac9c0..f96d6345 100644 --- a/java/examples/records/pom.xml +++ b/java/examples/records/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml index e3cfcab3..b7994503 100644 --- a/java/examples/simple/pom.xml +++ b/java/examples/simple/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml index bb3820b8..82bc6776 100644 --- a/java/examples/udt/pom.xml +++ b/java/examples/udt/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu-examples - 1.0.7-SNAPSHOT + 1.0.7 ../pom.xml diff --git a/java/lib/core/pom.xml b/java/lib/core/pom.xml index b7c212a0..be49f688 100644 --- a/java/lib/core/pom.xml +++ b/java/lib/core/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.7-SNAPSHOT + 1.0.7 ../../pom.xml diff --git a/java/lib/edge/pom.xml b/java/lib/edge/pom.xml index af0c6e3d..76625599 100644 --- a/java/lib/edge/pom.xml +++ b/java/lib/edge/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.7-SNAPSHOT + 1.0.7 ../../pom.xml diff --git a/java/lib/host/pom.xml b/java/lib/host/pom.xml index 314cc909..fdc26182 100644 --- a/java/lib/host/pom.xml +++ b/java/lib/host/pom.xml @@ -18,7 +18,7 @@ org.eclipse.tahu tahu - 1.0.7-SNAPSHOT + 1.0.7 ../../pom.xml diff --git a/java/pom.xml b/java/pom.xml index adf84491..3222019a 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tahu tahu - 1.0.7-SNAPSHOT + 1.0.7 pom Eclipse Tahu