fixed serialization/deserialization of LogEntry

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Aug 2, 2022 · 939fd55 · 939fd55
1 parent 15f6be0
commit 939fd55
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableLogEntry.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableLogEntry.java
@@ -82,7 +82,8 @@ public static LogEntry fromJson(final JsonObject jsonObject) {
         final String message = jsonObject.getValueOrThrow(JsonFields.MESSAGE);
         final String address = jsonObject.getValue(JsonFields.ADDRESS).orElse(null);
         final EntityId entityId = jsonObject.getValue(JsonFields.ENTITY_ID)
-                .map(eId -> EntityId.of(EntityType.of("unknown"), eId))
+                .map(eId -> EntityId.of(
+                        EntityType.of(jsonObject.getValue(JsonFields.ENTITY_TYPE).orElse("unknown")), eId))
                 .orElse(null);
 
         return getBuilder(correlationId, timestamp, category, type, level, message, address, entityId)
@@ -178,6 +179,7 @@ public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<
             builder.set(JsonFields.ADDRESS, address);
         }
         if (null != entityId) {
+            builder.set(JsonFields.ENTITY_TYPE, entityId.getEntityType().toString());
             builder.set(JsonFields.ENTITY_ID, entityId.toString());
         }
         return builder.build();

diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/LogEntry.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/LogEntry.java
@@ -143,6 +143,15 @@ final class JsonFields {
                 JsonFactory.newStringFieldDefinition("address", FieldType.REGULAR,
                         JsonSchemaVersion.V_2);
 
+        /**
+         * JSON field containing the entity type.
+         * @since 3.0.0
+         */
+        public static final JsonFieldDefinition<String> ENTITY_TYPE =
+                JsonFactory.newStringFieldDefinition("entityType", FieldType.REGULAR,
+                        JsonSchemaVersion.V_2);
+
+
         /**
          * JSON field containing the entity ID.
          * @since 2.1.0

diff --git a/...ivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ImmutableLogEntryTest.java b/...ivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ImmutableLogEntryTest.java
@@ -196,6 +196,7 @@ private static JsonObject getLogEntryJson() {
                 .set(LogEntry.JsonFields.LEVEL, LEVEL.getLevel())
                 .set(LogEntry.JsonFields.ADDRESS, ADDRESS)
                 .set(LogEntry.JsonFields.ENTITY_ID, THING_ID.toString())
+                .set(LogEntry.JsonFields.ENTITY_TYPE, THING_ID.getEntityType().toString())
                 .build();
     }
 

diff --git a/...el/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/TestConstants.java b/...el/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/TestConstants.java
@@ -260,6 +260,7 @@ public static final class Json {
                     .set(LogEntry.JsonFields.LEVEL, LEVEL.getLevel())
                     .set(LogEntry.JsonFields.ADDRESS, ADDRESS)
                     .set(LogEntry.JsonFields.ENTITY_ID, THING_ID.toString())
+                    .set(LogEntry.JsonFields.ENTITY_TYPE, THING_ID.getEntityType().toString())
                     .build();
             public static final JsonObject ENTRY_2_JSON = JsonFactory.newObjectBuilder()
                     .set(LogEntry.JsonFields.CORRELATION_ID, CORRELATION_ID)
@@ -270,6 +271,7 @@ public static final class Json {
                     .set(LogEntry.JsonFields.LEVEL, LEVEL.getLevel())
                     .set(LogEntry.JsonFields.ADDRESS, ADDRESS)
                     .set(LogEntry.JsonFields.ENTITY_ID, THING_ID.toString())
+                    .set(LogEntry.JsonFields.ENTITY_TYPE, THING_ID.getEntityType().toString())
                     .build();
 
             public static final JsonArray ENTRIES_JSON = JsonFactory.newArrayBuilder()

diff --git a/...itto/connectivity/service/messaging/monitoring/logs/FluentPublishingConnectionLogger.java b/...itto/connectivity/service/messaging/monitoring/logs/FluentPublishingConnectionLogger.java
@@ -56,7 +56,7 @@ final class FluentPublishingConnectionLogger
     private static final String TAG_TYPE = toTag(LogEntry.JsonFields.TYPE);
     private static final String TAG_CORRELATION_ID = toTag(LogEntry.JsonFields.CORRELATION_ID);
     private static final String TAG_ADDRESS = toTag(LogEntry.JsonFields.ADDRESS);
-    private static final String TAG_ENTITY_TYPE = "entityType";
+    private static final String TAG_ENTITY_TYPE = toTag(LogEntry.JsonFields.ENTITY_TYPE);
     private static final String TAG_ENTITY_ID = toTag(LogEntry.JsonFields.ENTITY_ID);
     private static final String TAG_MESSAGE = toTag(LogEntry.JsonFields.MESSAGE);
     private static final String TAG_INSTANCE_ID = "instanceId";