strip trailing whitespaces after trimming (short message)

osiegmar · Mar 4, 2024 · c84ed50 · c84ed50
1 parent 56be5c2
commit c84ed50
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/de/siegmar/logbackgelf/GelfEncoder.java b/src/main/java/de/siegmar/logbackgelf/GelfEncoder.java
@@ -438,13 +438,12 @@ protected String normalizeShortMessage(final String shortMessage) {
         return sanitizedShortMessage;
     }
 
-    private String sanitizeShortMessage(final String sanitizedShortMessage) {
-        final String stripped = sanitizedShortMessage.strip();
-        if (getMaxShortMessageLength() != 0 && stripped.length() > getMaxShortMessageLength()) {
-            return stripped.substring(0, getMaxShortMessageLength());
-        } else {
-            return stripped;
+    private String sanitizeShortMessage(final String shortMessage) {
+        String sanitized = shortMessage.stripLeading();
+        if (getMaxShortMessageLength() != 0 && sanitized.length() > getMaxShortMessageLength()) {
+            sanitized = sanitized.substring(0, getMaxShortMessageLength());
         }
+        return sanitized.stripTrailing();
     }
 
     protected String buildShortMessage(final ILoggingEvent event) {

diff --git a/src/test/java/de/siegmar/logbackgelf/GelfEncoderTest.java b/src/test/java/de/siegmar/logbackgelf/GelfEncoderTest.java
@@ -154,6 +154,17 @@ void stripLeadingAndTrailingWhitespaces() {
         assertThat(actual).isEqualTo("[---]");
     }
 
+    @Test
+    void stripTrailingWhitespacesAfterTrimming() {
+        final String shortMessage = "a          b";
+
+        final GelfEncoder gelfEncoder = new GelfEncoder();
+        gelfEncoder.setMaxShortMessageLength(5);
+
+        final String actual = gelfEncoder.normalizeShortMessage(shortMessage);
+        assertThat(actual).isEqualTo("a");
+    }
+
     @Test
     void shortenAfterStrippingWhitespaces() {
         final String shortMessage = "\t \n" + "A".repeat(250) + "\t \n";