change to allow validation to thrown SAXException, when no ErrorHandler is set

Author: nemonik

README.MD

@@ -25,7 +25,7 @@ see TODO.txt for a tentative roadmap.  Releases will be announced on the [STIX
 discussion list][list]. A java-stix for a particular schema release will match the 
 STIX schema version in Semantic Versioning form. Follow up patches of java-stix 
 for a particular schema release will increment a 4th digit. For example, the first 
-patch release for java-stix `v1.2.0` would be `v1.2.0.1`. Patches will be worked 
+patch release for java-stix `v1.2.0` would be `v1.2.0.2`. Patches will be worked 
 in a branch prior to being tagged and released.
 
 ## <a name="releases"></a>Releases
@@ -37,16 +37,16 @@ Releases are distributed via the Maven Central Repository.
 	<dependency>
 	  <groupId>org.mitre</groupId>
 	  <artifactId>stix</artifactId>
-	  <version>1.2.0.1</version>
+	  <version>1.2.0.2</version>
 	</dependency>
 
 ### <a name="gradle_dependency_info"></a>Gradle:
 
-	compile 'org.mitre:stix:1.2.0.1'
+	compile 'org.mitre:stix:1.2.0.2'
 
 ### <a name="ivy__dependency_info"></a>Apache Ivy:
 
-	<dependency org="org.mitre" name="stix" rev="1.2.0.1" />
+	<dependency org="org.mitre" name="stix" rev="1.2.0.2" />
 
 ## <a name="snapshots"></a>Snapshots
 
@@ -69,7 +69,7 @@ Users using Apache Maven for example can simply retrieve java-stix directly via
 		<dependency>
 			<groupId>org.mitre</groupId>
 			<artifactId>stix</artifactId>
-			<version>1.2.0.1-SNAPSHOT</version>
+			<version>1.2.0.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -356,17 +356,17 @@ Then create a container using the image you just created via:
 To retreive the jar archives from the running docker container use following 
 from the command-line of your docker host, not the container:
 
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar .
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar .
-	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-javadoc.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT-sources.jar .
+	docker cp <container id>:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar .
 
 If the containder ID is not obvious, but you can also retrieve it via:
 
 	docker ps
 
 An example of retrieving the snapshot jar would be the following:
 
-	docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar . 
+	docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.2-SNAPSHOT.jar . 
 
 By default the Docker container will build using OpenJdk 7.  You can modify
 the Dockerfile to other JVM's noted in the file.  Please, note Gradle targets 

buildSrc/src/main/groovy/org/mitre/stix/GeneratedSourceTransformationTask.groovy

@@ -304,16 +304,20 @@ class GeneratedSourceTransformationTask extends DefaultTask {
 						[
 							imports: 
 							[
+								"org.xml.sax.SAXException"
 							],
 							template:
 								"""\
 	/**
 	 * Validates the XML representation of this \${name} instance
 	 * Returning true indicating a successful validation, false if not.
 	 * 
-	 * @return boolean
+	 * @return boolean True If it validates against the schema
+	 * @throws SAXException
+	 *             If the a validation ErrorHandler has not been set, and
+	 *             validation throws a SAXException
 	 */
-	public boolean validate() {
+	public boolean validate() throws SAXException {
 		return STIXSchema.getInstance().validate(toXMLString());
 	}
 """

src/main/java/org/mitre/stix/STIXSchema.java

@@ -94,8 +94,7 @@ private STIXSchema() {
 
 		try {
 			schemaResources = patternResolver
-					.getResources("classpath:schemas/v" + version
-							+ "/**/*.xsd");
+					.getResources("classpath:schemas/v" + version + "/**/*.xsd");
 
 			prefixSchemaBindings = new HashMap<String, String>();
 
@@ -192,8 +191,12 @@ public String getVersion() {
 	 * 
 	 * @param url
 	 *            The URL object for the XML to be validated.
+	 * @return boolean True If the xmlText validates against the schema
+	 * @throws SAXException
+	 *             If the a validation ErrorHandler has not been set, and
+	 *             validation throws a SAXException
 	 */
-	public boolean validate(URL url) {
+	public boolean validate(URL url) throws SAXException {
 
 		String xmlText = null;
 
@@ -211,8 +214,12 @@ public boolean validate(URL url) {
 	 * 
 	 * @param xmlText
 	 *            A string of XML text to be validated
+	 * @return boolean True If the xmlText validates against the schema
+	 * @throws SAXException
+	 *             If the a validation ErrorHandler has not been set, and
+	 *             validation throws a SAXException
 	 */
-	public boolean validate(String xmlText) {
+	public boolean validate(String xmlText) throws SAXException {
 
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		factory.setNamespaceAware(true);
@@ -251,12 +258,15 @@ public boolean validate(String xmlText) {
 		try {
 			validator.validate(new StreamSource(new ByteArrayInputStream(
 					xmlText.getBytes(StandardCharsets.UTF_8))));
-
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		} catch (SAXException e) {
-			System.out.println("---------\n" + e + "--------\n");
-			return false;
+			if (this.validator.getErrorHandler() != null) {
+				return false;
+			} else {
+				//re-throw the SAXException
+				throw e;
+			}
 		}
 
 		return true;

src/main/java/org/mitre/stix/examples/CIQIdentity.java

@@ -43,6 +43,7 @@
 import org.mitre.stix.stix_1.IndicatorsType;
 import org.mitre.stix.stix_1.STIXHeaderType;
 import org.mitre.stix.stix_1.STIXPackage;
+import org.xml.sax.SAXException;
 
 /**
  * An example of how to add CIQ Identity information to a STIX Indicator.
@@ -190,6 +191,8 @@ public static void main(String[] args) {
 
 		} catch (DatatypeConfigurationException e) {
 			throw new RuntimeException(e);
+		} catch (SAXException e) {
+			e.printStackTrace();
 		}
 	}
 }

src/main/java/org/mitre/stix/examples/CreationToolMetadata.java

@@ -20,6 +20,7 @@
 import org.mitre.stix.common_1.StructuredTextType;
 import org.mitre.stix.stix_1.STIXHeaderType;
 import org.mitre.stix.stix_1.STIXPackage;
+import org.xml.sax.SAXException;
 
 /**
  * Build a STIX Document with Tool Information
@@ -69,6 +70,8 @@ public static void main(String[] args) {
 
 		} catch (DatatypeConfigurationException e) {
 			throw new RuntimeException(e);
+		} catch (SAXException e) {
+			e.printStackTrace();
 		}
 	}
 }

src/main/java/org/mitre/stix/examples/IndicatorHash.java

@@ -32,6 +32,7 @@
 import org.mitre.stix.stix_1.IndicatorsType;
 import org.mitre.stix.stix_1.STIXHeaderType;
 import org.mitre.stix.stix_1.STIXPackage;
+import org.xml.sax.SAXException;
 
 /**
  * Build a STIX Indicator document containing a File observable with an
@@ -129,6 +130,8 @@ public static void main(String[] args) {
 
 		} catch (DatatypeConfigurationException e) {
 			throw new RuntimeException(e);
+		} catch (SAXException e) {
+			e.printStackTrace();
 		}
 	}
 }