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 2017/05/21 12:08:20 UTC
svn commit: r1795696 - in
/webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer:
Context.java IllegalCharacterSequenceException.java Serializer.java
Author: veithen
Date: Sun May 21 12:08:20 2017
New Revision: 1795696
URL: http://svn.apache.org/viewvc?rev=1795696&view=rev
Log:
Use an integer instead of an enum to track the context in the serializer.
Removed:
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/Context.java
Modified:
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/IllegalCharacterSequenceException.java
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java
Modified: webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/IllegalCharacterSequenceException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/IllegalCharacterSequenceException.java?rev=1795696&r1=1795695&r2=1795696&view=diff
==============================================================================
--- webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/IllegalCharacterSequenceException.java (original)
+++ webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/IllegalCharacterSequenceException.java Sun May 21 12:08:20 2017
@@ -23,7 +23,7 @@ import org.apache.axiom.core.stream.Stre
public class IllegalCharacterSequenceException extends StreamException {
private static final long serialVersionUID = 1L;
- IllegalCharacterSequenceException(Context context) {
- super("Illegal character sequence \"" + context.getIllegalCharacterSequence() + "\"");
+ IllegalCharacterSequenceException(String msg) {
+ super(msg);
}
}
Modified: webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java?rev=1795696&r1=1795695&r2=1795696&view=diff
==============================================================================
--- webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java (original)
+++ webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java Sun May 21 12:08:20 2017
@@ -38,6 +38,23 @@ import org.apache.axiom.core.stream.seri
* @xsl.usage internal
*/
public final class Serializer implements XmlHandler {
+ private static final int MIXED_CONTENT = 0;
+ private static final int TAG = 1;
+ private static final int ATTRIBUTE_VALUE = 2;
+ private static final int COMMENT = 3;
+ private static final int PROCESSING_INSTRUCTION = 4;
+ private static final int CDATA_SECTION = 5;
+
+ private static final String[] illegalCharacterSequences = { null, null, null, "--", "?>", "]]>" };
+
+ private static final UnmappableCharacterHandler[] unmappableCharacterHandlers = {
+ UnmappableCharacterHandler.CONVERT_TO_CHARACTER_REFERENCE,
+ UnmappableCharacterHandler.THROW_EXCEPTION,
+ UnmappableCharacterHandler.CONVERT_TO_CHARACTER_REFERENCE,
+ UnmappableCharacterHandler.THROW_EXCEPTION,
+ UnmappableCharacterHandler.THROW_EXCEPTION,
+ UnmappableCharacterHandler.THROW_EXCEPTION };
+
private final XmlWriter writer;
private final OutputStream outputStream;
@@ -51,7 +68,7 @@ public final class Serializer implements
*/
protected boolean inDoctype = false;
- private Context context = Context.MIXED_CONTENT;
+ private int context = MIXED_CONTENT;
private int matchedIllegalCharacters;
/**
@@ -82,10 +99,10 @@ public final class Serializer implements
outputStream = out;
}
- private void switchContext(Context context) throws StreamException {
+ private void switchContext(int context) throws StreamException {
this.context = context;
try {
- writer.setUnmappableCharacterHandler(context.getUnmappableCharacterHandler());
+ writer.setUnmappableCharacterHandler(unmappableCharacterHandlers[context]);
} catch (IOException ex) {
throw new StreamException(ex);
}
@@ -178,7 +195,7 @@ public final class Serializer implements
@Override
public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding,
Boolean standalone) throws StreamException {
- switchContext(Context.TAG);
+ switchContext(TAG);
try {
writer.write("<?xml version=\"");
writer.write(xmlVersion == null ? "1.0" : xmlVersion);
@@ -197,7 +214,7 @@ public final class Serializer implements
} catch (IOException ex) {
throw new StreamException(ex);
}
- switchContext(Context.MIXED_CONTENT);
+ switchContext(MIXED_CONTENT);
}
@Override
@@ -313,14 +330,14 @@ public final class Serializer implements
if (length == 0)
return;
- String illegalCharacterSequence = context.getIllegalCharacterSequence();
+ String illegalCharacterSequence = illegalCharacterSequences[context];
if (illegalCharacterSequence != null) {
int matchedIllegalCharacters = this.matchedIllegalCharacters;
for (int i = 0; i < length; i++) {
while (true) {
if (chars[start+i] == illegalCharacterSequence.charAt(matchedIllegalCharacters)) {
if (++matchedIllegalCharacters == illegalCharacterSequence.length()) {
- throw new IllegalCharacterSequenceException(context);
+ throw new IllegalCharacterSequenceException("Illegal character sequence \"" + illegalCharacterSequence + "\"");
}
break;
} else if (matchedIllegalCharacters > 0) {
@@ -343,7 +360,7 @@ public final class Serializer implements
this.matchedIllegalCharacters = matchedIllegalCharacters;
}
- if (context == Context.CDATA_SECTION || context == Context.COMMENT || context == Context.PROCESSING_INSTRUCTION) {
+ if (context == CDATA_SECTION || context == COMMENT || context == PROCESSING_INSTRUCTION) {
// TODO: this doesn't take care of illegal characters
try {
writer.write(chars, start, length);
@@ -383,12 +400,12 @@ public final class Serializer implements
// common TAB, NEW-LINE, CARRIAGE-RETURN
switch (ch) {
case 0x09:
- if (context == Context.ATTRIBUTE_VALUE) {
+ if (context == ATTRIBUTE_VALUE) {
replacement = "	";
}
break;
case 0x0A:
- if (context == Context.ATTRIBUTE_VALUE) {
+ if (context == ATTRIBUTE_VALUE) {
replacement = " ";
}
break;
@@ -407,7 +424,7 @@ public final class Serializer implements
replacement = "<";
break;
case '>':
- if (context == Context.MIXED_CONTENT && squareBrackets >= 2) {
+ if (context == MIXED_CONTENT && squareBrackets >= 2) {
replacement = ">";
}
break;
@@ -415,7 +432,7 @@ public final class Serializer implements
replacement = "&";
break;
case '"':
- if (context == Context.ATTRIBUTE_VALUE) {
+ if (context == ATTRIBUTE_VALUE) {
replacement = """;
}
}
@@ -495,7 +512,7 @@ public final class Serializer implements
closeStartTag();
try
{
- switchContext(Context.TAG);
+ switchContext(TAG);
writer.write('<');
if (!prefix.isEmpty()) {
writer.write(prefix);
@@ -563,9 +580,9 @@ public final class Serializer implements
writer.write(localName);
writer.write("=\"");
if (!value.isEmpty()) {
- switchContext(Context.ATTRIBUTE_VALUE);
+ switchContext(ATTRIBUTE_VALUE);
characters(value);
- switchContext(Context.TAG);
+ switchContext(TAG);
}
writer.write('\"');
} catch (IOException ex) {
@@ -607,7 +624,7 @@ public final class Serializer implements
writer.write("/>");
}
} else {
- switchContext(Context.TAG);
+ switchContext(TAG);
writer.write("</");
String prefix = elementNameStack[2*depth];
if (!prefix.isEmpty()) {
@@ -616,7 +633,7 @@ public final class Serializer implements
}
writer.write(elementNameStack[2*depth+1]);
writer.write('>');
- switchContext(Context.MIXED_CONTENT);
+ switchContext(MIXED_CONTENT);
}
} catch (IOException ex) {
throw new StreamException(ex);
@@ -632,7 +649,7 @@ public final class Serializer implements
} catch (IOException ex) {
throw new StreamException(ex);
}
- switchContext(Context.COMMENT);
+ switchContext(COMMENT);
}
@Override
@@ -642,7 +659,7 @@ public final class Serializer implements
} catch (IOException ex) {
throw new StreamException(ex);
}
- switchContext(Context.MIXED_CONTENT);
+ switchContext(MIXED_CONTENT);
}
@Override
@@ -653,7 +670,7 @@ public final class Serializer implements
} catch (IOException ex) {
throw new StreamException(ex);
}
- switchContext(Context.MIXED_CONTENT);
+ switchContext(MIXED_CONTENT);
}
/**
@@ -681,7 +698,7 @@ public final class Serializer implements
} catch (IOException ex) {
throw new StreamException(ex);
}
- switchContext(Context.CDATA_SECTION);
+ switchContext(CDATA_SECTION);
}
/**
@@ -694,7 +711,7 @@ public final class Serializer implements
if (startTagOpen) {
try {
writer.write('>');
- switchContext(Context.MIXED_CONTENT);
+ switchContext(MIXED_CONTENT);
} catch (IOException ex) {
throw new StreamException(ex);
}
@@ -705,7 +722,7 @@ public final class Serializer implements
@Override
public void startProcessingInstruction(String target) throws StreamException {
closeStartTag();
- switchContext(Context.TAG);
+ switchContext(TAG);
try {
writer.write("<?");
writer.write(target);
@@ -713,7 +730,7 @@ public final class Serializer implements
} catch (IOException ex) {
throw new StreamException(ex);
}
- switchContext(Context.PROCESSING_INSTRUCTION);
+ switchContext(PROCESSING_INSTRUCTION);
}
@Override
@@ -723,7 +740,7 @@ public final class Serializer implements
} catch (IOException ex) {
throw new StreamException(ex);
}
- switchContext(Context.MIXED_CONTENT);
+ switchContext(MIXED_CONTENT);
}
public void writeInternalSubset(String internalSubset) throws StreamException {
@@ -797,7 +814,7 @@ public final class Serializer implements
try {
writer.setUnmappableCharacterHandler(unmappableCharacterHandler);
writer.write(s);
- writer.setUnmappableCharacterHandler(context.getUnmappableCharacterHandler());
+ writer.setUnmappableCharacterHandler(unmappableCharacterHandlers[context]);
} catch (IOException ex) {
throw new StreamException(ex);
}