Th2 3673 common need to change the filter

src/main/java/com/exactpro/th2/common/schema/filter/strategy/impl/AbstractFilterStrategy.java

@@ -21,6 +21,7 @@
 import com.google.protobuf.Message;
 import org.apache.commons.collections4.MultiMapUtils;
 import org.apache.commons.collections4.MultiValuedMap;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.List;
@@ -30,29 +31,40 @@ public abstract class AbstractFilterStrategy<T extends Message> implements Filte
 
     @Override
     public boolean verify(T message, RouterFilter routerFilter) {
-
-        MultiValuedMap<String, FieldFilterConfiguration> msgFieldFilters = MultiMapUtils.newListValuedHashMap();
-        msgFieldFilters.putAll(routerFilter.getMessage());
-        msgFieldFilters.putAll(routerFilter.getMetadata());
-
+        MultiValuedMap<String, FieldFilterConfiguration> msgFieldFilters = extractConfigMapFromRouterFilter(routerFilter);
         return checkValues(getFields(message), msgFieldFilters);
     }
 
     @Override
     public boolean verify(T message, List<? extends RouterFilter> routerFilters) {
+        Map<String, String> fields = getFields(message);
         for (var fieldsFilter : routerFilters) {
-            if (verify(message, fieldsFilter)) {
+            if (verify(fields, fieldsFilter)) {
                 return true;
             }
         }
 
         return false;
     }
 
+    private boolean verify(Map<String, String> fields, RouterFilter routerFilter) {
+        MultiValuedMap<String, FieldFilterConfiguration> msgFieldFilters = extractConfigMapFromRouterFilter(routerFilter);
+        return checkValues(fields, msgFieldFilters);
+    }
+
+    @NotNull
+    private MultiValuedMap<String, FieldFilterConfiguration> extractConfigMapFromRouterFilter(RouterFilter routerFilter) {
+        MultiValuedMap<String, FieldFilterConfiguration> msgFieldFilters = MultiMapUtils.newListValuedHashMap();
+        msgFieldFilters.putAll(routerFilter.getMessage());
+        msgFieldFilters.putAll(routerFilter.getMetadata());
+        msgFieldFilters.putAll(routerFilter.getProperties());
+        return msgFieldFilters;
+    }
+
     protected abstract Map<String, String> getFields(T message);
 
     private boolean checkValues(Map<String, String> messageFields, MultiValuedMap<String, FieldFilterConfiguration> fieldFilters) {
-        return fieldFilters.isEmpty() || fieldFilters.keys().stream().anyMatch(fieldName -> {
+        return fieldFilters.isEmpty() || fieldFilters.keys().stream().allMatch(fieldName -> {
             String messageValue = messageFields.get(fieldName);
             Collection<FieldFilterConfiguration> filters = fieldFilters.get(fieldName);
             return !filters.isEmpty() && filters.stream().allMatch(filter -> FieldValueChecker.checkFieldValue(filter, messageValue));

src/main/java/com/exactpro/th2/common/schema/filter/strategy/impl/AbstractTh2MsgFilterStrategy.java

@@ -47,6 +47,7 @@ public Map<String, String> getFields(com.google.protobuf.Message message) {
                 DIRECTION_KEY, messageID.getDirection().name()
         );
 
+        messageFields.putAll(th2Msg.getMetadata().getPropertiesMap());
         messageFields.putAll(metadataMsgFields);
 
         return messageFields;

src/main/kotlin/com/exactpro/th2/common/schema/filter/strategy/impl/AnyMessageFilterStrategy.kt

@@ -25,19 +25,21 @@ class AnyMessageFilterStrategy : AbstractFilterStrategy<Message>() {
     override fun getFields(message: Message): MutableMap<String, String> {
         check(message is AnyMessage) { "Message is not an ${AnyMessage::class.qualifiedName}: ${message.toJson()}" }
 
-        val result = HashMap<String, String>();
+        val result = HashMap<String, String>()
 
         when {
             message.hasMessage() -> {
                 result.putAll(message.message.fieldsMap.mapValues { it.value.simpleValue })
 
                 val metadata = message.message.metadata
+                result.putAll(message.message.metadata.propertiesMap)
                 result[AbstractTh2MsgFilterStrategy.SESSION_ALIAS_KEY] = metadata.id.connectionId.sessionAlias
                 result[AbstractTh2MsgFilterStrategy.MESSAGE_TYPE_KEY] = metadata.messageType
                 result[AbstractTh2MsgFilterStrategy.DIRECTION_KEY] = metadata.id.direction.name
             }
             message.hasRawMessage() -> {
                 val metadata = message.rawMessage.metadata
+                result.putAll(message.rawMessage.metadata.propertiesMap)
                 result[AbstractTh2MsgFilterStrategy.SESSION_ALIAS_KEY] = metadata.id.connectionId.sessionAlias
                 result[AbstractTh2MsgFilterStrategy.DIRECTION_KEY] = metadata.id.direction.name
             }

src/main/kotlin/com/exactpro/th2/common/schema/grpc/configuration/GrpcRawFilterStrategy.kt

@@ -30,7 +30,8 @@ data class GrpcRawFilterStrategy(var filters: List<GrpcRouterFilterConfiguration
 data class GrpcRouterFilterConfiguration(
     @JsonProperty(required = true) var endpoint: String,
     @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var metadata: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap(),
-    @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var message: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap()
+    @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var message: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap(),
+    @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var properties: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap()
 ) : RouterFilter, Configuration() {
 
     @JsonGetter("metadata")
@@ -39,4 +40,7 @@ data class GrpcRouterFilterConfiguration(
     @JsonGetter("message")
     fun getJsonMessage(): Collection<FieldFilterConfiguration> = message.values()
 
+    @JsonGetter("properties")
+    fun getJsonProperties(): Collection<FieldFilterConfiguration> = properties.values()
+
 }

src/main/kotlin/com/exactpro/th2/common/schema/message/configuration/MessageRouterConfiguration.kt

@@ -47,12 +47,14 @@ data class QueueConfiguration(
 
 data class MqRouterFilterConfiguration(
     @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var metadata: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap(),
-    @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var message: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap()
+    @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var message: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap(),
+    @JsonDeserialize(using = MultiMapFiltersDeserializer::class) override var properties: MultiValuedMap<String, FieldFilterConfiguration> = emptyMultiMap()
 ) : Configuration(), RouterFilter {
 
     constructor(
         metadata: Collection<FieldFilterConfiguration> = emptyList(),
-        message: Collection<FieldFilterConfiguration> = emptyList()
+        message: Collection<FieldFilterConfiguration> = emptyList(),
+        properties: Collection<FieldFilterConfiguration> = emptyList()
     ) : this(
         MultiMapUtils.newListValuedHashMap<String, FieldFilterConfiguration>().also { metadataMultiMap ->
             metadata.forEach {
@@ -63,6 +65,11 @@ data class MqRouterFilterConfiguration(
             message.forEach {
                 messageMultiMap.put(it.fieldName, it)
             }
+        },
+        MultiMapUtils.newListValuedHashMap<String, FieldFilterConfiguration>().also { propertiesMultiMap ->
+            properties.forEach {
+                propertiesMultiMap.put(it.fieldName, it)
+            }
         }
     )
 
@@ -71,6 +78,9 @@ data class MqRouterFilterConfiguration(
 
     @JsonGetter("message")
     fun getJsonMessage(): Collection<FieldFilterConfiguration> = message.values()
+
+    @JsonGetter("properties")
+    fun getJsonProperties(): Collection<FieldFilterConfiguration> = properties.values()
 }
 
 data class FieldFilterConfigurationOld(

src/main/kotlin/com/exactpro/th2/common/schema/message/configuration/RouterFilter.kt

@@ -20,4 +20,5 @@ import org.apache.commons.collections4.MultiValuedMap
 interface RouterFilter {
     val metadata: MultiValuedMap<String, FieldFilterConfiguration>
     val message: MultiValuedMap<String, FieldFilterConfiguration>
+    val properties: MultiValuedMap<String, FieldFilterConfiguration>
 }

src/main/kotlin/com/exactpro/th2/common/schema/message/impl/rabbitmq/group/RabbitMessageGroupBatchRouter.kt

@@ -51,7 +51,7 @@ class RabbitMessageGroupBatchRouter : AbstractRabbitRouter<MessageGroupBatch>()
 
         val builder = MessageGroupBatch.newBuilder()
         message.groupsList.forEach { group ->
-            if (group.messagesList.all { filterMessage(it, pinConfiguration.filters) }) {
+            if (group.messagesList.any { filterMessage(it, pinConfiguration.filters) }) {
                 builder.addGroups(group)
             } else {
                 incrementDroppedMetrics(

src/test/kotlin/com/exactpro/th2/common/schema/TestJsonConfiguration.kt

@@ -183,7 +183,14 @@ class TestJsonConfiguration {
                                 FieldFilterOperation.EQUAL
                             )
                         ),
-                        listOf(FieldFilterConfiguration("test_field", "test_value", FieldFilterOperation.EQUAL))
+                        listOf(FieldFilterConfiguration("test_field", "test_value", FieldFilterOperation.EQUAL)),
+                        listOf(
+                            FieldFilterConfiguration(
+                                "method",
+                                "POST",
+                                FieldFilterOperation.EQUAL
+                            )
+                        ),
                     ),
                     MqRouterFilterConfiguration(
                         listOf(
@@ -196,6 +203,10 @@ class TestJsonConfiguration {
                         listOf(
                             FieldFilterConfiguration("test_field", "test_value0", FieldFilterOperation.EQUAL),
                             FieldFilterConfiguration("test_field", "test_value1", FieldFilterOperation.EQUAL)
+                        ),
+                        listOf(
+                            FieldFilterConfiguration("method1", "POST", FieldFilterOperation.EQUAL),
+                            FieldFilterConfiguration("method2", "GET", FieldFilterOperation.NOT_EQUAL)
                         )
                     )
                 )