From 433700ea801e5ec01c6ac2d3a48e872684c9ba77 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Sat, 12 Sep 2020 23:37:12 +0100
Subject: [PATCH] One per line

---
 src/main/java/org/apache/commons/lang3/StringUtils.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 06de23625..6956226a2 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -5393,7 +5393,8 @@ public static String lowerCase(final String str, final Locale locale) {
     }
 
     private static int[] matches(final CharSequence first, final CharSequence second) {
-        CharSequence max, min;
+        CharSequence max;
+        CharSequence min;
         if (first.length() > second.length()) {
             max = first;
             min = second;
@@ -8430,7 +8431,7 @@ public static String stripToNull(String str) {
             return null;
         }
         str = strip(str, null);
-        return str.isEmpty() ? null : str;
+        return str.isEmpty() ? null : str; // NOSONARLINT str cannot be null here
     }
 
     // Substring