import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
+import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Map;
+import java.util.List;
import java.util.Set;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeInputStreamReader.class);
- private static final String REVISION_ARG = "?revision=";
-
private final DataInput input;
- private final Map<Integer, String> codedStringMap = new HashMap<>();
+ private final List<String> codedStringMap = new ArrayList<>();
private QName lastLeafSetQName;
@SuppressWarnings("rawtypes")
private NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder;
- private final StringBuilder reusableStringBuilder = new StringBuilder(50);
-
private boolean readSignatureMarker = true;
NormalizedNodeInputStreamReader(final DataInput input, final boolean versionChecked) {
// Read in the same sequence of writing
String localName = readCodedString();
String namespace = readCodedString();
- String revision = readCodedString();
-
- String qname;
- if (!Strings.isNullOrEmpty(revision)) {
- qname = reusableStringBuilder.append('(').append(namespace).append(REVISION_ARG).append(revision)
- .append(')').append(localName).toString();
- } else {
- qname = reusableStringBuilder.append('(').append(namespace).append(')').append(localName).toString();
- }
+ String revision = Strings.emptyToNull(readCodedString());
- reusableStringBuilder.delete(0, reusableStringBuilder.length());
- return QNameFactory.create(qname);
+ return QNameFactory.create(new QNameFactory.Key(localName, namespace, revision));
}
return null;
case TokenTypes.IS_CODE_VALUE:
final int code = input.readInt();
- final String lookup = codedStringMap.get(code);
- if (lookup == null) {
- throw new IOException("String code " + code + " was not found");
+ try {
+ return codedStringMap.get(code);
+ } catch (IndexOutOfBoundsException e) {
+ throw new IOException("String code " + code + " was not found", e);
}
- return lookup;
case TokenTypes.IS_STRING_VALUE:
final String value = input.readUTF().intern();
- codedStringMap.put(codedStringMap.size(), value);
+ codedStringMap.add(value);
return value;
default:
throw new IOException("Unhandled string value type " + valueType);