Skip to content

Commit

Permalink
Rename elastic/elasticsearch to opensearch (opensearch-project#14)
Browse files Browse the repository at this point in the history
Signed-off-by: Mital Awachat <mitalawachat@users.noreply.github.com>
  • Loading branch information
mitalawachat authored and imRishN committed Feb 3, 2022
1 parent cf73f7d commit 6d4fb1a
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#

# Build a Docker image that has Gradle and all project dependencies ready.
# Needs to be run with .git and java-client/src mounted under /elasticsearch-java.
# Needs to be run with .git and java-client/src mounted under /opensearch-java.

FROM openjdk:15

Expand Down
2 changes: 1 addition & 1 deletion .ci/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

# ------------------------------------------------------- #
#
# Skeleton for common build entry script for all elastic
# Skeleton for common build entry script for all OpenSearch
# clients. Needs to be adapted to individual client usage.
#
# Must be called: ./.ci/make.sh <target> <params>
Expand Down
4 changes: 4 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
OpenSearch (https://opensearch.org/)
Copyright 2021 OpenSearch Contributors

This product includes software developed by
Elasticsearch Java Client
Copyright 2021 Elasticsearch B.V.
13 changes: 13 additions & 0 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
<?xml version="1.0"?>
<!--
~ 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.
-->

<!--
~ Licensed to Elasticsearch B.V. under one or more contributor
~ license agreements. See the NOTICE file distributed with
Expand All @@ -18,6 +26,11 @@
~ under the License.
-->

<!--
~ Modifications Copyright OpenSearch Contributors. See
~ GitHub history for details.
-->

<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
Expand Down
13 changes: 13 additions & 0 deletions config/checkstyle/checkstyle_suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
<?xml version="1.0"?>
<!--
~ 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.
-->

<!--
~ Licensed to Elasticsearch B.V. under one or more contributor
~ license agreements. See the NOTICE file distributed with
Expand All @@ -18,6 +26,11 @@
~ under the License.
-->

<!--
~ Modifications Copyright OpenSearch Contributors. See
~ GitHub history for details.
-->

<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.1//EN"
"https://checkstyle.org/dtds/suppressions_1_1.dtd">
Expand Down
4 changes: 2 additions & 2 deletions docs/design/0001-model-classes-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## Context and Problem Statement

Elasticsearch request and response objects are data classes: they have no attached behavior.
OpenSearch request and response objects are data classes: they have no attached behavior.

Java has two ways to represent such classes:
* as JavaBeans: mutable classes with getters and setters,
Expand Down Expand Up @@ -191,7 +191,7 @@ This provides property-like access in Scala. Kotlin will require method calls bu

**Building nested objects**

There are many nested objects in the Elasticsearch API, which will also use the fluent builder pattern. Let's extend `FooRequest` with an innder `Bar` object:
There are many nested objects in the OpenSearch API, which will also use the fluent builder pattern. Let's extend `FooRequest` with an innder `Bar` object:

```java
FooResponse r = client.foo(
Expand Down
2 changes: 1 addition & 1 deletion docs/design/0002-namespace-clients-and-endpoints.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This allows writing code in a fluent and strongly typed way, leveraging the IDE

The client should also be open for extension, in at least two areas:
- allow custom endpoints to be defined, to support plugins that extend the ES API,
- allow overriding response types, to use the [`filter_path` query parameter](https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#common-options-response-filtering) that allows removing fields from the response. As the filter may remove fields that are expected to exist in the standard response, a new - stripped down - response type must be provided by the user for the same request type and URL. This is real-world use case, as shown by [elasticsearch#53846](https://github.com/elastic/elasticsearch/issues/53846).
- allow overriding response types, to use the `filter_path` query parameter that allows removing fields from the response. As the filter may remove fields that are expected to exist in the standard response, a new - stripped down - response type must be provided by the user for the same request type and URL.

## Decision Drivers

Expand Down
9 changes: 9 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#
# 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.
#
# Licensed to Elasticsearch B.V. under one or more contributor
# license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright
Expand All @@ -16,6 +22,9 @@
# specific language governing permissions and limitations
# under the License.
#
# Modifications Copyright OpenSearch Contributors. See
# GitHub history for details.
#

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
Expand Down
6 changes: 3 additions & 3 deletions java-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ tasks.withType<Jar> {
}

manifest {
attributes["Implementation-Title"] = "Elasticsearch Java client"
attributes["Implementation-Vendor"] = "Elastic"
attributes["Implementation-URL"] = "https://github.com/elastic/elasticsearch-java/"
attributes["Implementation-Title"] = "OpenSearch Java client"
attributes["Implementation-Vendor"] = "OpenSearch"
attributes["Implementation-URL"] = "https://github.com/opensearch-project/opensearch-java/"
attributes["Build-Date"] = rootProject.extra["buildTime"]
}

Expand Down

0 comments on commit 6d4fb1a

Please sign in to comment.