Skip to content

Ensure consistent XML parser config #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-jeckels wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Ensure consistent XML parser config #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions flow/enginesrc/org/labkey/flow/analysis/model/WorkspaceParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLLocator;
import org.apache.xerces.xni.XNIException;
import org.labkey.api.util.XmlBeansUtil;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand All @@ -41,7 +42,6 @@
import org.xml.sax.helpers.DefaultHandler;

import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -135,7 +135,7 @@ static public boolean isFlowJoWorkspace(File file)
WorkspaceRecognizer recognizer = new WorkspaceRecognizer();
try
{
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
SAXParser parser = XmlBeansUtil.SAX_PARSER_FACTORY.newSAXParser();

parser.parse(file, recognizer);
}
Expand Down Expand Up @@ -371,7 +371,6 @@ public void fatalError(SAXParseException exception) throws SAXException
static class FJParseFilter implements LSParserFilter
{
SymbolTable fSymbolTable = new SymbolTable();
Set<String> rejected = new HashSet<>();

@Override
public short startElement(Element element)
Expand All @@ -385,7 +384,6 @@ public short startElement(Element element)
else if (nsURI != null && (GATINGML_1_5_NAMESPACES.contains(nsURI) || FJ_GATINGML_1_5_NAMEPSACE_FIXUP.containsKey(nsURI) || GATINGML_2_0_NAMESPACES.contains(nsURI)))
filter = FILTER_ACCEPT;

// if (filter != FILTER_ACCEPT && rejected.add(element.getNodeName())) System.err.println((filter == FILTER_SKIP ? "SKIPPED: " : "REJECTED: ") + element.getNodeName());
return filter;
}

Expand Down Expand Up @@ -457,7 +455,7 @@ static FJDOMParser create()
{
super(st);
fSymbolTable = st;
fSkippedElemStack = new Stack();
fSkippedElemStack = new Stack<>();
fDOMFilter = new FJParseFilter();
try
{
Expand Down
1 change: 0 additions & 1 deletion ms2/src/org/labkey/ms2/reader/Q3AnalysisSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.labkey.ms2.reader;

import org.labkey.ms2.reader.SimpleXMLEventRewriter;
import org.labkey.api.reader.SimpleXMLStreamReader;

import org.apache.logging.log4j.Logger;
Expand Down
Loading