From dccbf1fcec0fc4e0812e8906494b15a1301ac32a Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Thu, 5 Apr 2018 07:28:18 +0200 Subject: [PATCH] Checkstyle and simplify, next iteration --- .../org/apache/tools/ant/AntClassLoader.java | 16 +- .../org/apache/tools/ant/PathTokenizer.java | 6 +- src/main/org/apache/tools/ant/Project.java | 8 +- .../org/apache/tools/ant/PropertyHelper.java | 30 ++-- .../apache/tools/ant/RuntimeConfigurable.java | 25 ++- src/main/org/apache/tools/ant/XmlLogger.java | 3 +- .../tools/ant/attribute/BaseIfAttribute.java | 3 +- .../tools/ant/filters/ClassConstants.java | 31 ++-- .../tools/ant/filters/ExpandProperties.java | 4 +- .../tools/ant/filters/LineContainsRegExp.java | 6 +- .../tools/ant/filters/StripJavaComments.java | 3 +- .../ant/filters/util/JavaClassHelper.java | 6 +- .../tools/ant/helper/ProjectHelper2.java | 150 +++++++++--------- .../tools/ant/helper/ProjectHelperImpl.java | 75 +++++---- .../tools/ant/taskdefs/AntStructure.java | 9 +- .../org/apache/tools/ant/taskdefs/Concat.java | 11 +- .../org/apache/tools/ant/taskdefs/Expand.java | 22 +-- .../org/apache/tools/ant/taskdefs/Get.java | 5 +- .../org/apache/tools/ant/taskdefs/Javac.java | 6 +- .../apache/tools/ant/taskdefs/Manifest.java | 29 +--- .../apache/tools/ant/taskdefs/Recorder.java | 3 +- .../apache/tools/ant/taskdefs/Replace.java | 2 +- .../org/apache/tools/ant/taskdefs/Rmic.java | 5 +- .../apache/tools/ant/taskdefs/UpToDate.java | 12 +- .../compilers/DefaultCompilerAdapter.java | 6 +- .../ant/taskdefs/condition/IsReference.java | 19 +-- .../tools/ant/taskdefs/condition/Os.java | 4 +- .../tools/ant/taskdefs/optional/NetRexxC.java | 2 +- .../ant/taskdefs/optional/SchemaValidate.java | 26 ++- .../taskdefs/optional/depend/AntAnalyzer.java | 4 +- .../taskdefs/optional/ejb/IPlanetEjbc.java | 33 ++-- .../optional/jlink/ClassNameReader.java | 3 +- .../taskdefs/optional/junit/JUnitTask.java | 10 +- .../native2ascii/BuiltinNative2Ascii.java | 18 +-- .../tools/ant/taskdefs/optional/net/FTP.java | 11 +- .../optional/net/FTPTaskMirrorImpl.java | 3 +- .../ant/taskdefs/optional/ssh/SSHExec.java | 2 +- .../taskdefs/optional/ssh/ScpFromMessage.java | 4 +- .../optional/ssh/ScpFromMessageBySftp.java | 6 +- .../tools/ant/types/AbstractFileSet.java | 8 +- .../tools/ant/types/CommandlineJava.java | 12 +- .../apache/tools/ant/types/PropertySet.java | 3 +- .../ant/types/resources/PropertyResource.java | 5 +- .../ant/types/resources/URLResource.java | 6 +- .../comparators/ResourceComparator.java | 5 +- .../tools/ant/util/DOMElementWriter.java | 19 +-- .../org/apache/tools/ant/util/DateUtils.java | 4 +- .../org/apache/tools/ant/util/FileUtils.java | 12 +- .../ant/util/LayoutPreservingProperties.java | 2 +- .../apache/tools/ant/util/LazyHashtable.java | 6 +- .../apache/tools/ant/util/ResourceUtils.java | 9 +- .../ant/util/regexp/Jdk14RegexpMatcher.java | 3 +- .../org/apache/tools/bzip2/BlockSort.java | 6 +- .../apache/tools/bzip2/CBZip2InputStream.java | 8 +- src/main/org/apache/tools/tar/TarEntry.java | 18 +-- .../apache/tools/zip/ZipEightByteInteger.java | 6 +- src/main/org/apache/tools/zip/ZipLong.java | 5 +- src/main/org/apache/tools/zip/ZipShort.java | 5 +- .../tools/ant/taskdefs/DirnameTest.java | 5 +- 59 files changed, 325 insertions(+), 443 deletions(-) diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index 39058bb24..8a46659d9 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -539,15 +539,11 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo */ public String getClasspath() { final StringBuilder sb = new StringBuilder(); - boolean firstPass = true; - final Enumeration componentEnum = pathComponents.elements(); - while (componentEnum.hasMoreElements()) { - if (!firstPass) { - sb.append(System.getProperty("path.separator")); - } else { - firstPass = false; + for (final File component : pathComponents) { + if (sb.length() > 0) { + sb.append(File.pathSeparator); } - sb.append(componentEnum.nextElement().getAbsolutePath()); + sb.append(component.getAbsolutePath()); } return sb.toString(); } @@ -1407,8 +1403,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo * files are closed. */ public synchronized void cleanup() { - for (final Enumeration e = jarFiles.elements(); e.hasMoreElements();) { - FileUtils.close(e.nextElement()); + for (final JarFile jarFile : jarFiles.values()) { + FileUtils.close(jarFile); } jarFiles = new Hashtable<>(); if (project != null) { diff --git a/src/main/org/apache/tools/ant/PathTokenizer.java b/src/main/org/apache/tools/ant/PathTokenizer.java index 2beb09c31..2563018ee 100644 --- a/src/main/org/apache/tools/ant/PathTokenizer.java +++ b/src/main/org/apache/tools/ant/PathTokenizer.java @@ -83,11 +83,7 @@ public class PathTokenizer { * in the string after the current position; false otherwise. */ public boolean hasMoreTokens() { - if (lookahead != null) { - return true; - } - - return tokenizer.hasMoreTokens(); + return lookahead != null || tokenizer.hasMoreTokens(); } /** diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 1983cdbc4..6540cd90a 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -1828,10 +1828,10 @@ public class Project implements ResourceFactory { + root); } } - final StringBuilder buf = new StringBuilder("Build sequence for target(s)"); - - for (int j = 0; j < roots.length; j++) { - buf.append((j == 0) ? " `" : ", `").append(roots[j]).append('\''); + final StringBuilder buf = new StringBuilder(); + for (String root : roots) { + buf.append((buf.length() == 0) ? "Build sequence for target(s) `" + : ", `").append(root).append('\''); } buf.append(" is ").append(ret); log(buf.toString(), MSG_VERBOSE); diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java index 339c44645..7c821fefb 100644 --- a/src/main/org/apache/tools/ant/PropertyHelper.java +++ b/src/main/org/apache/tools/ant/PropertyHelper.java @@ -20,10 +20,10 @@ package org.apache.tools.ant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.Vector; @@ -974,14 +974,11 @@ public class PropertyHelper implements GetProperty { public void copyInheritedProperties(Project other) { //avoid concurrent modification: synchronized (inheritedProperties) { - Enumeration e = inheritedProperties.keys(); - while (e.hasMoreElements()) { - String arg = e.nextElement(); - if (other.getUserProperty(arg) != null) { - continue; + for (Map.Entry entry : inheritedProperties.entrySet()) { + String arg = entry.getKey(); + if (other.getUserProperty(arg) == null) { + other.setInheritedProperty(arg, entry.getValue().toString()); } - Object value = inheritedProperties.get(arg); - other.setInheritedProperty(arg, value.toString()); } } } @@ -1004,14 +1001,11 @@ public class PropertyHelper implements GetProperty { public void copyUserProperties(Project other) { //avoid concurrent modification: synchronized (userProperties) { - Enumeration e = userProperties.keys(); - while (e.hasMoreElements()) { - Object arg = e.nextElement(); - if (inheritedProperties.containsKey(arg)) { - continue; + for (Map.Entry entry : userProperties.entrySet()) { + String arg = entry.getKey(); + if (!inheritedProperties.containsKey(arg)) { + other.setUserProperty(arg, entry.getValue().toString()); } - Object value = userProperties.get(arg); - other.setUserProperty(arg.toString(), value.toString()); } } } @@ -1123,16 +1117,14 @@ public class PropertyHelper implements GetProperty { * @return Set<Class> * @since Ant 1.8.0 */ + @SuppressWarnings("unchecked") protected static Set> getDelegateInterfaces(Delegate d) { final HashSet> result = new HashSet<>(); Class c = d.getClass(); while (c != null) { for (Class ifc : c.getInterfaces()) { if (Delegate.class.isAssignableFrom(ifc)) { - @SuppressWarnings("unchecked") - final Class delegateInterface = - (Class) ifc; - result.add(delegateInterface); + result.add((Class) ifc); } } c = c.getSuperclass(); diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java index bc3472024..107464d2b 100644 --- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java +++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java @@ -531,23 +531,22 @@ public class RuntimeConfigurable implements Serializable { ih.setAttribute(p, target, name, attrValue); } catch (UnsupportedAttributeException be) { // id attribute must be set externally - if ("id".equals(name)) { - // Do nothing - } else if (getElementTag() == null) { - throw be; - } else { - throw new BuildException( - getElementTag() + " doesn't support the \"" - + be.getAttribute() + "\" attribute", be); + if (!"id".equals(name)) { + if (getElementTag() == null) { + throw be; + } else { + throw new BuildException( + getElementTag() + " doesn't support the \"" + + be.getAttribute() + "\" attribute", be); + } } } catch (BuildException be) { - if ("id".equals(name)) { - // Assume that this is an not supported attribute type - // thrown for example by a dynamic attribute task - // Do nothing - } else { + if (!"id".equals(name)) { throw be; } + // Assume that this is an not supported attribute type + // thrown for example by a dynamic attribute task -- + // do nothing } } } diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java index 94b3e715e..5fa978e58 100644 --- a/src/main/org/apache/tools/ant/XmlLogger.java +++ b/src/main/org/apache/tools/ant/XmlLogger.java @@ -207,12 +207,11 @@ public class XmlLogger implements BuildLogger { * @return the stack of timed elements for the current thread */ private Stack getStack() { - Stack threadStack = threadStacks.computeIfAbsent(Thread.currentThread(), k -> new Stack<>()); /* For debugging purposes uncomment: org.w3c.dom.Comment s = doc.createComment("stack=" + threadStack); buildElement.element.appendChild(s); */ - return threadStack; + return threadStacks.computeIfAbsent(Thread.currentThread(), k -> new Stack<>()); } /** diff --git a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java index 6d4d6c32e..14c22a589 100644 --- a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java +++ b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java @@ -73,11 +73,10 @@ public abstract class BaseIfAttribute Hashtable attributes = rc.getAttributeMap(); // This does a copy! for (Map.Entry entry : attributes.entrySet()) { String key = entry.getKey(); - String value = (String) entry.getValue(); if (key.startsWith("ant-attribute:param")) { int pos = key.lastIndexOf(':'); ret.put(key.substring(pos + 1), - el.getProject().replaceProperties(value)); + el.getProject().replaceProperties((String) entry.getValue())); } } return ret; diff --git a/src/main/org/apache/tools/ant/filters/ClassConstants.java b/src/main/org/apache/tools/ant/filters/ClassConstants.java index 2bb4bfb23..b9d7b7ff9 100644 --- a/src/main/org/apache/tools/ant/filters/ClassConstants.java +++ b/src/main/org/apache/tools/ant/filters/ClassConstants.java @@ -86,41 +86,27 @@ public final class ClassConstants * be read (for example due to the class not being found). */ public int read() throws IOException { - int ch = -1; if (queuedData != null && queuedData.length() == 0) { queuedData = null; } - if (queuedData != null) { - ch = queuedData.charAt(0); - queuedData = queuedData.substring(1); - if (queuedData.length() == 0) { - queuedData = null; - } - } else { + if (queuedData == null) { final String clazz = readFully(); if (clazz == null || clazz.length() == 0) { ch = -1; } else { final byte[] bytes = clazz.getBytes(ResourceUtils.ISO_8859_1); try { - final Class javaClassHelper = - Class.forName(JAVA_CLASS_HELPER); + final Class javaClassHelper = Class.forName(JAVA_CLASS_HELPER); if (javaClassHelper != null) { - final Class[] params = { - byte[].class - }; final Method getConstants = - javaClassHelper.getMethod("getConstants", params); - final Object[] args = { - bytes - }; + javaClassHelper.getMethod("getConstants", byte[].class); // getConstants is a static method, no need to // pass in the object final StringBuffer sb = (StringBuffer) - getConstants.invoke(null, args); + getConstants.invoke(null, (Object) bytes); if (sb.length() > 0) { queuedData = sb.toString(); return read(); @@ -141,6 +127,12 @@ public final class ClassConstants throw new BuildException(ex); } } + } else { + ch = queuedData.charAt(0); + queuedData = queuedData.substring(1); + if (queuedData.length() == 0) { + queuedData = null; + } } return ch; } @@ -156,7 +148,6 @@ public final class ClassConstants * the specified reader */ public Reader chain(final Reader rdr) { - ClassConstants newFilter = new ClassConstants(rdr); - return newFilter; + return new ClassConstants(rdr); } } diff --git a/src/main/org/apache/tools/ant/filters/ExpandProperties.java b/src/main/org/apache/tools/ant/filters/ExpandProperties.java index 7609ef624..401b51190 100644 --- a/src/main/org/apache/tools/ant/filters/ExpandProperties.java +++ b/src/main/org/apache/tools/ant/filters/ExpandProperties.java @@ -19,7 +19,6 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; -import java.util.Properties; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -98,8 +97,7 @@ public final class ExpandProperties if (propertySet == null) { getProperty = PropertyHelper.getPropertyHelper(project); } else { - final Properties props = propertySet.getProperties(); - getProperty = props::getProperty; + getProperty = propertySet.getProperties()::getProperty; } Object expanded = new ParseProperties(project, PropertyHelper .getPropertyHelper(project) diff --git a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java index 4b02adfb1..2cb689ae4 100644 --- a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java +++ b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java @@ -186,10 +186,8 @@ public final class LineContainsRegExp LineContainsRegExp newFilter = new LineContainsRegExp(rdr); newFilter.setRegexps(getRegexps()); newFilter.setNegate(isNegated()); - newFilter - .setCaseSensitive(!RegexpUtil.hasFlag(regexpOptions, - Regexp.MATCH_CASE_INSENSITIVE) - ); + newFilter.setCaseSensitive(!RegexpUtil.hasFlag(regexpOptions, + Regexp.MATCH_CASE_INSENSITIVE)); return newFilter; } diff --git a/src/main/org/apache/tools/ant/filters/StripJavaComments.java b/src/main/org/apache/tools/ant/filters/StripJavaComments.java index 65bccd703..488873e69 100644 --- a/src/main/org/apache/tools/ant/filters/StripJavaComments.java +++ b/src/main/org/apache/tools/ant/filters/StripJavaComments.java @@ -139,7 +139,6 @@ public final class StripJavaComments */ public Reader chain(final Reader rdr) { - StripJavaComments newFilter = new StripJavaComments(rdr); - return newFilter; + return new StripJavaComments(rdr); } } diff --git a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java b/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java index 4e9752135..f60f3ad8c 100644 --- a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java @@ -46,14 +46,12 @@ public final class JavaClassHelper { final StringBuffer sb = new StringBuffer(); final ByteArrayInputStream bis = new ByteArrayInputStream(bytes); final ClassParser parser = new ClassParser(bis, ""); - final JavaClass javaClass = parser.parse(); - final Field[] fields = javaClass.getFields(); - for (final Field field : fields) { + for (final Field field : parser.parse().getFields()) { if (field != null) { final ConstantValue cv = field.getConstantValue(); if (cv != null) { String cvs = cv.toString(); - //Remove start and end quotes if field is a String + // Remove start and end quotes if field is a String if (cvs.startsWith("\"") && cvs.endsWith("\"")) { cvs = cvs.substring(1, cvs.length() - 1); } diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index 5d62c9d99..14e42aad5 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java @@ -274,12 +274,10 @@ public class ProjectHelper2 extends ProjectHelper { + uri + (zf != null ? " from a zip file" : ""), Project.MSG_VERBOSE); - DefaultHandler hb = handler; - - parser.setContentHandler(hb); - parser.setEntityResolver(hb); - parser.setErrorHandler(hb); - parser.setDTDHandler(hb); + parser.setContentHandler(handler); + parser.setEntityResolver(handler); + parser.setErrorHandler(handler); + parser.setDTDHandler(handler); parser.parse(inputSource); } catch (SAXParseException exc) { Location location = new Location(exc.getSystemId(), exc.getLineNumber(), exc @@ -603,8 +601,7 @@ public class ProjectHelper2 extends ProjectHelper { @Override public void endElement(String uri, String name, String qName) throws SAXException { currentHandler.onEndElement(uri, name, context); - AntHandler prev = antHandlers.pop(); - currentHandler = prev; + currentHandler = antHandlers.pop(); if (currentHandler != null) { currentHandler.onEndChild(uri, name, qName, context); } @@ -729,45 +726,49 @@ public class ProjectHelper2 extends ProjectHelper { if (attrUri != null && !attrUri.isEmpty() && !attrUri.equals(uri)) { continue; // Ignore attributes from unknown uris } - String key = attrs.getLocalName(i); String value = attrs.getValue(i); - - if ("default".equals(key)) { - if (value != null && !value.isEmpty()) { - if (!context.isIgnoringProjectTag()) { - project.setDefault(value); + switch (attrs.getLocalName(i)) { + case "default": + if (value != null && !value.isEmpty()) { + if (!context.isIgnoringProjectTag()) { + project.setDefault(value); + } } - } - } else if ("name".equals(key)) { - if (value != null) { - context.setCurrentProjectName(value); - nameAttributeSet = true; - if (!context.isIgnoringProjectTag()) { - project.setName(value); - project.addReference(value, project); - } else if (isInIncludeMode()) { - if (!"".equals(value) && getCurrentTargetPrefix()!= null && getCurrentTargetPrefix().endsWith(ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX)) { - String newTargetPrefix = getCurrentTargetPrefix().replace(ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX, value); - // help nested include tasks - setCurrentTargetPrefix(newTargetPrefix); + break; + case "name": + if (value != null) { + context.setCurrentProjectName(value); + nameAttributeSet = true; + if (!context.isIgnoringProjectTag()) { + project.setName(value); + project.addReference(value, project); + } else if (isInIncludeMode()) { + if (!value.isEmpty() && getCurrentTargetPrefix() != null + && getCurrentTargetPrefix().endsWith(ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX)) { + String newTargetPrefix = getCurrentTargetPrefix().replace(ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX, value); + // help nested include tasks + setCurrentTargetPrefix(newTargetPrefix); + } } } - } - } else if ("id".equals(key)) { - if (value != null) { - // What's the difference between id and name ? + break; + case "id": + if (value != null) { + // What's the difference between id and name ? + if (!context.isIgnoringProjectTag()) { + project.addReference(value, project); + } + } + break; + case "basedir": if (!context.isIgnoringProjectTag()) { - project.addReference(value, project); + baseDir = value; } - } - } else if ("basedir".equals(key)) { - if (!context.isIgnoringProjectTag()) { - baseDir = value; - } - } else { - // TODO ignore attributes in a different NS ( maybe store them ? ) - throw new SAXParseException("Unexpected attribute \"" + attrs.getQName(i) - + "\"", context.getLocator()); + break; + default: + // TODO ignore attributes in a different NS ( maybe store them ? ) + throw new SAXParseException("Unexpected attribute \"" + attrs.getQName(i) + + "\"", context.getLocator()); } } @@ -914,37 +915,44 @@ public class ProjectHelper2 extends ProjectHelper { if (attrUri != null && !attrUri.isEmpty() && !attrUri.equals(uri)) { continue; // Ignore attributes from unknown uris } - String key = attrs.getLocalName(i); String value = attrs.getValue(i); - - if ("name".equals(key)) { - name = value; - if (name.isEmpty()) { - throw new BuildException("name attribute must " + "not be empty"); - } - } else if ("depends".equals(key)) { - depends = value; - } else if ("if".equals(key)) { - target.setIf(value); - } else if ("unless".equals(key)) { - target.setUnless(value); - } else if ("id".equals(key)) { - if (value != null && !value.isEmpty()) { - context.getProject().addReference(value, target); - } - } else if ("description".equals(key)) { - target.setDescription(value); - } else if ("extensionOf".equals(key)) { - extensionPoint = value; - } else if ("onMissingExtensionPoint".equals(key)) { - try { - extensionPointMissing = OnMissingExtensionPoint.valueOf(value); - } catch (IllegalArgumentException e) { - throw new BuildException("Invalid onMissingExtensionPoint " + value); - } - } else { - throw new SAXParseException("Unexpected attribute \"" + key + "\"", context - .getLocator()); + switch (attrs.getLocalName(i)) { + case "name": + name = value; + if (name.isEmpty()) { + throw new BuildException("name attribute must not be empty"); + } + break; + case "depends": + depends = value; + break; + case "if": + target.setIf(value); + break; + case "unless": + target.setUnless(value); + break; + case "id": + if (value != null && !value.isEmpty()) { + context.getProject().addReference(value, target); + } + break; + case "description": + target.setDescription(value); + break; + case "extensionOf": + extensionPoint = value; + break; + case "onMissingExtensionPoint": + try { + extensionPointMissing = OnMissingExtensionPoint.valueOf(value); + } catch (IllegalArgumentException e) { + throw new BuildException("Invalid onMissingExtensionPoint " + value); + } + break; + default: + throw new SAXParseException("Unexpected attribute \"" + attrs.getQName(i) + + "\"", context.getLocator()); } } diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java index 734f8c80a..06d985422 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java @@ -389,19 +389,22 @@ public class ProjectHelperImpl extends ProjectHelper { for (int i = 0; i < attrs.getLength(); i++) { String key = attrs.getName(i); String value = attrs.getValue(i); - - if ("default".equals(key)) { - def = value; - } else if ("name".equals(key)) { - name = value; - } else if ("id".equals(key)) { - id = value; - } else if ("basedir".equals(key)) { - baseDir = value; - } else { - throw new SAXParseException( - "Unexpected attribute \"" + attrs.getName(i) - + "\"", helperImpl.locator); + switch (key) { + case "default": + def = value; + break; + case "name": + name = value; + break; + case "id": + id = value; + break; + case "basedir": + baseDir = value; + break; + default: + throw new SAXParseException("Unexpected attribute \"" + attrs.getName(i) + + "\"", helperImpl.locator); } } @@ -525,26 +528,32 @@ public class ProjectHelperImpl extends ProjectHelper { for (int i = 0; i < attrs.getLength(); i++) { String key = attrs.getName(i); String value = attrs.getValue(i); - - if ("name".equals(key)) { - name = value; - if (name.isEmpty()) { - throw new BuildException("name attribute must not" + " be empty", - new Location(helperImpl.locator)); - } - } else if ("depends".equals(key)) { - depends = value; - } else if ("if".equals(key)) { - ifCond = value; - } else if ("unless".equals(key)) { - unlessCond = value; - } else if ("id".equals(key)) { - id = value; - } else if ("description".equals(key)) { - description = value; - } else { - throw new SAXParseException("Unexpected attribute \"" + key + "\"", - helperImpl.locator); + switch (key) { + case "name": + name = value; + if (name.isEmpty()) { + throw new BuildException("name attribute must not be empty", + new Location(helperImpl.locator)); + } + break; + case "depends": + depends = value; + break; + case "if": + ifCond = value; + break; + case "unless": + unlessCond = value; + break; + case "id": + id = value; + break; + case "description": + description = value; + break; + default: + throw new SAXParseException("Unexpected attribute \"" + key + "\"", + helperImpl.locator); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 482a219c3..49ff449ac 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -348,19 +348,16 @@ public class AntStructure extends Task { sb.append(LINE_SEP).append(" ") .append(attrName).append(" "); final Class type = ih.getAttributeType(attrName); - if (type.equals(Boolean.class) - || type.equals(Boolean.TYPE)) { + if (type.equals(Boolean.class) || type.equals(Boolean.TYPE)) { sb.append(BOOLEAN).append(" "); } else if (Reference.class.isAssignableFrom(type)) { sb.append("IDREF "); } else if (EnumeratedAttribute.class.isAssignableFrom(type)) { try { final EnumeratedAttribute ea = - type.asSubclass(EnumeratedAttribute.class) - .newInstance(); + type.asSubclass(EnumeratedAttribute.class).newInstance(); final String[] values = ea.getValues(); - if (values == null - || values.length == 0 + if (values == null || values.length == 0 || !areNmtokens(values)) { sb.append("CDATA "); } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 8d53ba088..86c0c2a9e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -595,7 +595,7 @@ public class Concat extends Task implements ResourceCollection { */ @Deprecated public void setForce(boolean forceOverwrite) { - this.forceOverwrite = forceOverwrite; + setOverwrite(forceOverwrite); } /** @@ -606,7 +606,7 @@ public class Concat extends Task implements ResourceCollection { * @since Ant 1.8.2 */ public void setOverwrite(boolean forceOverwrite) { - setForce(forceOverwrite); + this.forceOverwrite = forceOverwrite; } /** @@ -923,11 +923,8 @@ public class Concat extends Task implements ResourceCollection { } private boolean isUpToDate(ResourceCollection c) { - if (dest == null || forceOverwrite) { - return false; - } - return c.stream().noneMatch(r -> SelectorUtils.isOutOfDate(r, dest, - FILE_UTILS.getFileTimestampGranularity())); + return dest != null && !forceOverwrite + && c.stream().noneMatch(r -> SelectorUtils.isOutOfDate(r, dest, FILE_UTILS.getFileTimestampGranularity())); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 8862fa7e0..fb1141adb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -270,7 +270,6 @@ public class Expand extends Task { String name = entryName.replace('/', File.separatorChar) .replace('\\', File.separatorChar); - boolean included = false; Set includePatterns = new HashSet<>(); Set excludePatterns = new HashSet<>(); for (PatternSet p : patternsets) { @@ -302,20 +301,23 @@ public class Expand extends Task { } } - for (Iterator iter = includePatterns.iterator(); - !included && iter.hasNext();) { - String pattern = iter.next(); - included = SelectorUtils.matchPath(pattern, name); + boolean included = false; + for (String pattern : includePatterns) { + if (SelectorUtils.matchPath(pattern, name)) { + included = true; + break; + } } - for (Iterator iter = excludePatterns.iterator(); - included && iter.hasNext();) { - String pattern = iter.next(); - included = !SelectorUtils.matchPath(pattern, name); + for (String pattern : excludePatterns) { + if (SelectorUtils.matchPath(pattern, name)) { + included = false; + break; + } } if (!included) { - //Do not process this file + // Do not process this file log("skipping " + entryName + " as it is excluded or not included.", Project.MSG_VERBOSE); diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index 34c1dd729..e920bdee7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -28,6 +28,8 @@ import java.net.URL; import java.net.URLConnection; import java.nio.file.Files; import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.zip.GZIPInputStream; import org.apache.tools.ant.BuildException; @@ -46,9 +48,6 @@ import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.StringUtils; -import java.util.LinkedHashMap; -import java.util.Map; - /** * Gets a particular file from a URL source. * Options include verbose reporting, timestamp based fetches and controlling diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index 8a965c506..a4d8c7e99 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -834,7 +834,7 @@ public class Javac extends MatchingTask { * @return whether or not the ant classpath is to be included in the classpath */ public boolean getIncludeantruntime() { - return includeAntRuntime != null ? includeAntRuntime : true; + return includeAntRuntime == null || includeAntRuntime; } /** @@ -1509,10 +1509,10 @@ public class Javac extends MatchingTask { * @return a mapping from module name to module source roots * @since 1.9.7 */ - private static Map> resolveModuleSourcePathElement( + private static Map> resolveModuleSourcePathElement( final File projectDir, final String element) { - final Map> result = new TreeMap<>(); + final Map> result = new TreeMap<>(); for (CharSequence resolvedElement : expandGroups(element)) { findModules(projectDir, resolvedElement.toString(), result); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index 4ed43e2f0..28634ef5e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -193,12 +193,8 @@ public class Manifest { Attribute rhsAttribute = (Attribute) rhs; String lhsKey = getKey(); String rhsKey = rhsAttribute.getKey(); - if ((lhsKey == null && rhsKey != null) - || (lhsKey != null && !lhsKey.equals(rhsKey))) { - return false; - } - - return values.equals(rhsAttribute.values); + return (lhsKey != null || rhsKey == null) + && (lhsKey == null || lhsKey.equals(rhsKey)) && values.equals(rhsAttribute.values); } /** @@ -243,10 +239,7 @@ public class Manifest { * @return the attribute's key. */ public String getKey() { - if (name == null) { - return null; - } - return name.toLowerCase(Locale.ENGLISH); + return name == null ? null : name.toLowerCase(Locale.ENGLISH); } /** @@ -302,8 +295,7 @@ public class Manifest { * @param line the continuation line. */ public void addContinuation(String line) { - String currentValue = values.elementAt(currentIndex); - setValue(currentValue + line.substring(1)); + setValue(values.elementAt(currentIndex) + line.substring(1)); } /** @@ -607,10 +599,7 @@ public class Manifest { */ public String getAttributeValue(String attributeName) { Attribute attribute = getAttribute(attributeName.toLowerCase(Locale.ENGLISH)); - if (attribute == null) { - return null; - } - return attribute.getValue(); + return attribute == null ? null : attribute.getValue(); } /** @@ -723,8 +712,7 @@ public class Manifest { if (attribute == null) { return; } - String attributeKey = attribute.getKey(); - attributes.put(attributeKey, attribute); + attributes.put(attribute.getKey(), attribute); } /** @@ -1113,11 +1101,8 @@ public class Manifest { return false; } - if (!mainSection.equals(rhsManifest.mainSection)) { - return false; - } + return mainSection.equals(rhsManifest.mainSection) && sections.equals(rhsManifest.sections); - return sections.equals(rhsManifest.sections); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java index d124a4527..cb9b4d88a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java +++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java @@ -310,8 +310,7 @@ public class Recorder extends Task implements SubBuildListener { Hashtable entries = (Hashtable) recorderEntries.clone(); for (Map.Entry entry : entries.entrySet()) { - RecorderEntry re = entry.getValue(); - if (re.getProject() == getProject()) { + if (entry.getValue().getProject() == getProject()) { recorderEntries.remove(entry.getKey()); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 93175315b..adbd35d9f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -286,7 +286,7 @@ public class Replace extends MatchingTask { * The filter expects from the component providing the input that data * is only added by that component to the end of this StringBuffer. * This StringBuffer will be modified by this filter, and expects that - * another component will only added to this StringBuffer. + * another component will only append to this StringBuffer. * @param input The input for this filter. */ void setInputBuffer(StringBuffer input) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 119e4b987..ed2ab219c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -775,10 +775,7 @@ public class Rmic extends MatchingTask { try { Class testClass = loader.loadClass(classname); // One cannot RMIC an interface for "classic" RMI (JRMP) - if (testClass.isInterface() && !iiop && !idl) { - return false; - } - return isValidRmiRemote(testClass); + return (!testClass.isInterface() || iiop || idl) && isValidRmiRemote(testClass); } catch (ClassNotFoundException e) { log(ERROR_UNABLE_TO_VERIFY_CLASS + classname + ERROR_NOT_FOUND, Project.MSG_WARN); diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 19dcd2316..2c7fc1f0f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Vector; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.condition.Condition; @@ -205,11 +204,12 @@ public class UpToDate extends Task implements Condition { // scan all filesets, even if we know the target is out of // date after the first test. - Iterator iter = sourceFileSets.iterator(); - while (upToDate && iter.hasNext()) { - FileSet fs = iter.next(); - DirectoryScanner ds = fs.getDirectoryScanner(getProject()); - upToDate = scanDir(fs.getDir(getProject()), ds.getIncludedFiles()); + for (FileSet fs : sourceFileSets) { + if (!scanDir(fs.getDir(getProject()), + fs.getDirectoryScanner(getProject()).getIncludedFiles())) { + upToDate = false; + break; + } } if (upToDate) { diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 48f95413a..9ed7017e5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -696,8 +696,7 @@ public abstract class DefaultCompilerAdapter */ @Deprecated protected boolean assumeJava19() { - return assumeJavaXY("javac1.9", JavaEnvUtils.JAVA_9) - || assumeJavaXY("javac9", JavaEnvUtils.JAVA_9); + return assumeJava9(); } /** @@ -706,7 +705,8 @@ public abstract class DefaultCompilerAdapter * @since Ant 1.9.8 */ protected boolean assumeJava9() { - return assumeJava19(); + return assumeJavaXY("javac1.9", JavaEnvUtils.JAVA_9) + || assumeJavaXY("javac9", JavaEnvUtils.JAVA_9); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java index 30e257361..4803cce98 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java @@ -60,31 +60,26 @@ public class IsReference extends ProjectComponent implements Condition { public boolean eval() throws BuildException { if (ref == null) { throw new BuildException( - "No reference specified for isreference condition"); + "No reference specified for isreference condition"); } String key = ref.getRefId(); if (!getProject().hasReference(key)) { return false; } + if (type == null) { return true; } - Object o = getProject().getReference(key); - Class typeClass = - getProject().getDataTypeDefinitions().get(type); - + Class typeClass = getProject().getDataTypeDefinitions().get(type); if (typeClass == null) { - typeClass = - getProject().getTaskDefinitions().get(type); + typeClass = getProject().getTaskDefinitions().get(type); } - if (typeClass == null) { - // don't know the type, should throw exception instead? - return false; - } + // if the type is unknown, throw exception instead? + return typeClass != null + && typeClass.isAssignableFrom(getProject().getReference(key).getClass()); - return typeClass.isAssignableFrom(o.getClass()); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java index 716375aa0..9ca87a9c4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs.condition; +import java.io.File; import java.util.Locale; import org.apache.tools.ant.BuildException; @@ -34,8 +35,7 @@ public class Os implements Condition { System.getProperty("os.arch").toLowerCase(Locale.ENGLISH); private static final String OS_VERSION = System.getProperty("os.version").toLowerCase(Locale.ENGLISH); - private static final String PATH_SEP = - System.getProperty("path.separator"); + private static final String PATH_SEP = File.pathSeparator; /** * OS family that can be tested for. {@value} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index e0c4d83b1..a1261f894 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -924,7 +924,7 @@ public class NetRexxC extends MatchingTask { */ private void addExistingToClasspath(StringBuilder target, String source) { StringTokenizer tok = new StringTokenizer(source, - System.getProperty("path.separator"), false); + File.pathSeparator, false); while (tok.hasMoreTokens()) { File f = getProject().resolveFile(tok.nextToken()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java index 62a42392a..f61a93bd4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java @@ -467,14 +467,9 @@ public class SchemaValidate extends XMLValidateTask { final SchemaLocation schemaLocation = (SchemaLocation) o; - if (file != null ? !file.equals(schemaLocation.file) : schemaLocation.file != null) { - return false; - } - if (namespace != null ? !namespace.equals(schemaLocation.namespace) - : schemaLocation.namespace != null) { - return false; - } - return url != null ? url.equals(schemaLocation.url) : schemaLocation.url == null; + return (file == null ? schemaLocation.file == null : file.equals(schemaLocation.file)) + && (namespace == null ? schemaLocation.namespace == null : namespace.equals(schemaLocation.namespace)) + && (url == null ? schemaLocation.url == null : url.equals(schemaLocation.url)); } /** @@ -485,9 +480,9 @@ public class SchemaValidate extends XMLValidateTask { public int hashCode() { int result; // CheckStyle:MagicNumber OFF - result = (namespace != null ? namespace.hashCode() : 0); - result = 29 * result + (file != null ? file.hashCode() : 0); - result = 29 * result + (url != null ? url.hashCode() : 0); + result = (namespace == null ? 0 : namespace.hashCode()); + result = 29 * result + (file == null ? 0 : file.hashCode()); + result = 29 * result + (url == null ? 0 : url.hashCode()); // CheckStyle:MagicNumber OFF return result; } @@ -499,10 +494,9 @@ public class SchemaValidate extends XMLValidateTask { */ @Override public String toString() { - String buffer = (namespace != null ? namespace : "(anonymous)") - + ' ' + (url != null ? (url + " ") : "") - + (file != null ? file.getAbsolutePath() : ""); - return buffer; + return (namespace == null ? "(anonymous)" : namespace) + + (url == null ? "" : " " + url) + + (file == null ? "" : " " + file.getAbsolutePath()); } - } //SchemaLocation + } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java index 160bbc7b2..95ec97362 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java @@ -20,11 +20,11 @@ package org.apache.tools.ant.taskdefs.optional.depend; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.Vector; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java index 30852209b..436ee7ddc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java @@ -812,11 +812,7 @@ public class IPlanetEjbc { String base = "\\ejb-jar\\enterprise-beans\\" + ejbType; if ((base + "\\ejb-name").equals(currentLoc)) { - currentEjb = ejbs.get(value); - if (currentEjb == null) { - currentEjb = new EjbInfo(value); - ejbs.put(value, currentEjb); - } + currentEjb = ejbs.computeIfAbsent(value, EjbInfo::new); } else if ((base + "\\home").equals(currentLoc)) { currentEjb.setHome(value); } else if ((base + "\\remote").equals(currentLoc)) { @@ -846,18 +842,13 @@ public class IPlanetEjbc { String base = "\\ias-ejb-jar\\enterprise-beans\\" + ejbType; if ((base + "\\ejb-name").equals(currentLoc)) { - currentEjb = ejbs.get(value); - if (currentEjb == null) { - currentEjb = new EjbInfo(value); - ejbs.put(value, currentEjb); - } + currentEjb = ejbs.computeIfAbsent(value, EjbInfo::new); } else if ((base + "\\iiop").equals(currentLoc)) { currentEjb.setIiop(value); } else if ((base + "\\failover-required").equals(currentLoc)) { currentEjb.setHasession(value); } else if ((base - + "\\persistence-manager\\properties-file-location") - .equals(currentLoc)) { + + "\\persistence-manager\\properties-file-location").equals(currentLoc)) { currentEjb.addCmpDescriptor(value); } } @@ -869,15 +860,15 @@ public class IPlanetEjbc { * */ private class EjbInfo { - private String name; // EJB's display name - private Classname home; // EJB's home interface name - private Classname remote; // EJB's remote interface name - private Classname implementation; // EJB's implementation class - private Classname primaryKey; // EJB's primary key class - private String beantype = "entity"; // or "stateful" or "stateless" - private boolean cmp = false; // Does this EJB support CMP? - private boolean iiop = false; // Does this EJB support IIOP? - private boolean hasession = false; // Does this EJB require failover? + private String name; // EJB's display name + private Classname home; // EJB's home interface name + private Classname remote; // EJB's remote interface name + private Classname implementation; // EJB's implementation class + private Classname primaryKey; // EJB's primary key class + private String beantype = "entity"; // or "stateful" or "stateless" + private boolean cmp = false; // Does this EJB support CMP? + private boolean iiop = false; // Does this EJB support IIOP? + private boolean hasession = false; // Does this EJB require failover? private List cmpDescriptors = new ArrayList<>(); // CMP descriptor list /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java index 602583488..8abe28d98 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java @@ -129,8 +129,7 @@ public class ClassNameReader { /* int accessFlags = */ data.readUnsignedShort(); int classIndex = data.readUnsignedShort(); Integer stringIndex = (Integer) values[classIndex]; - String className = (String) values[stringIndex]; - return className; + return (String) values[stringIndex]; } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index b57663a71..03f34cef6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1429,10 +1429,8 @@ public class JUnitTask extends Task { * @return created file */ private File createTempPropertiesFile(final String prefix) { - final File propsFile = - FILE_UTILS.createTempFile(prefix, ".properties", - tmpDir != null ? tmpDir : getProject().getBaseDir(), true, true); - return propsFile; + return FILE_UTILS.createTempFile(prefix, ".properties", + tmpDir != null ? tmpDir : getProject().getBaseDir(), true, true); } @@ -1701,8 +1699,8 @@ public class JUnitTask extends Task { * @since 1.9.8 */ private void checkModules() { - if (hasPath(getCommandline().getModulepath()) || - hasPath(getCommandline().getUpgrademodulepath())) { + if (hasPath(getCommandline().getModulepath()) + || hasPath(getCommandline().getUpgrademodulepath())) { if (!batchTests.stream().allMatch(BaseTest::getFork) || !tests.stream().allMatch(BaseTest::getFork)) { throw new BuildException( diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java index 5aae72d13..650f3cbf4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java @@ -60,11 +60,11 @@ public class BuiltinNative2Ascii implements Native2AsciiAdapter { private BufferedReader getReader(File srcFile, String encoding, boolean reverse) throws IOException { - if (!reverse && encoding != null) { - return new BufferedReader(new InputStreamReader( - Files.newInputStream(srcFile.toPath()), encoding)); + if (reverse || encoding == null) { + return new BufferedReader(new FileReader(srcFile)); } - return new BufferedReader(new FileReader(srcFile)); + return new BufferedReader(new InputStreamReader( + Files.newInputStream(srcFile.toPath()), encoding)); } private Writer getWriter(File destFile, String encoding, @@ -72,12 +72,12 @@ public class BuiltinNative2Ascii implements Native2AsciiAdapter { if (!reverse) { encoding = "ASCII"; } - if (encoding != null) { - return new BufferedWriter( - new OutputStreamWriter(Files.newOutputStream(destFile.toPath()), - encoding)); + if (encoding == null) { + return new BufferedWriter(new FileWriter(destFile)); } - return new BufferedWriter(new FileWriter(destFile)); + return new BufferedWriter( + new OutputStreamWriter(Files.newOutputStream(destFile.toPath()), + encoding)); } private void translate(BufferedReader input, Writer output, diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index b540ede66..b18878b96 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -1202,13 +1202,7 @@ public class FTP extends Task implements FTPTaskConfig { * @since ant 1.6 */ private boolean isFunctioningAsFile(FTPClient ftp, String dir, FTPFile file) { - if (file.isDirectory()) { - return false; - } - if (file.isFile()) { - return true; - } - return !isFunctioningAsDirectory(ftp, dir, file); + return !file.isDirectory() && (file.isFile() || !isFunctioningAsDirectory(ftp, dir, file)); } /** @@ -1901,8 +1895,7 @@ public class FTP extends Task implements FTPTaskConfig { * @return the filename as it will appear on the server. */ protected String resolveFile(String file) { - return file.replace(System.getProperty("file.separator").charAt(0), - remoteFileSep.charAt(0)); + return file.replace(File.separator.charAt(0), remoteFileSep.charAt(0)); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java index 2ea3787ab..721b2e39b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java @@ -1280,8 +1280,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { * @return the filename as it will appear on the server. */ protected String resolveFile(String file) { - return file.replace(System.getProperty("file.separator").charAt(0), - task.getSeparator().charAt(0)); + return file.replace(File.separator.charAt(0), task.getSeparator().charAt(0)); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java index d6012f641..fd26bf4b4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java @@ -218,7 +218,7 @@ public class SSHExec extends SSHBase { * will be stored. * @since Apache Ant 1.9.4 */ - public void setErrorproperty (final String property) { + public void setErrorproperty(final String property) { errorProperty = property; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java index 9a385e6b9..312bf6672 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java @@ -319,9 +319,7 @@ public class ScpFromMessage extends AbstractSshMessage { throw new JSchException("failed to stat remote file", e); } FileUtils.getFileUtils().setFileLastModified(localFile, - ((long) fileAttributes - .getMTime()) - * 1000); + ((long) fileAttributes.getMTime()) * 1000); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java index 3aac12d38..b066d9227 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java @@ -132,7 +132,7 @@ public class ScpFromMessageBySftp extends ScpFromMessage { private void getDir(final ChannelSftp channel, final String remoteFile, - final File localFile) throws IOException, SftpException { + final File localFile) throws SftpException { String pwd = remoteFile; if (remoteFile.lastIndexOf('/') != -1) { if (remoteFile.length() > 1) { @@ -196,9 +196,7 @@ public class ScpFromMessageBySftp extends ScpFromMessage { } if (getPreserveLastModified()) { FileUtils.getFileUtils().setFileLastModified(localFile, - ((long) le.getAttrs() - .getMTime()) - * 1000); + ((long) le.getAttrs().getMTime()) * 1000); } } } diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 56269b5ab..4d34acc28 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -592,7 +592,7 @@ public abstract class AbstractFileSet extends DataType return getRef(getProject()).hasSelectors(); } dieOnCircularReference(); - return !(selectors.isEmpty()); + return !selectors.isEmpty(); } /** @@ -605,10 +605,8 @@ public abstract class AbstractFileSet extends DataType return getRef(getProject()).hasPatterns(); } dieOnCircularReference(); - if (defaultPatterns.hasPatterns(getProject())) { - return true; - } - return additionalPatterns.stream().anyMatch(ps -> ps.hasPatterns(getProject())); + return defaultPatterns.hasPatterns(getProject()) + || additionalPatterns.stream().anyMatch(ps -> ps.hasPatterns(getProject())); } /** diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java index 2ec4c08be..3feaea6c2 100644 --- a/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -113,11 +113,8 @@ public class CommandlineJava implements Cloneable { } } Properties propertySetProperties = mergePropertySets(); - for (Enumeration e = propertySetProperties.keys(); - e.hasMoreElements();) { - String key = (String) e.nextElement(); - String value = propertySetProperties.getProperty(key); - listIt.add("-D" + key + "=" + value); + for (String key : propertySetProperties.stringPropertyNames()) { + listIt.add("-D" + key + "=" + propertySetProperties.getProperty(key)); } } @@ -140,10 +137,9 @@ public class CommandlineJava implements Cloneable { try { sys = System.getProperties(); Properties p = new Properties(); - for (Enumeration e = sys.propertyNames(); e.hasMoreElements();) { - String name = (String) e.nextElement(); + for (String name : sys.stringPropertyNames()) { String value = sys.getProperty(name); - if (name != null && value != null) { + if (value != null) { p.put(name, value); } } diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java index 7d1fd7ec4..545993258 100644 --- a/src/main/org/apache/tools/ant/types/PropertySet.java +++ b/src/main/org/apache/tools/ant/types/PropertySet.java @@ -568,8 +568,7 @@ public class PropertySet extends DataType implements ResourceCollection { pushAndInvokeCircularReferenceCheck(mapper, stk, p); } for (PropertySet propertySet : setRefs) { - pushAndInvokeCircularReferenceCheck(propertySet, stk, - p); + pushAndInvokeCircularReferenceCheck(propertySet, stk, p); } setChecked(true); } diff --git a/src/main/org/apache/tools/ant/types/resources/PropertyResource.java b/src/main/org/apache/tools/ant/types/resources/PropertyResource.java index d72881de9..c47e26666 100644 --- a/src/main/org/apache/tools/ant/types/resources/PropertyResource.java +++ b/src/main/org/apache/tools/ant/types/resources/PropertyResource.java @@ -120,10 +120,7 @@ public class PropertyResource extends Resource { */ @Override public boolean equals(Object o) { - if (super.equals(o)) { - return true; - } - return isReferenceOrProxy() && getReferencedOrProxied().equals(o); + return super.equals(o) || isReferenceOrProxy() && getReferencedOrProxied().equals(o); } /** diff --git a/src/main/org/apache/tools/ant/types/resources/URLResource.java b/src/main/org/apache/tools/ant/types/resources/URLResource.java index 7ece7e73a..fadb09834 100644 --- a/src/main/org/apache/tools/ant/types/resources/URLResource.java +++ b/src/main/org/apache/tools/ant/types/resources/URLResource.java @@ -310,10 +310,10 @@ public class URLResource extends Resource implements URLProvider { if (another == null || another.getClass() != getClass()) { return false; } - URLResource otheru = (URLResource) another; + URLResource other = (URLResource) another; return getURL() == null - ? otheru.getURL() == null - : getURL().equals(otheru.getURL()); + ? other.getURL() == null + : getURL().equals(other.getURL()); } /** diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java b/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java index ee9c556f5..b565fef3e 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java @@ -53,10 +53,7 @@ public abstract class ResourceComparator extends DataType implements Comparator< if (isReference()) { return getCheckedRef().equals(o); } - if (o == null) { - return false; - } - return o == this || o.getClass().equals(getClass()); + return o != null && (o == this || o.getClass().equals(getClass())); } /** diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java index 8113b3fbb..18de7306d 100644 --- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java +++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java @@ -434,10 +434,8 @@ public class DOMElementWriter { } private String encode(final String value, final boolean encodeWhitespace) { - final int len = value.length(); - final StringBuilder sb = new StringBuilder(len); - for (int i = 0; i < len; i++) { - final char c = value.charAt(i); + final StringBuilder sb = new StringBuilder(value.length()); + for (final char c : value.toCharArray()) { switch (c) { case '<': sb.append("<"); @@ -522,13 +520,12 @@ public class DOMElementWriter { while (prevEnd < len) { final int end = (cdataEndPos < 0 ? len : cdataEndPos); // Write out stretches of legal characters in the range [prevEnd, end). - for (int prevLegalCharPos = prevEnd; prevLegalCharPos < end;/*empty*/) { - int illegalCharPos; - for (illegalCharPos = prevLegalCharPos; true; ++illegalCharPos) { - if (illegalCharPos >= end - || !isLegalCharacter(value.charAt(illegalCharPos))) { - break; - } + int prevLegalCharPos = prevEnd; + while (prevLegalCharPos < end) { + int illegalCharPos = prevLegalCharPos; + while (illegalCharPos < end + && isLegalCharacter(value.charAt(illegalCharPos))) { + ++illegalCharPos; } out.write(value, prevLegalCharPos, illegalCharPos - prevLegalCharPos); prevLegalCharPos = illegalCharPos + 1; diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java index 6801fc5a0..4974c2053 100644 --- a/src/main/org/apache/tools/ant/util/DateUtils.java +++ b/src/main/org/apache/tools/ant/util/DateUtils.java @@ -318,12 +318,12 @@ public final class DateUtils { } } - final private static ThreadLocal iso8601WithTimeZone = + private static final ThreadLocal iso8601WithTimeZone = ThreadLocal.withInitial(() -> { // An arbitrary easy-to-read format to normalize to. return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS Z"); }); - final private static Pattern iso8601normalizer = Pattern.compile( + private static final Pattern iso8601normalizer = Pattern.compile( "^(\\d{4,}-\\d{2}-\\d{2})[Tt ]" + // yyyy-MM-dd "(\\d{2}:\\d{2}(:\\d{2}(\\.\\d{3})?)?) ?" + // HH:mm:ss.SSS "(?:Z|([+-]\\d{2})(?::?(\\d{2}))?)?$"); // Z diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 0ca5e73c4..e7e7fa041 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -1615,7 +1615,6 @@ public class FileUtils { if (0 < toPathStack.length && 0 < fromPathStack.length) { if (!fromPathStack[0].equals(toPathStack[0])) { // not the same device (would be "" on Linux/Unix) - return getPath(Arrays.asList(toPathStack)); } } else { @@ -1623,14 +1622,11 @@ public class FileUtils { return getPath(Arrays.asList(toPathStack)); } - int minLength = Math.min(fromPathStack.length, toPathStack.length); - int same = 1; // Used outside the for loop - // get index of parts which are equal - for (; - same < minLength && fromPathStack[same].equals(toPathStack[same]); - same++) { - // Do nothing + int minLength = Math.min(fromPathStack.length, toPathStack.length); + int same = 1; + while (same < minLength && fromPathStack[same].equals(toPathStack[same])) { + same++; } List relativePathStack = new ArrayList<>(); diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java index 6dcb3aa57..f1031e1dc 100644 --- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java +++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java @@ -338,7 +338,7 @@ public class LayoutPreservingProperties extends Properties { s = "\n" + s; } else { // could be a comment, if first non-whitespace is a # or ! - comment = s.matches("^( |\t|\f)*(#|!).*"); + comment = s.matches("^([ \t\f])*([#!]).*"); } // continuation if not a comment and the line ends is an diff --git a/src/main/org/apache/tools/ant/util/LazyHashtable.java b/src/main/org/apache/tools/ant/util/LazyHashtable.java index 9ef909178..e9632b89d 100644 --- a/src/main/org/apache/tools/ant/util/LazyHashtable.java +++ b/src/main/org/apache/tools/ant/util/LazyHashtable.java @@ -29,7 +29,7 @@ import java.util.Hashtable; * @since Ant 1.6 */ @Deprecated -public class LazyHashtable extends Hashtable { +public class LazyHashtable extends Hashtable { // CheckStyle:VisibilityModifier OFF - bc protected boolean initAllDone = false; // CheckStyle:VisibilityModifier OFF - bc @@ -55,7 +55,7 @@ public class LazyHashtable extends Hashtable { * Get a enumeration over the elements. * @return an enumeration. */ - public Enumeration elements() { + public Enumeration elements() { initAll(); return super.elements(); } @@ -111,7 +111,7 @@ public class LazyHashtable extends Hashtable { * Get an enumeration over the keys. * @return an enumeration. */ - public Enumeration keys() { + public Enumeration keys() { initAll(); return super.keys(); } diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java index 1813061df..f54a79f43 100644 --- a/src/main/org/apache/tools/ant/util/ResourceUtils.java +++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java @@ -796,14 +796,9 @@ public class ResourceUtils { return false; } final FileProvider fileResource1 = resource1.as(FileProvider.class); - if (fileResource1 == null) { - return false; - } final FileProvider fileResource2 = resource2.as(FileProvider.class); - if (fileResource2 == null) { - return false; - } - return FileUtils.getFileUtils().areSame(fileResource1.getFile(), fileResource2.getFile()); + return fileResource1 != null && fileResource2 != null + && FileUtils.getFileUtils().areSame(fileResource1.getFile(), fileResource2.getFile()); } private static void log(final Project project, final String message) { diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java index ac27b99ac..8eb3561c0 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java @@ -61,9 +61,8 @@ public class Jdk14RegexpMatcher implements RegexpMatcher { */ protected Pattern getCompiledPattern(int options) throws BuildException { - int cOptions = getCompilerOptions(options); try { - return Pattern.compile(this.pattern, cOptions); + return Pattern.compile(this.pattern, getCompilerOptions(options)); } catch (PatternSyntaxException e) { throw new BuildException(e); } diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java index f165b9bba..d39d705b3 100644 --- a/src/main/org/apache/tools/bzip2/BlockSort.java +++ b/src/main/org/apache/tools/bzip2/BlockSort.java @@ -729,10 +729,8 @@ class BlockSort { } break; } // while x > 0 - else { - if ((block[i1] & 0xff) <= (block[i2] & 0xff)) { - break; - } + else if ((block[i1] & 0xff) <= (block[i2] & 0xff)) { + break; } } else if ((block[i1 + 5] & 0xff) <= (block[i2 + 5] & 0xff)) { break; diff --git a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java index 0e000e335..e4d49804f 100644 --- a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java +++ b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java @@ -74,7 +74,7 @@ public class CBZip2InputStream extends InputStream implements BZip2Constants { private int currentChar = -1; - private static final int EOF = 0; + private static final int EOF = 0; private static final int START_BLOCK_STATE = 1; private static final int RAND_PART_A_STATE = 2; private static final int RAND_PART_B_STATE = 3; @@ -85,8 +85,10 @@ public class CBZip2InputStream extends InputStream implements BZip2Constants { private int currentState = START_BLOCK_STATE; - private int storedBlockCRC, storedCombinedCRC; - private int computedBlockCRC, computedCombinedCRC; + private int storedBlockCRC; + private int storedCombinedCRC; + private int computedBlockCRC; + private int computedCombinedCRC; // Variables used by setup* methods exclusively diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java index c5658129f..e7fe56177 100644 --- a/src/main/org/apache/tools/tar/TarEntry.java +++ b/src/main/org/apache/tools/tar/TarEntry.java @@ -343,10 +343,7 @@ public class TarEntry implements TarConstants { */ @Override public boolean equals(Object it) { - if (it == null || getClass() != it.getClass()) { - return false; - } - return equals((TarEntry) it); + return it != null && getClass() == it.getClass() && equals((TarEntry) it); } /** @@ -425,7 +422,7 @@ public class TarEntry implements TarConstants { */ @Deprecated public int getUserId() { - return (int) (userId & 0xffffffff); + return (int) userId; } /** @@ -466,7 +463,7 @@ public class TarEntry implements TarConstants { */ @Deprecated public int getGroupId() { - return (int) (groupId & 0xffffffff); + return (int) groupId; } /** @@ -753,13 +750,8 @@ public class TarEntry implements TarConstants { * @return true if it is a 'normal' file */ public boolean isFile() { - if (file != null) { - return file.isFile(); - } - if (linkFlag == LF_OLDNORM || linkFlag == LF_NORMAL) { - return true; - } - return !getName().endsWith("/"); + return file != null ? file.isFile() + : linkFlag == LF_OLDNORM || linkFlag == LF_NORMAL || !getName().endsWith("/"); } /** diff --git a/src/main/org/apache/tools/zip/ZipEightByteInteger.java b/src/main/org/apache/tools/zip/ZipEightByteInteger.java index c76b5d04c..46ba932d5 100644 --- a/src/main/org/apache/tools/zip/ZipEightByteInteger.java +++ b/src/main/org/apache/tools/zip/ZipEightByteInteger.java @@ -207,10 +207,8 @@ public final class ZipEightByteInteger { */ @Override public boolean equals(Object o) { - if (o instanceof ZipEightByteInteger) { - return value.equals(((ZipEightByteInteger) o).getValue()); - } - return false; + return o instanceof ZipEightByteInteger + && value.equals(((ZipEightByteInteger) o).getValue()); } /** diff --git a/src/main/org/apache/tools/zip/ZipLong.java b/src/main/org/apache/tools/zip/ZipLong.java index a84da7066..69d6ca41d 100644 --- a/src/main/org/apache/tools/zip/ZipLong.java +++ b/src/main/org/apache/tools/zip/ZipLong.java @@ -168,10 +168,7 @@ public final class ZipLong implements Cloneable { */ @Override public boolean equals(Object o) { - if (o instanceof ZipLong) { - return value == ((ZipLong) o).getValue(); - } - return false; + return o instanceof ZipLong && value == ((ZipLong) o).getValue(); } /** diff --git a/src/main/org/apache/tools/zip/ZipShort.java b/src/main/org/apache/tools/zip/ZipShort.java index e18c0d443..3dbe2cb5e 100644 --- a/src/main/org/apache/tools/zip/ZipShort.java +++ b/src/main/org/apache/tools/zip/ZipShort.java @@ -133,10 +133,7 @@ public final class ZipShort implements Cloneable { */ @Override public boolean equals(Object o) { - if (o instanceof ZipShort) { - return value == ((ZipShort) o).getValue(); - } - return false; + return o instanceof ZipShort && value == ((ZipShort) o).getValue(); } /** diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/DirnameTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/DirnameTest.java index 9fc03c7b0..bc0d127f6 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/DirnameTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/DirnameTest.java @@ -29,6 +29,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.io.File; + /** */ public class DirnameTest { @@ -75,8 +77,7 @@ public class DirnameTest { public void test4() { assumeFalse("Test not possible on DOS or Netware family OS", Os.isFamily("netware") || Os.isFamily("dos")); buildRule.executeTarget("test4"); - String filesep = System.getProperty("file.separator"); - String expected = filesep + "usr" + filesep + "local"; + String expected = File.separator + "usr" + File.separator + "local"; String checkprop = buildRule.getProject().getProperty("local.dir"); assertEquals("dirname failed", expected, checkprop); }