Added LoadingModelEvaluatorBuilder#setJAXBContext(JAXBContext) method

See #246
jpmml · Aug 6, 2022 · 7e0e08c · 7e0e08c
1 parent d1b9e75
commit 7e0e08c
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/pmml-evaluator/src/main/java/org/jpmml/evaluator/LoadingModelEvaluatorBuilder.java b/pmml-evaluator/src/main/java/org/jpmml/evaluator/LoadingModelEvaluatorBuilder.java
@@ -30,6 +30,7 @@
 import javax.xml.transform.Source;
 import javax.xml.validation.Schema;
 
+import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Unmarshaller;
 import jakarta.xml.bind.ValidationEventHandler;
@@ -101,6 +102,8 @@
  */
 public class LoadingModelEvaluatorBuilder extends ModelEvaluatorBuilder {
 
+	private JAXBContext jaxbContext = null;
+
 	private Schema schema = null;
 
 	private ValidationEventHandler validationEventHandler = null;
@@ -136,14 +139,19 @@ public LoadingModelEvaluatorBuilder load(InputStream is) throws ParserConfigurat
 	}
 
 	public LoadingModelEvaluatorBuilder load(InputStream is, String modelName) throws ParserConfigurationException, SAXException, JAXBException {
+		JAXBContext jaxbContext = getJAXBContext();
 		Schema schema = getSchema();
 		ValidationEventHandler validationEventHandler = getValidationEventHandler();
 		List<? extends XMLFilter> filters = getFilters();
 		boolean locatable = getLocatable();
 		boolean mutable = getMutable();
 		VisitorBattery visitors = getVisitors();
 
-		Unmarshaller unmarshaller = JAXBUtil.createUnmarshaller();
+		if(jaxbContext == null){
+			jaxbContext = JAXBUtil.getContext();
+		}
+
+		Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
 		unmarshaller.setSchema(schema);
 		unmarshaller.setEventHandler(validationEventHandler);
 
@@ -267,6 +275,19 @@ public LoadingModelEvaluatorBuilder setCheckSchema(boolean checkSchema){
 		return (LoadingModelEvaluatorBuilder)super.setCheckSchema(checkSchema);
 	}
 
+	public JAXBContext getJAXBContext(){
+		return this.jaxbContext;
+	}
+
+	/**
+	 * @see JAXBUtil#getObjectFactoryClasses()
+	 */
+	public LoadingModelEvaluatorBuilder setJAXBContext(JAXBContext jaxbContext){
+		this.jaxbContext = jaxbContext;
+
+		return this;
+	}
+
 	public Schema getSchema(){
 		return this.schema;
 	}