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

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

Closed
wants to merge 6 commits into from
Closed

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

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7446d50
Removed the null constraints on NodeInfo.host, NodeInfo.Ip, NodeInfo.…
Aug 7, 2024
e28d420
Added a CHANGELOG entry, made the getters nullable and removed extra …
Aug 8, 2024
9794a2a
Use own copy of PercentCodec for URI path encoding (#1109)
Xtansia Jul 31, 2024
eca99e0
Fixed deserialization of SearchRequest when `_source` is an array (#1…
Xtansia Aug 1, 2024
8e0f00f
Regenerate dangling_indices namespace (#1124)
Xtansia Aug 5, 2024
edbafe2
Bump org.eclipse.parsson:parsson from 1.1.6 to 1.1.7 (#1125)
dependabot[bot] Aug 5, 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
18 changes: 12 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
Copy link
Collaborator

Choose a reason for hiding this comment

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

The relevant getters below should also get @Nullable annotations

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 @@ -496,11 +499,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 +542,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 +599,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 +624,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 +834,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) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please fix the double space here, or just run ./gradlew spotlessApply

Suggested change
public final Builder transportAddress(@Nullable String value) {
public final Builder transportAddress(@Nullable String value) {

this.transportAddress = value;
return this;
}
Expand Down
Loading