Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed null constraints on NodeInfo fields that are returned null from Amazon OpenSearch Service #1132

Merged
merged 4 commits into from
Aug 12, 2024
Merged

Removed null constraints on NodeInfo fields that are returned null from Amazon OpenSearch Service #1132

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdd1956
Removed the null constraints on NodeInfo.host, NodeInfo.Ip, NodeInfo.…
Aug 7, 2024
09a75d4
Added a CHANGELOG entry, made the getters nullable and removed extra …
Aug 8, 2024
35ca1e5
Merge remote-tracking branch 'origin/main' into issue1129v2
Aug 9, 2024
b970299
modified the PR link in the changelog
Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ This section is for maintaining a changelog for all breaking changes for the cli
### Removed

### Fixed
- Fixed handling of NodeInfo fields that are not returned by Amazon OpenSearch Service ([#1131](https://github.com/opensearch-project/opensearch-java/pull/1131))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I missed catching this before, it should reference this PR rather than the previous one

Suggested change
- Fixed handling of NodeInfo fields that are not returned by Amazon OpenSearch Service ([#1131](https://github.com/opensearch-project/opensearch-java/pull/1131))
- Fixed handling of NodeInfo fields that are not returned by Amazon OpenSearch Service ([#1132](https://github.com/opensearch-project/opensearch-java/pull/1132))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, good catch! I made the changes.


### Security

Expand Down
21 changes: 15 additions & 6 deletions java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ public class NodeInfo implements PlainJsonSerializable {

private final String buildType;

@Nullable
private final String host;

@Nullable
private final NodeInfoHttp http;

@Nullable
private final String ip;

@Nullable
Expand Down Expand Up @@ -99,6 +101,7 @@ public class NodeInfo implements PlainJsonSerializable {
@Nullable
private final NodeInfoTransport transport;

@Nullable
private final String transportAddress;

private final String version;
Expand All @@ -117,9 +120,9 @@ private NodeInfo(Builder builder) {
this.attributes = ApiTypeHelper.unmodifiable(builder.attributes);
this.buildHash = ApiTypeHelper.requireNonNull(builder.buildHash, this, "buildHash");
this.buildType = ApiTypeHelper.requireNonNull(builder.buildType, this, "buildType");
this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
this.host = builder.host;
this.http = builder.http;
this.ip = ApiTypeHelper.requireNonNull(builder.ip, this, "ip");
this.ip = builder.ip;
this.jvm = builder.jvm;
this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
this.network = builder.network;
Expand All @@ -132,7 +135,7 @@ private NodeInfo(Builder builder) {
this.totalIndexingBuffer = builder.totalIndexingBuffer;
this.totalIndexingBufferInBytes = builder.totalIndexingBufferInBytes;
this.transport = builder.transport;
this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
this.transportAddress = builder.transportAddress;
this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
this.modules = ApiTypeHelper.unmodifiable(builder.modules);
this.ingest = builder.ingest;
Expand Down Expand Up @@ -173,6 +176,7 @@ public final String buildType() {
* <p>
* API name: {@code host}
*/
@Nullable
public final String host() {
return this.host;
}
Expand All @@ -190,6 +194,7 @@ public final NodeInfoHttp http() {
* <p>
* API name: {@code ip}
*/
@Nullable
public final String ip() {
return this.ip;
}
Expand Down Expand Up @@ -299,6 +304,7 @@ public final NodeInfoTransport transport() {
* <p>
* API name: {@code transport_address}
*/
@Nullable
public final String transportAddress() {
return this.transportAddress;
}
Expand Down Expand Up @@ -496,11 +502,13 @@ public static class Builder extends ObjectBuilderBase implements ObjectBuilder<N

private String buildType;

@Nullable
private String host;

@Nullable
private NodeInfoHttp http;

@Nullable
private String ip;

@Nullable
Expand Down Expand Up @@ -537,6 +545,7 @@ public static class Builder extends ObjectBuilderBase implements ObjectBuilder<N
@Nullable
private NodeInfoTransport transport;

@Nullable
private String transportAddress;

private String version;
Expand Down Expand Up @@ -593,7 +602,7 @@ public final Builder buildType(String value) {
* <p>
* API name: {@code host}
*/
public final Builder host(String value) {
public final Builder host(@Nullable String value) {
this.host = value;
return this;
}
Expand All @@ -618,7 +627,7 @@ public final Builder http(Function<NodeInfoHttp.Builder, ObjectBuilder<NodeInfoH
* <p>
* API name: {@code ip}
*/
public final Builder ip(String value) {
public final Builder ip(@Nullable String value) {
this.ip = value;
return this;
}
Expand Down Expand Up @@ -828,7 +837,7 @@ public final Builder transport(Function<NodeInfoTransport.Builder, ObjectBuilder
* <p>
* API name: {@code transport_address}
*/
public final Builder transportAddress(String value) {
public final Builder transportAddress(@Nullable String value) {
this.transportAddress = value;
return this;
}
Expand Down
Loading