This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit fa39904836d7741e6e9b6aa1e9f342261c1c4c77 Author: Gary D. Gregory <[email protected]> AuthorDate: Sun Jul 20 16:45:14 2025 -0400 Merge some string literals --- .../org/apache/commons/beanutils2/converters/DateTimeConverter.java | 2 +- .../java/org/apache/commons/beanutils2/converters/NumberConverter.java | 2 +- .../java/org/apache/commons/beanutils2/converters/PointConverter.java | 2 +- src/test/java/org/apache/commons/beanutils2/BeanMapTest.java | 2 +- .../org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java index 4c37c10e..d6e93c2a 100644 --- a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java @@ -620,7 +620,7 @@ public abstract class DateTimeConverter<D> extends AbstractConverter<D> { try { return type.cast(java.sql.Timestamp.valueOf(value)); } catch (final IllegalArgumentException e) { - throw new ConversionException("String must be in JDBC format [yyyy-MM-dd HH:mm:ss.fffffffff] " + "to create a java.sql.Timestamp"); + throw new ConversionException("String must be in JDBC format [yyyy-MM-dd HH:mm:ss.fffffffff] to create a java.sql.Timestamp"); } } diff --git a/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java index 8bf7a691..5e60b1ca 100644 --- a/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java @@ -206,7 +206,7 @@ public abstract class NumberConverter<N extends Number> extends AbstractConverte format = new DecimalFormat(pattern); } else { if (log().isDebugEnabled()) { - log().debug(" Using pattern '" + pattern + "'" + " with Locale[" + locale + "]"); + log().debug(" Using pattern '" + pattern + "' with Locale[" + locale + "]"); } final DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale); format = new DecimalFormat(pattern, symbols); diff --git a/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java index bcb7c98d..29c0c10f 100644 --- a/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java @@ -75,7 +75,7 @@ public class PointConverter extends AbstractConverter<Point> { final String[] xy = POINT_SPLIT.split(coordinates); if (xy.length != 2) { - throw new IllegalArgumentException("Point must have an x coordinate, and y coordinate only, " + "expecting the following format: (40, 200)"); + throw new IllegalArgumentException("Point must have an x coordinate, and y coordinate only, expecting the following format: (40, 200)"); } final int x = Integer.parseInt(xy[0]); diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java b/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java index 1ad16ad9..6604cfe1 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java @@ -279,7 +279,7 @@ class BeanMapTest extends AbstractMapTest<BeanMap, String, Object> { assertTrue(map2.containsKey(key), "Cloned BeanMap should contain the same keys"); } } catch (final CloneNotSupportedException exception) { - fail("BeanMap.clone() should not throw a " + "CloneNotSupportedException when clone should succeed."); + fail("BeanMap.clone() should not throw a CloneNotSupportedException when clone should succeed."); } } diff --git a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTest.java b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTest.java index 9fc9dd0e..1891ec1f 100644 --- a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTest.java +++ b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTest.java @@ -148,7 +148,7 @@ public class MemoryLeakTest { final long free = runtime.freeMemory() / 1024; final long total = runtime.totalMemory() / 1024; final long used = total - free; - return "MEMORY - Total: " + fmt.format(total) + "k " + "Used: " + fmt.format(used) + "k " + "Free: " + fmt.format(free) + "k"; + return "MEMORY - Total: " + fmt.format(total) + "k Used: " + fmt.format(used) + "k Free: " + fmt.format(free) + "k"; } /**
