You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/03/21 00:10:34 UTC
svn commit: r1735911 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/
aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/c...
Author: veithen
Date: Sun Mar 20 23:10:34 2016
New Revision: 1735911
URL: http://svn.apache.org/viewvc?rev=1735911&view=rev
Log:
Simplify the builder implementation.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/FilteredXmlInput.java (with props)
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlFilter.java (with props)
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java (with props)
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java (with props)
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/Model.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PlainXMLModel.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/FilteredXmlInput.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/FilteredXmlInput.java?rev=1735911&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/FilteredXmlInput.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/FilteredXmlInput.java Sun Mar 20 23:10:34 2016
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core.stream;
+
+public final class FilteredXmlInput implements XmlInput {
+ private XmlInput parent;
+ private XmlFilter filter;
+
+ public FilteredXmlInput(XmlInput parent, XmlFilter filter) {
+ this.parent = parent;
+ this.filter = filter;
+ }
+
+ @Override
+ public XmlReader createReader(XmlHandler handler) {
+ return parent.createReader(filter.createFilterHandler(handler));
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/FilteredXmlInput.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlFilter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlFilter.java?rev=1735911&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlFilter.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlFilter.java Sun Mar 20 23:10:34 2016
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core.stream;
+
+public interface XmlFilter {
+ XmlHandler createFilterHandler(XmlHandler parent);
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java?rev=1735911&r1=1735910&r2=1735911&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java Sun Mar 20 23:10:34 2016
@@ -22,8 +22,6 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.Queue;
-import javax.xml.stream.XMLStreamConstants;
-
import org.apache.axiom.core.Builder;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreNSAwareElement;
@@ -140,7 +138,6 @@ final class BuilderHandler implements Xm
public void processDocumentTypeDeclaration(String rootName, String publicId, String systemId,
String internalSubset) throws StreamException {
- model.validateEventType(XMLStreamConstants.DTD);
context.processDocumentTypeDeclaration(rootName, publicId, systemId, internalSubset);
}
@@ -172,7 +169,6 @@ final class BuilderHandler implements Xm
@Override
public void startProcessingInstruction(String target) throws StreamException {
- model.validateEventType(XMLStreamConstants.PROCESSING_INSTRUCTION);
context = context.startProcessingInstruction(target);
}
@@ -183,7 +179,6 @@ final class BuilderHandler implements Xm
@Override
public void startComment() throws StreamException {
- model.validateEventType(XMLStreamConstants.COMMENT);
context = context.startComment();
}
@@ -194,7 +189,6 @@ final class BuilderHandler implements Xm
@Override
public void startCDATASection() throws StreamException {
- model.validateEventType(XMLStreamConstants.CDATA);
context = context.startCDATASection();
}
@@ -204,7 +198,6 @@ final class BuilderHandler implements Xm
}
public void processEntityReference(String name, String replacementText) throws StreamException {
- model.validateEventType(XMLStreamConstants.ENTITY_REFERENCE);
context.processEntityReference(name, replacementText);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/Model.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/Model.java?rev=1735911&r1=1735910&r2=1735911&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/Model.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/Model.java Sun Mar 20 23:10:34 2016
@@ -23,8 +23,6 @@ import org.apache.axiom.om.impl.intf.Axi
import org.apache.axiom.om.impl.intf.AxiomElement;
public interface Model {
- void validateEventType(int eventType);
-
Class<? extends AxiomDocument> getDocumentType();
/**
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PlainXMLModel.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PlainXMLModel.java?rev=1735911&r1=1735910&r2=1735911&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PlainXMLModel.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PlainXMLModel.java Sun Mar 20 23:10:34 2016
@@ -28,10 +28,6 @@ public final class PlainXMLModel impleme
private PlainXMLModel() {}
@Override
- public void validateEventType(int eventType) {
- }
-
- @Override
public Class<? extends AxiomDocument> getDocumentType() {
return AxiomDocument.class;
}
Added: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java?rev=1735911&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java (added)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java Sun Mar 20 23:10:34 2016
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.soap.impl.common.builder;
+
+import org.apache.axiom.core.stream.XmlFilter;
+import org.apache.axiom.core.stream.XmlHandler;
+
+final class SOAPFilter implements XmlFilter {
+ static final SOAPFilter INSTANCE = new SOAPFilter();
+
+ private SOAPFilter() {}
+
+ @Override
+ public XmlHandler createFilterHandler(XmlHandler parent) {
+ return new SOAPFilterHandler(parent);
+ }
+}
Propchange: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java?rev=1735911&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java (added)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java Sun Mar 20 23:10:34 2016
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.soap.impl.common.builder;
+
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.XmlHandlerWrapper;
+import org.apache.axiom.soap.SOAPProcessingException;
+
+final class SOAPFilterHandler extends XmlHandlerWrapper {
+ SOAPFilterHandler(XmlHandler parent) {
+ super(parent);
+ }
+
+ @Override
+ public void processDocumentTypeDeclaration(String rootName, String publicId, String systemId,
+ String internalSubset) throws StreamException {
+ throw new SOAPProcessingException("SOAP message MUST NOT contain a Document Type Declaration(DTD)");
+ }
+
+ @Override
+ public void startProcessingInstruction(String target) throws StreamException {
+ throw new SOAPProcessingException("SOAP message MUST NOT contain Processing Instructions(PI)");
+ }
+
+ @Override
+ public void processEntityReference(String name, String replacementText) throws StreamException {
+ throw new SOAPProcessingException("A SOAP message cannot contain entity references because it must not have a DTD");
+ }
+}
Propchange: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java?rev=1735911&r1=1735910&r2=1735911&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java Sun Mar 20 23:10:34 2016
@@ -19,8 +19,6 @@
package org.apache.axiom.soap.impl.common.builder;
-import javax.xml.stream.XMLStreamConstants;
-
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.common.builder.Model;
@@ -52,18 +50,6 @@ public final class SOAPModel implements
private SOAPBuilderHelper builderHelper;
@Override
- public void validateEventType(int eventType) {
- switch (eventType) {
- case XMLStreamConstants.DTD:
- throw new SOAPProcessingException("SOAP message MUST NOT contain a Document Type Declaration(DTD)");
- case XMLStreamConstants.PROCESSING_INSTRUCTION:
- throw new SOAPProcessingException("SOAP message MUST NOT contain Processing Instructions(PI)");
- case XMLStreamConstants.ENTITY_REFERENCE:
- throw new SOAPProcessingException("A SOAP message cannot contain entity references because it must not have a DTD");
- }
- }
-
- @Override
public Class<? extends AxiomDocument> getDocumentType() {
return AxiomSOAPMessage.class;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java?rev=1735911&r1=1735910&r2=1735911&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java Sun Mar 20 23:10:34 2016
@@ -21,6 +21,7 @@ package org.apache.axiom.soap.impl.commo
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.core.stream.FilteredXmlInput;
import org.apache.axiom.core.stream.XmlInput;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.builder.Detachable;
@@ -38,7 +39,7 @@ import org.apache.axiom.soap.impl.intf.A
*/
public class SOAPModelBuilderImpl extends BuilderImpl implements SOAPModelBuilder {
public SOAPModelBuilderImpl(XmlInput input, NodeFactory nodeFactory, boolean repairNamespaces, Detachable detachable) {
- super(input, nodeFactory, new SOAPModel(), null, true, detachable);
+ super(new FilteredXmlInput(input, SOAPFilter.INSTANCE), nodeFactory, new SOAPModel(), null, true, detachable);
// The SOAPFactory instance linked to the SOAPMessage is unknown until we reach the
// SOAPEnvelope. Register a post-processor that does the necessary updates on the
// SOAPMessage.
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?rev=1735911&r1=1735910&r2=1735911&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java Sun Mar 20 23:10:34 2016
@@ -511,10 +511,6 @@ public class FOMFactory extends OMFactor
}
@Override
- public void validateEventType(int eventType) {
- }
-
- @Override
public Class<? extends AxiomDocument> getDocumentType() {
return FOMDocument.class;
}