Move ID generation to common util

Signed-off-by: Varun Bharadwaj <varunbharadwaj1995@gmail.com>

Author: varunbharadwaj

server/src/main/java/org/opensearch/action/index/IndexRequest.java

@@ -46,9 +46,9 @@
 import org.opensearch.cluster.metadata.MappingMetadata;
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.UUIDs;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.uid.Versions;
+import org.opensearch.common.util.RequestUtils;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.common.Strings;
@@ -625,7 +625,7 @@ public void process(Version indexCreatedVersion, @Nullable MappingMetadata mappi
             assert ifSeqNo == UNASSIGNED_SEQ_NO;
             assert ifPrimaryTerm == UNASSIGNED_PRIMARY_TERM;
             autoGeneratedTimestamp = Math.max(0, System.currentTimeMillis()); // extra paranoia
-            id(UUIDs.base64UUID());
+            id(RequestUtils.generateID());
         }
     }
 

server/src/main/java/org/opensearch/common/util/RequestUtils.java

@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.common.util;
+
+import org.opensearch.common.UUIDs;
+
+/**
+ * Common utility methods for request handling.
+ *
+ * @opensearch.internal
+ */
+public final class RequestUtils {
+
+    private RequestUtils() {}
+
+    /**
+     * Generates a new ID field for new documents.
+     */
+    public static String generateID() {
+        return UUIDs.base64UUID();
+    }
+}

server/src/main/java/org/opensearch/indices/pollingingest/IngestionUtils.java

@@ -15,8 +15,11 @@
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.metrics.CounterMetric;
+import org.opensearch.common.util.RequestUtils;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.MediaTypeRegistry;
 import org.opensearch.index.IngestionShardConsumer;
@@ -142,7 +145,7 @@ protected void process(Message message, IngestionShardPointer pointer) {
          * @return the engine operation
          */
         protected Engine.Operation getOperation(byte[] payload, IngestionShardPointer pointer) throws IOException {
-            Map<String, Object> payloadMap = IngestionUtils.getParsedPayloadMap(payload);
+            Map<String, Object> payloadMap = getParsedPayloadMap(payload);
 
             if (payloadMap.containsKey(OP_TYPE) && !(payloadMap.get(OP_TYPE) instanceof String)) {
                 // TODO: add metric
@@ -154,7 +157,7 @@ protected Engine.Operation getOperation(byte[] payload, IngestionShardPointer po
             long autoGeneratedIdTimestamp = UNSET_AUTO_GENERATED_TIMESTAMP;
             if (Strings.isNullOrEmpty(id)) {
                 // auto generate ID for the message
-                id = IngestionUtils.generateID();
+                id = RequestUtils.generateID();
                 payloadMap.put(ID, id);
                 autoGeneratedIdTimestamp = System.currentTimeMillis();
             }
@@ -233,6 +236,12 @@ protected Engine.Operation getOperation(byte[] payload, IngestionShardPointer po
 
             return operation;
         }
+
+        private Map<String, Object> getParsedPayloadMap(byte[] payload) {
+            BytesReference payloadBR = new BytesArray(payload);
+            Map<String, Object> payloadMap = XContentHelper.convertToMap(payloadBR, false, MediaTypeRegistry.xContentType(payloadBR)).v2();
+            return payloadMap;
+        }
     }
 
     private static BytesReference convertToBytes(Object object) throws IOException {

server/src/main/java/org/opensearch/indices/pollingingest/MessageProcessorRunnable.java

@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.common.util;
+
+import org.opensearch.core.common.Strings;
+import org.opensearch.test.OpenSearchTestCase;
+
+public class RequestUtilsTests extends OpenSearchTestCase {
+
+    public void testGenerateID() {
+        assertTrue(Strings.hasText(RequestUtils.generateID()));
+    }
+}