Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

体验新版 GitCode，发现更多精彩内容 >>

提交 106783b0 编写于 作者: J jbarrez
浏览文件
操作

ACT-230: switch all exceptions that are thrown during parsing to addError/addWarning

上级 a5eb899b
隐藏空白更改
内联 并排
Showing with 117 addition and 65 deletion
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
浏览文件 @ 106783b0
......@@ -159,7 +159,11 @@ public class BpmnParse extends Parse {
super(parser);
this.expressionManager = parser.getExpressionManager();
this.parseListeners = parser.getParseListeners();
setSchemaResource(BpmnParser.SCHEMA_RESOURCE);
//setSchemaResource(BpmnParser.SCHEMA_RESOURCE);
setSchemaResource(Thread.currentThread().getContextClassLoader().getResource(BpmnParser.SCHEMA_RESOURCE).toString());
this.importers.put("http://schemas.xmlsoap.org/wsdl/", new WSDLImporter());
}
......@@ -175,17 +179,31 @@ public class BpmnParse extends Parse {
parseInterfaces(rootElement);
parseProcessDefinitions(rootElement);
if (hasWarnings()) {
logWarnings();
}
if (hasErrors()) {
throwActivitiExceptionForErrors();
}
return this;
}
private void parseDefinitionsAttributes(Element rootElement) {
String typeLanguage = rootElement.attribute("typeLanguage");
String expressionLanguage = rootElement.attribute("expressionLanguage");
if (typeLanguage.contains("XMLSchema")) {
LOG.info("XMLSchema currently not supported as typeLanguage");
if (typeLanguage != null) {
if (typeLanguage.contains("XMLSchema")) {
LOG.info("XMLSchema currently not supported as typeLanguage");
}
}
if(expressionLanguage.contains("XPath")) {
LOG.info("XPath currently not supported as typeLanguage");
if (expressionLanguage != null) {
if(expressionLanguage.contains("XPath")) {
LOG.info("XPath currently not supported as typeLanguage");
}
}
}
......@@ -201,7 +219,7 @@ public class BpmnParse extends Parse {
String importType = theImport.attribute("importType");
XMLImporter importer = this.importers.get(importType);
if (importer == null) {
addProblem("Could not import item of type " + importType, theImport);
addError("Could not import item of type " + importType, theImport);
} else {
importer.importFrom(theImport, this);
}
......@@ -254,7 +272,7 @@ public class BpmnParse extends Parse {
String itemRef = messageElement.attribute("itemRef");
if (!this.itemDefinitions.containsKey(itemRef)) {
addProblem(itemRef + " does not exist", messageElement);
addError(itemRef + " does not exist", messageElement);
} else {
ItemDefinition itemDefinition = this.itemDefinitions.get(itemRef);
Message message = new Message(id, itemDefinition);
......@@ -293,7 +311,7 @@ public class BpmnParse extends Parse {
Element inMessageRefElement = operationElement.element("inMessageRef");
if (!this.messages.containsKey(inMessageRefElement.getText())) {
addProblem(inMessageRefElement.getText() + " does not exist", inMessageRefElement);
addError(inMessageRefElement.getText() + " does not exist", inMessageRefElement);
return null;
} else {
Message inMessage = this.messages.get(inMessageRefElement.getText());
......@@ -394,7 +412,7 @@ public class BpmnParse extends Parse {
public void parseStartEvents(Element parentElement, ScopeImpl scope) {
List<Element> startEventElements = parentElement.elements("startEvent");
if (startEventElements.size() > 1) {
throw new ActivitiException("Multiple start events are currently unsupported");
addError("Multiple start events are currently unsupported", parentElement);
} else if (startEventElements.size() > 0) {
Element startEventElement = startEventElements.get(0);
......@@ -411,7 +429,7 @@ public class BpmnParse extends Parse {
// in order to support this, the initial should here be replaced with
// a kind of hidden decision activity that has pvm transitions to all
// of the visible bpmn start events
addProblem("multiple startEvents in a process definition are not yet supported", startEventElement);
addError("multiple startEvents in a process definition are not yet supported", startEventElement);
}
processDefinition.setInitial(startEventActivity);
......@@ -581,12 +599,12 @@ public class BpmnParse extends Parse {
if (type.equalsIgnoreCase("mail")) {
parseEmailServiceTask(activity, serviceTaskElement, fieldDeclarations);
} else {
addProblem("Invalid usage of type attribute: '" + type + "'", serviceTaskElement);
addError("Invalid usage of type attribute: '" + type + "'", serviceTaskElement);
}
} else if (className != null && className.trim().length() > 0) {
if (resultVariableName != null) {
throw new ActivitiException("'result-variable-name' not supported for service tasks using 'class'");
addError("'result-variable-name' not supported for service tasks using 'class'", serviceTaskElement);
}
activity.setActivityBehavior(new ServiceTaskDelegateActivityBehaviour(expressionManager.createValueExpression(className), fieldDeclarations));
......@@ -599,13 +617,13 @@ public class BpmnParse extends Parse {
} else if (implementation != null && operationRef != null && implementation.equalsIgnoreCase("##WebService")) {
if (!this.operations.containsKey(operationRef)) {
addProblem(operationRef + " does not exist" , serviceTaskElement);
addError(operationRef + " does not exist" , serviceTaskElement);
} else {
Operation operation = this.operations.get(operationRef);
activity.setActivityBehavior(new WebServiceActivityBehavior(operation));
}
} else {
throw new ActivitiException("'class', 'method-expr' or 'value-expr' attribute is mandatory on serviceTask");
addError("'class', 'method-expr' or 'value-expr' attribute is mandatory on serviceTask", serviceTaskElement);
}
for (BpmnParseListener parseListener: parseListeners) {
......@@ -634,10 +652,10 @@ public class BpmnParse extends Parse {
}
if (!toDefined) {
addProblem("No recipient is defined on the mail activity", serviceTaskElement);
addError("No recipient is defined on the mail activity", serviceTaskElement);
}
if (!textOrHtmlDefined) {
addProblem("Text or html field should be provided", serviceTaskElement);
addError("Text or html field should be provided", serviceTaskElement);
}
}
......@@ -675,17 +693,17 @@ public class BpmnParse extends Parse {
if (stringElement != null) {
stringElementText = stringElement.getText();
if (stringValue != null && (stringElementText != null || stringElementText.length() > 0)) {
addProblem("Invalid: both string-value and a text are provided", stringElement);
addError("Invalid: both string-value and a text are provided", stringElement);
} else if (stringValue == null && (stringElementText == null || stringElementText.length() == 0)) {
addProblem("Invalid declartion: no string-value or string element text provided", fieldDeclarationElement);
addError("Invalid declartion: no string-value or string element text provided", fieldDeclarationElement);
}
}
valueExpression = expressionManager.createValueExpression(stringValue != null ? stringValue : stringElementText);
} catch (ActivitiException e) {
if (e.getMessage().contains("multiple elements with tag name")) {
addProblem("Invalid: multiple field declarations found", serviceTaskElement);
addError("Invalid: multiple field declarations found", serviceTaskElement);
} else {
addProblem("Error when paring field declarations: " + e.getMessage(), serviceTaskElement);
addError("Error when paring field declarations: " + e.getMessage(), serviceTaskElement);
}
}
return valueExpression;
......@@ -788,7 +806,8 @@ public class BpmnParse extends Parse {
List<Element> humanPerformerElements = taskElement.elements(HUMAN_PERFORMER);
if (humanPerformerElements.size() > 1) {
throw new ActivitiException("Invalid task definition: multiple " + HUMAN_PERFORMER + " sub elements defined for " + taskDefinition.getNameValueExpression());
addError("Invalid task definition: multiple " + HUMAN_PERFORMER + " sub elements defined for "
+ taskDefinition.getNameValueExpression(), taskElement);
} else if (humanPerformerElements.size() == 1) {
Element humanPerformerElement = humanPerformerElements.get(0);
if (humanPerformerElement != null) {
......@@ -838,7 +857,7 @@ public class BpmnParse extends Parse {
protected String[] splitCommaSeparatedExpression(String expression) {
if (expression == null) {
throw new ActivitiException("Invalid: no content for " + FORMAL_EXPRESSION + " provided");
addError("Invalid: no content for " + FORMAL_EXPRESSION + " provided", rootElement);
}
return expression.split(",");
}
......@@ -855,7 +874,8 @@ public class BpmnParse extends Parse {
if (taskDefinition.getAssigneeValueExpression() == null) {
taskDefinition.setAssigneeValueExpression(expressionManager.createValueExpression(assignee));
} else {
throw new ActivitiException("Invalid usage: duplicate assignee declaration for task " + taskDefinition.getNameValueExpression());
addError("Invalid usage: duplicate assignee declaration for task "
+ taskDefinition.getNameValueExpression(), taskElement);
}
}
......@@ -928,7 +948,7 @@ public class BpmnParse extends Parse {
// 'attachedToRef' attribute
String attachedToRef = boundaryEventElement.attribute("attachedToRef");
if (attachedToRef == null || attachedToRef.equals("")) {
throw new ActivitiException("AttachedToRef is required when using a timerEventDefinition");
addError("AttachedToRef is required when using a timerEventDefinition", boundaryEventElement);
}
// Representation structure-wise is a nested activity in the activity to
......@@ -940,8 +960,8 @@ public class BpmnParse extends Parse {
ActivityImpl parentActivity = scopeElement.findActivity(attachedToRef);
if (parentActivity == null) {
throw new ActivitiException("Invalid reference in boundary event: " + attachedToRef
+ " Make sure that the referenced activity is defined in the same scope as the boundary event");
addError("Invalid reference in boundary event. Make sure that the referenced activity is "
+ "defined in the same scope as the boundary event", boundaryEventElement);
}
ActivityImpl nestedActivity = parentActivity.createActivity(id);
nestedActivity.setProperty("name", boundaryEventElement.attribute("name"));
......@@ -955,7 +975,7 @@ public class BpmnParse extends Parse {
if (timerEventDefinition != null) {
parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity);
} else {
throw new ActivitiException("Unsupported boundary event type");
addError("Unsupported boundary event type", boundaryEventElement);
}
}
}
......@@ -1053,8 +1073,7 @@ public class BpmnParse extends Parse {
ActivityImpl activity = parseAndCreateActivityOnScopeElement(callActivityElement, scope);
String calledElement = callActivityElement.attribute("calledElement");
if (calledElement == null) {
throw new ActivitiException("Missing attribute 'calledElement' on callActivity (line " +
+ callActivityElement.getLine() + ")");
addError("Missing attribute 'calledElement'", callActivityElement);
}
activity.setActivityBehavior(new CallActivityBehaviour(calledElement));
......@@ -1095,7 +1114,7 @@ public class BpmnParse extends Parse {
// If name isn't given, use the id as name
if (name == null) {
if (id == null) {
throw new ActivitiException("Invalid property usage on line " + propertyElement.getLine() + ": no id or name specified.");
addError("Invalid property usage on line " + propertyElement.getLine() + ": no id or name specified.", propertyElement);
} else {
name = id;
}
......@@ -1109,7 +1128,7 @@ public class BpmnParse extends Parse {
Structure structure = itemDefinition.getStructure();
type = structure.getId();
} else {
throw new ActivitiException("Invalid itemDefinition reference: " + itemSubjectRef + " not found");
addError("Invalid itemDefinition reference: " + itemSubjectRef + " not found", propertyElement);
}
}
......@@ -1197,10 +1216,10 @@ public class BpmnParse extends Parse {
ActivityImpl destinationActivity = scope.findActivity(destinationRef);
if (sourceActivity == null) {
throw new ActivitiException("Invalid source of sequence flow '" + id + "'");
addError("Invalid source of sequence flow '" + id + "'", sequenceFlowElement);
}
if (destinationActivity == null) {
throw new ActivitiException("Invalid destination of sequence flow '" + id + "'");
addError("Invalid destination of sequence flow '" + id + "'", sequenceFlowElement);
}
TransitionImpl transition = sourceActivity.createOutgoingTransition(id);
......@@ -1229,8 +1248,7 @@ public class BpmnParse extends Parse {
String expr = conditionExprElement.getText().trim();
String type = conditionExprElement.attributeNS(BpmnParser.XSI_NS, "type");
if (type != null && !type.equals("tFormalExpression")) {
throw new ActivitiException("Invalid type on conditionExpression (" + conditionExprElement.getLine() + "). "
+ "Only tFormalExpression is currently supported");
addError("Invalid type, only tFormalExpression is currently supported", conditionExprElement);
}
String language = conditionExprElement.attribute("language");
......@@ -1244,7 +1262,7 @@ public class BpmnParse extends Parse {
} else if ("uel-method".equals(language)) {
condition = new UelMethodExpressionCondition(expressionManager.createMethodExpression(expr));
} else {
throw new ActivitiException("Unknown language for condition: " + language);
addError("Unknown language for condition: " + language, conditionExprElement);
}
seqFlow.setProperty(PROPERTYNAME_CONDITION, condition);
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/xml/Parse.java
浏览文件 @ 106783b0
......@@ -19,12 +19,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import java.util.Stack;
import java.util.logging.Logger;
import javax.xml.XMLConstants;
import javax.xml.parsers.SAXParser;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
import javax.xml.parsers.SAXParserFactory;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.util.io.InputStreamSource;
......@@ -41,11 +39,16 @@ import org.xml.sax.helpers.DefaultHandler;
*/
public class Parse extends DefaultHandler {
private static final Logger LOGGER = Logger.getLogger(Parse.class.getName());
private static final String NEW_LINE = System.getProperty("line.separator");
protected Parser parser;
protected String name;
protected StreamSource streamSource;
protected Element rootElement = null;
protected List<Problem> problems = new ArrayList<Problem>();
protected List<Problem> errors = new ArrayList<Problem>();
protected List<Problem> warnings = new ArrayList<Problem>();
protected String schemaResource;
protected Stack<Object> contextStack;
......@@ -108,25 +111,22 @@ public class Parse extends DefaultHandler {
}
this.streamSource = streamSource;
}
private static final String JAXP_SCHEMA_SOURCE
= "http://java.sun.com/xml/jaxp/properties/schemaSource";
private static final String JAXP_SCHEMA_LANGUAGE
= "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
private static final String W3C_XML_SCHEMA
= "http://www.w3.org/2001/XMLSchema";
public Parse execute() {
try {
InputStream inputStream = streamSource.getInputStream();
if (schemaResource != null) {
SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
Schema schema = factory.newSchema(Thread.currentThread().getContextClassLoader().getResource(schemaResource));
parser.getSaxParserFactory().setSchema(schema);
Validator validator = schema.newValidator();
validator.validate(new javax.xml.transform.stream.StreamSource(inputStream));
// The validator will read the stream until the end, rendering it useless for further usage
// PLEASE do not remove this comment. It has cost me 2 hours to figure it out.
inputStream.reset();
}
SAXParser saxParser = parser.getSaxParser();
saxParser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
saxParser.setProperty(JAXP_SCHEMA_SOURCE, schemaResource);
saxParser.parse(inputStream, new ParseHandler(this));
} catch (Exception e) { // any exception can happen (Activiti, Io, etc.)
throw new ActivitiException("couldn't parse '"+name+"': "+e.getMessage(), e);
......@@ -140,20 +140,52 @@ public class Parse extends DefaultHandler {
}
public List<Problem> getProblems() {
return problems;
return errors;
}
public void addProblem(SAXParseException e) {
problems.add(new Problem(e, name));
public void addError(SAXParseException e) {
errors.add(new Problem(e, name));
}
public void addError(String errorMessage, Element element) {
errors.add(new Problem(errorMessage, name, element));
}
public boolean hasErrors() {
return errors != null && !errors.isEmpty();
}
public void addProblem(String errorMessage, Element element) {
problems.add(new Problem(errorMessage, name, element));
public void addWarning(SAXParseException e) {
warnings.add(new Problem(e, name));
}
public void addWarning(String errorMessage, Element element) {
warnings.add(new Problem(errorMessage, name, element));
}
public boolean hasWarnings() {
return warnings != null && !warnings.isEmpty();
}
public void logWarnings() {
for (Problem warning : warnings) {
LOGGER.warning(warning.toString());
}
}
public void throwActivitiExceptionForErrors() {
StringBuilder strb = new StringBuilder();
for (Problem error : errors) {
strb.append(error.toString());
strb.append(NEW_LINE);
}
throw new ActivitiException(strb.toString());
}
public void setSchemaResource(String schemaResource) {
parser.getSaxParserFactory().setNamespaceAware(true);
parser.getSaxParserFactory().setValidating(true);
SAXParserFactory saxParserFactory = parser.getSaxParserFactory();
saxParserFactory.setNamespaceAware(true);
saxParserFactory.setValidating(true);
this.schemaResource = schemaResource;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/xml/ParseHandler.java
浏览文件 @ 106783b0
......@@ -56,10 +56,10 @@ public class ParseHandler extends DefaultHandler {
}
public void error(SAXParseException e) {
parse.addProblem(e);
parse.addError(e);
}
public void fatalError(SAXParseException e) {
parse.addProblem(e);
parse.addError(e);
}
public void warning(SAXParseException e) {
log.warning(e.toString());
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/xml/Problem.java
浏览文件 @ 106783b0
......@@ -17,6 +17,7 @@ import org.xml.sax.SAXParseException;
/**
* @author Tom Baeyens
* @author Joram Barrez
*/
public class Problem {
......@@ -35,6 +36,7 @@ public class Problem {
}
exception = exception.getCause();
}
this.resource = resource;
this.line = e.getLineNumber();
this.column = e.getColumnNumber();
}
......@@ -47,7 +49,7 @@ public class Problem {
this.column = element.getColumn();
}
}
public String toString() {
return errorMessage+(resource!=null ? " | "+resource : "")+" | line "+line+" | column "+column;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或