Updated content types, validation & logging message in GENERIC

MESE-Core · Aug 13, 2024 · 45d4ccb · 45d4ccb
1 parent e6a088c
commit 45d4ccb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/SEDAPExpress/dist/SEDAPExpress-v1.0.0.jar b/SEDAPExpress/dist/SEDAPExpress-v1.0.0.jar
diff --git a/SEDAPExpress/src/main/java/de/bundeswehr/mese/sedapexpress/messages/GENERIC.java b/SEDAPExpress/src/main/java/de/bundeswehr/mese/sedapexpress/messages/GENERIC.java
@@ -119,6 +119,19 @@ public GENERIC(Iterator<String> message) {
 			      "Optional field \"contentType\" is empty!");
 	    } else {
 		this.contentType = value;
+		if (!("SEDAP".equals(this.contentType) ||
+			"ASCII".equals(this.contentType) ||
+			"NMEA".equals(this.contentType) ||
+			"XML".equals(this.contentType) ||
+			"JSON".equals(this.contentType) ||
+			"BINARY".equals(this.contentType))) {
+		    SEDAPExpressMessage.logger
+			    .logp(
+				  Level.INFO,
+				  "GENERIC",
+				  "GENERIC(Iterator<String> message)",
+				  "Optional field \"contentType\" has an invalid value > " + this.contentType);
+		}
 	    }
 	} else {
 	    SEDAPExpressMessage.logger