[Java] Fix bugs after merge of PR aeron-io#649 due to wrong systemId being set and not dealing with schema validation.

Author: mjpt777

build.gradle

@@ -372,18 +372,16 @@ project(':sbe-samples') {
  }
 
  task generateCodecs(type: JavaExec) {
- workingDir = 'src/main/resources'
  main = 'uk.co.real_logic.sbe.SbeTool'
  classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
  systemProperties(
- 'sbe.output.dir': '../../../build/generated',
+ 'sbe.output.dir': 'build/generated',
  'sbe.target.language': 'Java',
  'sbe.java.generate.interfaces': 'true',
  'sbe.validation.stop.on.error': 'true',
  'sbe.xinclude.aware': 'true',
  'sbe.validation.xsd': validationXsdPath)
- args = ['example-schema.xml',
- 'example-extension-schema.xml']
+ args = ['src/main/resources/example-schema.xml', 'src/main/resources/example-extension-schema.xml']
  }
 
  task runExampleUsingGeneratedStub(dependsOn: 'compileJava', type: JavaExec) {
@@ -710,8 +708,6 @@ task generateCSharpCodecs {
  'generateCSharpCodecsWithXIncludes'
 }
 
-
-
 task generateJavaIrCodecs(type: JavaExec) {
  main = 'uk.co.real_logic.sbe.SbeTool'
  classpath = project(':sbe-all').sourceSets.main.runtimeClasspath

sbe-tool/src/main/java/uk/co/real_logic/sbe/SbeTool.java

@@ -260,9 +260,17 @@ public static void validateAgainstSchema(final String sbeSchemaFilename, final S
  .warningsFatal(Boolean.parseBoolean(System.getProperty(VALIDATION_WARNINGS_FATAL)))
  .suppressOutput(Boolean.parseBoolean(System.getProperty(VALIDATION_SUPPRESS_OUTPUT)));
 
- try (InputStream in = new BufferedInputStream(Files.newInputStream(Paths.get(sbeSchemaFilename))))
+ final Path filePath = Paths.get(sbeSchemaFilename);
+ try (InputStream in = new BufferedInputStream(Files.newInputStream(filePath)))
  {
- XmlSchemaParser.validate(xsdFilename, in, optionsBuilder.build());
+ final InputSource inputSource = new InputSource(in);
+ final Path parentPath = filePath.toAbsolutePath().getParent();
+ if (parentPath != null)
+ {
+ inputSource.setSystemId(parentPath.toUri().toString());
+ }
+
+ XmlSchemaParser.validate(xsdFilename, inputSource, optionsBuilder.build());
  }
  }
 
@@ -290,8 +298,9 @@ public static MessageSchema parseSchema(final String sbeSchemaFilename)
  final Path parentPath = filePath.toAbsolutePath().getParent();
  if (parentPath != null)
  {
- inputSource.setSystemId(filePath.toUri().toString());
+ inputSource.setSystemId(parentPath.toUri().toString());
  }
+
  return XmlSchemaParser.parse(inputSource, optionsBuilder.build());
  }
  }

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

@@ -72,11 +72,12 @@ public class XmlSchemaParser
  * Validate the document against a given schema. Error will be written to {@link java.lang.System#err}
  *
  * @param xsdFilename schema to validate against.
- * @param in document to be validated.
+ * @param is source from which schema is read. Ideally it will have the systemId property set to resolve
+ * relative references.
  * @param options to be applied during parsing.
  * @throws Exception if an error occurs when parsing the document or schema.
  */
- public static void validate(final String xsdFilename, final InputStream in, final ParserOptions options)
+ public static void validate(final String xsdFilename, final InputSource is, final ParserOptions options)
  throws Exception
  {
  final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -91,15 +92,32 @@ public static void validate(final String xsdFilename, final InputStream in, fina
  factory.setFeature("http://apache.org/xml/features/xinclude/fixup-base-uris", false);
  }
 
- factory.newDocumentBuilder().parse(in);
+ factory.newDocumentBuilder().parse(is);
  }
 
  /**
- * Take an {@link InputSource} and parse it generating map of template ID to Message objects, types, and schema.
+ * Wraps the {@link InputStream} into an {@link InputSource} and delegates to
+ * {@link #validate(String, InputSource, ParserOptions)}.
  * <p>
- * Exceptions are passed back up for any problems.
+ * <b>Note:</b> this method does not set the {@link InputSource#setSystemId(java.lang.String)} property.
+ * However, it is recommended to use the {@link #validate(String, InputSource, ParserOptions)} method directly.
  *
- * @param is inputSource from which schema is read. Ideally it will have the systemId property set to resolve relative references
+ * @param xsdFilename schema to validate against.
+ * @param in document to be validated.
+ * @param options to be applied during parsing.
+ * @throws Exception if an error occurs when parsing the document or schema.
+ */
+ public static void validate(final String xsdFilename, final InputStream in, final ParserOptions options)
+ throws Exception
+ {
+ validate(xsdFilename, new InputSource(in), options);
+ }
+
+ /**
+ * Take an {@link InputSource} and parse it generating map of template ID to Message objects, types, and schema.
+ *
+ * @param is source from which schema is read. Ideally it will have the systemId property set to resolve
+ * relative references.
  * @param options to be applied during parsing.
  * @return {@link MessageSchema} encoding for the schema.
  * @throws Exception on parsing error.
@@ -135,13 +153,11 @@ public static MessageSchema parse(final InputSource is, final ParserOptions opti
  }
 
  /**
- * Wraps an {@link InputStream} into an {@link InputSource} and delegates to
- * {@link #parse(org.xml.sax.InputSource, uk.co.real_logic.sbe.xml.ParserOptions) }.
- * <p>Note: this method does not the the {@link InputSource#setSystemId(java.lang.String) } property, however. It is recommended to use the
- * {@link #parse(org.xml.sax.InputSource, uk.co.real_logic.sbe.xml.ParserOptions) } method directly.</p>
- *
+ * Wraps the {@link InputStream} into an {@link InputSource} and delegates to
+ * {@link #parse(InputSource, ParserOptions)}.
  * <p>
- * Exceptions are passed back up for any problems.
+ * <b>Note:</b> this method does not set the {@link InputSource#setSystemId(java.lang.String)} property.
+ * However, it is recommended to use the {@link #parse(InputSource, ParserOptions)} method directly.
  *
  * @param in stream from which schema is read.
  * @param options to be applied during parsing.

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

@@ -32,12 +32,10 @@ public void shouldParseFileInSubDir()
  {
  final ClassLoader classLoader = getClass().getClassLoader();
  final URL testResource = classLoader.getResource("sub/basic-schema.xml");
- final InputStream inStream = testResource.openStream();
- final InputSource is = new InputSource(inStream);
+ final InputSource is = new InputSource(testResource.openStream());
 
  final File file = new File(testResource.getFile());
  is.setSystemId(file.toPath().toAbsolutePath().getParent().toUri().toString());
  parse(is, ParserOptions.DEFAULT);
  }
-
 }