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/05/07 17:11:27 UTC
svn commit: r1742734 - in /webservices/axiom/trunk/aspects/core-aspects/src:
main/java/org/apache/axiom/core/stream/serializer/
test/java/org/apache/axiom/core/stream/serializer/
Author: veithen
Date: Sat May 7 17:11:27 2016
New Revision: 1742734
URL: http://svn.apache.org/viewvc?rev=1742734&view=rev
Log:
Correctly support empty elements.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java (with props)
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java?rev=1742734&r1=1742733&r2=1742734&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java Sat May 7 17:11:27 2016
@@ -19,6 +19,7 @@
package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
+import java.io.Writer;
import java.util.Stack;
import org.apache.axiom.core.CharacterData;
@@ -40,8 +41,9 @@ public class SerializerXmlHandler implem
private CharacterDataAccumulator accumulator;
private String piTarget;
- public SerializerXmlHandler(ToXMLStream serializer) {
- this.serializer = serializer;
+ public SerializerXmlHandler(Writer writer) {
+ this.serializer = new ToXMLStream();
+ serializer.setWriter(writer);
}
private static String getQName(String prefix, String localName) {
@@ -69,6 +71,7 @@ public class SerializerXmlHandler implem
}
public void startElement(String namespaceURI, String localName, String prefix) throws StreamException {
+ serializer.closeStartTag();
elementURI = namespaceURI;
elementLocalName = localName;
elementQName = getQName(prefix, localName);
@@ -94,7 +97,6 @@ public class SerializerXmlHandler implem
elementURI = null;
elementLocalName = null;
elementQName = null;
- serializer.closeStartTag();
}
public void endElement() throws StreamException {
@@ -120,6 +122,7 @@ public class SerializerXmlHandler implem
}
public void processCharacterData(Object data, boolean ignorable) throws StreamException {
+ serializer.closeStartTag();
switch (characterDataMode) {
case PASS_THROUGH:
if (ignorable) {
@@ -155,6 +158,7 @@ public class SerializerXmlHandler implem
@Override
public void startCDATASection() throws StreamException {
+ serializer.closeStartTag();
serializer.startCDATA();
}
@@ -165,6 +169,7 @@ public class SerializerXmlHandler implem
@Override
public void startComment() throws StreamException {
+ serializer.closeStartTag();
characterDataMode = CharacterDataMode.BUFFER;
}
@@ -177,6 +182,7 @@ public class SerializerXmlHandler implem
@Override
public void startProcessingInstruction(String target) throws StreamException {
+ serializer.closeStartTag();
if (accumulator == null) {
accumulator = new CharacterDataAccumulator();
}
@@ -193,6 +199,7 @@ public class SerializerXmlHandler implem
}
public void processEntityReference(String name, String replacementText) throws StreamException {
+ serializer.closeStartTag();
serializer.skippedEntity(name);
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java?rev=1742734&r1=1742733&r2=1742734&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java Sat May 7 17:11:27 2016
@@ -46,11 +46,8 @@ public class SerializerConformanceTest e
@Override
protected void runTest() throws Throwable {
Document document = sample.getDocument();
- ToXMLStream serializer = new ToXMLStream();
StringWriter sw = new StringWriter();
- serializer.setWriter(sw);
- XmlReader reader = new DOMInput(document, false).createReader(
- new SerializerXmlHandler(serializer));
+ XmlReader reader = new DOMInput(document, false).createReader(new SerializerXmlHandler(sw));
while (!reader.proceed()) {
// Just loop
}
Added: webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java?rev=1742734&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java Sat May 7 17:11:27 2016
@@ -0,0 +1,37 @@
+/*
+ * 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.serializer;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.StringWriter;
+
+import org.junit.Test;
+
+public class SerializerTest {
+ @Test
+ public void testEmptyElement() throws Exception {
+ StringWriter sw = new StringWriter();
+ SerializerXmlHandler handler = new SerializerXmlHandler(sw);
+ handler.startElement("", "test", "");
+ handler.attributesCompleted();
+ handler.endElement();
+ assertThat(sw.toString()).containsMatch("<test ?/>");
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
------------------------------------------------------------------------------
svn:eol-style = native