ODE-769 Updating to default to schemaVersion=5

Trihydro · May 11, 2018 · 827e6ce · 827e6ce
1 parent 433a8c7
commit 827e6ce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -49,6 +49,7 @@ services:
  ODE_EXTERNAL_IPV4: ${ODE_EXTERNAL_IPV4}
  ODE_EXTERNAL_IPV6: ${ODE_EXTERNAL_IPV6}
  ODE_SECURITY_SVCS_SIGNATURE_URI: ${ODE_SECURITY_SVCS_SIGNATURE_URI}
+ ODE_OUTPUT_SCHEMA_VERSION: ${ODE_OUTPUT_SCHEMA_VERSION}
  depends_on:
  - kafka
  links:

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/OdeBsmDataCreatorHelper.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/OdeBsmDataCreatorHelper.java
@@ -16,6 +16,7 @@
 import us.dot.its.jpo.ode.model.OdeBsmPayload;
 import us.dot.its.jpo.ode.model.OdeLogMetadata;
 import us.dot.its.jpo.ode.model.OdeLogMetadata.SecurityResultCode;
+import us.dot.its.jpo.ode.model.OdeMsgMetadata;
 import us.dot.its.jpo.ode.model.OdeMsgMetadata.GeneratedBy;
 import us.dot.its.jpo.ode.model.SerialId;
 import us.dot.its.jpo.ode.plugin.j2735.J2735Bsm;
@@ -86,7 +87,7 @@ public static OdeBsmData createOdeBsmData(String consumedData)
  * ODE-755 and ODE-765 Starting with schemaVersion=5 receivedMessageDetails 
  * will be present in BSM metadata. None should be present in prior versions.
  */
- if (metadata.getSchemaVersion() <= 4) {
+ if (OdeMsgMetadata.getSchemaVersion() <= 4) {
  metadata.setReceivedMessageDetails(null);
  }
 

diff --git a/jpo-ode-svcs/src/main/resources/application.properties b/jpo-ode-svcs/src/main/resources/application.properties
@@ -5,7 +5,7 @@
 #server.ssl.key-store-password = keystore_pass
 #server.ssl.key-password = key_pass
 
-ode.outputSchemaVersion = 4
+ode.outputSchemaVersion=5
 
 spring.http.multipart.max-file-size=1MB
 spring.http.multipart.max-request-size=1MB

diff --git a/sample.env b/sample.env
@@ -28,7 +28,7 @@ DOCKER_HOST_IP=
 # Hint: usually the path to the `jpo-ode` directory.
 DOCKER_SHARED_VOLUME=
 
-ODE_OUTPUT_SCHEMA_VERSION=4
+ODE_OUTPUT_SCHEMA_VERSION=5
 
 CVPEP_BSM_ACCESS_KEY_ID=
 CVPEP_BSM_SECRET_ACCESS_KEY=