Better way to suppress individual checkstyle issues
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/fileupload/trunk@1458062 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 37623e0..b733d51 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -20,7 +20,5 @@
-->
<suppressions>
<suppress checks="MagicNumber" files="Base64Decoder.java" lines="0-9999"/>
- <!-- This inline conditional is easier to read than the alternative -->
- <suppress checks="AvoidInlineConditionals" files="FileUploadBase.java" lines="950-960"/>
<suppress checks="[a-zA-Z0-9]*" files=".+\.properties" />
</suppressions>
diff --git a/src/checkstyle/fileupload_checks.xml b/src/checkstyle/fileupload_checks.xml
index 2bf9e8e..d50593c 100644
--- a/src/checkstyle/fileupload_checks.xml
+++ b/src/checkstyle/fileupload_checks.xml
@@ -90,10 +90,16 @@
<!-- Require package Javadoc -->
<module name="JavadocPackage"/>
+ <!-- Allow comments to suppress checks -->
+ <module name="SuppressionCommentFilter"/>
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
+ <!-- Allow comments to suppress checks -->
+ <module name="FileContentsHolder"/>
+
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
diff --git a/src/main/java/org/apache/commons/fileupload/FileUploadBase.java b/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
index b08f738..4f7114e 100644
--- a/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
@@ -953,9 +953,12 @@
@SuppressWarnings("deprecation") // still has to be backward compatible
final int contentLengthInt = ctx.getContentLength();
+
final long requestSize = UploadContext.class.isAssignableFrom(ctx.getClass())
+ // Inline conditional is OK here CHECKSTYLE:OFF
? ((UploadContext) ctx).contentLength()
: contentLengthInt;
+ // CHECKSTYLE:ON
if (sizeMax >= 0) {
if (requestSize != -1 && requestSize > sizeMax) {
