From 7af23e52d679f18e24c28c408e5db75762069745 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Tue, 25 Mar 2025 12:16:48 -0500 Subject: [PATCH] feedback from code review --- .../qqq/backend/core/utils/ValueUtils.java | 3 +-- qqq-backend-core/src/main/resources/log4j2.xml | 1 - .../qqq/backend/core/utils/StringUtilsTest.java | 16 ++++++++++++++++ .../qqq/backend/core/utils/ValueUtilsTest.java | 2 +- .../module/api/actions/BaseAPIActionUtil.java | 2 +- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/ValueUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/ValueUtils.java index 5d37a406..1e791abd 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/ValueUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/ValueUtils.java @@ -56,7 +56,6 @@ public class ValueUtils private static final DateTimeFormatter dateTimeFormatter_yyyyMMddWithDashes = DateTimeFormatter.ofPattern("yyyy-MM-dd"); private static final DateTimeFormatter dateTimeFormatter_MdyyyyWithSlashes = DateTimeFormatter.ofPattern("M/d/yyyy"); - private static final DateTimeFormatter dateTimeFormatter_MdyyWithSlashes = DateTimeFormatter.ofPattern("M/d/yyyy"); private static final DateTimeFormatter dateTimeFormatter_yyyyMMdd = DateTimeFormatter.ofPattern("yyyyMMdd"); @@ -451,7 +450,7 @@ public class ValueUtils private static LocalDate tryLocalDateParsers(String s) { DateTimeParseException lastException = null; - for(DateTimeFormatter dateTimeFormatter : List.of(dateTimeFormatter_yyyyMMddWithDashes, dateTimeFormatter_MdyyyyWithSlashes, dateTimeFormatter_yyyyMMdd, dateTimeFormatter_MdyyWithSlashes)) + for(DateTimeFormatter dateTimeFormatter : List.of(dateTimeFormatter_yyyyMMddWithDashes, dateTimeFormatter_MdyyyyWithSlashes, dateTimeFormatter_yyyyMMdd)) { try { diff --git a/qqq-backend-core/src/main/resources/log4j2.xml b/qqq-backend-core/src/main/resources/log4j2.xml index 19c618c4..60ffc1f6 100644 --- a/qqq-backend-core/src/main/resources/log4j2.xml +++ b/qqq-backend-core/src/main/resources/log4j2.xml @@ -18,7 +18,6 @@ - diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java index bc08293f..ae8ce0d3 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java @@ -334,4 +334,20 @@ class StringUtilsTest extends BaseTest assertEquals("a", StringUtils.emptyToNull("a")); } + + + /******************************************************************************* + ** + *******************************************************************************/ + @Test + void testAppendIncrementingSuffix() + { + assertEquals("test (1)", StringUtils.appendIncrementingSuffix("test")); + assertEquals("test (2)", StringUtils.appendIncrementingSuffix("test (1)")); + assertEquals("test (a) (1)", StringUtils.appendIncrementingSuffix("test (a)")); + assertEquals("test (a32) (1)", StringUtils.appendIncrementingSuffix("test (a32)")); + assertEquals("test ((2)) (1)", StringUtils.appendIncrementingSuffix("test ((2))")); + assertEquals("test ((2)) (101)", StringUtils.appendIncrementingSuffix("test ((2)) (100)")); + } + } diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/ValueUtilsTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/ValueUtilsTest.java index ee1f69f1..6738ac31 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/ValueUtilsTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/ValueUtilsTest.java @@ -362,4 +362,4 @@ class ValueUtilsTest extends BaseTest assertEquals(QFieldType.TIME, ValueUtils.inferQFieldTypeFromValue(LocalTime.now(), null)); } -} \ No newline at end of file +} diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java index 1ebdc1fc..300a60b7 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java @@ -212,7 +212,7 @@ public class BaseAPIActionUtil catch(QNotFoundException qnfe) { LOG.info("Not found", qnfe); - throw new QException("Error executing get: " + qnfe.getMessage(), qnfe); + throw (qnfe); } catch(Exception e) {