Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9dce5091 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9dce5091 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9dce5091 Branch: refs/heads/master Commit: 9dce5091bc7533e294d09dfd08554f3e8f92bd2e Parents: 0c90522 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jul 24 13:53:17 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jul 24 13:53:17 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/impl/DefaultAttachment.java | 4 ++-- .../java/org/apache/camel/util/AttachmentMap.java | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9dce5091/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java index dbb87af..8a1ad89 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java @@ -29,7 +29,7 @@ import org.apache.camel.Attachment; import org.apache.camel.util.CollectionHelper; public class DefaultAttachment implements Attachment { - private Map<String, Object> headers = null; + private Map<String, Object> headers; private DataHandler dataHandler; public DefaultAttachment(DataHandler dh) { @@ -120,6 +120,6 @@ public class DefaultAttachment implements Attachment { } public int hashCode() { - return (dataHandler.hashCode()); + return dataHandler.hashCode(); } } http://git-wip-us.apache.org/repos/asf/camel/blob/9dce5091/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java b/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java index 1f33546..b6c0a5f 100644 --- a/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java +++ b/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java @@ -60,7 +60,7 @@ public class AttachmentMap extends AbstractMap<String, DataHandler> { private static class AttachmentEntrySet extends AbstractSet<Map.Entry<String, DataHandler>> { private Set<Map.Entry<String, Attachment>> set; - public AttachmentEntrySet(Set<Map.Entry<String, Attachment>> set) { + AttachmentEntrySet(Set<Map.Entry<String, Attachment>> set) { this.set = set; } @@ -78,7 +78,7 @@ public class AttachmentMap extends AbstractMap<String, DataHandler> { private static class AttachmentEntrySetIterator implements Iterator<Map.Entry<String, DataHandler>> { private Iterator<Map.Entry<String, Attachment>> iter; - public AttachmentEntrySetIterator(Iterator<Map.Entry<String, Attachment>> origIterator) { + AttachmentEntrySetIterator(Iterator<Map.Entry<String, Attachment>> origIterator) { iter = origIterator; } @@ -100,7 +100,7 @@ public class AttachmentMap extends AbstractMap<String, DataHandler> { private static class AttachmentEntry implements Map.Entry<String, DataHandler> { private Map.Entry<String, Attachment> entry; - public AttachmentEntry(Map.Entry<String, Attachment> backingEntry) { + AttachmentEntry(Map.Entry<String, Attachment> backingEntry) { this.entry = backingEntry; } @@ -112,24 +112,26 @@ public class AttachmentMap extends AbstractMap<String, DataHandler> { @Override public DataHandler getValue() { Attachment value = entry.getValue(); - if (value != null) + if (value != null) { return value.getDataHandler(); + } return null; } @Override public DataHandler setValue(DataHandler value) { Attachment oldValue = entry.setValue(new DefaultAttachment(value)); - if (oldValue != null) + if (oldValue != null) { return oldValue.getDataHandler(); + } return null; } - // two AttachmentEntry objects are equal if the backing entries are - // equal + // two AttachmentEntry objects are equal if the backing entries are equal public boolean equals(Object o) { - if (o instanceof AttachmentEntry && entry.equals(((AttachmentEntry)o).entry)) + if (o instanceof AttachmentEntry && entry.equals(((AttachmentEntry)o).entry)) { return true; + } return false; }