[TH2-3133] Put RawMessage.Metadata.properties to MessageToStore.metadata

README.md

@@ -1,4 +1,4 @@
-# Overview (3.5.1)
+# Overview (3.6.0)
 
 Message store (mstore) is an important th2 component responsible for storing raw messages into Cradle. Please refer to [Cradle repository] (https://github.com/th2-net/cradleapi/blob/master/README.md) for more details. This component has a pin for listening messages via MQ.
 
@@ -64,6 +64,10 @@ spec:
 This is a list of supported features provided by libraries.
 Please see more details about this feature via [link](https://github.com/th2-net/th2-common-j#configuration-formats).
 
+## 3.6.0
+
++ Fill cradle message metadata for `RawMessage`
+
 ## 3.5.1
 
 + Added more detail into logs

gradle.properties

@@ -1 +1 @@
-release_version=3.5.1
+release_version=3.6.0

src/main/java/com/exactpro/th2/mstore/AbstractMessageStore.java

@@ -197,7 +197,7 @@ public final void handle(T messageBatch) {
             storeMessages(messages, sessionData.getBatchHolder());
         } catch (Exception ex) {
             if (logger.isErrorEnabled()) {
-                logger.error("Cannot handle the batch of type {} message id {}", messageBatch.getClass(), shortDebugString(messageBatch), ex);
+                logger.error("Cannot handle the batch {}", shortDebugString(messageBatch), ex);
             }
         }
     }

src/main/java/com/exactpro/th2/mstore/ProtoUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2021 Exactpro (Exactpro Systems Limited)
+ * Copyright 2021-2022 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,8 @@
 
 import static com.exactpro.th2.common.util.StorageUtils.toCradleDirection;
 import static com.exactpro.th2.common.util.StorageUtils.toInstant;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.trimToEmpty;
 
 public class ProtoUtil {
     public static MessageToStore toCradleMessage(Message protoMessage) {
@@ -43,6 +45,18 @@ public static MessageToStore toCradleMessage(Message protoMessage) {
     public static MessageToStore toCradleMessage(RawMessage protoRawMessage) {
         RawMessageMetadata metadata = protoRawMessage.getMetadata();
         MessageID messageID = metadata.getId();
+//        MessageToStoreBuilder builder = new MessageToStoreBuilder()
+//                .streamName(messageID.getConnectionId().getSessionAlias())
+//                .content(protoRawMessage.toByteArray())
+//                .timestamp(toInstant(metadata.getTimestamp()))
+//                .direction(toCradleDirection(messageID.getDirection()))
+//                .index(messageID.getSequence());
+//        metadata.getPropertiesMap().forEach((key, value) -> {
+//            if (isNotBlank(key) || isNotBlank(value)) {
+//                builder.metadata(trimToEmpty(key), trimToEmpty(value));
+//            }
+//        });
+//        return builder.build();
         return new MessageToStoreBuilder()
                 .streamName(messageID.getConnectionId().getSessionAlias())
                 .content(protoRawMessage.toByteArray())