Skip to content

Commit 01c342c

Browse files
committed
resolve comments, update getEventTypet test to become parameterized
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
1 parent 8e2cb29 commit 01c342c

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/GetEventTypeExpressionFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public String getFunctionName() {
1919
}
2020

2121
@Override
22-
public Object evaluate(final List<Object> args, Event event, Function<Object, Object> convertLiteralType) {
22+
public Object evaluate(final List<Object> args, final Event event, final Function<Object, Object> convertLiteralType) {
2323
if (!args.isEmpty()) {
2424
throw new RuntimeException("getEventType() does not take any arguments");
2525
}

data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ParseTreeCoercionService {
2626
@Inject
2727
public ParseTreeCoercionService(
2828
final Map<Class<? extends Serializable>, Function<Object, Object>> literalTypeConversions,
29-
ExpressionFunctionProvider expressionFunctionProvider) {
29+
final ExpressionFunctionProvider expressionFunctionProvider) {
3030
this.literalTypeConversions = literalTypeConversions;
3131
convertLiteralType = (value) -> {
3232
if (literalTypeConversions.containsKey(value.getClass())) {

data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GetEventTypeExpressionFunctionTest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import org.opensearch.dataprepper.model.event.Event;
44
import org.opensearch.dataprepper.model.event.JacksonEvent;
55
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.params.ParameterizedTest;
7+
import org.junit.jupiter.params.provider.ValueSource;
8+
69
import static org.hamcrest.CoreMatchers.equalTo;
710
import static org.hamcrest.MatcherAssert.assertThat;
811
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -27,14 +30,15 @@ private Event createTestEvent(final String eventType) {
2730
.build();
2831
}
2932

30-
@Test
31-
void testGetEventTypeReturnsCorrectType() {
33+
@ParameterizedTest
34+
@ValueSource(strings = {"LOG", "TRACE", "METRIC"})
35+
void testGetEventTypeReturnsCorrectType(String eventType) {
3236
GetEventTypeExpressionFunction function = createObjectUnderTest();
33-
Event testEvent = createTestEvent("LOG");
37+
Event testEvent = createTestEvent(eventType);
3438

3539
Object result = function.evaluate(List.of(), testEvent, Function.identity());
3640

37-
assertThat(result, equalTo("LOG"));
41+
assertThat(result, equalTo(eventType));
3842
}
3943

4044
@Test

0 commit comments

Comments
 (0)