From f9b5bde0089a1bb7803b9be2673ff10e96e8fc02 Mon Sep 17 00:00:00 2001
From: Michael7371 <40476797+Michael7371@users.noreply.github.com>
Date: Fri, 13 Sep 2024 15:32:13 -0600
Subject: [PATCH 1/2] fixing srm schema to allow strings and nulls for the
 "recordGeneratedBy" field

---
 jpo-ode-core/src/main/resources/schemas/schema-srm.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jpo-ode-core/src/main/resources/schemas/schema-srm.json b/jpo-ode-core/src/main/resources/schemas/schema-srm.json
index 57d271c85..8ac5e068a 100644
--- a/jpo-ode-core/src/main/resources/schemas/schema-srm.json
+++ b/jpo-ode-core/src/main/resources/schemas/schema-srm.json
@@ -87,7 +87,10 @@
                     "type": "string"
                 },
                 "recordGeneratedBy": {
-                    "type": "null"
+                    "type": [
+                        "string",
+                        "null"
+                    ]
                 },
                 "sanitized": {
                     "type": "boolean"

From b1728dd00f1873d3b7f1f1a9d53d87f597ea5bf7 Mon Sep 17 00:00:00 2001
From: Michael7371 <40476797+Michael7371@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:37:33 -0600
Subject: [PATCH 2/2] updates to "recordGeneratedBy" schema definition

---
 .../main/resources/schemas/schema-map.json    |  9 +++++++
 .../main/resources/schemas/schema-spat.json   | 27 +++++++++----------
 .../main/resources/schemas/schema-srm.json    |  9 +++++++
 .../main/resources/schemas/schema-ssm.json    |  9 +++++++
 .../main/resources/schemas/schema-tim.json    | 14 +++++++++-
 5 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/jpo-ode-core/src/main/resources/schemas/schema-map.json b/jpo-ode-core/src/main/resources/schemas/schema-map.json
index c3da44f95..85495546a 100644
--- a/jpo-ode-core/src/main/resources/schemas/schema-map.json
+++ b/jpo-ode-core/src/main/resources/schemas/schema-map.json
@@ -51,6 +51,15 @@
                     "type": "string"
                 },
                 "recordGeneratedBy": {
+                    "enum": [
+                        "TMC",
+                        "OBU",
+                        "RSU",
+                        "TMC_VIA_SAT",
+                        "TMC_VIA_SNMP",
+                        "UNKNOWN",
+                        null
+                    ],
                     "type": [
                         "string",
                         "null"
diff --git a/jpo-ode-core/src/main/resources/schemas/schema-spat.json b/jpo-ode-core/src/main/resources/schemas/schema-spat.json
index cfc483e64..13d5e62a1 100644
--- a/jpo-ode-core/src/main/resources/schemas/schema-spat.json
+++ b/jpo-ode-core/src/main/resources/schemas/schema-spat.json
@@ -238,21 +238,18 @@
                     "type": "string"
                 },
                 "recordGeneratedBy": {
-                    "oneOf": [
-                        {
-                            "type": "string",
-                            "enum": [
-                                "TMC",
-                                "OBU",
-                                "RSU",
-                                "TMC_VIA_SAT",
-                                "TMC_VIA_SNMP",
-                                "UNKNOWN"
-                            ]
-                        },
-                        {
-                            "type": "null"
-                        }
+                    "enum": [
+                        "TMC",
+                        "OBU",
+                        "RSU",
+                        "TMC_VIA_SAT",
+                        "TMC_VIA_SNMP",
+                        "UNKNOWN",
+                        null
+                    ],
+                    "type": [
+                        "string",
+                        "null"
                     ]
                 },
                 "sanitized": {
diff --git a/jpo-ode-core/src/main/resources/schemas/schema-srm.json b/jpo-ode-core/src/main/resources/schemas/schema-srm.json
index 8ac5e068a..8ea7ec55c 100644
--- a/jpo-ode-core/src/main/resources/schemas/schema-srm.json
+++ b/jpo-ode-core/src/main/resources/schemas/schema-srm.json
@@ -87,6 +87,15 @@
                     "type": "string"
                 },
                 "recordGeneratedBy": {
+                    "enum": [
+                        "TMC",
+                        "OBU",
+                        "RSU",
+                        "TMC_VIA_SAT",
+                        "TMC_VIA_SNMP",
+                        "UNKNOWN",
+                        null
+                    ],
                     "type": [
                         "string",
                         "null"
diff --git a/jpo-ode-core/src/main/resources/schemas/schema-ssm.json b/jpo-ode-core/src/main/resources/schemas/schema-ssm.json
index 4bb8d7f5e..c3e030551 100644
--- a/jpo-ode-core/src/main/resources/schemas/schema-ssm.json
+++ b/jpo-ode-core/src/main/resources/schemas/schema-ssm.json
@@ -93,6 +93,15 @@
                     "type": "string"
                 },
                 "recordGeneratedBy": {
+                    "enum": [
+                        "TMC",
+                        "OBU",
+                        "RSU",
+                        "TMC_VIA_SAT",
+                        "TMC_VIA_SNMP",
+                        "UNKNOWN",
+                        null
+                    ],
                     "type": [
                         "string",
                         "null"
diff --git a/jpo-ode-core/src/main/resources/schemas/schema-tim.json b/jpo-ode-core/src/main/resources/schemas/schema-tim.json
index 01853a066..e9343d1d7 100644
--- a/jpo-ode-core/src/main/resources/schemas/schema-tim.json
+++ b/jpo-ode-core/src/main/resources/schemas/schema-tim.json
@@ -31,7 +31,19 @@
                     "type": "string"
                 },
                 "recordGeneratedBy": {
-                    "type": "string"
+                    "enum": [
+                        "TMC",
+                        "OBU",
+                        "RSU",
+                        "TMC_VIA_SAT",
+                        "TMC_VIA_SNMP",
+                        "UNKNOWN",
+                        null
+                    ],
+                    "type": [
+                        "string",
+                        "null"
+                    ]
                 },
                 "recordType": {
                     "type": "string"