Author: ilgrosso
Date: Tue Feb 26 11:51:23 2013
New Revision: 1450140
URL: http://svn.apache.org/r1450140
Log:
[COCOON3-121] White noise: formatting + making some minor improvements
Modified:
cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGenerator.java
cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGeneratorTest.java
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGenerator.java?rev=1450140&r1=1450139&r2=1450140&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGenerator.java Tue Feb 26 11:51:23 2013
@@ -34,125 +34,116 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Required;
/**
- * LogsGenerator.
+ * Wrap the given source URL with a root element.
*/
-public class AddRootElementGenerator extends AbstractSAXGenerator implements
- CachingPipelineComponent {
+public class AddRootElementGenerator extends AbstractSAXGenerator implements CachingPipelineComponent {
/**
* Logger.
*/
- private static final Logger LOG = LoggerFactory
- .getLogger(AddRootElementGenerator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AddRootElementGenerator.class);
+
private URL source;
private String encoding;
+
private String localName;
+
private String prefix;
+
private String namespace;
+
/**
* {@inheritDoc}.
+ *
* @see org.apache.cocoon.sax.AbstractSAXProducer#setConfiguration(java.util.Map)
*/
@Override
- public void setConfiguration(
- final Map<String, ? extends Object> configuration) {
+ public void setConfiguration(final Map<String, ? extends Object> configuration) {
this.source = (URL) configuration.get("source");
}
/**
* {@inheritDoc}
+ *
* @see org.apache.cocoon.pipeline.component.Starter#execute()
*/
@Override
public void execute() {
-
if (this.source == null) {
- throw new ProcessingException(this.getClass().getSimpleName()
- + " has no source.");
+ throw new ProcessingException(this.getClass().getSimpleName() + " has no source.");
}
- LOG.debug("Using the URL {} to produce SAX events.", this.source
- .toExternalForm());
+ LOG.debug("Using the URL {} to produce SAX events.", this.source.toExternalForm());
try {
- byte[] contenidoXML =
- getLogs(this.source.openConnection().getInputStream());
- InputStream aux = new ByteArrayInputStream(contenidoXML);
+ final byte[] xmlContent = getLogs(this.source.openConnection().getInputStream());
+ final InputStream aux = new ByteArrayInputStream(xmlContent);
XMLUtils.toSax(aux, this.getSAXConsumer());
} catch (Exception e) {
- throw new ProcessingException("Can't open connection to "
- + this.source.toExternalForm(), e);
+ throw new ProcessingException("Can't open connection to " + this.source.toExternalForm(), e);
}
}
- /**
- * Parsea el fichero de log para incluir el elemento raiz y convertir el log
- * en un XML well-formed.
- * @param content content
- * @return byte[]
- */
- private byte[] getLogs(InputStream content) {
-
- StringBuffer texto = new StringBuffer();
+ private byte[] getLogs(final InputStream content) {
+ final StringBuilder text = new StringBuilder();
try {
- // Inicializar
- texto.append("<?xml version=\"1.0\" encoding=\"");
- texto.append(encoding);
- texto.append("\"?><");
- texto.append(prefix);
- texto.append(":");
- texto.append(localName);
- texto.append(" ");
- texto.append("xmlns");
- texto.append(":");
- texto.append(prefix);
- texto.append("=\"");
- texto.append(namespace);
- texto.append("\">");
+ // Initializer
+ text.append("<?xml version=\"1.0\" encoding=\"");
+ text.append(encoding);
+ text.append("\"?><");
+ text.append(prefix);
+ text.append(':');
+ text.append(localName);
+ text.append(' ');
+ text.append("xmlns");
+ text.append(':');
+ text.append(prefix);
+ text.append("=\"");
+ text.append(namespace);
+ text.append("\">");
// Parse original stream
- texto.append(IOUtils.toString(content, encoding));
- // Finalizar
- texto.append("</");
- texto.append(prefix);
- texto.append(":");
- texto.append(localName);
- texto.append(">");
+ text.append(IOUtils.toString(content, encoding));
+ // Finalizer
+ text.append("</");
+ text.append(prefix);
+ text.append(':');
+ text.append(localName);
+ text.append('>');
} catch (Exception e) {
LOG.error("Error in getLogs method: " + e.getMessage());
}
- return texto.toString().getBytes();
+ return text.toString().getBytes();
}
/**
* {@inheritDoc}.
- * @see org.apache.cocoon.pipeline.component.CachingPipelineComponent
- * #constructCacheKey()
+ *
+ * @see org.apache.cocoon.pipeline.component.CachingPipelineComponent #constructCacheKey()
*/
@Override
public CacheKey constructCacheKey() {
- return new TimestampURLCacheKey(this.source, URLConnectionUtils
- .getLastModified(this.source));
+ return new TimestampURLCacheKey(this.source, URLConnectionUtils.getLastModified(this.source));
}
@Required
- public void setEncoding(String encoding) {
+ public void setEncoding(final String encoding) {
this.encoding = encoding;
}
@Required
- public void setLocalName(String localName) {
+ public void setLocalName(final String localName) {
this.localName = localName;
}
@Required
- public void setPrefix(String prefix) {
+ public void setPrefix(final String prefix) {
this.prefix = prefix;
}
@Required
- public void setNamespace(String namespace) {
+ public void setNamespace(final String namespace) {
this.namespace = namespace;
}
}
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGeneratorTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGeneratorTest.java?rev=1450140&r1=1450139&r2=1450140&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGeneratorTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/generator/AddRootElementGeneratorTest.java Tue Feb 26 11:51:23 2013
@@ -38,15 +38,14 @@ public class AddRootElementGeneratorTest
/**
* Logger.
*/
- private static final Logger LOG = LoggerFactory
- .getLogger(AddRootElementGeneratorTest.class);
-
- @Test
+ private static final Logger LOG = LoggerFactory.getLogger(AddRootElementGeneratorTest.class);
+
+ @Test
public void testPipelineWithAddRootElementGenerator() throws Exception {
- Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
- URL resource = this.getClass().getResource("page.xml");
- AddRootElementGenerator generator = new AddRootElementGenerator();
- Map<String, Object> parameters = new HashMap<String, Object>();
+ final Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
+ final URL resource = this.getClass().getResource("page.xml");
+ final AddRootElementGenerator generator = new AddRootElementGenerator();
+ final Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("source", resource);
generator.setConfiguration(parameters);
generator.setEncoding("UTF-8");
@@ -56,11 +55,11 @@ public class AddRootElementGeneratorTest
pipeline.addComponent(generator);
pipeline.addComponent(new XMLSerializer());
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
pipeline.setup(baos);
pipeline.execute();
- CountingNodeTester countingNodeTester = new CountingNodeTester(3);
- String out = new String(baos.toByteArray());
+ final CountingNodeTester countingNodeTester = new CountingNodeTester(3);
+ final String out = new String(baos.toByteArray());
LOG.debug(out);
assertNodeTestPasses(out, countingNodeTester, Node.ELEMENT_NODE);
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.