CAMEL-7912 Changed the camel-checkstyle.xml to fix the CS error of ObjectHelper
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fc88062 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fc88062 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fc88062 Branch: refs/heads/master Commit: 9fc8806270443f81c1fa837dcb0b1a7bc835e23d Parents: 1f94eab Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Nov 4 10:55:55 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Nov 4 10:58:20 2014 +0800 ---------------------------------------------------------------------- buildingtools/camel-checkstyle.xml | 26 ++++++++++---------- .../org/apache/camel/util/ObjectHelper.java | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9fc88062/buildingtools/camel-checkstyle.xml ---------------------------------------------------------------------- diff --git a/buildingtools/camel-checkstyle.xml b/buildingtools/camel-checkstyle.xml index b2ca3aa..6ca3a80 100644 --- a/buildingtools/camel-checkstyle.xml +++ b/buildingtools/camel-checkstyle.xml @@ -40,27 +40,27 @@ lengths, if/try depths, etc... <module name="Translation"/> <!--<module name="StrictDuplicateCode"/>--> - + <!-- Header checks --> <module name="Header"> <property name="header" value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/> </module> - + <module name="RegexpMultiline"> <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/> <property name="ignoreCase" value="true"/> </module> - + <module name="FileLength"> <property name="max" value="3500"/> </module> - + <module name="FileTabCharacter"> <property name="fileExtensions" value="java"/> </module> - - <!-- + + <!-- <module name="RegexpSingleline"> <property name="format" value="\s+$"/> <property name="minimum" value="0"/> @@ -101,7 +101,7 @@ lengths, if/try depths, etc... <module name="AvoidStarImport"> <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/> </module> - <!-- + <!-- <module name="ConstantName"/> --> <module name="IllegalImport"/> <!-- defaults to sun.* packages --> @@ -160,7 +160,7 @@ lengths, if/try depths, etc... <!-- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>--> </module> - <!-- + <!-- <module name="GenericWhitespace"/> --> @@ -185,8 +185,8 @@ lengths, if/try depths, etc... <module name="LeftCurly"/> <module name="NeedBraces"/> <module name="RightCurly"/> - - <!-- + + <!-- <module name="OuterTypeNumber"/> --> @@ -205,7 +205,7 @@ lengths, if/try depths, etc... <property name="ignoreSetter" value="true"/> </module> --> - <!-- + <!-- <module name="EqualsAvoidNull"/> --> <module name="IllegalInstantiation"/> @@ -236,7 +236,7 @@ lengths, if/try depths, etc... <module name="JUnitTestCase"/> --> <module name="ReturnCount"> - <property name="max" value="20"/> + <property name="max" value="25"/> </module> <!-- Um.. we tend to use these alot.. perhaps enable this check later. @@ -250,7 +250,7 @@ lengths, if/try depths, etc... <module name="ExplicitInitialization"/> <!-- <module name="AnnotationUseStyle"/> --> <!-- <module name="MissingDeprecated"/> --> - <!-- + <!-- <module name="MissingOverride"> <property name="javaFiveCompatibility" value="true"/> </module> http://git-wip-us.apache.org/repos/asf/camel/blob/9fc88062/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java index bd75e35..baeba4f 100644 --- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java @@ -865,7 +865,6 @@ public final class ObjectHelper { } else if ("char".equals(name)) { return char.class; } - return null; }
