Simplify

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/fileupload/trunk@1453130 13f79535-47bb-0310-9956-ffa450edef68
Suppress deprecation warnings for tests of deprecated classes

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/fileupload/trunk@1453134 13f79535-47bb-0310-9956-ffa450edef68