From 0e345444b162be334001f0b883bc0d28d3becc63 Mon Sep 17 00:00:00 2001 From: Noureddine Date: Mon, 9 May 2022 17:33:16 +0100 Subject: [PATCH 1/3] fix pubber null exception --- pubber/src/main/java/daq/pubber/Pubber.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pubber/src/main/java/daq/pubber/Pubber.java b/pubber/src/main/java/daq/pubber/Pubber.java index 2496619f2d..8c9478d6d6 100644 --- a/pubber/src/main/java/daq/pubber/Pubber.java +++ b/pubber/src/main/java/daq/pubber/Pubber.java @@ -51,6 +51,7 @@ import udmi.schema.FamilyDiscoveryEvent; import udmi.schema.FamilyDiscoveryState; import udmi.schema.FamilyLocalnetModel; +import udmi.schema.Hardware; import udmi.schema.Level; import udmi.schema.Metadata; import udmi.schema.PointEnumerationEvent; @@ -334,6 +335,7 @@ private void processCloudConfig(CloudIotConfig cloudIotConfig) { private void initializeDevice() { deviceState.system = new SystemState(); deviceState.pointset = new PointsetState(); + deviceState.system.hardware = new Hardware(); deviceState.pointset.points = new HashMap<>(); devicePoints.points = new HashMap<>(); From 4ec676e57d906fbb046752620610c4900e3f600d Mon Sep 17 00:00:00 2001 From: Noureddine Date: Mon, 9 May 2022 18:16:38 +0100 Subject: [PATCH 2/3] make pubsub datasink optional --- .../main/java/com/google/daq/mqtt/validator/Validator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java index de1d5afd7d..8ef6534512 100644 --- a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java +++ b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java @@ -264,7 +264,9 @@ private BiConsumer, Map> messageValidator() private void validatePubSub(String instName) { String registryId = cloudIotConfig.registry_id; client = new PubSubClient(projectId, registryId, instName); - dataSink = new PubSubDataSink(projectId, cloudIotConfig.update_topic); + if (cloudIotManager.getUpdateTopic() != null) { + dataSink = new PubSubDataSink(projectId, cloudIotConfig.update_topic); + } } private void validateReflector(String instName) { From 607d1937136c46fc620425d227a187a0ad638869 Mon Sep 17 00:00:00 2001 From: Noureddine Date: Mon, 9 May 2022 18:18:17 +0100 Subject: [PATCH 3/3] undo change on wrong branch --- .../main/java/com/google/daq/mqtt/validator/Validator.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java index 8ef6534512..de1d5afd7d 100644 --- a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java +++ b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java @@ -264,9 +264,7 @@ private BiConsumer, Map> messageValidator() private void validatePubSub(String instName) { String registryId = cloudIotConfig.registry_id; client = new PubSubClient(projectId, registryId, instName); - if (cloudIotManager.getUpdateTopic() != null) { - dataSink = new PubSubDataSink(projectId, cloudIotConfig.update_topic); - } + dataSink = new PubSubDataSink(projectId, cloudIotConfig.update_topic); } private void validateReflector(String instName) {