Fixed CS. This closes #889.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d6c49bb9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d6c49bb9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d6c49bb9 Branch: refs/heads/master Commit: d6c49bb9b6aace53cf4ed004c3e8445738170172 Parents: 37eb294 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 8 17:49:30 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 8 17:49:30 2016 +0100 ---------------------------------------------------------------------- .../apache/camel/builder/DataFormatClause.java | 2 +- .../model/dataformat/HessianDataFormat.java | 6 +++--- .../dataformat/hessian/HessianDataFormat.java | 1 + .../hessian/HessianDataFormatConfigXmlTest.java | 22 +++++++++++++++++--- .../HessianDataFormatMarshallingTest.java | 9 +++++--- .../camel/dataformat/hessian/TestObject.java | 20 +++++++++++------- 6 files changed, 42 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d6c49bb9/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java index e999b6c..ae5b1f7 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java +++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java @@ -34,8 +34,8 @@ import org.apache.camel.model.dataformat.CastorDataFormat; import org.apache.camel.model.dataformat.CsvDataFormat; import org.apache.camel.model.dataformat.CustomDataFormat; import org.apache.camel.model.dataformat.GzipDataFormat; -import org.apache.camel.model.dataformat.HessianDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; +import org.apache.camel.model.dataformat.HessianDataFormat; import org.apache.camel.model.dataformat.IcalDataFormat; import org.apache.camel.model.dataformat.JacksonXMLDataFormat; import org.apache.camel.model.dataformat.JaxbDataFormat; http://git-wip-us.apache.org/repos/asf/camel/blob/d6c49bb9/camel-core/src/main/java/org/apache/camel/model/dataformat/HessianDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/HessianDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/HessianDataFormat.java index 9417605..9da6ff7 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/HessianDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/HessianDataFormat.java @@ -16,13 +16,13 @@ */ package org.apache.camel.model.dataformat; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.Metadata; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; +import org.apache.camel.model.DataFormatDefinition; +import org.apache.camel.spi.Metadata; + /** * Hessian data format */ http://git-wip-us.apache.org/repos/asf/camel/blob/d6c49bb9/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/HessianDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/HessianDataFormat.java b/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/HessianDataFormat.java index ac8d653..624138e 100644 --- a/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/HessianDataFormat.java +++ b/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/HessianDataFormat.java @@ -31,6 +31,7 @@ import org.apache.camel.support.ServiceSupport; /** * The <a href="http://camel.apache.org/data-format.html";>data format</a> * using <a href="http://hessian.caucho.com/doc/hessian-serialization.html";>Hessian Serialization</a>. + * * @since 2.17 */ public class HessianDataFormat extends ServiceSupport implements DataFormat, DataFormatName { http://git-wip-us.apache.org/repos/asf/camel/blob/d6c49bb9/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatConfigXmlTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatConfigXmlTest.java b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatConfigXmlTest.java index 76ecd1a..71580c9 100644 --- a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatConfigXmlTest.java +++ b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatConfigXmlTest.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.camel.dataformat.hessian; import org.apache.camel.component.mock.MockEndpoint; @@ -13,9 +29,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * The ASF licenses this file to You 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 - * + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/d6c49bb9/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatMarshallingTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatMarshallingTest.java b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatMarshallingTest.java index f426c0c..d976584 100644 --- a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatMarshallingTest.java +++ b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/HessianDataFormatMarshallingTest.java @@ -16,6 +16,11 @@ */ package org.apache.camel.dataformat.hessian; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + import org.apache.camel.Exchange; import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; @@ -23,8 +28,6 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; -import java.util.*; - /** * Test for {@link HessianDataFormat}. */ @@ -62,7 +65,7 @@ public class HessianDataFormatMarshallingTest extends CamelTestSupport { @Test public void testMarshalAndUnmarshalDate() throws Exception { - testMarshalAndUnmarshal(new Date()) ; + testMarshalAndUnmarshal(new Date()); } http://git-wip-us.apache.org/repos/asf/camel/blob/d6c49bb9/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java ---------------------------------------------------------------------- diff --git a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java index 6aa3a08..7499dc6 100644 --- a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java +++ b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java @@ -72,23 +72,27 @@ class TestObject implements Serializable { @Override public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } final TestObject that = (TestObject) o; - return Objects.equals(bool, that.bool) && - Objects.equals(intNumber, that.intNumber) && - Objects.equals(floatNumber, that.floatNumber) && - Objects.equals(character, that.character) && - Objects.equals(text, that.text); + return Objects.equals(bool, that.bool) + && Objects.equals(intNumber, that.intNumber) + && Objects.equals(floatNumber, that.floatNumber) + && Objects.equals(character, that.character) + && Objects.equals(text, that.text); } @Override public int hashCode() { int result; long temp; - result = (bool ? 1 : 0); + result = bool ? 1 : 0; result = 31 * result + intNumber; temp = Double.doubleToLongBits(floatNumber); result = 31 * result + (int) (temp ^ (temp >>> 32));
