From ab8f3132bcc27dba45350db48b1e4977767934dd Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 8 Apr 2025 09:46:35 -0400 Subject: [PATCH 1/3] Conserve precious characters --- .../ingest/common/RemoveProcessorTests.java | 45 +++++++------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java index c511cb3252577..3739a0e029064 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java @@ -16,11 +16,12 @@ import org.elasticsearch.script.TemplateScript; import org.elasticsearch.test.ESTestCase; -import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.elasticsearch.ingest.common.RemoveProcessor.shouldKeep; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; @@ -124,12 +125,7 @@ public void testKeepFields() throws Exception { IngestDocument document = RandomDocumentPicks.randomIngestDocument(random(), source); - List fieldsToKeep = List.of( - new TestTemplateService.MockTemplateScript.Factory("name"), - new TestTemplateService.MockTemplateScript.Factory("address.street") - ); - - Processor processor = new RemoveProcessor(randomAlphaOfLength(10), null, new ArrayList<>(), fieldsToKeep, false); + Processor processor = new RemoveProcessor(null, null, List.of(), templates("name", "address.street"), false); processor.execute(document); assertTrue(document.hasField("name")); assertTrue(document.hasField("address")); @@ -153,37 +149,26 @@ public void testShouldKeep(String a, String b) { IngestDocument document = RandomDocumentPicks.randomIngestDocument(random(), source); - assertTrue(RemoveProcessor.shouldKeep("name", List.of(new TestTemplateService.MockTemplateScript.Factory("name")), document)); + assertTrue(shouldKeep("name", templates("name"), document)); - assertTrue(RemoveProcessor.shouldKeep("age", List.of(new TestTemplateService.MockTemplateScript.Factory("age")), document)); + assertTrue(shouldKeep("age", templates("age"), document)); - assertFalse(RemoveProcessor.shouldKeep("name", List.of(new TestTemplateService.MockTemplateScript.Factory("age")), document)); + assertFalse(shouldKeep("name", templates("age"), document)); - assertTrue( - RemoveProcessor.shouldKeep("address", List.of(new TestTemplateService.MockTemplateScript.Factory("address.street")), document) - ); + assertTrue(shouldKeep("address", templates("address.street"), document)); - assertTrue( - RemoveProcessor.shouldKeep("address", List.of(new TestTemplateService.MockTemplateScript.Factory("address.number")), document) - ); + assertTrue(shouldKeep("address", templates("address.number"), document)); - assertTrue( - RemoveProcessor.shouldKeep("address.street", List.of(new TestTemplateService.MockTemplateScript.Factory("address")), document) - ); + assertTrue(shouldKeep("address.street", templates("address"), document)); - assertTrue( - RemoveProcessor.shouldKeep("address.number", List.of(new TestTemplateService.MockTemplateScript.Factory("address")), document) - ); + assertTrue(shouldKeep("address.number", templates("address"), document)); - assertTrue(RemoveProcessor.shouldKeep("address", List.of(new TestTemplateService.MockTemplateScript.Factory("address")), document)); + assertTrue(shouldKeep("address", templates("address"), document)); - assertFalse( - RemoveProcessor.shouldKeep( - "address.street", - List.of(new TestTemplateService.MockTemplateScript.Factory("address.number")), - document - ) - ); + assertFalse(shouldKeep("address.street", templates("address.number"), document)); } + private static List templates(String... fields) { + return Arrays.stream(fields).map(f -> (TemplateScript.Factory) new TestTemplateService.MockTemplateScript.Factory(f)).toList(); + } } From d88a40a17b87544227178ba3c2dde54721f0056e Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 8 Apr 2025 09:48:31 -0400 Subject: [PATCH 2/3] Whitespace --- .../ingest/common/RemoveProcessorTests.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java index 3739a0e029064..c99c1f3b8360d 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java @@ -127,6 +127,7 @@ public void testKeepFields() throws Exception { Processor processor = new RemoveProcessor(null, null, List.of(), templates("name", "address.street"), false); processor.execute(document); + assertTrue(document.hasField("name")); assertTrue(document.hasField("address")); assertTrue(document.hasField("address.street")); @@ -150,21 +151,13 @@ public void testShouldKeep(String a, String b) { IngestDocument document = RandomDocumentPicks.randomIngestDocument(random(), source); assertTrue(shouldKeep("name", templates("name"), document)); - assertTrue(shouldKeep("age", templates("age"), document)); - assertFalse(shouldKeep("name", templates("age"), document)); - assertTrue(shouldKeep("address", templates("address.street"), document)); - assertTrue(shouldKeep("address", templates("address.number"), document)); - assertTrue(shouldKeep("address.street", templates("address"), document)); - assertTrue(shouldKeep("address.number", templates("address"), document)); - assertTrue(shouldKeep("address", templates("address"), document)); - assertFalse(shouldKeep("address.street", templates("address.number"), document)); } From c12414e9d5da8098516228a3c64d876672ab8458 Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 8 Apr 2025 09:52:33 -0400 Subject: [PATCH 3/3] Make this test actually run --- .../org/elasticsearch/ingest/common/RemoveProcessorTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java index c99c1f3b8360d..0b598c4528ef4 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RemoveProcessorTests.java @@ -139,7 +139,7 @@ public void testKeepFields() throws Exception { assertTrue(document.hasField("_version_type")); } - public void testShouldKeep(String a, String b) { + public void testShouldKeep() { Map address = new HashMap<>(); address.put("street", "Ipiranga Street"); address.put("number", 123);