From 6e3bbff167448ef5dc6ccb6d6405cc3d51c9648a Mon Sep 17 00:00:00 2001 From: oksanay Date: Mon, 29 Apr 2024 16:56:02 -0700 Subject: [PATCH 01/11] Fix integer overflow for remaining index stats Signed-off-by: oksanay --- .../opensearch/_types/QueryCacheStats.java | 67 ++++++++++--------- .../_types/QueryCacheStatsTest.java | 42 ++++++++++++ 2 files changed, 78 insertions(+), 31 deletions(-) create mode 100644 java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java index 77e93b0e9e..8117311b73 100644 --- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java +++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java @@ -32,9 +32,10 @@ package org.opensearch.client.opensearch._types; -import jakarta.json.stream.JsonGenerator; import java.util.function.Function; + import javax.annotation.Nullable; + import org.opensearch.client.json.JsonpDeserializable; import org.opensearch.client.json.JsonpDeserializer; import org.opensearch.client.json.JsonpMapper; @@ -45,26 +46,28 @@ import org.opensearch.client.util.ObjectBuilder; import org.opensearch.client.util.ObjectBuilderBase; +import jakarta.json.stream.JsonGenerator; + // typedef: _types.QueryCacheStats @JsonpDeserializable public class QueryCacheStats implements JsonpSerializable { - private final int cacheCount; + private final long cacheCount; - private final int cacheSize; + private final long cacheSize; - private final int evictions; + private final long evictions; - private final int hitCount; + private final long hitCount; @Nullable private final String memorySize; private final long memorySizeInBytes; - private final int missCount; + private final long missCount; - private final int totalCount; + private final long totalCount; // --------------------------------------------------------------------------------------------- @@ -88,28 +91,28 @@ public static QueryCacheStats of(Function { - private Integer cacheCount; + private Long cacheCount; - private Integer cacheSize; + private Long cacheSize; - private Integer evictions; + private Long evictions; - private Integer hitCount; + private Long hitCount; @Nullable private String memorySize; private Long memorySizeInBytes; - private Integer missCount; + private Long missCount; - private Integer totalCount; + private Long totalCount; /** * Required - API name: {@code cache_count} */ - public final Builder cacheCount(int value) { + public final Builder cacheCount(long value) { this.cacheCount = value; return this; } @@ -216,7 +220,7 @@ public final Builder cacheCount(int value) { /** * Required - API name: {@code cache_size} */ - public final Builder cacheSize(int value) { + public final Builder cacheSize(long value) { this.cacheSize = value; return this; } @@ -224,7 +228,7 @@ public final Builder cacheSize(int value) { /** * Required - API name: {@code evictions} */ - public final Builder evictions(int value) { + public final Builder evictions(long value) { this.evictions = value; return this; } @@ -232,7 +236,7 @@ public final Builder evictions(int value) { /** * Required - API name: {@code hit_count} */ - public final Builder hitCount(int value) { + public final Builder hitCount(long value) { this.hitCount = value; return this; } @@ -256,7 +260,7 @@ public final Builder memorySizeInBytes(long value) { /** * Required - API name: {@code miss_count} */ - public final Builder missCount(int value) { + public final Builder missCount(long value) { this.missCount = value; return this; } @@ -264,7 +268,7 @@ public final Builder missCount(int value) { /** * Required - API name: {@code total_count} */ - public final Builder totalCount(int value) { + public final Builder totalCount(long value) { this.totalCount = value; return this; } @@ -275,6 +279,7 @@ public final Builder totalCount(int value) { * @throws NullPointerException * if some of the required fields are null. */ + @Override public QueryCacheStats build() { _checkSingleUse(); @@ -294,14 +299,14 @@ public QueryCacheStats build() { protected static void setupQueryCacheStatsDeserializer(ObjectDeserializer op) { - op.add(Builder::cacheCount, JsonpDeserializer.integerDeserializer(), "cache_count"); - op.add(Builder::cacheSize, JsonpDeserializer.integerDeserializer(), "cache_size"); - op.add(Builder::evictions, JsonpDeserializer.integerDeserializer(), "evictions"); - op.add(Builder::hitCount, JsonpDeserializer.integerDeserializer(), "hit_count"); + op.add(Builder::cacheCount, JsonpDeserializer.longDeserializer(), "cache_count"); + op.add(Builder::cacheSize, JsonpDeserializer.longDeserializer(), "cache_size"); + op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions"); + op.add(Builder::hitCount, JsonpDeserializer.longDeserializer(), "hit_count"); op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size"); op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes"); - op.add(Builder::missCount, JsonpDeserializer.integerDeserializer(), "miss_count"); - op.add(Builder::totalCount, JsonpDeserializer.integerDeserializer(), "total_count"); + op.add(Builder::missCount, JsonpDeserializer.longDeserializer(), "miss_count"); + op.add(Builder::totalCount, JsonpDeserializer.longDeserializer(), "total_count"); } diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java new file mode 100644 index 0000000000..52707cf570 --- /dev/null +++ b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java @@ -0,0 +1,42 @@ +// (c) Copyright 2024 Hewlett Packard Enterprise Development LP +package org.opensearch.client.opensearch._types; + +import static org.junit.Assert.assertEquals; + +import java.io.StringReader; + +import org.junit.Test; +import org.opensearch.client.json.jackson.JacksonJsonpMapper; + +import jakarta.json.stream.JsonParser; + +public class QueryCacheStatsTest { + + @Test + public void testLongSerailization() { + QueryCacheStats expected = new QueryCacheStats.Builder().cacheCount(8757938874l) + .cacheSize(8757938874l) + .evictions(8757938874l) + .hitCount(8757938874l) + .memorySizeInBytes(8757938874l) + .missCount(8757938874l) + .totalCount(8757938874l) + .build(); + + String jsonString = "{\"cache_count\": 8757938874, \"cache_size\": 8757938874, \"evictions\":" + + " 8757938874, \"hit_count\": 8757938874, \"memory_size_in_bytes\": 8757938874, \"miss_count\":" + + " 8757938874, \"total_count\": 8757938874}"; + + StringReader reader = new StringReader(jsonString); + JacksonJsonpMapper mapper = new JacksonJsonpMapper(); + JsonParser parser = mapper.jsonProvider().createParser(reader); + QueryCacheStats actual = QueryCacheStats._DESERIALIZER.deserialize(parser, mapper); + assertEquals(expected.hitCount(), actual.hitCount()); + assertEquals(expected.memorySizeInBytes(), actual.memorySizeInBytes()); + assertEquals(expected.missCount(), actual.missCount()); + assertEquals(expected.cacheCount(), actual.cacheCount()); + assertEquals(expected.totalCount(), actual.totalCount()); + assertEquals(expected.cacheSize(), actual.cacheSize()); + assertEquals(expected.evictions(), actual.evictions()); + } +} From 73fce13bb9353bc06fb2eae3eef8dc0681238ffd Mon Sep 17 00:00:00 2001 From: oksanay Date: Mon, 29 Apr 2024 17:03:37 -0700 Subject: [PATCH 02/11] formatting Signed-off-by: oksanay --- .../opensearch/client/opensearch/_types/QueryCacheStatsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java index 52707cf570..9e1d6cd2a8 100644 --- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java +++ b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java @@ -1,4 +1,3 @@ -// (c) Copyright 2024 Hewlett Packard Enterprise Development LP package org.opensearch.client.opensearch._types; import static org.junit.Assert.assertEquals; From 181703ffd8b8415bd5e063d89032773cc6729e1c Mon Sep 17 00:00:00 2001 From: oksanay Date: Mon, 29 Apr 2024 17:25:14 -0700 Subject: [PATCH 03/11] CHANGELOG comment Signed-off-by: oksanay --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12fbcc6496..4b76c682c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,8 @@ This section is for maintaining a changelog for all breaking changes for the cli - Delete shape property ([#884](https://github.com/opensearch-project/opensearch-java/pull/885)) ### Fixed -- Fix version and build ([#254](https://github.com/opensearch-project/opensearch-java/pull/254)) +- Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/96)) + ### Security From fefd74fcbc4dd95aa65d840b8d71c3111b91035e Mon Sep 17 00:00:00 2001 From: oksanay Date: Mon, 29 Apr 2024 17:27:19 -0700 Subject: [PATCH 04/11] CHANGELOG comment Signed-off-by: oksanay --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b76c682c6..6e3830ea27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ This section is for maintaining a changelog for all breaking changes for the cli - Delete shape property ([#884](https://github.com/opensearch-project/opensearch-java/pull/885)) ### Fixed -- Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/96)) +- Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/960)) ### Security From 3bd2ec918e0c4a3fd6527d452275b16179739434 Mon Sep 17 00:00:00 2001 From: oksanay Date: Mon, 29 Apr 2024 18:09:13 -0700 Subject: [PATCH 05/11] Formatting Signed-off-by: oksanay --- .../_types/QueryCacheStatsTest.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java index 9e1d6cd2a8..f7e785cfd2 100644 --- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java +++ b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java @@ -12,30 +12,30 @@ public class QueryCacheStatsTest { @Test - public void testLongSerailization() { - QueryCacheStats expected = new QueryCacheStats.Builder().cacheCount(8757938874l) - .cacheSize(8757938874l) - .evictions(8757938874l) - .hitCount(8757938874l) - .memorySizeInBytes(8757938874l) - .missCount(8757938874l) - .totalCount(8757938874l) - .build(); - - String jsonString = "{\"cache_count\": 8757938874, \"cache_size\": 8757938874, \"evictions\":" + - " 8757938874, \"hit_count\": 8757938874, \"memory_size_in_bytes\": 8757938874, \"miss_count\":" + - " 8757938874, \"total_count\": 8757938874}"; - - StringReader reader = new StringReader(jsonString); - JacksonJsonpMapper mapper = new JacksonJsonpMapper(); - JsonParser parser = mapper.jsonProvider().createParser(reader); - QueryCacheStats actual = QueryCacheStats._DESERIALIZER.deserialize(parser, mapper); - assertEquals(expected.hitCount(), actual.hitCount()); - assertEquals(expected.memorySizeInBytes(), actual.memorySizeInBytes()); - assertEquals(expected.missCount(), actual.missCount()); - assertEquals(expected.cacheCount(), actual.cacheCount()); - assertEquals(expected.totalCount(), actual.totalCount()); - assertEquals(expected.cacheSize(), actual.cacheSize()); - assertEquals(expected.evictions(), actual.evictions()); - } + public void testLongSerailization() { + QueryCacheStats expected = new QueryCacheStats.Builder().cacheCount(8757938874l) + .cacheSize(8757938874l) + .evictions(8757938874l) + .hitCount(8757938874l) + .memorySizeInBytes(8757938874l) + .missCount(8757938874l) + .totalCount(8757938874l) + .build(); + + String jsonString = "{\"cache_count\": 8757938874, \"cache_size\": 8757938874, \"evictions\":" + + " 8757938874, \"hit_count\": 8757938874, \"memory_size_in_bytes\": 8757938874, \"miss_count\":" + + " 8757938874, \"total_count\": 8757938874}"; + + StringReader reader = new StringReader(jsonString); + JacksonJsonpMapper mapper = new JacksonJsonpMapper(); + JsonParser parser = mapper.jsonProvider().createParser(reader); + QueryCacheStats actual = QueryCacheStats._DESERIALIZER.deserialize(parser, mapper); + assertEquals(expected.hitCount(), actual.hitCount()); + assertEquals(expected.memorySizeInBytes(), actual.memorySizeInBytes()); + assertEquals(expected.missCount(), actual.missCount()); + assertEquals(expected.cacheCount(), actual.cacheCount()); + assertEquals(expected.totalCount(), actual.totalCount()); + assertEquals(expected.cacheSize(), actual.cacheSize()); + assertEquals(expected.evictions(), actual.evictions()); + } } From 3d98bfa5c2db88aa5defba5da7c03dc84d021e8e Mon Sep 17 00:00:00 2001 From: oksanay Date: Mon, 29 Apr 2024 20:31:28 -0700 Subject: [PATCH 06/11] pr comment addressed Signed-off-by: oksanay --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e3830ea27..2d2ac90714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,9 @@ This section is for maintaining a changelog for all breaking changes for the cli - Delete shape property ([#884](https://github.com/opensearch-project/opensearch-java/pull/885)) ### Fixed -- Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/960)) +- Fix version and build ([#254](https://github.com/opensearch-project/opensearcjava/pull/254)) + +- Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/960)) ### Security From 22f1e80b7bdefbcba119d1da095e6649379d2eca Mon Sep 17 00:00:00 2001 From: oksanay Date: Mon, 29 Apr 2024 20:39:58 -0700 Subject: [PATCH 07/11] applied formatting with gradlew.bat Signed-off-by: oksanay --- .../opensearch/_types/QueryCacheStats.java | 21 ++++++------- .../_types/QueryCacheStatsTest.java | 30 +++++++++---------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java index 8117311b73..848038a336 100644 --- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java +++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java @@ -32,10 +32,9 @@ package org.opensearch.client.opensearch._types; +import jakarta.json.stream.JsonGenerator; import java.util.function.Function; - import javax.annotation.Nullable; - import org.opensearch.client.json.JsonpDeserializable; import org.opensearch.client.json.JsonpDeserializer; import org.opensearch.client.json.JsonpMapper; @@ -46,8 +45,6 @@ import org.opensearch.client.util.ObjectBuilder; import org.opensearch.client.util.ObjectBuilderBase; -import jakarta.json.stream.JsonGenerator; - // typedef: _types.QueryCacheStats @JsonpDeserializable @@ -192,13 +189,13 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { */ public static class Builder extends ObjectBuilderBase implements ObjectBuilder { - private Long cacheCount; + private Long cacheCount; - private Long cacheSize; + private Long cacheSize; - private Long evictions; + private Long evictions; - private Long hitCount; + private Long hitCount; @Nullable private String memorySize; @@ -299,10 +296,10 @@ public QueryCacheStats build() { protected static void setupQueryCacheStatsDeserializer(ObjectDeserializer op) { - op.add(Builder::cacheCount, JsonpDeserializer.longDeserializer(), "cache_count"); - op.add(Builder::cacheSize, JsonpDeserializer.longDeserializer(), "cache_size"); - op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions"); - op.add(Builder::hitCount, JsonpDeserializer.longDeserializer(), "hit_count"); + op.add(Builder::cacheCount, JsonpDeserializer.longDeserializer(), "cache_count"); + op.add(Builder::cacheSize, JsonpDeserializer.longDeserializer(), "cache_size"); + op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions"); + op.add(Builder::hitCount, JsonpDeserializer.longDeserializer(), "hit_count"); op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size"); op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes"); op.add(Builder::missCount, JsonpDeserializer.longDeserializer(), "miss_count"); diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java index f7e785cfd2..83d9752434 100644 --- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java +++ b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java @@ -2,29 +2,27 @@ import static org.junit.Assert.assertEquals; +import jakarta.json.stream.JsonParser; import java.io.StringReader; - import org.junit.Test; import org.opensearch.client.json.jackson.JacksonJsonpMapper; -import jakarta.json.stream.JsonParser; - public class QueryCacheStatsTest { - @Test + @Test public void testLongSerailization() { QueryCacheStats expected = new QueryCacheStats.Builder().cacheCount(8757938874l) - .cacheSize(8757938874l) - .evictions(8757938874l) - .hitCount(8757938874l) - .memorySizeInBytes(8757938874l) - .missCount(8757938874l) - .totalCount(8757938874l) - .build(); - - String jsonString = "{\"cache_count\": 8757938874, \"cache_size\": 8757938874, \"evictions\":" + - " 8757938874, \"hit_count\": 8757938874, \"memory_size_in_bytes\": 8757938874, \"miss_count\":" + - " 8757938874, \"total_count\": 8757938874}"; + .cacheSize(8757938874l) + .evictions(8757938874l) + .hitCount(8757938874l) + .memorySizeInBytes(8757938874l) + .missCount(8757938874l) + .totalCount(8757938874l) + .build(); + + String jsonString = "{\"cache_count\": 8757938874, \"cache_size\": 8757938874, \"evictions\":" + + " 8757938874, \"hit_count\": 8757938874, \"memory_size_in_bytes\": 8757938874, \"miss_count\":" + + " 8757938874, \"total_count\": 8757938874}"; StringReader reader = new StringReader(jsonString); JacksonJsonpMapper mapper = new JacksonJsonpMapper(); @@ -37,5 +35,5 @@ public void testLongSerailization() { assertEquals(expected.totalCount(), actual.totalCount()); assertEquals(expected.cacheSize(), actual.cacheSize()); assertEquals(expected.evictions(), actual.evictions()); - } + } } From 1694fae6b81eddfdbd7fcccef9af1b526adadf45 Mon Sep 17 00:00:00 2001 From: oksanay Date: Tue, 30 Apr 2024 08:55:21 -0700 Subject: [PATCH 08/11] PR comments addressed Signed-off-by: oksanay --- CHANGELOG.md | 1 - .../_types/QueryCacheStatsTest.java | 22 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d2ac90714..916c6e11bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,6 @@ This section is for maintaining a changelog for all breaking changes for the cli ### Fixed - Fix version and build ([#254](https://github.com/opensearch-project/opensearcjava/pull/254)) - - Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/960)) diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java index 83d9752434..2dff4c0799 100644 --- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java +++ b/java-client/src/test/java/org/opensearch/client/opensearch/_types/QueryCacheStatsTest.java @@ -10,19 +10,19 @@ public class QueryCacheStatsTest { @Test - public void testLongSerailization() { - QueryCacheStats expected = new QueryCacheStats.Builder().cacheCount(8757938874l) - .cacheSize(8757938874l) - .evictions(8757938874l) - .hitCount(8757938874l) - .memorySizeInBytes(8757938874l) - .missCount(8757938874l) - .totalCount(8757938874l) + public void testLongSerialization() { + QueryCacheStats expected = new QueryCacheStats.Builder().cacheCount(2757938871l) + .cacheSize(1757938872l) + .evictions(3757938873l) + .hitCount(4757938874l) + .memorySizeInBytes(5757938875l) + .missCount(6757938876l) + .totalCount(7757938877l) .build(); - String jsonString = "{\"cache_count\": 8757938874, \"cache_size\": 8757938874, \"evictions\":" - + " 8757938874, \"hit_count\": 8757938874, \"memory_size_in_bytes\": 8757938874, \"miss_count\":" - + " 8757938874, \"total_count\": 8757938874}"; + String jsonString = "{\"cache_count\": 2757938871, \"cache_size\": 1757938872, \"evictions\":" + + " 3757938873, \"hit_count\": 4757938874, \"memory_size_in_bytes\": 5757938875, \"miss_count\":" + + " 6757938876, \"total_count\": 7757938877}"; StringReader reader = new StringReader(jsonString); JacksonJsonpMapper mapper = new JacksonJsonpMapper(); From 2871333fd094aee2a5d8a60f86d2c01877d260a5 Mon Sep 17 00:00:00 2001 From: oksanay Date: Tue, 30 Apr 2024 09:41:53 -0700 Subject: [PATCH 09/11] CHANGELOG problem fixed? Signed-off-by: oksanay --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 916c6e11bb..feb080ee3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ This section is for maintaining a changelog for all breaking changes for the cli - Delete shape property ([#884](https://github.com/opensearch-project/opensearch-java/pull/885)) ### Fixed -- Fix version and build ([#254](https://github.com/opensearch-project/opensearcjava/pull/254)) +- Fix version and build ([#254](https://github.com/opensearch-project/opensearch-java/pull/254)) - Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/960)) From 55573397977a924f8f19c1cc37c805f401bbfd13 Mon Sep 17 00:00:00 2001 From: oksanay Date: Tue, 30 Apr 2024 09:46:32 -0700 Subject: [PATCH 10/11] CHANGELOG problem fixed? Signed-off-by: oksanay --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index feb080ee3c..262966246f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ This section is for maintaining a changelog for all breaking changes for the cli ### Fixed - Fix version and build ([#254](https://github.com/opensearch-project/opensearch-java/pull/254)) -- Fix integer overflow for variables in indices stats response ([#959](https://github.com/opensearch-project/opensearch-java/pull/960)) +- Fix integer overflow for variables in indices stats response ([#960](https://github.com/opensearch-project/opensearch-java/pull/960)) ### Security From bc7c38c2819823b0823b13a7064463d57f7ed65a Mon Sep 17 00:00:00 2001 From: oksanay Date: Tue, 30 Apr 2024 09:55:23 -0700 Subject: [PATCH 11/11] macOS-13 Signed-off-by: oksanay --- .github/workflows/test-unit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 14fa9a538f..f2e1f3d08a 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: java: [ 8, 11, 17, 21 ] - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-latest, windows-latest, macOS-13] steps: - name: Checkout Java Client uses: actions/checkout@v3