Skip to content
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.

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

[LOGMGR-155] Added XML and JSON formatters. Also some general framewo… #115

Merged
merged 1 commit into from
Jun 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@

<properties>
<!-- Dependency versions -->
<version.javax.json>1.0</version.javax.json>
<version.org.glassfish.javax.json>1.0.4</version.org.glassfish.javax.json>
<version.org.jboss.modules.jboss-modules>1.5.2.Final</version.org.jboss.modules.jboss-modules>
<version.org.wildfly.common.wildfly-common>1.2.0.Beta10</version.org.wildfly.common.wildfly-common>
<version.junit.junit>4.12</version.junit.junit>
Expand All @@ -70,6 +72,24 @@
<artifactId>wildfly-common</artifactId>
<version>${version.org.wildfly.common.wildfly-common}</version>
</dependency>

<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>${version.javax.json}</version>
<!-- only required for the JsonFormatter -->
<optional>true</optional>
</dependency>
<!-- JSON implementation -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>${version.org.glassfish.javax.json}</version>
<!-- only required for the JsonFormatter, another implementation of the JSON-P API may be used as well -->
<optional>true</optional>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
329 changes: 329 additions & 0 deletions src/main/java/org/jboss/logmanager/formatters/IndentingXmlWriter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,329 @@
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2017 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed 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.jboss.logmanager.formatters;

import java.util.Iterator;
import java.util.NoSuchElementException;
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;

/**
* An XML stream writer which pretty prints the XML.
*
* @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
*/
class IndentingXmlWriter implements XMLStreamWriter, XMLStreamConstants {

private static final String SPACES = " ";

private final XMLStreamWriter delegate;
private int index;
private int state = START_DOCUMENT;
private boolean indentEnd;

IndentingXmlWriter(final XMLStreamWriter delegate) {
this.delegate = delegate;
index = 0;
indentEnd = false;
}

private void indent() throws XMLStreamException {
final int index = this.index;
if (index > 0) {
for (int i = 0; i < index; i++) {
delegate.writeCharacters(SPACES);
}
}

}

private void newline() throws XMLStreamException {
delegate.writeCharacters("\n");
}

@Override
public void writeStartElement(final String localName) throws XMLStreamException {
newline();
indent();
delegate.writeStartElement(localName);
indentEnd = false;
state = START_ELEMENT;
index++;
}

@Override
public void writeStartElement(final String namespaceURI, final String localName) throws XMLStreamException {
newline();
indent();
delegate.writeStartElement(namespaceURI, localName);
indentEnd = false;
state = START_ELEMENT;
index++;
}

@Override
public void writeStartElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
newline();
indent();
delegate.writeStartElement(prefix, localName, namespaceURI);
indentEnd = false;
state = START_ELEMENT;
index++;
}

@Override
public void writeEmptyElement(final String namespaceURI, final String localName) throws XMLStreamException {
newline();
indent();
delegate.writeEmptyElement(namespaceURI, localName);
state = END_ELEMENT;
}

@Override
public void writeEmptyElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
newline();
indent();
delegate.writeEmptyElement(prefix, localName, namespaceURI);
state = END_ELEMENT;
}

@Override
public void writeEmptyElement(final String localName) throws XMLStreamException {
newline();
indent();
delegate.writeEmptyElement(localName);
state = END_ELEMENT;
}

@Override
public void writeEndElement() throws XMLStreamException {
index--;
if (state != CHARACTERS || indentEnd) {
newline();
indent();
indentEnd = false;
}
delegate.writeEndElement();
state = END_ELEMENT;
}

@Override
public void writeEndDocument() throws XMLStreamException {
delegate.writeEndDocument();
state = END_DOCUMENT;
}

@Override
public void close() throws XMLStreamException {
delegate.close();
}

@Override
public void flush() throws XMLStreamException {
delegate.flush();
}

@Override
public void writeAttribute(final String localName, final String value) throws XMLStreamException {
delegate.writeAttribute(localName, value);
}

@Override
public void writeAttribute(final String prefix, final String namespaceURI, final String localName, final String value) throws XMLStreamException {
delegate.writeAttribute(prefix, namespaceURI, localName, value);
}

@Override
public void writeAttribute(final String namespaceURI, final String localName, final String value) throws XMLStreamException {
delegate.writeAttribute(namespaceURI, localName, value);
}

@Override
public void writeNamespace(final String prefix, final String namespaceURI) throws XMLStreamException {
delegate.writeNamespace(prefix, namespaceURI);
}

@Override
public void writeDefaultNamespace(final String namespaceURI) throws XMLStreamException {
delegate.writeDefaultNamespace(namespaceURI);
}

@Override
public void writeComment(final String data) throws XMLStreamException {
newline();
indent();
delegate.writeComment(data);
state = COMMENT;
}

@Override
public void writeProcessingInstruction(final String target) throws XMLStreamException {
newline();
indent();
delegate.writeProcessingInstruction(target);
state = PROCESSING_INSTRUCTION;
}

@Override
public void writeProcessingInstruction(final String target, final String data) throws XMLStreamException {
newline();
indent();
delegate.writeProcessingInstruction(target, data);
state = PROCESSING_INSTRUCTION;
}

@Override
public void writeCData(final String data) throws XMLStreamException {
delegate.writeCData(data);
state = CDATA;
}

@Override
public void writeDTD(final String dtd) throws XMLStreamException {
newline();
indent();
delegate.writeDTD(dtd);
state = DTD;
}

@Override
public void writeEntityRef(final String name) throws XMLStreamException {
delegate.writeEntityRef(name);
state = ENTITY_REFERENCE;
}

@Override
public void writeStartDocument() throws XMLStreamException {
delegate.writeStartDocument();
newline();
state = START_DOCUMENT;
}

@Override
public void writeStartDocument(final String version) throws XMLStreamException {
delegate.writeStartDocument(version);
newline();
state = START_DOCUMENT;
}

@Override
public void writeStartDocument(final String encoding, final String version) throws XMLStreamException {
delegate.writeStartDocument(encoding, version);
newline();
state = START_DOCUMENT;
}

@Override
public void writeCharacters(final String text) throws XMLStreamException {
indentEnd = false;
boolean first = true;
final Iterator<String> iterator = new SplitIterator(text, '\n');
while (iterator.hasNext()) {
final String t = iterator.next();
// On first iteration if more than one line is required, skip to a new line and indent
if (first && iterator.hasNext()) {
first = false;
newline();
indent();
}
delegate.writeCharacters(t);
if (iterator.hasNext()) {
newline();
indent();
indentEnd = true;
}
}
state = CHARACTERS;
}

@Override
public void writeCharacters(final char[] text, final int start, final int len) throws XMLStreamException {
delegate.writeCharacters(text, start, len);
}

@Override
public String getPrefix(final String uri) throws XMLStreamException {
return delegate.getPrefix(uri);
}

@Override
public void setPrefix(final String prefix, final String uri) throws XMLStreamException {
delegate.setPrefix(prefix, uri);
}

@Override
public void setDefaultNamespace(final String uri) throws XMLStreamException {
delegate.setDefaultNamespace(uri);
}

@Override
public void setNamespaceContext(final NamespaceContext context) throws XMLStreamException {
delegate.setNamespaceContext(context);
}

@Override
public NamespaceContext getNamespaceContext() {
return delegate.getNamespaceContext();
}

@Override
public Object getProperty(final String name) throws IllegalArgumentException {
return delegate.getProperty(name);
}

private static class SplitIterator implements Iterator<String> {

private final String value;
private final char delimiter;
private int index;

private SplitIterator(final String value, final char delimiter) {
this.value = value;
this.delimiter = delimiter;
index = 0;
}

@Override
public boolean hasNext() {
return index != -1;
}

@Override
public String next() {
final int index = this.index;
if (index == -1) {
throw new NoSuchElementException();
}
int x = value.indexOf(delimiter, index);
try {
return x == -1 ? value.substring(index) : value.substring(index, x);
} finally {
this.index = (x == -1 ? -1 : x + 1);
}
}

@Override
public void remove() {
throw new UnsupportedOperationException();
}
}
}