Breaking changes for type removal (#132)

* Adding support to test against unreleased OpenSearch Signed-off-by: Vacha Shah <[email protected]> * Upgrading OpenSearch version to 2.0.0-SNAPSHOT and Java version Signed-off-by: Vacha Shah <[email protected]> * Remove type mapping Signed-off-by: Vacha Shah <[email protected]> * Using snapshots from sonatype for 2.0 OpenSearch snapshot Signed-off-by: Vacha Shah <[email protected]> * Updating workflows and removing exists_type Signed-off-by: Vacha Shah <[email protected]> * Fixing integration tests Signed-off-by: Vacha Shah <[email protected]>
opensearch-project · Apr 1, 2022 · 02a313f · 02a313f
1 parent 9348be9
commit 02a313f
Show file tree

Hide file tree

Showing 47 changed files with 77 additions and 2,546 deletions.
diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
@@ -0,0 +1,54 @@
+name: Integration with Unreleased OpenSearch
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "main"
+
+env:
+  OPENSEARCH_VERSION: '2.0'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 11 ]
+    steps:
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Checkout OpenSearch
+        uses: actions/checkout@v2
+        with:
+          repository: opensearch-project/opensearch
+          ref: ${{ env.OPENSEARCH_VERSION }}
+          path: opensearch
+
+      - name: Assemble OpenSearch
+        run: |
+          cd opensearch
+          ./gradlew assemble
+
+        # This step runs the docker image generated during gradle assemble in OpenSearch. It is tagged as opensearch:test.
+        # Reference: https://github.com/opensearch-project/OpenSearch/blob/2.0/distribution/docker/build.gradle#L190
+      - name: Run Docker Image
+        run: |
+          docker run -p 9200:9200 -p 9600:9600 -d -e "discovery.type=single-node" -e "bootstrap.memory_lock=true" opensearch:test
+          sleep 90
+
+      - name: Checkout Java Client
+        uses: actions/checkout@v2
+        with:
+          path: opensearch-java
+
+      - name: Run Integration Test
+        run: |
+          cd opensearch-java
+          ./gradlew clean integrationTest -Dhttps=false
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -1,4 +1,4 @@
-name: Integration
+name: Integration with Released OpenSearch
 
 on:
   push:
@@ -15,33 +15,29 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { opensearch_version: 1.0.0, java: 11 }
-          - { opensearch_version: 1.0.1, java: 11 }
-          - { opensearch_version: 1.1.0, java: 11 }
-          - { opensearch_version: 1.2.0, java: 11 }
-          - { opensearch_version: 1.2.1, java: 11 }
-          - { opensearch_version: 1.2.2, java: 11 }
-          - { opensearch_version: 1.2.3, java: 11 }
-          - { opensearch_version: 1.2.4, java: 11 }
-          - { opensearch_version: 1.3.0, java: 11 }
+          - { opensearch_version: "", java: 11 }
     steps:
-      - name: Set up JDK ${{ matrix.entry.java }}
+      - name: Set up JDK ${{ matrix.java }}
+        if: ${{ matrix.entry.opensearch_version != ''}}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.entry.java }}
 
       - name: Checkout Branch
+        if: ${{ matrix.entry.opensearch_version != ''}}
         uses: actions/checkout@v2
 
       - name: Run Docker
+        if: ${{ matrix.entry.opensearch_version != ''}}
         run: |
           docker-compose --project-directory .ci/opensearch build --build-arg OPENSEARCH_VERSION=${{ matrix.entry.opensearch_version }}
           docker-compose --project-directory .ci/opensearch up -d
           sleep 60
-
       - name: Run Integration Test
+        if: ${{ matrix.entry.opensearch_version != ''}}
         run: ./gradlew clean integrationTest
 
       - name: Stop Docker
+        if: ${{ matrix.entry.opensearch_version != ''}}
         run: |
-          docker-compose --project-directory .ci/opensearch down
+          docker-compose --project-directory .ci/opensearch down
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,8 +37,9 @@ allprojects {
         (File(project.rootDir, "config/version.txt").readText().trim() + "-SNAPSHOT")
 
     repositories {
-        mavenCentral()
         mavenLocal()
+        maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots")
+        mavenCentral()
         maven(url = "https://plugins.gradle.org/m2/")
     }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -35,7 +35,8 @@ dependencies {
 }
 
 repositories {
-    mavenCentral()
     mavenLocal()
+    maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots")
+    mavenCentral()
     maven(url = "https://plugins.gradle.org/m2/")
 }
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -36,8 +36,9 @@ import java.io.FileWriter
 
 buildscript {
     repositories {
-        mavenCentral()
         mavenLocal()
+        maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots")
+        mavenCentral()
         maven(url = "https://plugins.gradle.org/m2/")
     }
 }
@@ -55,8 +56,8 @@ checkstyle {
 }
 
 java {
-    targetCompatibility = JavaVersion.VERSION_1_8
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_11
 
     withJavadocJar()
     withSourcesJar()
@@ -122,13 +123,14 @@ val integrationTest = task<Test>("integrationTest") {
 
 dependencies {
 
-    val opensearchVersion = "1.2.4"
+    val opensearchVersion = "2.0.0-alpha1-SNAPSHOT"
     val jacksonVersion = "2.12.6"
     val jacksonDatabindVersion = "2.12.6.1"
 
     // Apache 2.0
     implementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion)
     testImplementation("org.opensearch.test", "framework", opensearchVersion)
+    implementation("org.apache.logging.log4j", "log4j-core", "2.17.2")
 
     // Apache 2.0
     // https://search.maven.org/artifact/com.google.code.findbugs/jsr305

diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java
@@ -63,9 +63,6 @@ public abstract class WriteResponseBase implements JsonpSerializable {
 
 	private final ShardStatistics shards;
 
-	@Nullable
-	private final String type;
-
 	private final long version;
 
 	@Nullable
@@ -81,7 +78,6 @@ protected WriteResponseBase(AbstractBuilder<?> builder) {
 		this.result = ApiTypeHelper.requireNonNull(builder.result, this, "result");
 		this.seqNo = ApiTypeHelper.requireNonNull(builder.seqNo, this, "seqNo");
 		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-		this.type = builder.type;
 		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
 		this.forcedRefresh = builder.forcedRefresh;
 
@@ -129,14 +125,6 @@ public final ShardStatistics shards() {
 		return this.shards;
 	}
 
-	/**
-	 * API name: {@code _type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
 	/**
 	 * Required - API name: {@code _version}
 	 */
@@ -180,11 +168,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeKey("_shards");
 		this.shards.serialize(generator, mapper);
 
-		if (this.type != null) {
-			generator.writeKey("_type");
-			generator.write(this.type);
-
-		}
 		generator.writeKey("_version");
 		generator.write(this.version);
 
@@ -211,9 +194,6 @@ protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder
 
 		private ShardStatistics shards;
 
-		@Nullable
-		private String type;
-
 		private Long version;
 
 		@Nullable
@@ -274,14 +254,6 @@ public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<Sha
 			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
 		}
 
-		/**
-		 * API name: {@code _type}
-		 */
-		public final BuilderT type(@Nullable String value) {
-			this.type = value;
-			return self();
-		}
-
 		/**
 		 * Required - API name: {@code _version}
 		 */
@@ -312,7 +284,6 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupWriteRes
 		op.add(AbstractBuilder::result, Result._DESERIALIZER, "result");
 		op.add(AbstractBuilder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
 		op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(AbstractBuilder::type, JsonpDeserializer.stringDeserializer(), "_type");
 		op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "_version");
 		op.add(AbstractBuilder::forcedRefresh, JsonpDeserializer.booleanDeserializer(), "forced_refresh");
 

diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkRequest.java
@@ -95,9 +95,6 @@ public class BulkRequest extends RequestBase implements NdJsonpSerializable, Jso
 	@Nullable
 	private final Time timeout;
 
-	@Nullable
-	private final String type;
-
 	@Nullable
 	private final WaitForActiveShards waitForActiveShards;
 
@@ -116,7 +113,6 @@ private BulkRequest(Builder builder) {
 		this.requireAlias = builder.requireAlias;
 		this.routing = builder.routing;
 		this.timeout = builder.timeout;
-		this.type = builder.type;
 		this.waitForActiveShards = builder.waitForActiveShards;
 		this.operations = ApiTypeHelper.unmodifiableRequired(builder.operations, this, "operations");
 
@@ -224,16 +220,6 @@ public final Time timeout() {
 		return this.timeout;
 	}
 
-	/**
-	 * Default document type for items which don't provide one
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
 	/**
 	 * Sets the number of shard copies that must be active before proceeding with
 	 * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
@@ -304,9 +290,6 @@ public static class Builder extends ObjectBuilderBase implements ObjectBuilder<B
 		@Nullable
 		private Time timeout;
 
-		@Nullable
-		private String type;
-
 		@Nullable
 		private WaitForActiveShards waitForActiveShards;
 
@@ -457,16 +440,6 @@ public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 			return this.timeout(fn.apply(new Time.Builder()).build());
 		}
 
-		/**
-		 * Default document type for items which don't provide one
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
 		/**
 		 * Sets the number of shard copies that must be active before proceeding with
 		 * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
@@ -559,14 +532,11 @@ public BulkRequest build() {
 			// Request path
 			request -> {
 				final int _index = 1 << 0;
-				final int _type = 1 << 1;
 
 				int propsSet = 0;
 
 				if (request.index() != null)
 					propsSet |= _index;
-				if (request.type() != null)
-					propsSet |= _type;
 
 				if (propsSet == 0) {
 					StringBuilder buf = new StringBuilder();
@@ -580,15 +550,6 @@ public BulkRequest build() {
 					buf.append("/_bulk");
 					return buf.toString();
 				}
-				if (propsSet == (_index | _type)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.type, buf);
-					buf.append("/_bulk");
-					return buf.toString();
-				}
 				throw SimpleEndpoint.noPathTemplateFound("path");
 
 			},