From 32b7fd75971a44c43cf87a8341df1ba81443b45e Mon Sep 17 00:00:00 2001 From: Andrey Bruykhov Date: Thu, 2 Feb 2023 23:06:38 +0300 Subject: [PATCH] Using static modifier to normalize methods contract and performance --- .../org/apache/tools/ant/AntClassLoader.java | 2 +- .../apache/tools/ant/AntTypeDefinition.java | 2 +- .../tools/ant/ArgumentProcessorRegistry.java | 6 +++--- .../org/apache/tools/ant/ComponentHelper.java | 4 ++-- .../apache/tools/ant/DirectoryScanner.java | 2 +- .../apache/tools/ant/IntrospectionHelper.java | 20 +++++++++---------- .../tools/ant/ProjectHelperRepository.java | 6 +++--- .../org/apache/tools/ant/PropertyHelper.java | 2 +- .../apache/tools/ant/RuntimeConfigurable.java | 4 ++-- src/main/org/apache/tools/ant/XmlLogger.java | 4 ++-- .../tools/ant/helper/ProjectHelper2.java | 2 +- .../org/apache/tools/ant/launch/Launcher.java | 4 ++-- .../apache/tools/ant/listener/MailLogger.java | 6 +++--- .../tools/ant/taskdefs/AbstractCvsTask.java | 4 ++-- .../tools/ant/taskdefs/AntStructure.java | 4 ++-- .../org/apache/tools/ant/taskdefs/Antlib.java | 2 +- .../apache/tools/ant/taskdefs/Basename.java | 2 +- .../apache/tools/ant/taskdefs/Checksum.java | 2 +- .../org/apache/tools/ant/taskdefs/Copy.java | 2 +- .../org/apache/tools/ant/taskdefs/Delete.java | 2 +- .../apache/tools/ant/taskdefs/Deltree.java | 2 +- .../apache/tools/ant/taskdefs/DependSet.java | 6 +++--- .../apache/tools/ant/taskdefs/ExecTask.java | 6 +++--- .../org/apache/tools/ant/taskdefs/Exit.java | 2 +- .../apache/tools/ant/taskdefs/HostInfo.java | 4 ++-- .../apache/tools/ant/taskdefs/ImportTask.java | 6 +++--- .../org/apache/tools/ant/taskdefs/Jar.java | 2 +- .../org/apache/tools/ant/taskdefs/Java.java | 4 ++-- .../org/apache/tools/ant/taskdefs/Javac.java | 4 ++-- .../apache/tools/ant/taskdefs/Javadoc.java | 16 +++++++-------- .../tools/ant/taskdefs/MacroInstance.java | 2 +- .../apache/tools/ant/taskdefs/MakeUrl.java | 2 +- .../tools/ant/taskdefs/ManifestTask.java | 4 ++-- .../org/apache/tools/ant/taskdefs/Mkdir.java | 2 +- .../org/apache/tools/ant/taskdefs/Pack.java | 2 +- .../tools/ant/taskdefs/PathConvert.java | 2 +- .../apache/tools/ant/taskdefs/Property.java | 2 +- .../tools/ant/taskdefs/PumpStreamHandler.java | 4 ++-- .../apache/tools/ant/taskdefs/Replace.java | 4 ++-- .../org/apache/tools/ant/taskdefs/Rmic.java | 2 +- .../org/apache/tools/ant/taskdefs/SubAnt.java | 2 +- .../org/apache/tools/ant/taskdefs/Unpack.java | 2 +- .../org/apache/tools/ant/taskdefs/Zip.java | 4 ++-- .../compilers/DefaultCompilerAdapter.java | 2 +- .../ant/taskdefs/compilers/JavacExternal.java | 2 +- .../ant/taskdefs/condition/AntVersion.java | 2 +- .../ant/taskdefs/condition/IsReachable.java | 2 +- .../taskdefs/condition/ParserSupports.java | 2 +- .../ant/taskdefs/cvslib/ChangeLogTask.java | 2 +- .../tools/ant/taskdefs/cvslib/CvsTagDiff.java | 2 +- .../ant/taskdefs/email/EmailAddress.java | 2 +- .../ant/taskdefs/email/JakartaMimeMailer.java | 2 +- .../tools/ant/taskdefs/email/Mailer.java | 2 +- .../tools/ant/taskdefs/email/MimeMailer.java | 2 +- .../taskdefs/launcher/VmsCommandLauncher.java | 4 ++-- .../ant/taskdefs/optional/EchoProperties.java | 2 +- .../ant/taskdefs/optional/PropertyFile.java | 2 +- .../ant/taskdefs/optional/SchemaValidate.java | 2 +- .../ant/taskdefs/optional/TraXLiaison.java | 2 +- .../ant/taskdefs/optional/depend/Depend.java | 8 ++++---- .../optional/depend/DirectoryIterator.java | 2 +- .../optional/ejb/BorlandDeploymentTool.java | 4 ++-- .../optional/ejb/JonasDeploymentTool.java | 6 +++--- .../optional/extension/Extension.java | 2 +- .../extension/JarLibManifestTask.java | 4 ++-- .../optional/extension/LibraryDisplayer.java | 6 +++--- .../optional/extension/Specification.java | 2 +- .../ant/taskdefs/optional/javacc/JJTree.java | 2 +- .../ant/taskdefs/optional/javacc/JavaCC.java | 2 +- .../ant/taskdefs/optional/javah/Gcjh.java | 2 +- .../ant/taskdefs/optional/javah/Kaffeh.java | 2 +- .../taskdefs/optional/jlink/JlinkTask.java | 2 +- .../ant/taskdefs/optional/jlink/jlink.java | 2 +- .../taskdefs/optional/jsp/JspNameMangler.java | 4 ++-- .../taskdefs/optional/junit/JUnitTask.java | 4 ++-- .../optional/junit/JUnitTestRunner.java | 4 ++-- .../junit/XMLJUnitResultFormatter.java | 2 +- .../AbstractJUnitResultFormatter.java | 2 +- .../native2ascii/BuiltinNative2Ascii.java | 6 +++--- .../ant/taskdefs/optional/pvcs/Pvcs.java | 2 +- .../optional/sound/AntSoundPlayer.java | 4 ++-- .../optional/ssh/AbstractSshMessage.java | 2 +- .../ant/taskdefs/optional/ssh/SSHExec.java | 2 +- .../tools/ant/taskdefs/optional/ssh/Scp.java | 4 ++-- .../taskdefs/optional/testing/Funtest.java | 2 +- .../ant/taskdefs/optional/vss/MSVSS.java | 2 +- .../ant/taskdefs/rmic/DefaultRmicAdapter.java | 2 +- .../tools/ant/types/AbstractFileSet.java | 2 +- .../org/apache/tools/ant/types/DataType.java | 2 +- .../apache/tools/ant/types/Permissions.java | 4 ++-- .../apache/tools/ant/types/PropertySet.java | 2 +- .../apache/tools/ant/types/XMLCatalog.java | 2 +- .../ant/types/optional/imageio/Rotate.java | 2 +- .../resources/comparators/FileSystem.java | 4 ++-- .../ant/util/LayoutPreservingProperties.java | 20 +++++++++---------- .../tools/ant/util/ScriptFixBSFPath.java | 2 +- .../org/apache/tools/ant/util/UUEncoder.java | 2 +- .../ant/util/depend/AbstractAnalyzer.java | 2 +- .../ant/util/optional/JavaxScriptRunner.java | 2 +- .../org/apache/tools/bzip2/BlockSort.java | 8 ++++---- src/main/org/apache/tools/tar/TarEntry.java | 4 ++-- .../org/apache/tools/tar/TarOutputStream.java | 16 +++++++-------- src/main/org/apache/tools/zip/ZipEntry.java | 4 ++-- src/main/org/apache/tools/zip/ZipFile.java | 2 +- .../org/apache/tools/zip/ZipOutputStream.java | 6 +++--- 105 files changed, 188 insertions(+), 188 deletions(-) diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index 9560f98158..e93e9feff9 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -1140,7 +1140,7 @@ protected synchronized Class loadClass(final String classname, final boolean * * @return the classname in filesystem format (eg java/lang/Integer.class) */ - private String getClassFilename(final String classname) { + private static String getClassFilename(final String classname) { return classname.replace('.', '/') + ".class"; } diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java index c645a948d0..6768f0d60b 100644 --- a/src/main/org/apache/tools/ant/AntTypeDefinition.java +++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java @@ -372,7 +372,7 @@ public boolean similarDefinition(AntTypeDefinition other, Project project) { .equals(((AntClassLoader) newLoader).getClasspath())); } - private String extractClassname(Class c) { + private static String extractClassname(Class c) { return (c == null) ? "" : c.getName(); } } diff --git a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java index 2a36399a69..a2e2a57ca1 100644 --- a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java +++ b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java @@ -107,7 +107,7 @@ public void registerArgumentProcessor( registerArgumentProcessor(getProcessor(helperClass)); } - private ArgumentProcessor getProcessor(String helperClassName) { + private static ArgumentProcessor getProcessor(String helperClassName) { try { @SuppressWarnings("unchecked") Class< ? extends ArgumentProcessor> cl = (Class< ? extends ArgumentProcessor>) Class.forName(helperClassName); @@ -118,7 +118,7 @@ private ArgumentProcessor getProcessor(String helperClassName) { } } - private ArgumentProcessor getProcessor( + private static ArgumentProcessor getProcessor( Class< ? extends ArgumentProcessor> processorClass) { ArgumentProcessor processor; try { @@ -143,7 +143,7 @@ public void registerArgumentProcessor(ArgumentProcessor processor) { } } - private ArgumentProcessor getProcessorByService(InputStream is) + private static ArgumentProcessor getProcessorByService(InputStream is) throws IOException { try (BufferedReader rd = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { String processorClassName = rd.readLine(); diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index 0011c19c88..af109cf478 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -1027,7 +1027,7 @@ private void printUnknownDefinition(PrintWriter out, String componentName, Strin /** * Print class not found. */ - private void printClassNotFound(PrintWriter out, String classname, boolean optional, + private static void printClassNotFound(PrintWriter out, String classname, boolean optional, String dirListing) { out.println("Cause: the class " + classname + " was not found."); if (optional) { @@ -1044,7 +1044,7 @@ private void printClassNotFound(PrintWriter out, String classname, boolean optio /** * Print could not load dependent class. */ - private void printNotLoadDependentClass(PrintWriter out, boolean optional, + private static void printNotLoadDependentClass(PrintWriter out, boolean optional, NoClassDefFoundError ncdfe, String dirListing) { out.println("Cause: Could not load a dependent class " + ncdfe.getMessage()); diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index b7f6479992..ce1695e0ee 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -1438,7 +1438,7 @@ && isMorePowerfulThanExcludes(tokenizedName.toString()) * @return whether the pattern is deeper than the name. * @since Ant 1.6.3 */ - private boolean isDeeper(final TokenizedPattern pattern, final TokenizedPath name) { + private static boolean isDeeper(final TokenizedPattern pattern, final TokenizedPath name) { return pattern.containsPattern(SelectorUtils.DEEP_TREE_MATCH) || pattern.depth() > name.depth(); } diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index b61a6de087..4aad7cac29 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -313,7 +313,7 @@ private IntrospectionHelper(final Class bean) { * @param type the type of the set method's parameter * @return true if the given set method is to be hidden. */ - private boolean isHiddenSetMethod(final String name, final Class type) { + private static boolean isHiddenSetMethod(final String name, final Class type) { return "setLocation".equals(name) && Location.class.equals(type) || "setTaskType".equals(name) && String.class.equals(type); } @@ -517,7 +517,7 @@ public void addText(final Project project, final Object element, String text) * @param parent the object which doesn't support a requested element * @param elementName the name of the Element which is trying to be created. */ - public void throwNotSupported(final Project project, final Object parent, final String elementName) { + public static void throwNotSupported(final Project project, final Object parent, final String elementName) { final String msg = project.getElementName(parent) + NOT_SUPPORTED_CHILD_PREFIX + elementName + NOT_SUPPORTED_CHILD_POSTFIX; @@ -581,7 +581,7 @@ Object create(final Project project, final Object parent, final Object ignore) { * * @since Ant 1.8.0. */ - private Object createDynamicElement(final Object parent, final String ns, + private static Object createDynamicElement(final Object parent, final String ns, final String localName, final String qName) { Object nestedElement = null; if (parent instanceof DynamicElementNS) { @@ -1035,7 +1035,7 @@ public List getExtensionPoints() { * @return an appropriate AttributeSetter instance, or null * if no appropriate conversion is available. */ - private AttributeSetter createAttributeSetter(final Method m, + private static AttributeSetter createAttributeSetter(final Method m, final Class arg, final String attrName) { if (Optional.class.equals(arg)) { @@ -1274,7 +1274,7 @@ public Object toTargetType(Project project, String value) { }; } - private AttributeSetter getEnumSetter( + private static AttributeSetter getEnumSetter( final Class reflectedArg, final Method m, final Class arg) { if (reflectedArg.isEnum()) { return new AttributeSetter(m, arg) { @@ -1308,7 +1308,7 @@ public Enum toTargetType(Project project, String value) { * * @return a description of the element type */ - private String getElementName(final Project project, final Object element) { + private static String getElementName(final Project project, final Object element) { return project.getElementName(element); } @@ -1672,7 +1672,7 @@ private void insertAddTypeMethod(final Method method) { * @param methods the List of methods to search. * @return a matching Method; null if none found. */ - private Method findMatchingMethod(final Class paramClass, final List methods) { + private static Method findMatchingMethod(final Class paramClass, final List methods) { if (paramClass == null) { return null; } @@ -1694,7 +1694,7 @@ private Method findMatchingMethod(final Class paramClass, final List return matchedMethod; } - private String condenseText(final String text) { + private static String condenseText(final String text) { if (text.length() <= MAX_REPORT_NESTED_TEXT) { return text; } @@ -1715,7 +1715,7 @@ public MethodAndObject(final Method method, final Object object) { /** * */ - private AntTypeDefinition findRestrictedDefinition( + private static AntTypeDefinition findRestrictedDefinition( final ComponentHelper helper, final String componentName, final List methods) { AntTypeDefinition definition = null; Class matchedDefinitionClass = null; @@ -1747,7 +1747,7 @@ private AntTypeDefinition findRestrictedDefinition( return definition; } - private MethodAndObject createRestricted( + private static MethodAndObject createRestricted( final ComponentHelper helper, final String elementName, final List addTypeMethods) { final Project project = helper.getProject(); diff --git a/src/main/org/apache/tools/ant/ProjectHelperRepository.java b/src/main/org/apache/tools/ant/ProjectHelperRepository.java index 8bee97f91d..3b982c82ab 100644 --- a/src/main/org/apache/tools/ant/ProjectHelperRepository.java +++ b/src/main/org/apache/tools/ant/ProjectHelperRepository.java @@ -159,7 +159,7 @@ private void registerProjectHelper(Constructor helperCo helpers.add(helperConstructor); } - private Constructor getProjectHelperBySystemProperty() { + private static Constructor getProjectHelperBySystemProperty() { String helperClass = System.getProperty(MagicNames.PROJECT_HELPER_CLASS); try { if (helperClass != null) { @@ -177,7 +177,7 @@ private Constructor getProjectHelperBySystemProperty() return null; } - private Constructor getProjectHelperByService(InputStream is) { + private static Constructor getProjectHelperByService(InputStream is) { try { // This code is needed by EBCDIC and other strange systems. // It's a fix for bugs reported in xerces @@ -214,7 +214,7 @@ private Constructor getProjectHelperByService(InputStre * if the class cannot be found or if a constructor with no * argument cannot be found. */ - private Constructor getHelperConstructor(String helperClass) throws BuildException { + private static Constructor getHelperConstructor(String helperClass) throws BuildException { ClassLoader classLoader = LoaderUtils.getContextClassLoader(); try { Class clazz = null; diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java index 99d1a29ae5..0bc81d00f5 100644 --- a/src/main/org/apache/tools/ant/PropertyHelper.java +++ b/src/main/org/apache/tools/ant/PropertyHelper.java @@ -182,7 +182,7 @@ public interface PropertyEnumerator extends Delegate { // -------------------------------------------------------- private static final PropertyEvaluator TO_STRING = new PropertyEvaluator() { - private final String PREFIX = "toString:"; + private static final String PREFIX = "toString:"; private final int PREFIX_LEN = PREFIX.length(); public Object evaluate(String property, PropertyHelper propertyHelper) { diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java index 001c9d8aa9..4869aa1fb3 100644 --- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java +++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java @@ -150,7 +150,7 @@ public boolean isRestricted() { * @param componentHelper current component helper * @return AttributeComponentInformation instance */ - private AttributeComponentInformation isRestrictedAttribute(String name, ComponentHelper componentHelper) { + private static AttributeComponentInformation isRestrictedAttribute(String name, ComponentHelper componentHelper) { if (!name.contains(":")) { return new AttributeComponentInformation(null, false); } @@ -211,7 +211,7 @@ public boolean isEnabled(UnknownElement owner) { return true; } - private String attrToComponent(String a) { + private static String attrToComponent(String a) { // need to remove the prefix int p1 = a.lastIndexOf(':'); int p2 = a.lastIndexOf(':', p1 - 1); diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java index 14a82115a7..93e39a9c70 100644 --- a/src/main/org/apache/tools/ant/XmlLogger.java +++ b/src/main/org/apache/tools/ant/XmlLogger.java @@ -197,7 +197,7 @@ public void buildFinished(BuildEvent event) { buildElement = null; } - private String getProperty(BuildEvent event, String propertyName, String defaultValue) { + private static String getProperty(BuildEvent event, String propertyName, String defaultValue) { String rv = defaultValue; if (event != null && event.getProject() != null && event.getProject().getProperty(propertyName) != null) { rv = event.getProject().getProperty(propertyName); @@ -469,7 +469,7 @@ public void setEmacsMode(boolean emacsMode) { public void setErrorPrintStream(PrintStream err) { } - private void synchronizedAppend(Node parent, Node child) { + private static void synchronizedAppend(Node parent, Node child) { synchronized (parent) { parent.appendChild(child); } diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index f5785b1377..7346e9c99a 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java @@ -1049,7 +1049,7 @@ public void onStartElement(String uri, String tag, String qname, Attributes attr } } - private String getTargetPrefix(AntXMLContext context) { + private static String getTargetPrefix(AntXMLContext context) { String configuredValue = getCurrentTargetPrefix(); if (configuredValue != null && configuredValue.isEmpty()) { configuredValue = null; diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java index cad635907b..6d5652e820 100644 --- a/src/main/org/apache/tools/ant/launch/Launcher.java +++ b/src/main/org/apache/tools/ant/launch/Launcher.java @@ -356,7 +356,7 @@ private URL[] getSystemURLs(final File antLauncherDir) throws MalformedURLExcept * @return the URLS from the user's lib dir * @throws MalformedURLException if the URLs cannot be created. */ - private URL[] getUserURLs() throws MalformedURLException { + private static URL[] getUserURLs() throws MalformedURLException { final File userLibDir = new File(System.getProperty(USER_HOMEDIR), USER_LIBDIR); @@ -372,7 +372,7 @@ private URL[] getUserURLs() throws MalformedURLException { * @return a combined array * @throws MalformedURLException if there is a problem. */ - private URL[] getJarArray(final URL[] libJars, final URL[] userJars, + private static URL[] getJarArray(final URL[] libJars, final URL[] userJars, final URL[] systemJars, final File toolsJar) throws MalformedURLException { int numJars = libJars.length + userJars.length + systemJars.length; diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java index 897f0000bf..3d3a89ff8a 100644 --- a/src/main/org/apache/tools/ant/listener/MailLogger.java +++ b/src/main/org/apache/tools/ant/listener/MailLogger.java @@ -322,7 +322,7 @@ protected void log(String message) { * Set to null to make required. * @return The value of the property, or default value. */ - private String getValue(Map properties, String name, + private static String getValue(Map properties, String name, String defaultValue) { String propertyName = "MailLogger." + name; String value = (String) properties.get(propertyName); @@ -345,7 +345,7 @@ private String getValue(Map properties, String name, * @param message mail body * @exception IOException thrown if sending message fails */ - private void sendMail(Values values, String message) throws IOException { + private static void sendMail(Values values, String message) throws IOException { MailMessage mailMessage = new MailMessage( values.mailhost(), values.port()); mailMessage.setHeader("Date", DateUtils.getDateForHeader()); @@ -422,7 +422,7 @@ private void sendMimeMail(Project project, Values values, String message) { mailer.send(); } - private Vector splitEmailAddresses(String listString) { + private static Vector splitEmailAddresses(String listString) { return Stream.of(listString.split(",")).map(EmailAddress::new) .collect(Collectors.toCollection(Vector::new)); } diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index 4dc2a77513..1e1d6d9a47 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -414,7 +414,7 @@ public void execute() throws BuildException { } } - private String executeToString(Execute execute) { + private static String executeToString(Execute execute) { String cmdLine = Commandline.describeCommand(execute .getCommandline()); @@ -437,7 +437,7 @@ private String executeToString(Execute execute) { * @param cmdLine the CVS command line * @return a StringBuffer where the password has been removed (if available) */ - private StringBuilder removeCvsPassword(String cmdLine) { + private static StringBuilder removeCvsPassword(String cmdLine) { StringBuilder buf = new StringBuilder(cmdLine); int start = cmdLine.indexOf("-d:"); diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 5978ee0381..5fb1d79bee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -184,7 +184,7 @@ public void printHead(final PrintWriter out, final Project p, final HashtableBasically this prints the XML declaration, defines some * entities and the project element.

*/ - private void printHead(final PrintWriter out, final Set tasks, + private static void printHead(final PrintWriter out, final Set tasks, final Set types) { out.println(""); out.println(""); @@ -229,7 +229,7 @@ public void printTargetDecl(final PrintWriter out) { /** * Prints the definition for the target element. */ - private void printTargetAttrs(final PrintWriter out, final String tag) { + private static void printTargetAttrs(final PrintWriter out, final String tag) { out.print(" map) { + private static String getPath(Map map) { String p = map.get("PATH"); return p != null ? p : map.get("Path"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 6ef274bd73..8b4f45ee6b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java @@ -164,7 +164,7 @@ public void execute() throws BuildException { } } - private boolean isNullOrEmpty(Object value) { + private static boolean isNullOrEmpty(Object value) { return value == null || "".equals(value); } diff --git a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java index 14d8096fa4..ddbb495e16 100644 --- a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java @@ -146,7 +146,7 @@ private void executeLocal() { } } - private boolean hasHostName(InetAddress addr) { + private static boolean hasHostName(InetAddress addr) { return !addr.getHostAddress().equals(addr.getCanonicalHostName()); } @@ -164,7 +164,7 @@ private void selectAddresses() { nameAddr = selectBestAddress(best4, best6); } - private InetAddress selectBestAddress(InetAddress bestSoFar, + private static InetAddress selectBestAddress(InetAddress bestSoFar, InetAddress current) { InetAddress best = bestSoFar; if (best == null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java index 79685cef01..0be24aa589 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java @@ -265,12 +265,12 @@ private Resource getFileAttributeResource() { return null; } - private boolean isExistingAbsoluteFile(String name) { + private static boolean isExistingAbsoluteFile(String name) { File f = new File(name); return f.isAbsolute() && f.exists(); } - private boolean hasAlreadyBeenImported(Resource importedResource, + private static boolean hasAlreadyBeenImported(Resource importedResource, Vector importStack) { File importedFile = importedResource.asOptional(FileProvider.class) .map(FileProvider::getFile).orElse(null); @@ -282,7 +282,7 @@ private boolean hasAlreadyBeenImported(Resource importedResource, o -> isOneOf(o, importedResource, importedFile, importedURL)); } - private boolean isOneOf(Object o, Resource importedResource, + private static boolean isOneOf(Object o, Resource importedResource, File importedFile, URL importedURL) { if (o.equals(importedResource) || o.equals(importedFile) || o.equals(importedURL)) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 0c7bff9528..e980a50a97 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -361,7 +361,7 @@ private Manifest getManifest(Reader r) { } } - private boolean jarHasIndex(File jarFile) throws IOException { + private static boolean jarHasIndex(File jarFile) throws IOException { try (ZipFile zf = new ZipFile(jarFile)) { return StreamUtils.enumerationAsStream(zf.entries()) .anyMatch(ze -> INDEX_NAME.equalsIgnoreCase(ze.getName())); diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index 7c55bbe6e5..dc272afcf1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -985,7 +985,7 @@ private void setupWorkingDir(Execute exe) { * @param exe executable. * @param command command to execute. */ - private void setupCommandLine(Execute exe, String[] command) { + private static void setupCommandLine(Execute exe, String[] command) { //On VMS platform, we need to create a special java options file //containing the arguments and classpath for the java command. //The special file is supported by the "-V" switch on the VMS JVM. @@ -1004,7 +1004,7 @@ private void setupCommandLine(Execute exe, String[] command) { * @param exe executable. * @param command command to execute. */ - private void setupCommandLineForVMS(Execute exe, String[] command) { + private static void setupCommandLineForVMS(Execute exe, String[] command) { ExecuteJava.setupCommandLineForVMS(exe, command); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index f79a4aaca6..ae8e3065aa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -144,7 +144,7 @@ public Javac() { facade = new FacadeTaskHelper(assumedJavaVersion()); } - private String assumedJavaVersion() { + private static String assumedJavaVersion() { if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_8)) { return CompilerAdapterFactory.COMPILER_JAVAC_1_8; } @@ -942,7 +942,7 @@ public String[] getCurrentCompilerArgs() { } } - private String getAltCompilerName(final String anImplementation) { + private static String getAltCompilerName(final String anImplementation) { if (CompilerAdapterFactory.isModernJdkCompiler(anImplementation)) { return CompilerAdapterFactory.COMPILER_MODERN; } diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index efee9d3223..2087aaab54 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1954,7 +1954,7 @@ private void checkPackageAndSourcePath() { } } - private void checkPackages(final List packagesToDoc, final Path sourceDirs) { + private static void checkPackages(final List packagesToDoc, final Path sourceDirs) { if (!packagesToDoc.isEmpty() && sourceDirs.isEmpty()) { throw new BuildException( "sourcePath attribute must be set when specifying package names."); @@ -1970,7 +1970,7 @@ private void checkPackagesToDoc( } } - private void doSourcePath(final Commandline toExecute, final Path sourceDirs) { + private static void doSourcePath(final Commandline toExecute, final Path sourceDirs) { if (!sourceDirs.isEmpty()) { toExecute.createArgument().setValue("-sourcepath"); toExecute.createArgument().setPath(sourceDirs); @@ -2285,7 +2285,7 @@ private void doDocFilesSubDirs(final Commandline toExecute) { } } - private void doSourceAndPackageNames( + private static void doSourceAndPackageNames( final Commandline toExecute, final List packagesToDoc, final List sourceFilesToDoc, @@ -2329,7 +2329,7 @@ private void doSourceAndPackageNames( * @return the quoted string, if there is no need to quote the string, * return the original string. */ - private String quoteString(final String str) { + private static String quoteString(final String str) { if (!containsWhitespace(str) && !str.contains("'") && !str.contains("\"")) { return str; @@ -2340,7 +2340,7 @@ private String quoteString(final String str) { return quoteString(str, '"'); } - private boolean containsWhitespace(final String s) { + private static boolean containsWhitespace(final String s) { for (char c : s.toCharArray()) { if (Character.isWhitespace(c)) { return true; @@ -2349,7 +2349,7 @@ private boolean containsWhitespace(final String s) { return false; } - private String quoteString(final String str, final char delim) { + private static String quoteString(final String str, final char delim) { final StringBuilder buf = new StringBuilder(str.length() * 2); buf.append(delim); boolean lastCharWasCR = false; @@ -2576,12 +2576,12 @@ private int postProcess(final File file, final String fixData) throws IOExceptio return 0; } - private String fixLineFeeds(final String orig) { + private static String fixLineFeeds(final String orig) { return orig.replace("\r\n", "\n") .replace("\n", System.lineSeparator()); } - private String patchContent(final String fileContents, final String fixData) { + private static String patchContent(final String fileContents, final String fixData) { // using regexes here looks like overkill final int start = fileContents.indexOf(LOAD_FRAME); if (start >= 0) { diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java index 077b6d5fd2..7ce6b99a47 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java @@ -166,7 +166,7 @@ public List getUnknownElements() { private static final int STATE_EXPECT_BRACKET = 1; private static final int STATE_EXPECT_NAME = 2; - private String macroSubs(String s, Map macroMapping) { + private static String macroSubs(String s, Map macroMapping) { if (s == null) { return null; } diff --git a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java index 69af070c5e..0268149874 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java +++ b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java @@ -277,7 +277,7 @@ private void validate() { * @param fileToConvert File * @return the file converted to a URL */ - private String toURL(File fileToConvert) { + private static String toURL(File fileToConvert) { //create the URL //ant equivalent of fileToConvert.toURI().toURL().toExternalForm(); return FileUtils.getFileUtils().toURI(fileToConvert.getAbsolutePath()); diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java index f344a6b292..93468da2ad 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java @@ -113,7 +113,7 @@ public ManifestTask() { public void addConfiguredSection(Manifest.Section section) throws ManifestException { StreamUtils.enumerationAsStream(section.getAttributeKeys()) - .map(section::getAttribute).forEach(this::checkAttribute); + .map(section::getAttribute).forEach(ManifestTask::checkAttribute); nestedManifest.addConfiguredSection(section); } @@ -147,7 +147,7 @@ public void addConfiguredAttribute(Manifest.Attribute attribute) * @param attribute The attribute to check * @throws BuildException if the check fails */ - private void checkAttribute(Manifest.Attribute attribute) throws BuildException { + private static void checkAttribute(Manifest.Attribute attribute) throws BuildException { String name = attribute.getName(); char ch = name.charAt(0); diff --git a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java index a69050de59..9c11354df9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java +++ b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java @@ -100,7 +100,7 @@ public File getDir() { * directories on WinXP. If the mkdirs does not work, * wait a little and try again. */ - private boolean mkdirs(File f) { + private static boolean mkdirs(File f) { if (!f.mkdirs()) { try { Thread.sleep(MKDIR_RETRY_SLEEP_MILLIS); diff --git a/src/main/org/apache/tools/ant/taskdefs/Pack.java b/src/main/org/apache/tools/ant/taskdefs/Pack.java index eaf3f3b49d..55ef37a201 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Pack.java +++ b/src/main/org/apache/tools/ant/taskdefs/Pack.java @@ -152,7 +152,7 @@ public void execute() throws BuildException { * @param zOut the output stream * @throws IOException if something goes wrong */ - private void zipFile(InputStream in, OutputStream zOut) + private static void zipFile(InputStream in, OutputStream zOut) throws IOException { byte[] buffer = new byte[BUFFER_SIZE]; int count = 0; diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index 45b2a6e5b0..ce91de3deb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java @@ -547,7 +547,7 @@ private void validateSetup() throws BuildException { * child elements if the refid attribute is set. * @return BuildException. */ - private BuildException noChildrenAllowed() { + private static BuildException noChildrenAllowed() { return new BuildException( "You must not specify nested elements when using the refid attribute."); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java index cd930dbbd7..661fec114e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -607,7 +607,7 @@ protected void loadUrl(URL url) throws BuildException { * @see "http://java.sun.com/dtd/properties.dtd" * @see java.util.Properties#loadFromXML(InputStream) */ - private void loadProperties( + private static void loadProperties( Properties props, InputStream is, boolean isXml) throws IOException { if (isXml) { // load the xml based property definition diff --git a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java index 0a856cb49a..9ad2bbb469 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java @@ -161,7 +161,7 @@ public void stop() { private static final long JOIN_TIMEOUT = 200; - private void start(Thread t) { + private static void start(Thread t) { if (t != null) { t.start(); } @@ -176,7 +176,7 @@ private void start(Thread t) { * @param t Thread * @since Ant 1.8.0 */ - protected final void finish(Thread t) { + protected static final void finish(Thread t) { if (t == null) { // nothing to terminate return; diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 66cdef43b4..ae0aea3bae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -918,7 +918,7 @@ private Replacefilter createPrimaryfilter() { * @param str1 String * @param str2 String */ - private void stringReplace(StringBuilder str, String str1, String str2) { + private static void stringReplace(StringBuilder str, String str1, String str2) { int found = str.indexOf(str1); final int str1Length = str1.length(); final int str2Length = str2.length(); @@ -934,7 +934,7 @@ private void stringReplace(StringBuilder str, String str1, String str2) { * * @param props Properties */ - private Iterator getOrderedIterator(Properties props) { + private static Iterator getOrderedIterator(Properties props) { List keys = new ArrayList<>(props.stringPropertyNames()); keys.sort(Comparator.comparingInt(String::length).reversed()); return keys.iterator(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index ece5a9475f..d24eab8331 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -804,7 +804,7 @@ public Class getRemoteInterface(Class testClass) { * Check to see if the class or (super)interfaces implement * java.rmi.Remote. */ - private boolean isValidRmiRemote(Class testClass) { + private static boolean isValidRmiRemote(Class testClass) { return Remote.class.isAssignableFrom(testClass); } diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java index 6e09032cc8..19b69ba2f5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java +++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java @@ -325,7 +325,7 @@ private void execute(File file, File directory) } /** whether we should even try to continue after this error */ - private boolean isHardError(Throwable t) { + private static boolean isHardError(Throwable t) { if (t instanceof BuildException) { return isHardError(t.getCause()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Unpack.java b/src/main/org/apache/tools/ant/taskdefs/Unpack.java index bee0bdf610..3d9dbddd24 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Unpack.java +++ b/src/main/org/apache/tools/ant/taskdefs/Unpack.java @@ -198,7 +198,7 @@ protected boolean supportsNonFileResources() { return false; } - private String getLastNamePart(Resource r) { + private static String getLastNamePart(Resource r) { String n = r.getName(); int idx = n.lastIndexOf('/'); return idx < 0 ? n : n.substring(idx + 1); diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index b694057564..8bba677cb8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -1737,7 +1737,7 @@ protected void zipDir(final Resource dir, final ZipOutputStream zOut, final Stri * @return ZipExtraField[] * @since Ant 1.8.0 */ - protected final ZipExtraField[] getCurrentExtraFields() { + protected static final ZipExtraField[] getCurrentExtraFields() { return CURRENT_ZIP_EXTRA.get(); } @@ -1747,7 +1747,7 @@ protected final ZipExtraField[] getCurrentExtraFields() { * @param extra ZipExtraField[] * @since Ant 1.8.0 */ - protected final void setCurrentExtraFields(final ZipExtraField[] extra) { + protected static final void setCurrentExtraFields(final ZipExtraField[] extra) { CURRENT_ZIP_EXTRA.set(extra); } 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 cf3ec45f3f..9d28492ea8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -943,7 +943,7 @@ private boolean mustSetSourceForTarget(String t) { *

support for -source 1.1 and -source 1.2 has been added with * JDK 1.4.2 but isn't present in 1.5.0+

*/ - private String adjustSourceValue(final String source) { + private static String adjustSourceValue(final String source) { return "1.1".equals(source) || "1.2".equals(source) ? "1.3" : source; } } diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java index d4487699c7..f2fd291b3a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java @@ -86,7 +86,7 @@ public boolean execute() throws BuildException { * @param commandLine command line to process * @return int index of first argument that could be put into argfile */ - private int moveArgFileEligibleOptionsToEnd(String[] commandLine) { + private static int moveArgFileEligibleOptionsToEnd(String[] commandLine) { int nonArgFileOptionIdx = 1; // 0 for javac executable while (nonArgFileOptionIdx < commandLine.length) { int argsToMove = numberOfArgsNotEligibleForFile(commandLine, nonArgFileOptionIdx); diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java b/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java index 4669cc8542..44a892ea5b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java @@ -100,7 +100,7 @@ private void validate() throws BuildException { } } - private DeweyDecimal getVersion() { + private static DeweyDecimal getVersion() { Project p = new Project(); p.init(); StringBuilder sb = new StringBuilder(); diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java index c0d46ee485..7379dba729 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java @@ -127,7 +127,7 @@ public void setTimeout(final int timeout) { * * @return true if it is isNullOrEmpty */ - private boolean isNullOrEmpty(final String string) { + private static boolean isNullOrEmpty(final String string) { return string == null || string.isEmpty(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java b/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java index 6f86a4aa54..2b1899903c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java @@ -105,7 +105,7 @@ public boolean eval() throws BuildException { * Get our reader * @return a reader */ - private XMLReader getReader() { + private static XMLReader getReader() { JAXPUtils.getParser(); return JAXPUtils.getXMLReader(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java index c84f610601..7c355c99f8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java @@ -397,7 +397,7 @@ private CVSEntry[] filterEntrySet(final CVSEntry[] entrySet) { /** * replace all known author's id's with their maven specified names */ - private void replaceAuthorIdWithName(final Properties userList, + private static void replaceAuthorIdWithName(final Properties userList, final CVSEntry[] entrySet) { for (final CVSEntry entry : entrySet) { if (userList.containsKey(entry.getAuthor())) { diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java index bc50afa731..bdf9006132 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java @@ -446,7 +446,7 @@ private void writeTagDiff(CvsTagEntry[] entries) throws BuildException { * @param writer a PrintWriter value * @param entry a CvsTagEntry value */ - private void writeTagEntry(Document doc, PrintWriter writer, + private static void writeTagEntry(Document doc, PrintWriter writer, CvsTagEntry entry) throws IOException { Element ent = doc.createElement("entry"); diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java index 359cbc2081..de2f15c3db 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java @@ -116,7 +116,7 @@ public EmailAddress(String email) { * A specialised trim() that trims whitespace, * '(', ')', '"', '<', '>' from the start and end of strings */ - private String trim(String t, boolean trimAngleBrackets) { + private static String trim(String t, boolean trimAngleBrackets) { int start = 0; int end = t.length(); boolean trim; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java index a1ebb983c1..530825372e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java @@ -297,7 +297,7 @@ private static InternetAddress[] internetAddresses(final Vector li return addrs.toArray(new InternetAddress[addrs.size()]); } - private String parseCharSetFromMimeType(final String type) { + private static String parseCharSetFromMimeType(final String type) { if (type == null) { return null; } diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java b/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java index 7c00038a39..39f5198b9f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java @@ -275,7 +275,7 @@ protected boolean shouldIgnoreInvalidRecipients() { * @return the current date in SMTP suitable format. * @since Ant 1.5 */ - protected final String getDate() { + protected static final String getDate() { return DateUtils.getDateForHeader(); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java index 387078b8a4..518f6808aa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java @@ -299,7 +299,7 @@ private static InternetAddress[] internetAddresses(final Vector li return addrs.toArray(new InternetAddress[addrs.size()]); } - private String parseCharSetFromMimeType(final String type) { + private static String parseCharSetFromMimeType(final String type) { if (type == null) { return null; } diff --git a/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java b/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java index be5c44da1d..90238fb471 100644 --- a/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java +++ b/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java @@ -91,7 +91,7 @@ public Process exec(Project project, String[] cmd, String[] env, * @return the command File. * @throws IOException if errors are encountered creating the file. */ - private File createCommandFile(final Project project, String[] cmd, String[] env) + private static File createCommandFile(final Project project, String[] cmd, String[] env) throws IOException { File script = FILE_UTILS.createTempFile(project, "ANT", ".COM", null, true, true); try (BufferedWriter out = new BufferedWriter(new FileWriter(script))) { @@ -121,7 +121,7 @@ private File createCommandFile(final Project project, String[] cmd, String[] env return script; } - private void deleteAfter(final File f, final Process p) { + private static void deleteAfter(final File f, final Process p) { new Thread(() -> { try { p.waitFor(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java index 7404bdcae1..97e9d79d2b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java @@ -424,7 +424,7 @@ public int hashCode() { } } - private List sortProperties(Properties props) { + private static List sortProperties(Properties props) { // sort the list. Makes SCM and manual diffs easier. return props.stringPropertyNames().stream() .map(k -> new Tuple(k, props.getProperty(k))).sorted() diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java index 7c24c94ca8..6bdc8a01b8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java @@ -265,7 +265,7 @@ private void writeFile() throws BuildException { } } - private boolean checkParam(File param) { + private static boolean checkParam(File param) { return param != null; } 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 354dcabb86..0a216597d4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java @@ -445,7 +445,7 @@ public void validateNamespace() { * @param property string to check * @return true if it is not null or empty */ - private boolean isSet(String property) { + private static boolean isSet(String property) { return property != null && !property.isEmpty(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index 1be941ce79..44aa2a5cbc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -266,7 +266,7 @@ private Source getSource(final InputStream is, final Resource resource) return src; } - private String resourceToURI(final Resource resource) { + private static String resourceToURI(final Resource resource) { final FileProvider fp = resource.as(FileProvider.class); if (fp != null) { return FILE_UTILS.toURI(fp.getFile().getAbsolutePath()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index beb2d6f967..8d0370167b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -190,7 +190,7 @@ public void setWarnOnRmiStubs(boolean warnOnRmiStubs) { * @return a collection of class dependencies * @exception IOException if the dependency file cannot be read */ - private Map> readCachedDependencies(File depFile) throws IOException { + private static Map> readCachedDependencies(File depFile) throws IOException { Map> dependencyMap = new HashMap<>(); int prependLength = CLASSNAME_PREPEND.length(); @@ -541,14 +541,14 @@ private void warnOutOfDateButNotDeleted( * @param className possible origin of the RMI stub * @return whether the class affectedClass is a RMI stub */ - private boolean isRmiStub(String affectedClass, String className) { + private static boolean isRmiStub(String affectedClass, String className) { return isStub(affectedClass, className, DefaultRmicAdapter.RMI_STUB_SUFFIX) || isStub(affectedClass, className, DefaultRmicAdapter.RMI_SKEL_SUFFIX) || isStub(affectedClass, className, WLRmic.RMI_STUB_SUFFIX) || isStub(affectedClass, className, WLRmic.RMI_SKEL_SUFFIX); } - private boolean isStub(String affectedClass, String baseClass, String suffix) { + private static boolean isStub(String affectedClass, String baseClass, String suffix) { return (baseClass + suffix).equals(affectedClass); } @@ -824,7 +824,7 @@ public void setDump(boolean dump) { this.dump = dump; } - private Stream directories(ResourceCollection rc) { + private static Stream directories(ResourceCollection rc) { return rc.stream().map(r -> r.as(FileProvider.class)) .filter(Objects::nonNull).map(FileProvider::getFile) .filter(File::isDirectory); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java index 2cf71aaf56..8464a5cbb3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java @@ -79,7 +79,7 @@ public DirectoryIterator(File rootDirectory, boolean changeInto) * @return a vector containing File objects for each entry in the * directory. */ - private List getDirectoryEntries(File directory) { + private static List getDirectoryEntries(File directory) { File[] filesInDir = directory.listFiles(); if (filesInDir == null) { return Collections.emptyList(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 76bcbde7a3..f686bee66c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -472,7 +472,7 @@ protected void writeJar(String baseName, File jarFile, Hashtable f * convert a class file name : A/B/C/toto.class * into a class name: A.B.C.toto */ - private String toClass(String filename) { + private static String toClass(String filename) { //remove the .class return filename.substring(0, filename.lastIndexOf(".class")) .replace('\\', '.').replace('/', '.'); @@ -482,7 +482,7 @@ private String toClass(String filename) { * convert a file name : A/B/C/toto.java * into a class name: A/B/C/toto.class */ - private String toClassFile(String filename) { + private static String toClassFile(String filename) { //remove the .class return filename.replaceFirst("\\.java$", ".class"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java index 768e9cb6fe..2934dc067b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java @@ -777,7 +777,7 @@ protected void checkConfiguration(String descriptorFileName, * @return the temp directory. * @throws BuildException if a temp directory cannot be created. */ - private File createTempDir() throws IOException { + private static File createTempDir() throws IOException { return Files.createTempDirectory("genic").toFile(); } @@ -787,7 +787,7 @@ private File createTempDir() throws IOException { * * @param aFile file to delete. */ - private void deleteAllFiles(File aFile) { + private static void deleteAllFiles(File aFile) { if (aFile.isDirectory()) { for (File child : aFile.listFiles()) { deleteAllFiles(child); @@ -804,7 +804,7 @@ private void deleteAllFiles(File aFile) { * @param rootDir the current sub-directory to scan. * @param hashtable the hashtable where to add the files. */ - private void addAllFiles(File file, String rootDir, Hashtable hashtable) { + private static void addAllFiles(File file, String rootDir, Hashtable hashtable) { if (!file.exists()) { throw new IllegalArgumentException(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java index 73a78570e8..77cfeb0efc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java @@ -516,7 +516,7 @@ public String toString() { * @param first First version number (dotted decimal) * @param second Second version number (dotted decimal) */ - private boolean isCompatible(final DeweyDecimal first, + private static boolean isCompatible(final DeweyDecimal first, final DeweyDecimal second) { return first.isGreaterThanOrEqual(second); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java index ac4d914ac0..eb581adaf6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java @@ -232,7 +232,7 @@ private void writeManifest(final Manifest manifest) throws IOException { * @param extensions the list of extensions * @throws BuildException if an error occurs */ - private void appendLibraryList(final Attributes attributes, final String listPrefix, + private static void appendLibraryList(final Attributes attributes, final String listPrefix, final List extensions) throws BuildException { final int size = extensions.size(); for (int i = 0; i < size; i++) { @@ -252,7 +252,7 @@ private void appendLibraryList(final Attributes attributes, final String listPre * @param attributes the attributes to add key-value to * @param extensionKey the key to use */ - private void appendExtensionList(final Attributes attributes, + private static void appendExtensionList(final Attributes attributes, final Attributes.Name extensionKey, final String listPrefix, final int size) { //add in something like //"Extension-List: javahelp java3d" diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java index 56d64a8c96..9dd1be5c56 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java @@ -103,7 +103,7 @@ void displayLibrary(final File file, * * @param size the number of dashes to printout */ - private void printLine(final int size) { + private static void printLine(final int size) { for (int i = 0; i < size; i++) { System.out.print("-"); } @@ -117,7 +117,7 @@ private void printLine(final int size) { * @return the specifications or null if none * @throws BuildException if malformed specification sections */ - private Specification[] getSpecifications(final Manifest manifest) + private static Specification[] getSpecifications(final Manifest manifest) throws BuildException { try { return Specification.getSpecifications(manifest); @@ -131,7 +131,7 @@ private Specification[] getSpecifications(final Manifest manifest) * * @param specification the specification */ - private void displaySpecification(final Specification specification) { + private static void displaySpecification(final Specification specification) { final String[] sections = specification.getSections(); if (null != sections) { System.out.print("Sections: "); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java index 1cb6833515..61061b152d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java @@ -406,7 +406,7 @@ public String toString() { * @param first First version number (dotted decimal) * @param second Second version number (dotted decimal) */ - private boolean isCompatible(final DeweyDecimal first, + private static boolean isCompatible(final DeweyDecimal first, final DeweyDecimal second) { return first.isGreaterThanOrEqual(second); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index b552c8e35f..1dbe694d60 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -398,7 +398,7 @@ private String getDefaultOutputDirectory() { * @param file File * @return file's root directory */ - private File getRoot(File file) { + private static File getRoot(File file) { File root = file.getAbsoluteFile(); while (root.getParent() != null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 532afb5d19..3a36aabfb1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -545,7 +545,7 @@ protected static int getMajorVersionNumber(File home) * file. * */ - private File getOutputJavaFile(File outputdir, File srcfile) { + private static File getOutputJavaFile(File outputdir, File srcfile) { String path = srcfile.getPath(); // Extract file's base-name diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java index 966a33589c..3e039521bc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.java @@ -49,7 +49,7 @@ public boolean compile(Javah javah) throws BuildException { return false; } - private Commandline setupGcjhCommand(Javah javah) { + private static Commandline setupGcjhCommand(Javah javah) { Commandline cmd = new Commandline(); cmd.setExecutable(JavaEnvUtils.getJdkExecutable("gcjh")); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java index 51de22bffc..1debad442d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java @@ -54,7 +54,7 @@ public boolean compile(Javah javah) throws BuildException { return false; } - private Commandline setupKaffehCommand(Javah javah) { + private static Commandline setupKaffehCommand(Javah javah) { Commandline cmd = new Commandline(); cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh")); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java index df02abe226..eb68feb1fc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java @@ -169,7 +169,7 @@ private boolean haveMergeFiles() { return haveEntries(mergefiles); } - private boolean haveEntries(Path p) { + private static boolean haveEntries(Path p) { return !(p == null || p.isEmpty()); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java index 480c4cab04..f795d24aa7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java @@ -271,7 +271,7 @@ private void addDirContents(ZipOutputStream output, File dir, String prefix, * which for a class is the name of the package with the class * name appended. */ - private String getEntryName(File file, String prefix) { + private static String getEntryName(File file, String prefix) { String name = file.getName(); if (!name.endsWith(".class")) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java index 38a27fe31c..adb625c2d1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java @@ -70,7 +70,7 @@ public String mapJspToJavaName(File jspFile) { * @param jspFile jspFile file * @return extensionless potentially remapped name */ - private String mapJspToBaseName(File jspFile) { + private static String mapJspToBaseName(File jspFile) { String className = stripExtension(jspFile); // since we don't mangle extensions like the servlet does, @@ -109,7 +109,7 @@ private String mapJspToBaseName(File jspFile) { * @param jspFile file in * @return file without any jsp extension */ - private String stripExtension(File jspFile) { + private static String stripExtension(File jspFile) { return StringUtils.removeSuffix(jspFile.getName(), ".jsp"); } 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 2f6b42e43e..93bd08e030 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 @@ -1058,7 +1058,7 @@ protected void execute(final JUnitTest arg) throws BuildException { * @param testName the test name to be validated * @throws BuildException if testName is not a valid test name */ - private void validateTestName(final String testName) throws BuildException { + private static void validateTestName(final String testName) throws BuildException { if (testName == null || testName.isEmpty() || "null".equals(testName)) { throw new BuildException("test name must be specified"); @@ -1340,7 +1340,7 @@ private void checkIncludeAntRuntime(final CommandlineJava cmd) { * @param summaryOption the summary option -can be null * @return true if the run should be withoutput and error */ - private boolean equalsWithOutAndErr(final String summaryOption) { + private static boolean equalsWithOutAndErr(final String summaryOption) { return "withoutanderr".equalsIgnoreCase(summaryOption); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 8c35e9d523..70af81a408 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -314,7 +314,7 @@ public JUnitTestRunner(final JUnitTest test, final String[] methods, final boole private PrintStream savedOut = null; private PrintStream savedErr = null; - private PrintStream createEmptyStream() { + private static PrintStream createEmptyStream() { return new PrintStream( new OutputStream() { @Override @@ -323,7 +323,7 @@ public void write(final int b) { }); } - private PrintStream createTeePrint(final PrintStream ps1, final PrintStream ps2) { + private static PrintStream createTeePrint(final PrintStream ps1, final PrintStream ps2) { return new PrintStream(new TeeOutputStream(ps1, ps2)); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index 5ed9ddd5ec..37c1ced614 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -162,7 +162,7 @@ public void startTestSuite(final JUnitTest suite) { * get the local hostname * @return the name of the local host, or "localhost" if we cannot work it out */ - private String getHostname() { + private static String getHostname() { String hostname = "localhost"; try { final InetAddress localHost = InetAddress.getLocalHost(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java index be70e94ddd..b1eaad40cf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java @@ -164,7 +164,7 @@ static Optional isTestClass(final TestIdentifier testIdentifier) { return Optional.empty(); } - private void writeFrom(final SysOutErrContentStore store, final Writer writer) throws IOException { + private static void writeFrom(final SysOutErrContentStore store, final Writer writer) throws IOException { final char[] chars = new char[1024]; int numRead = -1; try (final Reader reader = store.getReader()) { 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 eba66e5bd2..b98f9d84a7 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 @@ -58,7 +58,7 @@ public final boolean convert(Native2Ascii args, File srcFile, } } - private BufferedReader getReader(File srcFile, String encoding, + private static BufferedReader getReader(File srcFile, String encoding, boolean reverse) throws IOException { if (reverse || encoding == null) { return new BufferedReader(new FileReader(srcFile)); @@ -67,7 +67,7 @@ private BufferedReader getReader(File srcFile, String encoding, Files.newInputStream(srcFile.toPath()), encoding)); } - private Writer getWriter(File destFile, String encoding, + private static Writer getWriter(File destFile, String encoding, boolean reverse) throws IOException { if (!reverse) { encoding = "ASCII"; @@ -80,7 +80,7 @@ private Writer getWriter(File destFile, String encoding, encoding)); } - private void translate(BufferedReader input, Writer output, + private static void translate(BufferedReader input, Writer output, UnaryOperator translation) throws IOException { for (String line : (Iterable) () -> input.lines() .map(translation).iterator()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index c31ae3570e..b46bf80318 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -350,7 +350,7 @@ private void createFolders(File file) throws IOException, ParseException { * handling UNC notation. * @throws IOException if there is an error. */ - private void massagePCLI(File in, File out) + private static void massagePCLI(File in, File out) throws IOException { try (BufferedReader inReader = new BufferedReader(new FileReader(in)); BufferedWriter outWriter = new BufferedWriter(new FileWriter(out))) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java index 623fb61367..4885b102c2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java @@ -138,7 +138,7 @@ private void play(Project project, File file, int loops, Long duration) { } } - private void playClip(Clip clip, int loops) { + private static void playClip(Clip clip, int loops) { clip.loop(loops); do { @@ -159,7 +159,7 @@ private void playClip(Clip clip, int loops) { } } - private void playClip(Clip clip, long duration) { + private static void playClip(Clip clip, long duration) { clip.loop(Clip.LOOP_CONTINUOUSLY); try { Thread.sleep(duration); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java index 8572011673..7319ea1a3a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java @@ -218,7 +218,7 @@ protected final boolean getCompressed() { * @param percentTransmitted the current percent transmitted * @return the percent that the file is of the total */ - protected final int trackProgress(final long filesize, final long totalLength, + protected static int trackProgress(final long filesize, final long totalLength, final int percentTransmitted) { // CheckStyle:MagicNumber OFF 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 17dd4313bb..0758c3163d 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 @@ -483,7 +483,7 @@ private void executeCommand(final Session session, final String cmd, final Strin * @param to file to write to * @param append if true, append to existing file, else overwrite */ - private void writeToFile(final String from, final boolean append, final File to) + private static void writeToFile(final String from, final boolean append, final File to) throws IOException { final StandardOpenOption appendOrTruncate = append ? StandardOpenOption.APPEND : StandardOpenOption.TRUNCATE_EXISTING; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java index 3d181d30ee..c5071dbc8b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java @@ -547,11 +547,11 @@ private void setToUri(final String toUri) { this.toUri = toUri; } - private BuildException exactlyOne(final String[] attrs) { + private static BuildException exactlyOne(final String[] attrs) { return exactlyOne(attrs, null); } - private BuildException exactlyOne(final String[] attrs, final String alt) { + private static BuildException exactlyOne(final String[] attrs, final String alt) { return new BuildException("Exactly one of [%s]%s is required", String.join("|", attrs), alt == null ? "" : " or " + alt); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java index 863be82a8a..af5ee60b3f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java @@ -376,7 +376,7 @@ private Parallel newParallel(long parallelTimeout, Task child) { * @param task task * @param role role of the task */ - private void validateTask(Task task, String role) { + private static void validateTask(Task task, String role) { if (task != null && task.getProject() == null) { throw new BuildException("%s task is not bound to the project %s", role, task); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 64486047cc..c12553eabc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -744,7 +744,7 @@ private String calcDate(String startDate, int daysToAdd) throws ParseException { * @param cmd The command line to clean * @return The command line as a string with out the password */ - private String formatCommandLine(Commandline cmd) { + private static String formatCommandLine(Commandline cmd) { final StringBuilder sBuff = new StringBuilder(cmd.toString()); int indexUser = sBuff.substring(0).indexOf(FLAG_LOGIN); if (indexUser > 0) { diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 40d18a230c..c4e16a1862 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -358,7 +358,7 @@ protected void logAndAddFilesToCompile(Commandline cmd) { attributes.log(niceSourceList, Project.MSG_VERBOSE); } - private void verifyArguments(Commandline cmd) { + private static void verifyArguments(Commandline cmd) { if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) { for (String arg : cmd.getArguments()) { if ("-Xnew".equals(arg)) { diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index a3c5d1b883..8c390899b3 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -991,7 +991,7 @@ protected synchronized void dieOnCircularReference(Stack stk, Project p) } } - private BuildException dirAndFileAreMutuallyExclusive() { + private static BuildException dirAndFileAreMutuallyExclusive() { return new BuildException("you can only specify one of the dir and file attributes"); } } diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java index bac304cd06..db1a0bb302 100644 --- a/src/main/org/apache/tools/ant/types/DataType.java +++ b/src/main/org/apache/tools/ant/types/DataType.java @@ -383,7 +383,7 @@ public Object clone() throws CloneNotSupportedException { return dt; } - private String displayName(Class clazz) { + private static String displayName(Class clazz) { return clazz.getName() + " (loaded via " + clazz.getClassLoader() + ")"; } } diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java index b61d9f6c11..00964d5ee1 100644 --- a/src/main/org/apache/tools/ant/types/Permissions.java +++ b/src/main/org/apache/tools/ant/types/Permissions.java @@ -147,7 +147,7 @@ private void init() throws BuildException { granted.add(new PropertyPermission("java.vm.name", "read")); } - private java.security.Permission createPermission( + private static java.security.Permission createPermission( final Permissions.Permission permission) { try { // First add explicitly already resolved permissions will not be @@ -327,7 +327,7 @@ boolean matches(final java.security.Permission perm) { * Parses the actions into a set of separate strings. * @param actions The actions to be parsed. */ - private Set parseActions(final String actions) { + private static Set parseActions(final String actions) { final Set result = new HashSet<>(); final StringTokenizer tk = new StringTokenizer(actions, ","); while (tk.hasMoreTokens()) { diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java index b1b7d7934f..b8b215d51a 100644 --- a/src/main/org/apache/tools/ant/types/PropertySet.java +++ b/src/main/org/apache/tools/ant/types/PropertySet.java @@ -280,7 +280,7 @@ public Mapper getMapper() { * Use stringPropertyNames to get the list of properties (including * default ones). */ - private Map getAllSystemProperties() { + private static Map getAllSystemProperties() { return System.getProperties().stringPropertyNames().stream() .collect(Collectors.toMap(name -> name, name -> System.getProperties().getProperty(name), (a, b) -> b)); } diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index 92943fc4e4..47b3ee36a7 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java @@ -604,7 +604,7 @@ private ResourceLocation findMatchingEntry(String publicId) { * fragment. * @return The URI sans fragment. */ - private String removeFragment(String uri) { + private static String removeFragment(String uri) { String result = uri; int hashPos = uri.indexOf("#"); if (hashPos >= 0) { diff --git a/src/main/org/apache/tools/ant/types/optional/imageio/Rotate.java b/src/main/org/apache/tools/ant/types/optional/imageio/Rotate.java index d95a9d2a24..9932db7278 100644 --- a/src/main/org/apache/tools/ant/types/optional/imageio/Rotate.java +++ b/src/main/org/apache/tools/ant/types/optional/imageio/Rotate.java @@ -90,7 +90,7 @@ public BufferedImage performRotate(BufferedImage image) { return rotatedImage; } - private Rectangle2D getBoundingBox(BufferedImage image, AffineTransform tx) { + private static Rectangle2D getBoundingBox(BufferedImage image, AffineTransform tx) { int xmax = image.getWidth() - 1; int ymax = image.getHeight() - 1; Point2D[] corners = new Point2D.Double[4]; diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java index 782bec1a71..d4bc317c7b 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java @@ -46,14 +46,14 @@ protected int resourceCompare(Resource foo, Resource bar) { return compare(file(foo), file(bar)); } - private File file(Resource r) { + private static File file(Resource r) { return r.asOptional(FileProvider.class) .orElseThrow(() -> new ClassCastException( r.getClass() + " doesn't provide files")) .getFile(); } - private int compare(File f1, File f2) { + private static int compare(File f1, File f2) { if (Objects.equals(f1, f2)) { return 0; } diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java index fbdb6b9302..25b386a3a5 100644 --- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java +++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java @@ -422,7 +422,7 @@ private String readFirstLine(final PushbackReader r) throws IOException { * @return true if the line is to be continued, * false otherwise */ - private boolean requiresContinuation(final String s) { + private static boolean requiresContinuation(final String s) { final char[] ca = s.toCharArray(); int i = ca.length - 1; while (i > 0 && ca[i] == '\\') { @@ -440,7 +440,7 @@ private boolean requiresContinuation(final String s) { * @param s the string to unescape (coming from the source file) * @return the unescaped string */ - private String unescape(final String s) { + private static String unescape(final String s) { /* * The following combinations are converted: * \n newline @@ -495,7 +495,7 @@ private String unescape(final String s) { * @param ch the character array containing the unicode character code * @return the character extracted */ - private char unescapeUnicode(final char[] ch, final int i) { + private static char unescapeUnicode(final char[] ch, final int i) { final String s = new String(ch, i, 4); return (char) Integer.parseInt(s, 16); } @@ -507,7 +507,7 @@ private char unescapeUnicode(final char[] ch, final int i) { * @param s the string to escape * @return the escaped string */ - private String escapeValue(final String s) { + private static String escapeValue(final String s) { return escape(s, false); } @@ -520,7 +520,7 @@ private String escapeValue(final String s) { * @param s the string to escape * @return the escaped string */ - private String escapeName(final String s) { + private static String escapeName(final String s) { return escape(s, true); } @@ -534,7 +534,7 @@ private String escapeName(final String s) { * leading whitespace * @return the escaped string */ - private String escape(final String s, final boolean escapeAllSpaces) { + private static String escape(final String s, final boolean escapeAllSpaces) { if (s == null) { return null; } @@ -571,7 +571,7 @@ private String escape(final String s, final boolean escapeAllSpaces) { * @param ch the character to encode * @return the unicode escape sequence */ - private String escapeUnicode(final char ch) { + private static String escapeUnicode(final char ch) { return "\\" + UnicodeUtil.EscapeUnicode(ch); } @@ -731,7 +731,7 @@ private void parsePair(final String text) { name = stripStart(name, " \t\f"); } - private String stripStart(final String s, final String chars) { + private static String stripStart(final String s, final String chars) { if (s == null) { return null; } @@ -748,7 +748,7 @@ private String stripStart(final String s, final String chars) { return s.substring(i); } - private int findFirstSeparator(String s) { + private static int findFirstSeparator(String s) { // Replace double backslashes with underscores so that they don't // confuse us looking for '\t' or '\=', for example, but they also // don't change the position of other characters @@ -765,7 +765,7 @@ private int findFirstSeparator(String s) { return indexOfAny(s, " :=\t"); } - private int indexOfAny(final String s, final String chars) { + private static int indexOfAny(final String s, final String chars) { if (s == null || chars == null) { return -1; } diff --git a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java index 6e4db9cb2e..34804ee97a 100644 --- a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java +++ b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java @@ -64,7 +64,7 @@ public class ScriptFixBSFPath { } } - private File getClassSource(ClassLoader loader, String className) { + private static File getClassSource(ClassLoader loader, String className) { return LoaderUtils.getResourceSource( loader, LoaderUtils.classNameToResource(className)); diff --git a/src/main/org/apache/tools/ant/util/UUEncoder.java b/src/main/org/apache/tools/ant/util/UUEncoder.java index 80274d6d79..b89bec6f03 100644 --- a/src/main/org/apache/tools/ant/util/UUEncoder.java +++ b/src/main/org/apache/tools/ant/util/UUEncoder.java @@ -104,7 +104,7 @@ private void encodeEnd() { * @param out The output stream the encoded data is written to. * @exception IOException if something goes wrong */ - private void encodeLine( + private static void encodeLine( byte[] data, int offset, int length, OutputStream out) throws IOException { // write out the number of characters encoded in this line. diff --git a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java index 448e8b9008..927fc90d76 100644 --- a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java @@ -264,7 +264,7 @@ protected boolean isClosureRequired() { * class or null if the class could not be found. * @exception IOException if the files in the given paths cannot be read. */ - private File getResourceContainer(String resourceLocation, String[] paths) + private static File getResourceContainer(String resourceLocation, String[] paths) throws IOException { for (String path : paths) { File element = new File(path); diff --git a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java index 591744eb41..f74edd65a0 100644 --- a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java +++ b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java @@ -215,7 +215,7 @@ && languageIsJavaScript()) { private static final String DROP_GRAAL_SECURITY_RESTRICTIONS = "polyglot.js.allowAllAccess"; - private void maybeApplyGraalJsProperties(final ScriptEngine engine) { + private static void maybeApplyGraalJsProperties(final ScriptEngine engine) { if (engine != null && engine.getClass().getName().contains("Graal")) { engine.getBindings(ScriptContext.ENGINE_SCOPE) .put(DROP_GRAAL_SECURITY_RESTRICTIONS, true); diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java index 01439e1c58..e4fc0d0ae2 100644 --- a/src/main/org/apache/tools/bzip2/BlockSort.java +++ b/src/main/org/apache/tools/bzip2/BlockSort.java @@ -265,7 +265,7 @@ final void fallbackSort(final CBZip2OutputStream.Data data, * @param lo lower boundary of the fmap-interval to be sorted * @param hi upper boundary of the fmap-interval to be sorted */ - private void fallbackSimpleSort(int[] fmap, + private static void fallbackSimpleSort(int[] fmap, int[] eclass, int lo, int hi) { @@ -301,7 +301,7 @@ private void fallbackSimpleSort(int[] fmap, /** * swaps two values in fmap */ - private void fswap(int[] fmap, int zz1, int zz2) { + private static void fswap(int[] fmap, int zz1, int zz2) { int zztmp = fmap[zz1]; fmap[zz1] = fmap[zz2]; fmap[zz2] = zztmp; @@ -310,7 +310,7 @@ private void fswap(int[] fmap, int zz1, int zz2) { /** * swaps two intervals starting at yyp1 and yyp2 of length yyn inside fmap. */ - private void fvswap(int[] fmap, int yyp1, int yyp2, int yyn) { + private static void fvswap(int[] fmap, int yyp1, int yyp2, int yyn) { while (yyn > 0) { fswap(fmap, yyp1, yyp2); yyp1++; @@ -319,7 +319,7 @@ private void fvswap(int[] fmap, int yyp1, int yyp2, int yyn) { } } - private int fmin(int a, int b) { + private static int fmin(int a, int b) { return a < b ? a : b; } diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java index a47b256892..af15089d92 100644 --- a/src/main/org/apache/tools/tar/TarEntry.java +++ b/src/main/org/apache/tools/tar/TarEntry.java @@ -907,7 +907,7 @@ public void writeEntryHeader(byte[] outbuf, ZipEncoding encoding, TarUtils.formatCheckSumOctalBytes(chk, outbuf, csOffset, CHKSUMLEN); } - private int writeEntryHeaderField(long value, byte[] outbuf, int offset, + private static int writeEntryHeaderField(long value, byte[] outbuf, int offset, int length, boolean starMode) { if (!starMode && (value < 0 || value >= (1L << (3 * (length - 1))))) { @@ -1071,7 +1071,7 @@ private static String normalizeFileName(String fileName, * @param header The tar entry header buffer to evaluate the format for. * @return format type */ - private int evaluateType(byte[] header) { + private static int evaluateType(byte[] header) { if (matchAsciiBuffer(GNU_TMAGIC, header, MAGIC_OFFSET, PURE_MAGICLEN)) { return FORMAT_OLDGNU; } diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java index 76460e951d..b772336358 100644 --- a/src/main/org/apache/tools/tar/TarOutputStream.java +++ b/src/main/org/apache/tools/tar/TarOutputStream.java @@ -522,7 +522,7 @@ void writePaxHeaders(TarEntry entry, closeEntry(); } - private String stripTo7Bits(String name) { + private static String stripTo7Bits(String name) { StringBuilder result = new StringBuilder(name.length()); for (final char ch : name.toCharArray()) { char stripped = (char) (ch & 0x7F); @@ -543,7 +543,7 @@ private void writeEOFRecord() throws IOException { buffer.writeRecord(recordBuf); } - private void addPaxHeadersForBigNumbers(Map paxHeaders, + private static void addPaxHeadersForBigNumbers(Map paxHeaders, TarEntry entry) { addPaxHeaderForBigNumber(paxHeaders, "size", entry.getSize(), TarConstants.MAXSIZE); @@ -563,7 +563,7 @@ private void addPaxHeadersForBigNumbers(Map paxHeaders, failForBigNumber("mode", entry.getMode(), TarConstants.MAXID); } - private void addPaxHeaderForBigNumber(Map paxHeaders, + private static void addPaxHeaderForBigNumber(Map paxHeaders, String header, long value, long maxValue) { if (value < 0 || value > maxValue) { @@ -571,7 +571,7 @@ private void addPaxHeaderForBigNumber(Map paxHeaders, } } - private void failForBigNumbers(TarEntry entry) { + private static void failForBigNumbers(TarEntry entry) { failForBigNumber("entry size", entry.getSize(), TarConstants.MAXSIZE); failForBigNumberWithPosixMessage("group id", entry.getLongGroupId(), TarConstants.MAXID); failForBigNumber("last modification time", @@ -585,15 +585,15 @@ private void failForBigNumbers(TarEntry entry) { TarConstants.MAXID); } - private void failForBigNumber(String field, long value, long maxValue) { + private static void failForBigNumber(String field, long value, long maxValue) { failForBigNumber(field, value, maxValue, ""); } - private void failForBigNumberWithPosixMessage(String field, long value, long maxValue) { + private static void failForBigNumberWithPosixMessage(String field, long value, long maxValue) { failForBigNumber(field, value, maxValue, " Use STAR or POSIX extensions to overcome this limit"); } - private void failForBigNumber(String field, long value, long maxValue, String additionalMsg) { + private static void failForBigNumber(String field, long value, long maxValue, String additionalMsg) { if (value < 0 || value > maxValue) { throw new RuntimeException(field + " '" + value //NOSONAR + "' is too big ( > " @@ -655,7 +655,7 @@ private boolean handleLongName(TarEntry entry, String name, return false; } - private void transferModTime(TarEntry from, TarEntry to) { + private static void transferModTime(TarEntry from, TarEntry to) { Date fromModTime = from.getModTime(); long fromModTimeSeconds = fromModTime.getTime() / 1000; if (fromModTimeSeconds < 0 || fromModTimeSeconds > TarConstants.MAXSIZE) { diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java index a1afbdaeae..068b4d7fcc 100644 --- a/src/main/org/apache/tools/zip/ZipEntry.java +++ b/src/main/org/apache/tools/zip/ZipEntry.java @@ -355,11 +355,11 @@ private ZipExtraField[] getParseableExtraFields() { : parseableExtraFields; } - private ZipExtraField[] copyOf(ZipExtraField[] src) { + private static ZipExtraField[] copyOf(ZipExtraField[] src) { return copyOf(src, src.length); } - private ZipExtraField[] copyOf(ZipExtraField[] src, int length) { + private static ZipExtraField[] copyOf(ZipExtraField[] src, int length) { ZipExtraField[] cpy = new ZipExtraField[length]; System.arraycopy(src, 0, cpy, 0, Math.min(src.length, length)); return cpy; diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java index 8806ae74c3..07a0352a61 100644 --- a/src/main/org/apache/tools/zip/ZipFile.java +++ b/src/main/org/apache/tools/zip/ZipFile.java @@ -586,7 +586,7 @@ private Map populateFromCentralDirectory() * even if they are never used - and here a field with only one * size would be invalid.

*/ - private void setSizesAndOffsetFromZip64Extra(final ZipEntry ze, + private static void setSizesAndOffsetFromZip64Extra(final ZipEntry ze, final OffsetEntry offset, final int diskStart) throws IOException { diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java index 9e216d8ca0..101402347a 100644 --- a/src/main/org/apache/tools/zip/ZipOutputStream.java +++ b/src/main/org/apache/tools/zip/ZipOutputStream.java @@ -667,11 +667,11 @@ private boolean checkIfNeedsZip64(Zip64Mode effectiveMode) return actuallyNeedsZip64; } - private boolean isZip64Required(ZipEntry entry1, Zip64Mode requestedMode) { + private static boolean isZip64Required(ZipEntry entry1, Zip64Mode requestedMode) { return requestedMode == Zip64Mode.Always || isTooLageForZip32(entry1); } - private boolean isTooLageForZip32(ZipEntry zipArchiveEntry) { + private static boolean isTooLageForZip32(ZipEntry zipArchiveEntry) { return zipArchiveEntry.getSize() >= ZIP64_MAGIC || zipArchiveEntry.getCompressedSize() >= ZIP64_MAGIC; } @@ -1634,7 +1634,7 @@ private Zip64ExtendedInformationExtraField getZip64Extra(ZipEntry ze) { * @param ze ZipEntry * @return boolean */ - private boolean hasZip64Extra(ZipEntry ze) { + private static boolean hasZip64Extra(ZipEntry ze) { return ze.getExtraField(Zip64ExtendedInformationExtraField .HEADER_ID) != null;