From bce66cd2806f9fbaf8efa043ecfc17bc4809d360 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Fri, 12 Aug 2022 17:04:02 -0400 Subject: [PATCH 01/10] Rename _iot_config to iot_endpoint_config --- bin/test_redirect | 2 +- etc/Blob.java | 2 +- gencode/java/udmi/schema/Blob.java | 3 ++- pubber/src/main/java/daq/pubber/Pubber.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/test_redirect b/bin/test_redirect index e6e91e50ae..510682ff70 100755 --- a/bin/test_redirect +++ b/bin/test_redirect @@ -59,7 +59,7 @@ cat < out/blobs.json { "blobset": { "blobs": { - "_iot_config": { + "_iot_endpoint_config": { "phase": "final", "base64": "$base64" } diff --git a/etc/Blob.java b/etc/Blob.java index 933264fdac..5db207002c 100644 --- a/etc/Blob.java +++ b/etc/Blob.java @@ -4,5 +4,5 @@ // proper source and don't be fooled! These are general constants for blob management. public abstract class Blob { public static final String FINAL_PHASE = "final"; - public static final String IOT_CONFIG_BLOB = "_iot_config"; + public static final String IOT_ENDPOINT_CONFIG_BLOB = "_iot_endpoint_config"; } diff --git a/gencode/java/udmi/schema/Blob.java b/gencode/java/udmi/schema/Blob.java index 933264fdac..9590109300 100644 --- a/gencode/java/udmi/schema/Blob.java +++ b/gencode/java/udmi/schema/Blob.java @@ -4,5 +4,6 @@ // proper source and don't be fooled! These are general constants for blob management. public abstract class Blob { public static final String FINAL_PHASE = "final"; - public static final String IOT_CONFIG_BLOB = "_iot_config"; + public static final String IOT_ENDPOINT_CONFIG_BLOB = "_iot_endpoint_config"; + public static final String FIRMWARE_UPDATE_BLOB = "_firmware_update"; } diff --git a/pubber/src/main/java/daq/pubber/Pubber.java b/pubber/src/main/java/daq/pubber/Pubber.java index 1bffbf76d6..df0b4464d1 100644 --- a/pubber/src/main/java/daq/pubber/Pubber.java +++ b/pubber/src/main/java/daq/pubber/Pubber.java @@ -2,7 +2,7 @@ import static java.util.stream.Collectors.toMap; import static udmi.schema.Blob.FINAL_PHASE; -import static udmi.schema.Blob.IOT_CONFIG_BLOB; +import static udmi.schema.Blob.IOT_ENDPOINT_CONFIG_BLOB; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; @@ -730,7 +730,7 @@ private void processConfigUpdate(Config config) { private EndpointConfiguration extractEndpointBlobConfig() { try { - String iotConfig = extractConfigBlob(IOT_CONFIG_BLOB); + String iotConfig = extractConfigBlob(IOT_ENDPOINT_CONFIG_BLOB); if (iotConfig == null) { return null; } From ba4d2c25f554e514c0413899e91859f5b02e3d31 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Fri, 12 Aug 2022 17:08:23 -0400 Subject: [PATCH 02/10] More --- tests/config.tests/blobset_applied.json | 2 +- tests/state.tests/blobset_receive.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/config.tests/blobset_applied.json b/tests/config.tests/blobset_applied.json index 8850cfe5f3..3fa2e8cdc0 100644 --- a/tests/config.tests/blobset_applied.json +++ b/tests/config.tests/blobset_applied.json @@ -12,7 +12,7 @@ "url": "https://manuf.com/path/file.zip", "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }, - "_endpoint_redirect": { + "_iot_endpoint_redirect": { "phase": "applied", "content_type": "application/json", "base64": "e30=" diff --git a/tests/state.tests/blobset_receive.json b/tests/state.tests/blobset_receive.json index d85d5743b1..8255f3fa5c 100644 --- a/tests/state.tests/blobset_receive.json +++ b/tests/state.tests/blobset_receive.json @@ -31,9 +31,9 @@ "level": 100 } }, - "_endpoint_redirect": { + "_iot_endpoint_config": { "status": { - "message": "Received endpoint redirect", + "message": "Received endpoint config", "category": "blobset.blob.receive", "timestamp": "2022-07-13T12:00:08.000Z", "level": 100 From ce750eddee080d2dee6af03ad4f1d9555e9af221 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Mon, 15 Aug 2022 10:54:03 -0400 Subject: [PATCH 03/10] Again --- tests/config.tests/blobset_applied.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/config.tests/blobset_applied.json b/tests/config.tests/blobset_applied.json index 3fa2e8cdc0..b2e21d9c86 100644 --- a/tests/config.tests/blobset_applied.json +++ b/tests/config.tests/blobset_applied.json @@ -12,7 +12,7 @@ "url": "https://manuf.com/path/file.zip", "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }, - "_iot_endpoint_redirect": { + "_iot_endpoint_config": { "phase": "applied", "content_type": "application/json", "base64": "e30=" From 9b76e9fdfc3ede0b4ae83309d13fc5349759fd1a Mon Sep 17 00:00:00 2001 From: John Randolph Date: Mon, 15 Aug 2022 12:53:26 -0400 Subject: [PATCH 04/10] Fix receive -> received --- tests/state.tests/blobset_received.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/state.tests/blobset_received.json b/tests/state.tests/blobset_received.json index 97ad472083..0f477aec19 100644 --- a/tests/state.tests/blobset_received.json +++ b/tests/state.tests/blobset_received.json @@ -34,7 +34,7 @@ "_iot_endpoint_config": { "status": { "message": "Received endpoint config", - "category": "blobset.blob.receive", + "category": "blobset.blob.received", "timestamp": "2022-07-13T12:00:08.000Z", "level": 100 } From a4f84db1a2e0ed142f70be09b30be1db3753df59 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Mon, 15 Aug 2022 13:05:04 -0400 Subject: [PATCH 05/10] x --- gencode/java/udmi/schema/Blob.java | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 gencode/java/udmi/schema/Blob.java diff --git a/gencode/java/udmi/schema/Blob.java b/gencode/java/udmi/schema/Blob.java deleted file mode 100644 index 9590109300..0000000000 --- a/gencode/java/udmi/schema/Blob.java +++ /dev/null @@ -1,9 +0,0 @@ -package udmi.schema; - -// This class is manually curated and then copied into the gencode directory. Look for the -// proper source and don't be fooled! These are general constants for blob management. -public abstract class Blob { - public static final String FINAL_PHASE = "final"; - public static final String IOT_ENDPOINT_CONFIG_BLOB = "_iot_endpoint_config"; - public static final String FIRMWARE_UPDATE_BLOB = "_firmware_update"; -} From 3bad2f612612ff05c20c46c39deec61715d7bf23 Mon Sep 17 00:00:00 2001 From: John R Date: Mon, 15 Aug 2022 13:16:49 -0400 Subject: [PATCH 06/10] Delete Blob.java --- etc/Blob.java | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 etc/Blob.java diff --git a/etc/Blob.java b/etc/Blob.java deleted file mode 100644 index 5db207002c..0000000000 --- a/etc/Blob.java +++ /dev/null @@ -1,8 +0,0 @@ -package udmi.schema; - -// This class is manually curated and then copied into the gencode directory. Look for the -// proper source and don't be fooled! These are general constants for blob management. -public abstract class Blob { - public static final String FINAL_PHASE = "final"; - public static final String IOT_ENDPOINT_CONFIG_BLOB = "_iot_endpoint_config"; -} From faea65aee64f9a5ddddbde74687012a80c6304a2 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Mon, 15 Aug 2022 13:21:40 -0400 Subject: [PATCH 07/10] rename schema constant --- schema/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/common.json b/schema/common.json index 98909ceefd..9406e7cbe4 100644 --- a/schema/common.json +++ b/schema/common.json @@ -15,7 +15,7 @@ "title": "System Blobsets", "description": "Predefined system blobsets", "enum": [ - "_iot_config" + "_iot_endpoint_config" ] }, "entry": { From be06918cea9271f7997cc92c75a9b44ce4058c70 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Mon, 15 Aug 2022 13:50:23 -0400 Subject: [PATCH 08/10] Add changes --- gencode/docs/config.html | 2 +- gencode/java/udmi/schema/BlobsetConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gencode/docs/config.html b/gencode/docs/config.html index 4d2a38bb50..c545725790 100644 --- a/gencode/docs/config.html +++ b/gencode/docs/config.html @@ -1320,7 +1320,7 @@

Must be one of:

-
  • "_iot_config"
+
  • "_iot_endpoint_config"
diff --git a/gencode/java/udmi/schema/BlobsetConfig.java b/gencode/java/udmi/schema/BlobsetConfig.java index 407ffbcde8..47ce485561 100644 --- a/gencode/java/udmi/schema/BlobsetConfig.java +++ b/gencode/java/udmi/schema/BlobsetConfig.java @@ -68,7 +68,7 @@ public boolean equals(Object other) { @Generated("jsonschema2pojo") public enum SystemBlobsets { - IOT_CONFIG("_iot_config"); + IOT_ENDPOINT_CONFIG("_iot_endpoint_config"); private final java.lang.String value; private final static Map CONSTANTS = new HashMap(); From ca266715467921d4c053f3840faac335a28ed2e0 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Mon, 15 Aug 2022 13:58:41 -0400 Subject: [PATCH 09/10] x : --- .gencode_hash.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gencode_hash.txt b/.gencode_hash.txt index 205c6b6b38..0451c797cd 100644 --- a/.gencode_hash.txt +++ b/.gencode_hash.txt @@ -1,4 +1,4 @@ -6e1a32e071eb2df1fa40908767277bd648a821772dfeb57c58d905e10323d238 gencode/docs/config.html +bf79c2371745ef800d3434c9dd4155a9a4f10a3c5dd1b07246cbb0c641fd06bb gencode/docs/config.html 90679d3d866579501e7aa00b515af05d42fc9fe399eafacaacf297d1e4a22884 gencode/docs/envelope.html 9362682fa830ce9d98b3c074cab05ba44fae96a82de316a3520df3956e9325dc gencode/docs/event_discovery.html 8133e380e40f27c56accbffc665b2eeb56ec84a4da3b52ba7aa5e439c9c40572 gencode/docs/event_pointset.html @@ -14,7 +14,7 @@ d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b gencode/java/u 0825a5cec83003bb0a6488c4ed7010a04ae0d3848ef36fe01bb4e6718ba7b96d gencode/java/udmi/schema/Aux.java d326a550d75ab7f558f165f1a5e8c24eee2b0b52290a7472f529bb1e15d79fb2 gencode/java/udmi/schema/BlobBlobsetConfig.java 2c03651cb2ecda072b1418222eebb5560185669f8ffdd03021ad5ad8ff7ba3b0 gencode/java/udmi/schema/BlobBlobsetState.java -3fccb6bc6714fdc3dd912c8b1155e7ce19b0ac8a7ec48a01be9eb27bdd034a75 gencode/java/udmi/schema/BlobsetConfig.java +b9f903444ab08907e41eb123286434ff3207b1edd01397af3ddefb8475bbdadc gencode/java/udmi/schema/BlobsetConfig.java fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56 gencode/java/udmi/schema/BlobsetState.java 0c908ea34ee54aa66f9ce472ad23ecaec3c091f2afbba7b509e1515b5557f82c gencode/java/udmi/schema/Category.java d6875f63ce67d1b945a0b75a4a660bd083cc52492371a7350c4109f6bf54968b gencode/java/udmi/schema/CloudIotConfig.java From a76c736a5ca84170178279e22c22829c76b8f71a Mon Sep 17 00:00:00 2001 From: John Randolph Date: Mon, 15 Aug 2022 14:05:49 -0400 Subject: [PATCH 10/10] x --- pubber/src/main/java/daq/pubber/Pubber.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pubber/src/main/java/daq/pubber/Pubber.java b/pubber/src/main/java/daq/pubber/Pubber.java index 302abfa1a8..4b1be26723 100644 --- a/pubber/src/main/java/daq/pubber/Pubber.java +++ b/pubber/src/main/java/daq/pubber/Pubber.java @@ -2,6 +2,7 @@ import static java.lang.Boolean.TRUE; import static java.util.stream.Collectors.toMap; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature;