Merge branch '3.x' into master-3.x

eclipse-tahu · Jun 20, 2024 · 57846ff · 57846ff
2 parents 6d11a06 + 69ebd53
commit 57846ff
Show file tree

Hide file tree

Showing 43 changed files with 6,777 additions and 4,473 deletions.
diff --git a/java/compat_impl/edge/pom.xml b/java/compat_impl/edge/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/compat_impl/host/pom.xml b/java/compat_impl/host/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/java/compat_impl/host/src/main/java/org/eclipse/tahu/host/SparkplugHostApplication.java b/java/compat_impl/host/src/main/java/org/eclipse/tahu/host/SparkplugHostApplication.java
@@ -101,7 +101,7 @@ public SparkplugHostApplication() {
 		try {
 			hostApplication = new HostApplication(this, HOST_ID,
 					new ArrayList<>(Arrays.asList(SparkplugMeta.SPARKPLUG_B_TOPIC_PREFIX + "/#")),
-					mqttServerDefinitions, null, new SparkplugBPayloadDecoder());
+					mqttServerDefinitions, null, new SparkplugBPayloadDecoder(), true);
 		} catch (Exception e) {
 			logger.error("Failed to create the HostApplication", e);
 		}
@@ -110,7 +110,7 @@ public SparkplugHostApplication() {
 	public void start() throws TahuException {
 		commandListener = new CommandListener(hostApplication, COMMAND_LISTENER_DIRECTORY, COMMAND_LISTENER_POLL_RATE);
 		commandListener.start();
-		hostApplication.start();
+		hostApplication.start(true);
 	}
 
 	public void shutdown() {

diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/pom.xml b/java/examples/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.eclipse.tahu</groupId>
   <artifactId>tahu-examples</artifactId>
-  <version>1.0.8</version>
+  <version>1.0.10</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Tahu</name>

diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/records/pom.xml b/java/examples/records/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/java/lib/core/pom.xml b/java/lib/core/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.10</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.21</version>
+      <version>1.26.0</version>
     </dependency>
   </dependencies>
 

diff --git a/java/lib/core/readme.txt b/java/lib/core/readme.txt
@@ -1,2 +1,3 @@
 # To generate the base protobuf sparkplug_b Java library
-protoc --proto_path=../../ --java_out=src/main/java ../../sparkplug_b/sparkplug_b.proto
+cd ~/dev/gitflow/Tahu/java/lib/core
+protoc --proto_path=../../../sparkplug_b/ --java_out=src/main/java ../../../sparkplug_b/sparkplug_b.proto 
diff --git a/java/lib/core/src/main/java/org/eclipse/tahu/json/DataSetDeserializer.java b/java/lib/core/src/main/java/org/eclipse/tahu/json/DataSetDeserializer.java
@@ -163,34 +163,35 @@ private Value<?> getValueFromNode(JsonNode nodeValue, DataSetDataType type) {
 			logger.debug("Getting value: type={} and nodeValue={}", type, nodeValue);
 		}
 
-		switch (type) {
-			case Boolean:
-				return new Value<Boolean>(type, (boolean) nodeValue.asBoolean());
-			case DateTime:
-				return new Value<Date>(type, new Date(nodeValue.asLong()));
-			case Double:
-				return new Value<Double>(type, nodeValue.asDouble());
-			case Float:
-				return new Value<Float>(type, (float) nodeValue.asDouble());
-			case Int8:
-				return new Value<Byte>(type, (byte) nodeValue.asInt());
-			case UInt8:
-			case Int16:
-				return new Value<Short>(type, (short) nodeValue.asInt());
-			case UInt16:
-			case Int32:
-				return new Value<Integer>(type, nodeValue.asInt());
-			case UInt32:
-			case Int64:
-				return new Value<Long>(type, (long) nodeValue.asLong());
-			case Text:
-			case String:
-				return new Value<String>(type, nodeValue.asText());
-			case UInt64:
-				return new Value<BigInteger>(type, BigInteger.valueOf(nodeValue.asLong()));
-			case Unknown:
-			default:
-				return null;
+		if (type.toIntValue() == DataSetDataType.Boolean.toIntValue()) {
+			return new Value<Boolean>(type, (boolean) nodeValue.asBoolean());
+		} else if (type.toIntValue() == DataSetDataType.DateTime.toIntValue()) {
+			return new Value<Date>(type, new Date(nodeValue.asLong()));
+		} else if (type.toIntValue() == DataSetDataType.Double.toIntValue()) {
+			return new Value<Double>(type, nodeValue.asDouble());
+		} else if (type.toIntValue() == DataSetDataType.Float.toIntValue()) {
+			return new Value<Float>(type, (float) nodeValue.asDouble());
+		} else if (type.toIntValue() == DataSetDataType.Int8.toIntValue()) {
+			return new Value<Byte>(type, (byte) nodeValue.asInt());
+		} else if (type.toIntValue() == DataSetDataType.Int16.toIntValue()) {
+			return new Value<Short>(type, (short) nodeValue.asInt());
+		} else if (type.toIntValue() == DataSetDataType.Int32.toIntValue()) {
+			return new Value<Integer>(type, nodeValue.asInt());
+		} else if (type.toIntValue() == DataSetDataType.Int64.toIntValue()) {
+			return new Value<Long>(type, (long) nodeValue.asLong());
+		} else if (type.toIntValue() == DataSetDataType.UInt8.toIntValue()) {
+			return new Value<Short>(type, (short) nodeValue.asInt());
+		} else if (type.toIntValue() == DataSetDataType.UInt16.toIntValue()) {
+			return new Value<Integer>(type, nodeValue.asInt());
+		} else if (type.toIntValue() == DataSetDataType.UInt32.toIntValue()) {
+			return new Value<Long>(type, (long) nodeValue.asLong());
+		} else if (type.toIntValue() == DataSetDataType.UInt64.toIntValue()) {
+			return new Value<BigInteger>(type, BigInteger.valueOf(nodeValue.asLong()));
+		} else if (type.toIntValue() == DataSetDataType.String.toIntValue()
+				|| type.toIntValue() == DataSetDataType.Text.toIntValue()) {
+			return new Value<String>(type, nodeValue.asText());
+		} else {
+			return null;
 		}
 	}
 }