addressing review comments

Signed-off-by: Bharathwaj G <[email protected]>

CHANGELOG.md

@@ -71,7 +71,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix 'org.apache.hc.core5.http.ParseException: Invalid protocol version' under JDK 16+ ([#4827](https://github.com/opensearch-project/OpenSearch/pull/4827))
 - Fix compression support for h2c protocol ([#4944](https://github.com/opensearch-project/OpenSearch/pull/4944))
 - Support OpenSSL Provider with default Netty allocator ([#5460](https://github.com/opensearch-project/OpenSearch/pull/5460))
-- Fixing input validation in segments and delete pit request ([#6645](https://github.com/opensearch-project/OpenSearch/pull/6645))
 - Replaces ZipInputStream with ZipFile to fix Zip Slip vulnerability ([#7230](https://github.com/opensearch-project/OpenSearch/pull/7230))
 - Add missing validation/parsing of SearchBackpressureMode of SearchBackpressureSettings ([#7541](https://github.com/opensearch-project/OpenSearch/pull/7541))
 
@@ -137,6 +136,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add more index blocks check for resize APIs ([#6774](https://github.com/opensearch-project/OpenSearch/pull/6774))
 - Replaces ZipInputStream with ZipFile to fix Zip Slip vulnerability ([#7230](https://github.com/opensearch-project/OpenSearch/pull/7230))
 - Add missing validation/parsing of SearchBackpressureMode of SearchBackpressureSettings ([#7541](https://github.com/opensearch-project/OpenSearch/pull/7541))
+- Fix input validation in segments and delete pit request ([#6645](https://github.com/opensearch-project/OpenSearch/pull/6645))
 
 ### Security
 

server/src/main/java/org/opensearch/action/admin/indices/segments/PitSegmentsRequest.java

@@ -19,9 +19,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import static org.opensearch.action.ValidateActions.addValidationError;
 
@@ -89,7 +87,7 @@ public ActionRequestValidationException validate() {
     }
 
     public void fromXContent(XContentParser parser) throws IOException {
-        Set<String> pitIds = new HashSet<>();
+        pitIds.clear();
         if (parser.nextToken() != XContentParser.Token.START_OBJECT) {
             throw new IllegalArgumentException("Malformed content, must start with an object");
         } else {
@@ -119,7 +117,5 @@ public void fromXContent(XContentParser parser) throws IOException {
                 }
             }
         }
-        this.pitIds.clear();
-        this.pitIds.addAll(pitIds);
     }
 }

server/src/main/java/org/opensearch/action/admin/indices/segments/TransportPitSegmentsAction.java

@@ -44,8 +44,10 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static org.opensearch.action.search.SearchContextId.decode;
@@ -94,8 +96,10 @@ public TransportPitSegmentsAction(
      */
     @Override
     protected void doExecute(Task task, PitSegmentsRequest request, ActionListener<IndicesSegmentResponse> listener) {
-        List<String> pitIds = request.getPitIds();
-        if (pitIds.size() == 1 && "_all".equals(pitIds.get(0))) {
+        // remove pit id duplicates from the request
+        Set<String> pitIdSet = new LinkedHashSet<>(request.getPitIds());
+        request.clearAndSetPitIds(new ArrayList<>(pitIdSet));
+        if (request.getPitIds().size() == 1 && "_all".equals(request.getPitIds().get(0))) {
             pitService.getAllPits(ActionListener.wrap(response -> {
                 request.clearAndSetPitIds(response.getPitInfos().stream().map(ListPitInfo::getPitId).collect(Collectors.toList()));
                 super.doExecute(task, request, listener);

server/src/main/java/org/opensearch/action/search/DeletePitRequest.java

@@ -21,9 +21,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import static org.opensearch.action.ValidateActions.addValidationError;
 
@@ -93,7 +91,7 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par
     }
 
     public void fromXContent(XContentParser parser) throws IOException {
-        Set<String> pitIds = new HashSet<>();
+        pitIds.clear();
         if (parser.nextToken() != XContentParser.Token.START_OBJECT) {
             throw new IllegalArgumentException("Malformed content, must start with an object");
         } else {
@@ -123,8 +121,6 @@ public void fromXContent(XContentParser parser) throws IOException {
                 }
             }
         }
-        this.pitIds.clear();
-        this.pitIds.addAll(pitIds);
     }
 
 }

server/src/main/java/org/opensearch/action/search/TransportDeletePitAction.java

@@ -18,8 +18,10 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -46,8 +48,10 @@ public TransportDeletePitAction(
      */
     @Override
     protected void doExecute(Task task, DeletePitRequest request, ActionListener<DeletePitResponse> listener) {
-        List<String> pitIds = request.getPitIds();
-        if (pitIds.size() == 1 && "_all".equals(pitIds.get(0))) {
+        // remove pit id duplicates from the request
+        Set<String> pitIdSet = new LinkedHashSet<>(request.getPitIds());
+        request.clearAndSetPitIds(new ArrayList<>(pitIdSet));
+        if (request.getPitIds().size() == 1 && "_all".equals(request.getPitIds().get(0))) {
             deleteAllPits(listener);
         } else {
             deletePits(listener, request);