From 98e4cacf042e3aac05851a9b21640181b4f6c8cc Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Thu, 29 Jun 2017 23:33:04 +0200 Subject: [PATCH 1/2] Replaced custom code by JRE 7 method --- src/main/java/org/codehaus/plexus/util/StringUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/plexus/util/StringUtils.java b/src/main/java/org/codehaus/plexus/util/StringUtils.java index 5edbb0cd..49db9a44 100644 --- a/src/main/java/org/codehaus/plexus/util/StringUtils.java +++ b/src/main/java/org/codehaus/plexus/util/StringUtils.java @@ -57,6 +57,7 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.StringTokenizer; /** @@ -250,7 +251,7 @@ public static boolean isNotBlank( String str ) */ public static boolean equals( String str1, String str2 ) { - return ( str1 == null ? str2 == null : str1.equals( str2 ) ); + return Objects.equals( str1, str2 ); } /** From 413bc3cfbfe14208675774416b189253955c48c0 Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Fri, 30 Jun 2017 00:05:41 +0200 Subject: [PATCH 2/2] Replaced custom code by JRE 7 method --- src/main/java/org/codehaus/plexus/util/StringUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/plexus/util/StringUtils.java b/src/main/java/org/codehaus/plexus/util/StringUtils.java index 49db9a44..b99d258b 100644 --- a/src/main/java/org/codehaus/plexus/util/StringUtils.java +++ b/src/main/java/org/codehaus/plexus/util/StringUtils.java @@ -1952,7 +1952,7 @@ public static String defaultString( Object obj ) */ public static String defaultString( Object obj, String defaultString ) { - return ( obj == null ) ? defaultString : obj.toString(); + return Objects.toString( obj, defaultString ); } // Reversing