From d1c25465167320dce41a04991fb8ca03f65120cb Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 13 Jun 2024 09:28:22 -0700 Subject: [PATCH] Use `isEmpty()` where possible --- core/src/main/java/org/kohsuke/stapler/AncestorImpl.java | 6 +++--- .../org/kohsuke/stapler/BytecodeReadingParanamer.java | 2 +- .../main/java/org/kohsuke/stapler/ClassDescriptor.java | 2 +- core/src/main/java/org/kohsuke/stapler/Header.java | 2 +- core/src/main/java/org/kohsuke/stapler/MetaClass.java | 2 +- .../src/main/java/org/kohsuke/stapler/QueryParameter.java | 4 ++-- core/src/main/java/org/kohsuke/stapler/RequestImpl.java | 2 +- core/src/main/java/org/kohsuke/stapler/Stapler.java | 8 ++++---- core/src/main/java/org/kohsuke/stapler/TokenList.java | 2 +- .../java/org/kohsuke/stapler/export/XMLDataWriter.java | 2 +- .../org/kohsuke/stapler/jsr269/ConstructorProcessor.java | 2 +- .../stapler/jsr269/QueryParameterAnnotationProcessor.java | 2 +- core/src/test/java/org/kohsuke/stapler/StaplerTest.java | 2 +- .../org/kohsuke/stapler/jelly/groovy/JellyBuilder.java | 2 +- .../kohsuke/stapler/framework/adjunct/AdjunctManager.java | 2 +- .../stapler/jelly/InternationalizedStringExpression.java | 2 +- .../java/org/kohsuke/stapler/jelly/ResourceBundle.java | 6 +++--- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/core/src/main/java/org/kohsuke/stapler/AncestorImpl.java b/core/src/main/java/org/kohsuke/stapler/AncestorImpl.java index f73aece1b..ad6e070ae 100644 --- a/core/src/main/java/org/kohsuke/stapler/AncestorImpl.java +++ b/core/src/main/java/org/kohsuke/stapler/AncestorImpl.java @@ -76,7 +76,7 @@ public String getUrl() { public String getRestOfUrl() { StringBuilder buf = new StringBuilder(); for (int i = index; i < tokens.length; i++) { - if (buf.length() > 0) { + if (!buf.isEmpty()) { buf.append('/'); } buf.append(tokens[i]); @@ -104,12 +104,12 @@ public String getFullUrl() { public String getRelativePath() { StringBuilder buf = new StringBuilder(); for (int i = index + (endsWithSlash ? 0 : 1); i < tokens.length; i++) { - if (buf.length() > 0) { + if (!buf.isEmpty()) { buf.append('/'); } buf.append(".."); } - if (buf.length() == 0) { + if (buf.isEmpty()) { buf.append('.'); } return buf.toString(); diff --git a/core/src/main/java/org/kohsuke/stapler/BytecodeReadingParanamer.java b/core/src/main/java/org/kohsuke/stapler/BytecodeReadingParanamer.java index 3d5318b58..18a53e44c 100644 --- a/core/src/main/java/org/kohsuke/stapler/BytecodeReadingParanamer.java +++ b/core/src/main/java/org/kohsuke/stapler/BytecodeReadingParanamer.java @@ -242,7 +242,7 @@ private void visitLocalVariable(String name, int index) { } private String getResult() { - return result.length() != 0 ? result.substring(1) : ""; + return !result.isEmpty() ? result.substring(1) : ""; } private boolean isDebugInfoPresent() { diff --git a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java index 25aa52333..517a99ba3 100644 --- a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java +++ b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java @@ -309,7 +309,7 @@ public String[] loadConstructorParamNames() { s.close(); String v = p.getProperty("constructor"); - if (v.length() == 0) { + if (v.isEmpty()) { return new String[0]; } return v.split(","); diff --git a/core/src/main/java/org/kohsuke/stapler/Header.java b/core/src/main/java/org/kohsuke/stapler/Header.java index 229716e9a..cd4e53072 100644 --- a/core/src/main/java/org/kohsuke/stapler/Header.java +++ b/core/src/main/java/org/kohsuke/stapler/Header.java @@ -56,7 +56,7 @@ class HandlerImpl extends AnnotationHandler
{ public Object parse(StaplerRequest request, Header a, Class type, String parameterName) throws ServletException { String name = a.value(); - if (name.length() == 0) { + if (name.isEmpty()) { name = parameterName; } if (name == null) { diff --git a/core/src/main/java/org/kohsuke/stapler/MetaClass.java b/core/src/main/java/org/kohsuke/stapler/MetaClass.java index 513708fc9..f9511b1df 100644 --- a/core/src/main/java/org/kohsuke/stapler/MetaClass.java +++ b/core/src/main/java/org/kohsuke/stapler/MetaClass.java @@ -627,7 +627,7 @@ private void registerDoToken(KlassDescriptor node) { for (String name : names) { final Function ff = f.contextualize(new WebMethodContext(name)); - if (name.length() == 0) { + if (name.isEmpty()) { dispatchers.add(new IndexDispatcher(ff)); } else { final boolean isAccepted = filteredFunctions.contains(f); diff --git a/core/src/main/java/org/kohsuke/stapler/QueryParameter.java b/core/src/main/java/org/kohsuke/stapler/QueryParameter.java index 541246251..6f062399d 100644 --- a/core/src/main/java/org/kohsuke/stapler/QueryParameter.java +++ b/core/src/main/java/org/kohsuke/stapler/QueryParameter.java @@ -63,7 +63,7 @@ class HandlerImpl extends AnnotationHandler { public Object parse(StaplerRequest request, QueryParameter a, Class type, String parameterName) throws ServletException { String name = a.value(); - if (name.length() == 0) { + if (name.isEmpty()) { name = parameterName; } if (name == null) { @@ -74,7 +74,7 @@ public Object parse(StaplerRequest request, QueryParameter a, Class type, String if (a.required() && value == null) { throw new ServletException("Required Query parameter " + name + " is missing"); } - if (a.fixEmpty() && value != null && value.length() == 0) { + if (a.fixEmpty() && value != null && value.isEmpty()) { value = null; } return convert(type, value); diff --git a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java index ffd8ae67e..46fc9256d 100644 --- a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java +++ b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java @@ -1234,7 +1234,7 @@ public JSONObject getSubmittedForm() throws ServletException { isSubmission = !getParameterMap().isEmpty(); } - if (p == null || p.length() == 0) { + if (p == null || p.isEmpty()) { // no data submitted try { StaplerResponse rsp = Stapler.getCurrentResponse(); diff --git a/core/src/main/java/org/kohsuke/stapler/Stapler.java b/core/src/main/java/org/kohsuke/stapler/Stapler.java index 68a2530a2..1eb6489ce 100644 --- a/core/src/main/java/org/kohsuke/stapler/Stapler.java +++ b/core/src/main/java/org/kohsuke/stapler/Stapler.java @@ -222,7 +222,7 @@ protected void service(HttpServletRequest req, HttpServletResponse rsp) throws S } String lowerPath = servletPath.toLowerCase(Locale.ENGLISH); - if (servletPath.length() != 0 && !lowerPath.startsWith("/web-inf") && !lowerPath.startsWith("/meta-inf")) { + if (!servletPath.isEmpty() && !lowerPath.startsWith("/web-inf") && !lowerPath.startsWith("/meta-inf")) { // getResource requires '/' prefix (and resin insists on that, too) but servletPath can be empty string // (JENKINS-879) // so make sure servletPath is at least length 1 before calling getResource() @@ -634,7 +634,7 @@ boolean serveStaticResource( Matcher m = RANGE_SPEC.matcher(range); if (m.matches()) { long s = Long.parseLong(m.group(1)); - long e = m.group(2).length() > 0 + long e = !m.group(2).isEmpty() ? Long.parseLong(m.group(2)) + 1 // range set is inclusive : contentLength; // unspecified value means "all the way to the end" e = Math.min(e, contentLength); @@ -1129,7 +1129,7 @@ public static Stapler getCurrent() { static String canonicalPath(String path) { List r = new ArrayList<>(Arrays.asList(path.split("/+"))); for (int i = 0; i < r.size(); ) { - if (r.get(i).length() == 0 || r.get(i).equals(".")) { + if (r.get(i).isEmpty() || r.get(i).equals(".")) { // empty token occurs for example, "".split("/+") is [""] r.remove(i); } else if (r.get(i).equals("..")) { @@ -1158,7 +1158,7 @@ static String canonicalPath(String path) { buf.append(token); } // translation: if (path.endsWith("/") && !buf.endsWith("/")) - if (path.endsWith("/") && (buf.length() == 0 || buf.charAt(buf.length() - 1) != '/')) { + if (path.endsWith("/") && (buf.isEmpty() || buf.charAt(buf.length() - 1) != '/')) { buf.append('/'); } return buf.toString(); diff --git a/core/src/main/java/org/kohsuke/stapler/TokenList.java b/core/src/main/java/org/kohsuke/stapler/TokenList.java index 87b6a8b4d..e5959dafc 100644 --- a/core/src/main/java/org/kohsuke/stapler/TokenList.java +++ b/core/src/main/java/org/kohsuke/stapler/TokenList.java @@ -132,7 +132,7 @@ public int countRemainingTokens() { public String toString() { StringBuilder buf = new StringBuilder(); for (int i = 0; i < tokens.length; i++) { - if (buf.length() > 0) { + if (!buf.isEmpty()) { buf.append('/'); } if (i == idx) { diff --git a/core/src/main/java/org/kohsuke/stapler/export/XMLDataWriter.java b/core/src/main/java/org/kohsuke/stapler/export/XMLDataWriter.java index 2e43033eb..580e27a09 100644 --- a/core/src/main/java/org/kohsuke/stapler/export/XMLDataWriter.java +++ b/core/src/main/java/org/kohsuke/stapler/export/XMLDataWriter.java @@ -151,7 +151,7 @@ private String adjustName() { } /*package*/ static String makeXmlName(String name) { - if (name.length() == 0) { + if (name.isEmpty()) { name = "_"; } diff --git a/core/src/main/java/org/kohsuke/stapler/jsr269/ConstructorProcessor.java b/core/src/main/java/org/kohsuke/stapler/jsr269/ConstructorProcessor.java index 9b2ced5bc..066021bf7 100644 --- a/core/src/main/java/org/kohsuke/stapler/jsr269/ConstructorProcessor.java +++ b/core/src/main/java/org/kohsuke/stapler/jsr269/ConstructorProcessor.java @@ -104,7 +104,7 @@ private void write(ExecutableElement c) { try { StringBuilder buf = new StringBuilder(); for (VariableElement p : c.getParameters()) { - if (buf.length() > 0) { + if (!buf.isEmpty()) { buf.append(','); } buf.append(p.getSimpleName()); diff --git a/core/src/main/java/org/kohsuke/stapler/jsr269/QueryParameterAnnotationProcessor.java b/core/src/main/java/org/kohsuke/stapler/jsr269/QueryParameterAnnotationProcessor.java index 04299896a..c152e7579 100644 --- a/core/src/main/java/org/kohsuke/stapler/jsr269/QueryParameterAnnotationProcessor.java +++ b/core/src/main/java/org/kohsuke/stapler/jsr269/QueryParameterAnnotationProcessor.java @@ -62,7 +62,7 @@ public SourceVersion getSupportedSourceVersion() { private void write(ExecutableElement m) throws IOException { StringBuilder buf = new StringBuilder(); for (VariableElement p : m.getParameters()) { - if (buf.length() > 0) { + if (!buf.isEmpty()) { buf.append(','); } buf.append(p.getSimpleName()); diff --git a/core/src/test/java/org/kohsuke/stapler/StaplerTest.java b/core/src/test/java/org/kohsuke/stapler/StaplerTest.java index 1b85f0790..2a9b1a653 100644 --- a/core/src/test/java/org/kohsuke/stapler/StaplerTest.java +++ b/core/src/test/java/org/kohsuke/stapler/StaplerTest.java @@ -67,7 +67,7 @@ public void testToFileOnWindows() throws Exception { new URL("file:/c:/" + path)); assertToFile( - path.length() == 0 ? "\\\\vboxsvr" : "\\\\vboxsvr\\" + path.replace("%20", " "), + path.isEmpty() ? "\\\\vboxsvr" : "\\\\vboxsvr\\" + path.replace("%20", " "), new URL("file://vboxsvr/" + path), new URL("file:////vboxsvr/" + path)); } diff --git a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java index de868a907..86800a393 100644 --- a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java +++ b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java @@ -322,7 +322,7 @@ public void run(JellyContext context, XMLOutput output) throws JellyTagException * a jelly tag that needs evaluation? */ private boolean isTag(QName name) { - return name.getNamespaceURI().length() > 0; + return !name.getNamespaceURI().isEmpty(); } /** diff --git a/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java b/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java index 10eb28564..3131a89be 100644 --- a/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java +++ b/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java @@ -162,7 +162,7 @@ public Adjunct get(String name) throws IOException { */ public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { String path = req.getRestOfPath(); - if (path.length() == 0) { + if (path.isEmpty()) { throw HttpResponses.error( HttpServletResponse.SC_NOT_FOUND, new IllegalArgumentException("No adjunct provided")); } diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/InternationalizedStringExpression.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/InternationalizedStringExpression.java index 0bc41cc4c..fbeff0bc1 100644 --- a/jelly/src/main/java/org/kohsuke/stapler/jelly/InternationalizedStringExpression.java +++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/InternationalizedStringExpression.java @@ -73,7 +73,7 @@ public InternationalizedStringExpression(ResourceBundle resourceBundle, String t List args = new ArrayList<>(); key = text.substring(0, idx); text = text.substring(idx + 1); // at this point text="arg,arg)" - while (text.length() > 0) { + while (!text.isEmpty()) { String token = tokenize(text); args.add(JellyClassLoaderTearOff.EXPRESSION_FACTORY.createExpression(token)); text = text.substring(token.length() + 1); diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/ResourceBundle.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/ResourceBundle.java index e27115f78..45544b1b4 100644 --- a/jelly/src/main/java/org/kohsuke/stapler/jelly/ResourceBundle.java +++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/ResourceBundle.java @@ -89,7 +89,7 @@ public String getFormatString(Locale locale, String key) { for (int i = 0; i < suffixes.length; i++) { String suffix = suffixes[i]; String msg = get(suffix).getProperty(key); - if (msg != null && msg.length() > 0) { + if (msg != null && !msg.isEmpty()) { // ignore a definition without value, because stapler:i18n generates // value-less definitions return msg; @@ -111,7 +111,7 @@ public String getFormatString(Locale locale, String key) { public String getFormatStringWithoutDefaulting(Locale locale, String key) { for (String s : toStrings(locale)) { String msg = get(s).getProperty(key); - if (msg != null && msg.length() > 0) { + if (msg != null && !msg.isEmpty()) { return msg; } } @@ -161,7 +161,7 @@ protected Properties get(String key) { throw new UncheckedIOException("Failed to load " + url + ": " + e, e); } - resources.put(key, wrapUp(key.length() > 0 ? key.substring(1) : "", props)); + resources.put(key, wrapUp(!key.isEmpty() ? key.substring(1) : "", props)); return props; }