Removes usage of mapping types (opensearch-project#155)

Signed-off-by: Drew Baugher <[email protected]>
ochprince · Mar 26, 2022 · 6536db7 · 6536db7
1 parent 0b43e14
commit 6536db7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.0.0-alpha1-SNAPSHOT")
     }
 
     repositories {

diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
@@ -41,11 +41,6 @@
 
 public final class LockService {
     private static final Logger logger = LogManager.getLogger(LockService.class);
-    /**
-     * This should go away starting ES 7. We use "_doc" for future compatibility as described here:
-     * https://www.elastic.co/guide/en/elasticsearch/reference/6.x/removal-of-types.html#_schedule_for_removal_of_mapping_types
-     */
-    private static final String MAPPING_TYPE = "_doc";
     private static final String LOCK_INDEX_NAME = ".opendistro-job-scheduler-lock";
 
     private final Client client;
@@ -82,8 +77,7 @@ void createLockIndex(ActionListener<Boolean> listener) {
         if (lockIndexExist()) {
             listener.onResponse(true);
         } else {
-            final CreateIndexRequest request = new CreateIndexRequest(LOCK_INDEX_NAME)
-                    .mapping(MAPPING_TYPE, lockMapping(), XContentType.JSON);
+            final CreateIndexRequest request = new CreateIndexRequest(LOCK_INDEX_NAME).mapping(lockMapping());
             client.admin().indices().create(request, ActionListener.wrap(
                response -> listener.onResponse(response.isAcknowledged()),
                exception -> {

diff --git a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java b/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java
@@ -283,7 +283,7 @@ private Engine.Index getIndexOperation() {
             "id_field",
             new BytesRef(docId.getBytes(Charset.defaultCharset()), 0, docId.getBytes(Charset.defaultCharset()).length)
         );
-        ParsedDocument parsedDocument = new ParsedDocument(null, null, docId, "_doc", null, docs, source, null, null);
+        ParsedDocument parsedDocument = new ParsedDocument(null, null, docId, null, docs, source, null, null);
 
         return new Engine.Index(uid, primaryTerm, parsedDocument);
     }
@@ -293,7 +293,7 @@ private Engine.Delete getDeleteOperation(String docId) {
             "id_field",
             new BytesRef(docId.getBytes(Charset.defaultCharset()), 0, docId.getBytes(Charset.defaultCharset()).length)
         );
-        return new Engine.Delete("_doc", docId, uid, 1L);
+        return new Engine.Delete(docId, uid, 1L);
     }
 
     private BytesReference getTestJsonSource() {