Skip to content

Commit 0dcd4c7

Browse files
committed
[Java] Make detection of invalid names by language a warning and not an error. Issue #433.
1 parent a52a0f7 commit 0dcd4c7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/XmlSchemaParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,17 +303,17 @@ public static void checkForValidName(final Node node, final String name)
303303
{
304304
if (!ValidationUtil.isSbeCppName(name))
305305
{
306-
handleError(node, "name is not valid for C++: " + name);
306+
handleWarning(node, "name is not valid for C++: " + name);
307307
}
308308

309309
if (!ValidationUtil.isSbeJavaName(name))
310310
{
311-
handleError(node, "name is not valid for Java: " + name);
311+
handleWarning(node, "name is not valid for Java: " + name);
312312
}
313313

314314
if (!ValidationUtil.isSbeGolangName(name))
315315
{
316-
handleError(node, "name is not valid for Golang: " + name);
316+
handleWarning(node, "name is not valid for Golang: " + name);
317317
}
318318
}
319319

sbe-tool/src/test/java/uk/co/real_logic/sbe/xml/ErrorHandlerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public void shouldNotExitOnTypeErrorsAndWarnings()
9292
parseTestXmlAddToMap(map, "/types/enum", testXmlString, handler);
9393
parseTestXmlAddToMap(map, "/types/set", testXmlString, handler);
9494

95-
assertThat(valueOf(handler.errorCount()), is(valueOf(24)));
96-
assertThat(valueOf(handler.warningCount()), is(valueOf(5)));
95+
assertThat(valueOf(handler.errorCount()), is(valueOf(3)));
96+
assertThat(valueOf(handler.warningCount()), is(valueOf(26)));
9797
}
9898

9999
@Test
@@ -173,7 +173,7 @@ public void shouldExitInvalidFieldNames()
173173
throws Exception
174174
{
175175
exceptionRule.expect(IllegalStateException.class);
176-
exceptionRule.expectMessage("had 12 errors");
176+
exceptionRule.expectMessage("had 12 warnings");
177177

178178
final ParserOptions options = ParserOptions.builder().suppressOutput(true).warningsFatal(true).build();
179179

0 commit comments

Comments
 (0)