From 0fc789fe5b4fbc969c09452638154fb170b0af21 Mon Sep 17 00:00:00 2001 From: Bertrand Renuart Date: Mon, 20 Dec 2021 16:17:06 +0100 Subject: [PATCH] getFieldValue() should return the value of fieldValue without transforming it into a String `ObjectAppendingMarker#getFieldValue()` should ideally return the value of the `fieldValue` property without transformation. This method is intended to be used by `SingleFieldAppendingMarker#tselfToString()` that already takes care of converting the value into a String. closes #719 --- .../net/logstash/logback/marker/ObjectAppendingMarker.java | 4 ++-- .../net/logstash/logback/marker/RawJsonAppendingMarker.java | 2 +- .../logstash/logback/marker/SingleFieldAppendingMarker.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java b/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java index d7af65c1..3ab37747 100755 --- a/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java @@ -94,8 +94,8 @@ protected void writeFieldValue(JsonGenerator generator) throws IOException { } @Override - public Object getFieldValue() { - return StructuredArguments.toString(fieldValue); + protected Object getFieldValue() { + return fieldValue; } @Override diff --git a/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java b/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java index 9852c0f6..864b1aaf 100755 --- a/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java @@ -66,7 +66,7 @@ protected void writeFieldValue(JsonGenerator generator) throws IOException { } @Override - public Object getFieldValue() { + protected Object getFieldValue() { return rawJson; } diff --git a/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java b/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java index 1b1679f7..56d70585 100755 --- a/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java @@ -129,7 +129,7 @@ public String toStringSelf() { * * @return the field value */ - public abstract Object getFieldValue(); + protected abstract Object getFieldValue(); @Override public boolean equals(Object obj) {