Using EventKey in Expression Parsing flow (#6064)

san81 · web-flow · commit 318483dfe726 · 2025-09-15T10:43:48.000-07:00
Using `EventKey` in `ParseTreeCoercionService` and corresponding test configuration fixes. It also includes change the data-prepper-event module classes to be moved from `org.opensearch.dataprepper.core.expression` to `org.opensearch.dataprepper.expression`  and corresponding change in the Spring context initialization order.
diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java
@@ -12,9 +12,9 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager;
-import org.opensearch.dataprepper.core.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.core.validation.LoggingPluginErrorsHandler;
 import org.opensearch.dataprepper.core.validation.PluginErrorCollector;
+import org.opensearch.dataprepper.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.metrics.PluginMetrics;
 import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel;
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java
@@ -16,7 +16,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager;
 import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager;
-import org.opensearch.dataprepper.core.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.core.parser.config.DataPrepperAppConfiguration;
 import org.opensearch.dataprepper.core.parser.config.FileStructurePathProvider;
 import org.opensearch.dataprepper.core.parser.config.PipelineParserConfiguration;
@@ -25,8 +24,8 @@
 import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory;
 import org.opensearch.dataprepper.core.validation.LoggingPluginErrorsHandler;
 import org.opensearch.dataprepper.core.validation.PluginErrorCollector;
+import org.opensearch.dataprepper.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.expression.StartsWithExpressionFunction;
-import org.opensearch.dataprepper.validation.PluginErrorsHandler;
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager;
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
 import org.opensearch.dataprepper.model.event.EventFactory;
@@ -35,6 +34,7 @@
 import org.opensearch.dataprepper.plugin.ObjectMapperConfiguration;
 import org.opensearch.dataprepper.plugin.TestPluggableInterface;
 import org.opensearch.dataprepper.plugins.test.TestExtension;
+import org.opensearch.dataprepper.validation.PluginErrorsHandler;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import java.util.ArrayList;
diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/AbstractContextManager.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/AbstractContextManager.java
@@ -29,7 +29,10 @@ public abstract class AbstractContextManager {
             BASE_DATA_PREPPER_PACKAGE + ".core",
             BASE_DATA_PREPPER_PACKAGE + ".plugin"
     };
-    private static final String EXPRESSION_PACKAGE =   BASE_DATA_PREPPER_PACKAGE + ".expression";
+    private static final String[] PRE_BASE_DATA_PREPPER_PACKAGES = {
+            BASE_DATA_PREPPER_PACKAGE + ".event",
+            BASE_DATA_PREPPER_PACKAGE + ".expression"
+    };
 
     private final AnnotationConfigApplicationContext publicApplicationContext;
     private final AnnotationConfigApplicationContext coreApplicationContext;
@@ -53,7 +56,7 @@ public DataPrepper getDataPrepperBean() {
     }
 
     private void start() {
-        publicApplicationContext.scan(EXPRESSION_PACKAGE);
+        publicApplicationContext.scan(PRE_BASE_DATA_PREPPER_PACKAGES);
         preRefreshPublicApplicationContext(publicApplicationContext);
 
         publicApplicationContext.refresh();
diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfiguration.java
@@ -11,11 +11,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
-import org.opensearch.dataprepper.core.event.EventConfiguration;
-import org.opensearch.dataprepper.core.event.EventConfigurationContainer;
 import org.opensearch.dataprepper.core.parser.config.MetricTagFilter;
 import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration;
 import org.opensearch.dataprepper.core.pipeline.PipelineShutdownOption;
+import org.opensearch.dataprepper.event.EventConfiguration;
+import org.opensearch.dataprepper.event.EventConfigurationContainer;
 import org.opensearch.dataprepper.model.configuration.PipelineExtensions;
 import org.opensearch.dataprepper.model.configuration.PluginModel;
 import org.opensearch.dataprepper.plugin.ExperimentalConfiguration;
diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java
@@ -21,16 +21,16 @@
 import org.opensearch.dataprepper.TestDataProvider;
 import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager;
 import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager;
-import org.opensearch.dataprepper.core.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration;
 import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration;
 import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider;
 import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer;
-import org.opensearch.dataprepper.core.pipeline.Pipeline;
 import org.opensearch.dataprepper.core.pipeline.HeadlessPipelineSource;
+import org.opensearch.dataprepper.core.pipeline.Pipeline;
 import org.opensearch.dataprepper.core.pipeline.router.RouterFactory;
 import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory;
 import org.opensearch.dataprepper.core.validation.PluginErrorCollector;
+import org.opensearch.dataprepper.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.expression.ExpressionEvaluator;
 import org.opensearch.dataprepper.model.breaker.CircuitBreaker;
 import org.opensearch.dataprepper.model.buffer.Buffer;
@@ -61,15 +61,15 @@
 import java.util.UUID;
 import java.util.stream.Stream;
 
-import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigIT.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigIT.java
@@ -8,8 +8,8 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.junit.jupiter.api.Test;
 import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager;
-import org.opensearch.dataprepper.core.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode;
+import org.opensearch.dataprepper.event.EventFactoryApplicationContextMarker;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/CachingEventKeyFactory.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/CachingEventKeyFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultBaseEventBuilder.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultBaseEventBuilder.java
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.opensearch.dataprepper.model.event.BaseEventBuilder;
 import org.opensearch.dataprepper.model.event.DefaultEventMetadata;
 import org.opensearch.dataprepper.model.event.Event;
-import org.opensearch.dataprepper.model.event.EventMetadata;
 import org.opensearch.dataprepper.model.event.EventHandle;
+import org.opensearch.dataprepper.model.event.EventMetadata;
 
 import java.time.Instant;
 import java.util.HashMap;
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultEventBuilderFactory.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultEventBuilderFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.opensearch.dataprepper.model.event.Event;
 import org.opensearch.dataprepper.model.event.EventBuilder;
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultEventFactory.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultEventFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.opensearch.dataprepper.model.event.BaseEventBuilder;
 import org.opensearch.dataprepper.model.event.Event;
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultEventKeyFactory.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultEventKeyFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.opensearch.dataprepper.model.event.EventKey;
 import org.opensearch.dataprepper.model.event.EventKeyFactory;
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultLogEventBuilderFactory.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/DefaultLogEventBuilderFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.opensearch.dataprepper.model.event.LogEventBuilder;
 import org.opensearch.dataprepper.model.log.JacksonLog;
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventBuilderFactory.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventBuilderFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 abstract class EventBuilderFactory {
     abstract Class<?> getEventClass();
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventConfiguration.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventConfiguration.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventConfigurationContainer.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventConfigurationContainer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 public interface EventConfigurationContainer {
     EventConfiguration getEventConfiguration();
diff --git a/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventFactoryApplicationConfiguration.java b/data-prepper-event/src/main/java/org/opensearch/dataprepper/event/EventFactoryApplicationConfiguration.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.opensearch.dataprepper.model.event.EventKeyFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/CachingEventKeyFactoryTest.java b/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/CachingEventKeyFactoryTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultBaseEventBuilderTests.java b/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultBaseEventBuilderTests.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
diff --git a/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultEventBuilderFactoryTests.java b/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultEventBuilderFactoryTests.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultEventFactoryTests.java b/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultEventFactoryTests.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultEventKeyFactoryTest.java b/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultEventKeyFactoryTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.dataprepper.model.event.EventKey;
diff --git a/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultLogEventBuilderFactoryTests.java b/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/DefaultLogEventBuilderFactoryTests.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/EventFactoryApplicationConfigurationTest.java b/data-prepper-event/src/test/java/org/opensearch/dataprepper/event/EventFactoryApplicationConfigurationTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.core.event;
+package org.opensearch.dataprepper.event;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
diff --git a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java
@@ -8,6 +8,8 @@
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.opensearch.dataprepper.expression.antlr.DataPrepperExpressionParser;
 import org.opensearch.dataprepper.model.event.Event;
+import org.opensearch.dataprepper.model.event.EventKey;
+import org.opensearch.dataprepper.model.event.EventKeyFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -34,6 +36,7 @@ class ParseTreeCoercionService {
     private final ExpressionFunctionProvider expressionFunctionProvider;
     private final Function<Object, Object> convertLiteralType;
     private final ConcurrentMap<String, FunctionMetadata> cachedFunctionStrings = new ConcurrentHashMap<>(16, 0.75f);
+    private final EventKeyFactory eventKeyFactory;
 
     public Object coercePrimaryTerminalNode(final TerminalNode node, final Event event) {
         Objects.requireNonNull(node, "TerminalNode cannot be null");
@@ -77,7 +80,8 @@ public Object coercePrimaryTerminalNode(final TerminalNode node, final Event eve
     @Inject
     public ParseTreeCoercionService(
             final Map<Class<? extends Serializable>, Function<Object, Object>> literalTypeConversions,
-            final ExpressionFunctionProvider expressionFunctionProvider) {
+            final ExpressionFunctionProvider expressionFunctionProvider,
+            final EventKeyFactory eventKeyFactory) {
         Objects.requireNonNull(literalTypeConversions, "literalTypeConversions cannot be null");
         Objects.requireNonNull(expressionFunctionProvider, "expressionFunctionProvider cannot be null");
         this.literalTypeConversions = literalTypeConversions;
@@ -89,6 +93,7 @@ public ParseTreeCoercionService(
             }
         };
         this.expressionFunctionProvider = expressionFunctionProvider;
+        this.eventKeyFactory = eventKeyFactory;
     }
 
     public <T> T coerce(final Object obj, Class<T> clazz) throws ExpressionCoercionException {
@@ -148,7 +153,8 @@ private FunctionMetadata(final String functionName, final List<Object> argList)
     }
 
     private Object resolveJsonPointerValue(final String jsonPointer, final Event event) {
-        final Object value = event.get(jsonPointer, Object.class);
+        EventKey eventKey = this.eventKeyFactory.createEventKey(jsonPointer);
+        final Object value = event.get(eventKey, Object.class);
         return value != null ? convertLiteralType.apply(value) : null;
     }
 }
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/BaseExpressionEvaluatorIT.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/BaseExpressionEvaluatorIT.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.expression;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+abstract class BaseExpressionEvaluatorIT {
+    
+    protected AnnotationConfigApplicationContext applicationContext;
+
+    @BeforeEach
+    void beforeEach() {
+        applicationContext = createApplicationContext();
+    }
+
+    protected AnnotationConfigApplicationContext createApplicationContext() {
+        return new AnnotationConfigApplicationContext(TestExpressionSpringConfig.class);
+    }
+}
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ArithmeticIT.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ArithmeticIT.java
@@ -5,24 +5,23 @@
 
 package org.opensearch.dataprepper.expression;
 
-import org.junit.jupiter.api.BeforeEach;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opensearch.dataprepper.model.event.Event;
 import org.opensearch.dataprepper.model.event.JacksonEvent;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
-import java.util.Random;
 
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -33,19 +32,8 @@
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.hamcrest.CoreMatchers.not;
-import org.apache.commons.lang3.RandomStringUtils;
-
-class GenericExpressionEvaluator_ArithmeticIT {
 
-    private AnnotationConfigApplicationContext applicationContext;
-
-    @BeforeEach
-    void beforeEach() {
-        applicationContext = new AnnotationConfigApplicationContext();
-        applicationContext.scan("org.opensearch.dataprepper.expression");
-        applicationContext.refresh();
-    }
+class GenericExpressionEvaluator_ArithmeticIT extends BaseExpressionEvaluatorIT {
 
     @Test
     void testArithmeticExpressionEvaluatorBeanAvailable() {
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ConditionalIT.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ConditionalIT.java
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_MultiTypeIT.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_MultiTypeIT.java
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceParameterizedTest.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceParameterizedTest.java
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListenerTest.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListenerTest.java
diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/TestExpressionSpringConfig.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/TestExpressionSpringConfig.java
diff --git a/data-prepper-test/test-event/src/main/java/org/opensearch/dataprepper/event/EventFactoryApplicationContextMarker.java b/data-prepper-test/test-event/src/main/java/org/opensearch/dataprepper/event/EventFactoryApplicationContextMarker.java
diff --git a/data-prepper-test/test-event/src/main/java/org/opensearch/dataprepper/event/TestEventConfigurationContainer.java b/data-prepper-test/test-event/src/main/java/org/opensearch/dataprepper/event/TestEventConfigurationContainer.java
diff --git a/data-prepper-test/test-event/src/main/java/org/opensearch/dataprepper/event/TestEventContext.java b/data-prepper-test/test-event/src/main/java/org/opensearch/dataprepper/event/TestEventContext.java
