localstack
diff --git a/‎localstack-core/localstack/services/events/provider.py
Lines changed: 4 additions & 4 deletions b/‎localstack-core/localstack/services/events/provider.py
Lines changed: 4 additions & 4 deletions
diff --git a/‎localstack-core/localstack/services/events/v1/provider.py
Lines changed: 3 additions & 51 deletions b/‎localstack-core/localstack/services/events/v1/provider.py
Lines changed: 3 additions & 51 deletions
diff --git a/‎localstack-core/localstack/services/lambda_/event_source_listeners/utils.py
Lines changed: 2 additions & 2 deletions b/‎localstack-core/localstack/services/lambda_/event_source_listeners/utils.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎localstack-core/localstack/utils/event_matcher.py
Lines changed: 10 additions & 10 deletions b/‎localstack-core/localstack/utils/event_matcher.py
Lines changed: 10 additions & 10 deletions
diff --git a/‎tests/unit/utils/test_event_matcher.py
Lines changed: 1 addition & 1 deletion b/‎tests/unit/utils/test_event_matcher.py
Lines changed: 1 addition & 1 deletion
@@ -131,7 +131,7 @@
 )
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.utils.common import truncate
-from localstack.utils.event_matcher import matches_event as matches_rule
+from localstack.utils.event_matcher import matches_event
 from localstack.utils.strings import long_uid
 from localstack.utils.time import TIMESTAMP_FORMAT_TZ, timestamp
 
@@ -489,7 +489,7 @@ def test_event_pattern(
         https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-event-patterns.html
         """
         try:
-            result = matches_rule(event, event_pattern)
+            result = matches_event(event_pattern, event)
         except InternalInvalidEventPatternException as e:
             raise InvalidEventPatternException(e.message) from e
 
@@ -1396,7 +1396,7 @@ def _process_rules(
     ) -> None:
         event_pattern = rule.event_pattern
         event_str = to_json_str(event_formatted)
-        if matches_rule(event_str, event_pattern):
+        if matches_event(event_pattern, event_str):
             if not rule.targets:
                 LOG.info(
                     json.dumps(
@@ -1440,7 +1440,7 @@ def _process_rules(
             LOG.info(
                 json.dumps(
                     {
-                        "InfoCode": "InternalInfoEvents at matches_rule",
+                        "InfoCode": "InternalInfoEvents at matches_event",
                         "InfoMessage": f"No rules matched for formatted event: {event_formatted}",
                     }
                 )
 
@@ -24,7 +24,6 @@
     EventBusNameOrArn,
     EventPattern,
     EventsApi,
-    InvalidEventPatternException,
     PutRuleResponse,
     PutTargetsResponse,
     RoleArn,
@@ -40,20 +39,16 @@
 from localstack.constants import APPLICATION_AMZ_JSON_1_1
 from localstack.http import route
 from localstack.services.edge import ROUTER
-from localstack.services.events.models import (
-    InvalidEventPatternException as InternalInvalidEventPatternException,
-)
 from localstack.services.events.scheduler import JobScheduler
 from localstack.services.events.v1.models import EventsStore, events_stores
-from localstack.services.events.v1.utils import matches_event
 from localstack.services.moto import call_moto
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.utils.aws.arns import event_bus_arn, parse_arn
 from localstack.utils.aws.client_types import ServicePrincipal
 from localstack.utils.aws.message_forwarding import send_event_to_target
 from localstack.utils.collections import pick_attributes
 from localstack.utils.common import TMP_FILES, mkdir, save_file, truncate
-from localstack.utils.event_matcher import matches_event as matches_rule
+from localstack.utils.event_matcher import matches_event
 from localstack.utils.json import extract_jsonpath
 from localstack.utils.strings import long_uid, short_uid
 from localstack.utils.time import TIMESTAMP_FORMAT_TZ, timestamp
@@ -115,44 +110,7 @@ def test_event_pattern(
         """Test event pattern uses EventBridge event pattern matching:
         https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-event-patterns.html
         """
-        if config.EVENT_RULE_ENGINE == "java":
-            try:
-                result = matches_rule(event, event_pattern)
-            except InternalInvalidEventPatternException as e:
-                raise InvalidEventPatternException(e.message) from e
-        else:
-            event_pattern_dict = json.loads(event_pattern)
-            event_dict = json.loads(event)
-            result = matches_event(event_pattern_dict, event_dict)
-
-        # TODO: unify the different implementations below:
-        # event_pattern_dict = json.loads(event_pattern)
-        # event_dict = json.loads(event)
-
-        # EventBridge:
-        # result = matches_event(event_pattern_dict, event_dict)
-
-        # Lambda EventSourceMapping:
-        # from localstack.services.lambda_.event_source_listeners.utils import does_match_event
-        #
-        # result = does_match_event(event_pattern_dict, event_dict)
-
-        # moto-ext EventBridge:
-        # from moto.events.models import EventPattern as EventPatternMoto
-        #
-        # event_pattern = EventPatternMoto.load(event_pattern)
-        # result = event_pattern.matches_event(event_dict)
-
-        # SNS: The SNS rule engine seems to differ slightly, for example not allowing the wildcard pattern.
-        # from localstack.services.sns.publisher import SubscriptionFilter
-        # subscription_filter = SubscriptionFilter()
-        # result = subscription_filter._evaluate_nested_filter_policy_on_dict(event_pattern_dict, event_dict)
-
-        # moto-ext SNS:
-        # from moto.sns.utils import FilterPolicyMatcher
-        # filter_policy_matcher = FilterPolicyMatcher(event_pattern_dict, "MessageBody")
-        # result = filter_policy_matcher._body_based_match(event_dict)
-
+        result = matches_event(event_pattern, event)
         return TestEventPatternResponse(Result=result)
 
     @staticmethod
@@ -430,13 +388,7 @@ def filter_event_based_on_event_format(
         return False
     if rule_information.event_pattern._pattern:
         event_pattern = rule_information.event_pattern._pattern
-        if config.EVENT_RULE_ENGINE == "java":
-            event_str = json.dumps(event)
-            event_pattern_str = json.dumps(event_pattern)
-            match_result = matches_rule(event_str, event_pattern_str)
-        else:
-            match_result = matches_event(event_pattern, event)
-        if not match_result:
+        if not matches_event(event_pattern, event):
             return False
     return True
 
 
@@ -4,7 +4,7 @@
 
 from localstack import config
 from localstack.aws.api.lambda_ import FilterCriteria
-from localstack.services.events.event_ruler import matches_rule
+from localstack.utils.event_matcher import matches_event
 from localstack.utils.strings import first_char_to_lower
 
 LOG = logging.getLogger(__name__)
@@ -26,7 +26,7 @@ def filter_stream_records(records, filters: list[FilterCriteria]):
                 if config.EVENT_RULE_ENGINE == "java":
                     event_str = json.dumps(record)
                     event_pattern_str = rule["Pattern"]
-                    match_result = matches_rule(event_str, event_pattern_str)
+                    match_result = matches_event(event_pattern_str, event_str)
                 else:
                     filter_pattern: dict[str, any] = json.loads(rule["Pattern"])
                     match_result = does_match_event(filter_pattern, record)
 
@@ -6,7 +6,7 @@
 from localstack.services.events.v1.utils import matches_event as python_matches_event
 
 
-def matches_event(event_pattern: dict[str, Any] | str, event: dict[str, Any] | str) -> bool:
+def matches_event(event_pattern: dict[str, Any] | str | None, event: dict[str, Any] | str) -> bool:
     """
     Match events based on configured rule engine.
 
@@ -35,19 +35,19 @@ def matches_event(event_pattern: dict[str, Any] | str, event: dict[str, Any] | s
         - EventBridge Pipes: https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-pipes-event-filtering.html
         - Event Source Mappings: https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html
     """
+    if not event_pattern:
+        return True
+
     if config.EVENT_RULE_ENGINE == "python":
         # Python implementation needs dicts
         event_dict = json.loads(event) if isinstance(event, str) else event
         pattern_dict = (
             json.loads(event_pattern) if isinstance(event_pattern, str) else event_pattern
         )
         return python_matches_event(pattern_dict, event_dict)
-
-    # Java implementation (default)
-    # If inputs are already strings (EventBridge), use directly
-    if isinstance(event, str) and isinstance(event_pattern, str):
-        return matches_rule(event, event_pattern)
-    # Convert dicts (ESM/Pipes) to strings for Java engine
-    event_str = event if isinstance(event, str) else json.dumps(event)
-    pattern_str = event_pattern if isinstance(event_pattern, str) else json.dumps(event_pattern)
-    return matches_rule(event_str, pattern_str)
+    else:
+        # Java implementation (default)
+        # Convert dicts to strings if necessary
+        event_str = event if isinstance(event, str) else json.dumps(event)
+        pattern_str = event_pattern if isinstance(event_pattern, str) else json.dumps(event_pattern)
+        return matches_rule(event_str, pattern_str)
@@ -49,7 +49,7 @@ def test_matches_event_with_python_engine_strings(event_rule_engine):
 def test_matches_event_with_python_engine_dicts(event_rule_engine):
     """Test Python engine with dict inputs"""
     event_rule_engine("python")
-    assert matches_event(EVENT_PATTERN_DICT, EVENT_DICT)
+    assert matches_event(EVENT_PATTERN_DICT, EVENT_STR)
 
 
 def test_matches_event_mixed_inputs(event_rule_engine):