Fix checkstyle issues with patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/070ed43e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/070ed43e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/070ed43e Branch: refs/heads/master Commit: 070ed43e1808ab2db381eaddd9abf520b88ce7cf Parents: 3c8560f Author: Daniel Kulp <dk...@apache.org> Authored: Mon Feb 1 15:46:20 2016 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Feb 1 16:06:25 2016 -0500 ---------------------------------------------------------------------- .../apache/camel/converter/jaxp/StAX2SAXSource.java | 15 ++++++++++----- .../apache/camel/converter/jaxp/XMLReaderPool.java | 14 +++++++++----- .../apache/camel/converter/jaxp/XmlConverter.java | 3 ++- 3 files changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/070ed43e/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java index 957637b..89a17b0 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java @@ -204,22 +204,25 @@ public class StAX2SAXSource extends SAXSource implements XMLReader { @Override public String getURI(int index) { - if (!checkIndex(index)) + if (!checkIndex(index)) { return null; + } return nullToEmpty(streamReader.getAttributeNamespace(index)); } @Override public String getLocalName(int index) { - if (!checkIndex(index)) + if (!checkIndex(index)) { return null; + } return streamReader.getAttributeLocalName(index); } @Override public String getQName(int index) { - if (!checkIndex(index)) + if (!checkIndex(index)) { return null; + } String localName = streamReader.getAttributeLocalName(index); String prefix = streamReader.getAttributePrefix(index); return getPrefixedName(prefix, localName); @@ -227,15 +230,17 @@ public class StAX2SAXSource extends SAXSource implements XMLReader { @Override public String getType(int index) { - if (!checkIndex(index)) + if (!checkIndex(index)) { return null; + } return streamReader.getAttributeType(index); } @Override public String getValue(int index) { - if (!checkIndex(index)) + if (!checkIndex(index)) { return null; + } return nullToEmpty(streamReader.getAttributeType(index)); } http://git-wip-us.apache.org/repos/asf/camel/blob/070ed43e/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java index ec50920..658268c 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java @@ -69,8 +69,9 @@ public class XMLReaderPool { XMLReader xmlReader = null; WeakReference<XMLReader> ref; while ((ref = pool.poll()) != null) { - if ((xmlReader = ref.get()) != null) + if ((xmlReader = ref.get()) != null) { break; + } } if (xmlReader == null) { @@ -83,7 +84,7 @@ public class XMLReaderPool { /** * Wraps another XMLReader for single use only. */ - private class OneTimeXMLReader implements XMLReader { + private final class OneTimeXMLReader implements XMLReader { private XMLReader xmlReader; private final Map<String, Boolean> initFeatures = new HashMap<String, Boolean>(); private final Map<String, Object> initProperties = new HashMap<String, Object>(); @@ -127,8 +128,9 @@ public class XMLReaderPool { } private void checkValid() { - if (xmlReader == null) + if (xmlReader == null) { throw new IllegalStateException("OneTimeXMLReader.parse() can only be used once!"); + } } @Override @@ -142,8 +144,9 @@ public class XMLReaderPool { public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException { checkValid(); - if (!initFeatures.containsKey(name)) + if (!initFeatures.containsKey(name)) { initFeatures.put(name, Boolean.valueOf(xmlReader.getFeature(name))); + } xmlReader.setFeature(name, value); } @@ -158,8 +161,9 @@ public class XMLReaderPool { public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException { checkValid(); - if (!initProperties.containsKey(name)) + if (!initProperties.containsKey(name)) { initProperties.put(name, xmlReader.getProperty(name)); + } xmlReader.setProperty(name, value); } http://git-wip-us.apache.org/repos/asf/camel/blob/070ed43e/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 649d327..c3c2aae 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -1048,8 +1048,9 @@ public class XmlConverter { } public void setTransformerFactory(TransformerFactory transformerFactory) { - if (transformerFactory != null) + if (transformerFactory != null) { configureSaxonTransformerFactory(transformerFactory); + } this.transformerFactory = transformerFactory; }
