Update package name

Rename package name from org.opensearch.clients.* to org.opensearch.client.*. OpenSearch is publishing all rest low level clients under client heirarchy, hence rename to publish opensearch-java inside client instead of creating additional clients folder. Also, update version to 0.1.0. Signed-off-by: Vijayan Balasubramanian <[email protected]>
opensearch-project · Oct 11, 2021 · 59540e6 · 59540e6
1 parent c7f9bea
commit 59540e6
Show file tree

Hide file tree

Showing 932 changed files with 7,012 additions and 7,013 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,7 @@
  */
 
 allprojects {
-    group = "org.opensearch.clients"
+    group = "org.opensearch.client"
     // Release manager provides a $VERSION. If not present, it's a local or CI snapshot build.
     version = System.getenv("VERSION") ?:
         (File(project.rootDir, "config/version.txt").readText().trim() + "-SNAPSHOT")
@@ -84,7 +84,7 @@ tasks.register<Task>(name = "publishForReleaseManager") {
         val releaseDir = File(rootProject.buildDir, "release")
         releaseDir.mkdirs()
 
-        File(rootProject.buildDir, "repository/org/opensearch/clients").listFiles()?.forEach { artifact ->
+        File(rootProject.buildDir, "repository/org/opensearch/client").listFiles()?.forEach { artifact ->
             println("Releasing artifact " + artifact.name)
 
             val versionDir = File(artifact, version)

diff --git a/config/checkstyle/checkstyle_suppressions.xml b/config/checkstyle/checkstyle_suppressions.xml
@@ -37,9 +37,9 @@
 
 <suppressions>
     <!-- Do not enforce line length on generated code -->
-    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]clients[/\\]opensearch[^.]*\.java" checks="LineLength" />
-    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]clients[/\\]opensearch[^.]*\.java" checks="UnusedImports" />
-    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]clients[/\\]opensearch[/\\]OpenSearch[^.]*\.java" checks="LineLength" />
-    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]clients[/\\]opensearch[/\\]OpenSearch[^.]*\.java" checks="UnusedImports" />
-    <suppress files="client[/\\]src[/\\]test[/\\]java[/\\]org[/\\]opensearch[/\\]clients[/\\]opensearch[/\\]integTest[^.]*\.java" checks="Header" />
+    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]client[/\\]opensearch[^.]*\.java" checks="LineLength" />
+    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]client[/\\]opensearch[^.]*\.java" checks="UnusedImports" />
+    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]client[/\\]opensearch[/\\]OpenSearch[^.]*\.java" checks="LineLength" />
+    <suppress files="client[/\\]src[/\\]main[/\\]java[/\\]org[/\\]opensearch[/\\]client[/\\]opensearch[/\\]OpenSearch[^.]*\.java" checks="UnusedImports" />
+    <suppress files="client[/\\]src[/\\]test[/\\]java[/\\]org[/\\]opensearch[/\\]client[/\\]opensearch[/\\]integTest[^.]*\.java" checks="Header" />
 </suppressions>
diff --git a/config/version.txt b/config/version.txt
@@ -1 +1 @@
-1.0.0
+0.1.0
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -89,13 +89,13 @@ tasks.test {
 
 val unitTest = task<Test>("unitTest") {
     filter {
-        excludeTestsMatching("org.opensearch.clients.opensearch.integTest.*")
+        excludeTestsMatching("org.opensearch.client.opensearch.integTest.*")
     }
 }
 
 val integrationTest = task<Test>("integrationTest") {
     filter {
-        includeTestsMatching("org.opensearch.clients.opensearch.integTest.*")
+        includeTestsMatching("org.opensearch.client.opensearch.integTest.*")
     }
     systemProperty("tests.security.manager", "false")
     // Basic auth settings for integration test

diff --git a/...ch/clients/base/AdditionalProperties.java → ...rch/client/base/AdditionalProperties.java b/...ch/clients/base/AdditionalProperties.java → ...rch/client/base/AdditionalProperties.java
@@ -30,16 +30,16 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
 import jakarta.json.stream.JsonGenerator;
-import org.opensearch.clients.json.DelegatingDeserializer;
-import org.opensearch.clients.json.JsonpDeserializer;
-import org.opensearch.clients.json.JsonpMapper;
-import org.opensearch.clients.json.JsonpSerializer;
-import org.opensearch.clients.json.JsonpUtils;
-import org.opensearch.clients.json.ObjectDeserializer;
-import org.opensearch.clients.json.ToJsonp;
+import org.opensearch.client.json.DelegatingDeserializer;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializer;
+import org.opensearch.client.json.JsonpUtils;
+import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.ToJsonp;
 
 import javax.annotation.Nullable;
 import java.util.Collections;

diff --git a/...rg/opensearch/clients/base/ApiClient.java → ...org/opensearch/client/base/ApiClient.java b/...rg/opensearch/clients/base/ApiClient.java → ...org/opensearch/client/base/ApiClient.java
@@ -30,10 +30,10 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
 import org.opensearch.client.RequestOptions;
-import org.opensearch.clients.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpDeserializer;
 
 import javax.annotation.Nullable;
 

diff --git a/...opensearch/clients/base/ApiException.java → .../opensearch/client/base/ApiException.java b/...opensearch/clients/base/ApiException.java → .../opensearch/client/base/ApiException.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
 import java.io.IOException;
 

diff --git a/...nsearch/clients/base/BooleanResponse.java → ...ensearch/client/base/BooleanResponse.java b/...nsearch/clients/base/BooleanResponse.java → ...ensearch/client/base/BooleanResponse.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
 /**
  * An API response that has boolean value according to the HTTP status code.

diff --git a/...org/opensearch/clients/base/Endpoint.java → .../org/opensearch/client/base/Endpoint.java b/...org/opensearch/clients/base/Endpoint.java → .../org/opensearch/client/base/Endpoint.java
@@ -30,9 +30,9 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
-import org.opensearch.clients.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpDeserializer;
 
 import javax.annotation.Nullable;
 import java.util.Collections;

diff --git a/...nsearch/clients/base/OpenSearchError.java → ...ensearch/client/base/OpenSearchError.java b/...nsearch/clients/base/OpenSearchError.java → ...ensearch/client/base/OpenSearchError.java
@@ -30,10 +30,10 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
-import org.opensearch.clients.json.JsonpDeserializer;
-import org.opensearch.clients.json.ObjectDeserializer;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 
 public class OpenSearchError {
 

diff --git a/...rch/clients/base/RestClientTransport.java → ...arch/client/base/RestClientTransport.java b/...rch/clients/base/RestClientTransport.java → ...arch/client/base/RestClientTransport.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
@@ -41,9 +41,9 @@
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseListener;
 import org.opensearch.client.RestClient;
-import org.opensearch.clients.json.JsonpDeserializer;
-import org.opensearch.clients.json.JsonpMapper;
-import org.opensearch.clients.json.ToJsonp;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.ToJsonp;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/...rg/opensearch/clients/base/Transport.java → ...org/opensearch/client/base/Transport.java b/...rg/opensearch/clients/base/Transport.java → ...org/opensearch/client/base/Transport.java
@@ -30,10 +30,10 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.base;
+package org.opensearch.client.base;
 
 import org.opensearch.client.RequestOptions;
-import org.opensearch.clients.json.JsonpMapper;
+import org.opensearch.client.json.JsonpMapper;
 
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;

diff --git a/...ients/json/BuildFunctionDeserializer.java → ...lient/json/BuildFunctionDeserializer.java b/...ients/json/BuildFunctionDeserializer.java → ...lient/json/BuildFunctionDeserializer.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonParser;
 

diff --git a/.../clients/json/DelegatingDeserializer.java → ...h/client/json/DelegatingDeserializer.java b/.../clients/json/DelegatingDeserializer.java → ...h/client/json/DelegatingDeserializer.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonParser;
 

diff --git a/...earch/clients/json/JsonpDeserializer.java → ...search/client/json/JsonpDeserializer.java b/...earch/clients/json/JsonpDeserializer.java → ...search/client/json/JsonpDeserializer.java
@@ -30,14 +30,14 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.JsonNumber;
 import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;
 import jakarta.json.stream.JsonParsingException;
-import org.opensearch.clients.util.TriFunction;
+import org.opensearch.client.util.TriFunction;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/.../opensearch/clients/json/JsonpMapper.java → ...g/opensearch/client/json/JsonpMapper.java b/.../opensearch/clients/json/JsonpMapper.java → ...g/opensearch/client/json/JsonpMapper.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.spi.JsonProvider;
 import jakarta.json.stream.JsonGenerator;

diff --git a/...nsearch/clients/json/JsonpSerializer.java → ...ensearch/client/json/JsonpSerializer.java b/...nsearch/clients/json/JsonpSerializer.java → ...ensearch/client/json/JsonpSerializer.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonGenerator;
 

diff --git a/...g/opensearch/clients/json/JsonpUtils.java → ...rg/opensearch/client/json/JsonpUtils.java b/...g/opensearch/clients/json/JsonpUtils.java → ...rg/opensearch/client/json/JsonpUtils.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;

diff --git a/...ients/json/ObjectBuilderDeserializer.java → ...lient/json/ObjectBuilderDeserializer.java b/...ients/json/ObjectBuilderDeserializer.java → ...lient/json/ObjectBuilderDeserializer.java
@@ -30,10 +30,10 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonParser;
-import org.opensearch.clients.util.ObjectBuilder;
+import org.opensearch.client.util.ObjectBuilder;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;

diff --git a/...arch/clients/json/ObjectDeserializer.java → ...earch/client/json/ObjectDeserializer.java b/...arch/clients/json/ObjectDeserializer.java → ...earch/client/json/ObjectDeserializer.java
@@ -30,12 +30,12 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;
 import jakarta.json.stream.JsonParsingException;
-import org.opensearch.clients.util.QuadConsumer;
+import org.opensearch.client.util.QuadConsumer;
 
 import java.util.EnumSet;
 import java.util.HashMap;

diff --git a/.../org/opensearch/clients/json/ToJsonp.java → ...a/org/opensearch/client/json/ToJsonp.java b/.../org/opensearch/clients/json/ToJsonp.java → ...a/org/opensearch/client/json/ToJsonp.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonGenerator;
 

diff --git a/...ts/json/UnexpectedJsonEventException.java → ...nt/json/UnexpectedJsonEventException.java b/...ts/json/UnexpectedJsonEventException.java → ...nt/json/UnexpectedJsonEventException.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;

diff --git a/...h/clients/json/ValueBodyDeserializer.java → ...ch/client/json/ValueBodyDeserializer.java b/...h/clients/json/ValueBodyDeserializer.java → ...ch/client/json/ValueBodyDeserializer.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json;
+package org.opensearch.client.json;
 
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;

diff --git a/...nts/json/jackson/JacksonJsonProvider.java → ...ent/json/jackson/JacksonJsonProvider.java b/...nts/json/jackson/JacksonJsonProvider.java → ...ent/json/jackson/JacksonJsonProvider.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jackson;
+package org.opensearch.client.json.jackson;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import jakarta.json.JsonArray;

diff --git a/...s/json/jackson/JacksonJsonpGenerator.java → ...t/json/jackson/JacksonJsonpGenerator.java b/...s/json/jackson/JacksonJsonpGenerator.java → ...t/json/jackson/JacksonJsonpGenerator.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jackson;
+package org.opensearch.client.json.jackson;
 
 import com.fasterxml.jackson.core.JsonStreamContext;
 import jakarta.json.JsonValue;

diff --git a/...ts/json/jackson/JacksonJsonpLocation.java → ...nt/json/jackson/JacksonJsonpLocation.java b/...ts/json/jackson/JacksonJsonpLocation.java → ...nt/json/jackson/JacksonJsonpLocation.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jackson;
+package org.opensearch.client.json.jackson;
 
 import jakarta.json.stream.JsonLocation;
 

diff --git a/...ents/json/jackson/JacksonJsonpMapper.java → ...ient/json/jackson/JacksonJsonpMapper.java b/...ents/json/jackson/JacksonJsonpMapper.java → ...ient/json/jackson/JacksonJsonpMapper.java
@@ -30,14 +30,14 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jackson;
+package org.opensearch.client.json.jackson;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.spi.JsonProvider;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
-import org.opensearch.clients.json.JsonpDeserializer;
-import org.opensearch.clients.json.JsonpMapper;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
 
 import java.io.IOException;
 import java.util.EnumSet;

diff --git a/...ents/json/jackson/JacksonJsonpParser.java → ...ient/json/jackson/JacksonJsonpParser.java b/...ents/json/jackson/JacksonJsonpParser.java → ...ient/json/jackson/JacksonJsonpParser.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jackson;
+package org.opensearch.client.json.jackson;
 
 import com.fasterxml.jackson.core.JsonToken;
 import jakarta.json.JsonArray;

diff --git a/...ch/clients/json/jackson/JacksonUtils.java → ...rch/client/json/jackson/JacksonUtils.java b/...ch/clients/json/jackson/JacksonUtils.java → ...rch/client/json/jackson/JacksonUtils.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jackson;
+package org.opensearch.client.json.jackson;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import jakarta.json.JsonException;

diff --git a/...clients/json/jackson/JsonValueParser.java → .../client/json/jackson/JsonValueParser.java b/...clients/json/jackson/JsonValueParser.java → .../client/json/jackson/JsonValueParser.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jackson;
+package org.opensearch.client.json.jackson;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;

diff --git a/.../clients/json/jsonb/JsonbJsonpMapper.java → ...h/client/json/jsonb/JsonbJsonpMapper.java b/.../clients/json/jsonb/JsonbJsonpMapper.java → ...h/client/json/jsonb/JsonbJsonpMapper.java
@@ -30,15 +30,15 @@
  * GitHub history for details.
  */
 
-package org.opensearch.clients.json.jsonb;
+package org.opensearch.client.json.jsonb;
 
 import jakarta.json.bind.spi.JsonbProvider;
 import jakarta.json.spi.JsonProvider;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;
-import org.opensearch.clients.json.JsonpDeserializer;
-import org.opensearch.clients.json.JsonpMapper;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
 
 import java.io.CharArrayReader;
 import java.io.CharArrayWriter;