From 708b6205c47b83997d3e4c7134cc917476db4f93 Mon Sep 17 00:00:00 2001 From: Surya Sashank Nistala Date: Mon, 27 Nov 2023 16:14:37 -0800 Subject: [PATCH] Revert "fix doc level query constructor (#651) (#682)" This reverts commit 282046d7c76048f6e2120fcfe2eb7b50360d015f. Signed-off-by: Surya Sashank Nistala --- .../securityanalytics/findings/FindingsService.java | 2 +- .../transport/TransportIndexDetectorAction.java | 8 ++------ .../securityanalytics/findings/FindingDtoTests.java | 5 ++--- .../securityanalytics/findings/FindingServiceTests.java | 4 ++-- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java b/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java index 4674f40cc..755b124db 100644 --- a/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java +++ b/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java @@ -216,7 +216,7 @@ public FindingDto mapFindingWithDocsToFindingDto(FindingWithDocs findingWithDocs if (docLevelQueries.isEmpty()) { // this is finding generated by a bucket level monitor for (Map.Entry entry : detector.getRuleIdMonitorIdMap().entrySet()) { if(entry.getValue().equals(findingWithDocs.getFinding().getMonitorId())) { - docLevelQueries = Collections.singletonList(new DocLevelQuery(entry.getKey(),"", Collections.emptyList(),"",Collections.emptyList())); + docLevelQueries = Collections.singletonList(new DocLevelQuery(entry.getKey(),"","",Collections.emptyList())); } } } diff --git a/src/main/java/org/opensearch/securityanalytics/transport/TransportIndexDetectorAction.java b/src/main/java/org/opensearch/securityanalytics/transport/TransportIndexDetectorAction.java index 09df709b1..c27cc14da 100644 --- a/src/main/java/org/opensearch/securityanalytics/transport/TransportIndexDetectorAction.java +++ b/src/main/java/org/opensearch/securityanalytics/transport/TransportIndexDetectorAction.java @@ -295,10 +295,7 @@ private void createMonitorFromQueries(List> rulesById, Detect ); } }, - e1 -> { - log.error("Failed to index doc level monitor in detector creation", e1); - listener.onFailure(e1); - } + listener::onFailure ); }, listener::onFailure); } else { @@ -645,7 +642,7 @@ private IndexMonitorRequest createDocLevelMonitorRequest(List tags.add(rule.getCategory()); tags.addAll(rule.getTags().stream().map(Value::getValue).collect(Collectors.toList())); - DocLevelQuery docLevelQuery = new DocLevelQuery(id, name, Collections.emptyList(), actualQuery, tags); + DocLevelQuery docLevelQuery = new DocLevelQuery(id, name, actualQuery, tags); docLevelQueries.add(docLevelQuery); } DocLevelMonitorInput docLevelMonitorInput = new DocLevelMonitorInput(detector.getName(), detector.getInputs().get(0).getIndices(), docLevelQueries); @@ -695,7 +692,6 @@ private IndexMonitorRequest createDocLevelMonitorMatchAllRequest( DocLevelQuery docLevelQuery = new DocLevelQuery( monitorName, monitorName + "doc", - Collections.emptyList(), actualQuery, Collections.emptyList() ); diff --git a/src/test/java/org/opensearch/securityanalytics/findings/FindingDtoTests.java b/src/test/java/org/opensearch/securityanalytics/findings/FindingDtoTests.java index ffcb75644..7877410be 100644 --- a/src/test/java/org/opensearch/securityanalytics/findings/FindingDtoTests.java +++ b/src/test/java/org/opensearch/securityanalytics/findings/FindingDtoTests.java @@ -5,7 +5,6 @@ package org.opensearch.securityanalytics.findings; import java.time.Instant; -import java.util.Collections; import java.util.List; import org.opensearch.commons.alerting.model.DocLevelQuery; import org.opensearch.commons.alerting.model.FindingDocument; @@ -28,7 +27,7 @@ public void testFindingDTO_creation() { "findingId", List.of("doc1", "doc2", "doc3"), "my_index", - List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())), + List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())), now, List.of(findingDocument1, findingDocument2, findingDocument3) ); @@ -37,7 +36,7 @@ public void testFindingDTO_creation() { assertEquals("findingId", findingDto.getId()); assertEquals(List.of("doc1", "doc2", "doc3"), findingDto.getRelatedDocIds()); assertEquals("my_index", findingDto.getIndex()); - assertEquals(List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())), findingDto.getDocLevelQueries()); + assertEquals(List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())), findingDto.getDocLevelQueries()); assertEquals(now, findingDto.getTimestamp()); assertEquals(List.of(findingDocument1, findingDocument2, findingDocument3), findingDto.getDocuments()); } diff --git a/src/test/java/org/opensearch/securityanalytics/findings/FindingServiceTests.java b/src/test/java/org/opensearch/securityanalytics/findings/FindingServiceTests.java index 5c28ba65b..0fb9376b6 100644 --- a/src/test/java/org/opensearch/securityanalytics/findings/FindingServiceTests.java +++ b/src/test/java/org/opensearch/securityanalytics/findings/FindingServiceTests.java @@ -84,7 +84,7 @@ public void testGetFindings_success() { "monitor_id1", "monitor_name1", "test_index1", - List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())), + List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())), Instant.now(), "1234" ); @@ -100,7 +100,7 @@ public void testGetFindings_success() { "monitor_id2", "monitor_name2", "test_index2", - List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())), + List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())), Instant.now(), "1234" );