Merge pull request #629 from kdkavanagh/master

mjpt777 · web-flow · commit 9a289d6582a5 · 2019-01-30T12:47:34.000Z
Header validation warning on non-uint16 types instead of error
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/CompositeType.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/CompositeType.java
@@ -323,7 +323,7 @@ else if (blockLengthType.primitiveType() != UINT16)
         }
         else if (templateIdType.primitiveType() != UINT16)
         {
-            XmlSchemaParser.handleError(node, "\"templateId\" must be UINT16");
+            XmlSchemaParser.handleWarning(node, "\"templateId\" should be UINT16");
         }
 
         if (schemaIdType == null)
@@ -332,7 +332,7 @@ else if (templateIdType.primitiveType() != UINT16)
         }
         else if (schemaIdType.primitiveType() != UINT16)
         {
-            XmlSchemaParser.handleError(node, "\"schemaId\" must be UINT16");
+            XmlSchemaParser.handleWarning(node, "\"schemaId\" should be UINT16");
         }
 
         if (versionType == null)
@@ -341,7 +341,7 @@ else if (schemaIdType.primitiveType() != UINT16)
         }
         else if (versionType.primitiveType() != UINT16)
         {
-            XmlSchemaParser.handleError(node, "\"version\" must be UINT16");
+            XmlSchemaParser.handleWarning(node, "\"version\" should be UINT16");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ else if (blockLengthType.primitiveType() != UINT16)`
`323`	`323`	`}`
`324`	`324`	`else if (templateIdType.primitiveType() != UINT16)`
`325`	`325`	`{`
`326`		`- XmlSchemaParser.handleError(node, "\"templateId\" must be UINT16");`
	`326`	`+ XmlSchemaParser.handleWarning(node, "\"templateId\" should be UINT16");`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`if (schemaIdType == null)`
`@@ -332,7 +332,7 @@ else if (templateIdType.primitiveType() != UINT16)`
`332`	`332`	`}`
`333`	`333`	`else if (schemaIdType.primitiveType() != UINT16)`
`334`	`334`	`{`
`335`		`- XmlSchemaParser.handleError(node, "\"schemaId\" must be UINT16");`
	`335`	`+ XmlSchemaParser.handleWarning(node, "\"schemaId\" should be UINT16");`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`if (versionType == null)`
`@@ -341,7 +341,7 @@ else if (schemaIdType.primitiveType() != UINT16)`
`341`	`341`	`}`
`342`	`342`	`else if (versionType.primitiveType() != UINT16)`
`343`	`343`	`{`
`344`		`- XmlSchemaParser.handleError(node, "\"version\" must be UINT16");`
	`344`	`+ XmlSchemaParser.handleWarning(node, "\"version\" should be UINT16");`
`345`	`345`	`}`
`346`	`346`	`}`
`347`	`347`