Merge branch 'release_v2.4.0' into update-dependency-ydb-proto-api

Author: asmyasnikov

.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
+
+ENV MAVEN_CONFIG=/var/maven/.m2
+
+# [Optional] Uncomment if you want to install more tools
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends maven \
+    && mkdir -p /var/maven/.m2 \
+    && chown -R vscode:vscode /var/maven/.m2

.devcontainer/commands/initialize.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+git config --local user.name "$(git config user.name)"
+git config --local user.email "$(git config user.email)"

.devcontainer/devcontainer.json

@@ -0,0 +1,35 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/java
+{
+    "name": "YDB Java SDK",
+    "dockerFile": "Dockerfile",
+    // Allows the container to use ptrace, which is useful for debugging.
+    "capAdd": [
+        "SYS_PTRACE"
+    ],
+    // Disables seccomp, which can be necessary for some debugging tools to function correctly.
+    "securityOpt": [
+        "seccomp=unconfined"
+    ],
+    "features": {
+        "ghcr.io/devcontainers/features/github-cli:1": {},
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+    },
+    // Use 'initializeCommand' to run commands before the container is created.
+    "initializeCommand": "chmod +x .devcontainer/commands/initialize.sh && .devcontainer/commands/initialize.sh",
+    // Use 'postCreateCommand' to run commands after the container is created.
+    // Use 'postStartCommand' to run commands after the container is started.
+    // Configure tool-specific properties.
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "redhat.java",
+                "vscjava.vscode-java-pack"
+            ]
+        }
+    },
+    // Maven cache volume configuration.
+    "mounts": [
+        "source=maven-cache,target=/var/maven/.m2,type=volume"
+    ]
+}

.editorconfig

@@ -17,5 +17,20 @@ ij_java_insert_override_annotation = true
 ij_java_lambda_brace_style = end_of_line
 ij_java_method_brace_style = end_of_line
 ij_java_names_count_to_use_import_on_demand = 9000
+ij_java_space_after_colon = true
+ij_java_space_before_colon = true
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_annotation_eq = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
 ij_java_use_single_class_imports = true
 ij_java_while_brace_force = always

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly

.gitignore

@@ -9,4 +9,7 @@
 **/.idea/
 **/*.iml
 **/*.iws
-**/*.ipr
+**/*.ipr
+
+# VS Code
+.vscode

CHANGELOG.md

@@ -1,3 +1,43 @@
+## 2.3.17 ##
+* Query: Fixed session status updating
+* Topic: Fixed maxActivePartitions on topic creation
+* Tests: Updated JUnit5 helper to avoid NPE
+* Added devcontainer configuration
+
+## 2.3.16 ##
+* Core: Added option to control the grpc stream flow
+* Table: Added Serializable to all values and types
+* Topic: Fixed double compression of one message
+
+## 2.3.15 ##
+
+* Core: ResourceExhausted isn't pessimize the node
+* Table: Added flag about default value in TableColumn
+* Table: Added support of describeTableOptions
+* Query: Fixed QueryReader.setRowIndex() & added tests
+* Topic: Added max_active_partitions support to topic operations
+* Topic: Added configuration for GrpcStreamRetrier ID
+* Topic: Added equals & hashCode implementations for descriptions
+
+## 2.3.14 ##
+
+* Core: Removed mockito-inline from compile dependencies
+* Core: Improved catching of RuntimeException in BaseGrpcTransport
+* Table: Fixed support of extended date types in ProtoValue
+* Query: Added support of concurrent_result_sets option
+* Topic: Add equals() and hashCode() methods to topic description classes
+* Topic: Fixed ErrorHandler behaviour
+* Topic: Added support of readSessionId
+* Topic: SyncWriter.flush() now throw Exception when previous task was failed
+* Topic: Add functional interface support to ReadEventHandler
+* Topic: Added support of auto-partitioning options to CreateTopic/AlterTopic
+* Topic: Fix logger prefix for partition session log events and print correct consumer name
+
+## 2.3.13 ##
+
+* Topic: fixed reconnect after shutdown
+* OAuth2 provider: fixed NPE
+
 ## 2.3.12 ##
 
 * Table: added validation of entry type in describeTable method

README.md

@@ -30,7 +30,7 @@ Firstly you can import YDB Java BOM to specify correct versions of SDK modules.
         <dependency>
             <groupId>tech.ydb</groupId>
             <artifactId>ydb-sdk-bom</artifactId>
-            <version>2.3.12</version>
+            <version>2.3.17</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

auth-providers/oauth2-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>tech.ydb</groupId>
         <artifactId>ydb-sdk-parent</artifactId>
-        <version>2.3.12</version>
+        <version>2.3.18-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -100,6 +100,7 @@
                     <groupId>org.mockito</groupId>
                     <artifactId>mockito-inline</artifactId>
                     <version>${mockito.version}</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
         </profile>

auth-providers/oauth2-provider/src/main/java/tech/ydb/auth/OAuth2TokenExchangeProvider.java

@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -54,12 +53,12 @@ public class OAuth2TokenExchangeProvider implements AuthRpcProvider<GrpcAuthRpc>
 
     private static final Logger logger = LoggerFactory.getLogger(OAuth2TokenExchangeProvider.class);
     private static final Gson GSON = new Gson();
-    private static final Set<String> SUPPORTED_JWT_ALGS = new HashSet<String>(Arrays.asList(new String[]{
-        "HS256", "HS384", "HS512",
-        "RS256", "RS384", "RS512",
-        "PS256", "PS384", "PS512",
-        "ES256", "ES384", "ES512",
-    }));
+    private static final Set<String> SUPPORTED_JWT_ALGS = new HashSet<>(Arrays.asList(
+            "HS256", "HS384", "HS512",
+            "RS256", "RS384", "RS512",
+            "PS256", "PS384", "PS512",
+            "ES256", "ES384", "ES512"
+    ));
 
     private final Clock clock;
     private final String endpoint;
@@ -83,41 +82,40 @@ private OAuth2TokenExchangeProvider(Clock clock, String endpoint, String scope,
     public static String[] getSupportedJwtAlgorithms() {
         String[] result = new String[SUPPORTED_JWT_ALGS.size()];
         int i = 0;
-        Iterator<String> it = SUPPORTED_JWT_ALGS.iterator();
-        while (it.hasNext()) {
-            result[i++] = it.next();
+        for (String supportedJwtAlg : SUPPORTED_JWT_ALGS) {
+            result[i++] = supportedJwtAlg;
         }
         Arrays.sort(result);
         return result;
     }
 
     private static OAuth2TokenSource buildFixedTokenSourceFromConfig(TokenSourceJsonConfig cfg) {
-        if (cfg.getToken() == null || cfg.getToken().length() == 0
-            || cfg.getTokenType() == null || cfg.getTokenType().length() == 0) {
+        if (cfg.getToken() == null || cfg.getToken().isEmpty()
+                || cfg.getTokenType() == null || cfg.getTokenType().isEmpty()) {
             throw new RuntimeException("Both token and token-type are required");
         }
         return OAuth2TokenSource.fromValue(cfg.getToken(), cfg.getTokenType());
     }
 
     private static OAuth2TokenSource buildJwtTokenSourceFromConfig(TokenSourceJsonConfig cfg) {
-        if (cfg.getAlg() == null || cfg.getAlg().length() == 0) {
+        if (cfg.getAlg() == null || cfg.getAlg().isEmpty()) {
             throw new RuntimeException("Algorithm is required");
         }
-        if (cfg.getPrivateKey() == null || cfg.getPrivateKey().length() == 0) {
+        if (cfg.getPrivateKey() == null || cfg.getPrivateKey().isEmpty()) {
             throw new RuntimeException("Key is required");
         }
 
         String alg = cfg.getAlg().toUpperCase();
         if (!SUPPORTED_JWT_ALGS.contains(alg)) {
             String[] supportedAlgs = getSupportedJwtAlgorithms();
-            String lstMsg = "";
+            StringBuilder lstMsg = new StringBuilder();
             for (int i = 0; i < supportedAlgs.length; i++) {
                 if (lstMsg.length() > 0) {
-                    lstMsg += ", ";
+                    lstMsg.append(", ");
                 }
-                lstMsg += "\"";
-                lstMsg += supportedAlgs[i];
-                lstMsg += "\"";
+                lstMsg.append("\"");
+                lstMsg.append(supportedAlgs[i]);
+                lstMsg.append("\"");
             }
             throw new RuntimeException(
                 String.format("Algorithm \"%s\" is not supported. Supported algorithms: %s",
@@ -129,7 +127,7 @@ private static OAuth2TokenSource buildJwtTokenSourceFromConfig(TokenSourceJsonCo
         boolean isHmac = "HS256".equals(alg)
             || "HS384".equals(alg)
             || "HS512".equals(alg);
-        OAuth2TokenSource.JWTTokenBuilder builder = null;
+        OAuth2TokenSource.JWTTokenBuilder builder;
         if (isHmac) {
             builder = OAuth2TokenSource.withHmacPrivateKeyBase64(cfg.getPrivateKey(), alg);
         } else {
@@ -184,6 +182,9 @@ public static Builder fromFile(File configFile) {
         configFile = expandUserHomeDir(configFile);
         try (BufferedReader br = new BufferedReader(new FileReader(configFile))) {
             JsonConfig cfg = GSON.fromJson(br, JsonConfig.class);
+            if (cfg == null) {
+                throw new RuntimeException("Empty config");
+            }
 
             if (cfg.getTokenEndpoint() != null) {
                 builder.withTokenEndpoint(cfg.getTokenEndpoint());
@@ -193,13 +194,13 @@ public static Builder fromFile(File configFile) {
                 builder.withCustomGrantType(cfg.getGrantType());
             }
 
-            if (cfg.getResource() != null && cfg.getResource().length != 0) {
+            if (cfg.getResource() != null) {
                 for (String res: cfg.getResource()) {
                     builder.withResource(res);
                 }
             }
 
-            if (cfg.getAudience() != null && cfg.getAudience().length != 0) {
+            if (cfg.getAudience() != null) {
                 for (String audience: cfg.getAudience()) {
                     builder.withAudience(audience);
                 }
@@ -312,6 +313,9 @@ private Token updateToken() throws IOException {
 
             try (Reader reader = new InputStreamReader(response.getEntity().getContent())) {
                 OAuth2Response json = GSON.fromJson(reader, OAuth2Response.class);
+                if (json == null) {
+                    throw new UnexpectedResultException("Empty OAuth2 response", Status.of(StatusCode.INTERNAL_ERROR));
+                }
 
                 if (!"Bearer".equalsIgnoreCase(json.getTokenType())) {
                     throw new UnexpectedResultException(
@@ -529,13 +533,13 @@ private static class SingleStringOrArrayOfStringsJsonConfigDeserializer implemen
         public String[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
             if (json.isJsonArray()) {
                 JsonArray arr = json.getAsJsonArray();
-                if (arr.size() == 0) {
+                if (arr.isEmpty()) {
                     return null;
                 }
                 String[] result = new String[arr.size()];
                 for (int i = 0; i < arr.size(); i++) {
                     result[i] = arr.get(i).getAsJsonPrimitive().getAsString();
-                    if (result[i].length() == 0) {
+                    if (result[i].isEmpty()) {
                         throw new RuntimeException("Cannot parse config from json: empty string");
                     }
                 }
@@ -544,7 +548,7 @@ public String[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
             if (json.isJsonPrimitive()) {
                 String[] result = new String[1];
                 result[0] = json.getAsJsonPrimitive().getAsString();
-                if (result[0].length() == 0) {
+                if (result[0].isEmpty()) {
                     throw new RuntimeException("Cannot parse config from json: empty string");
                 }
                 return result;
@@ -709,14 +713,14 @@ public String[] getScope() {
         }
 
         public String buildScope() {
-            String result = new String();
+            StringBuilder result = new StringBuilder();
             for (String s: this.scope) {
                 if (result.length() != 0) {
-                    result += " ";
+                    result.append(" ");
                 }
-                result += s;
+                result.append(s);
             }
-            return result;
+            return result.toString();
         }
 
         public String getRequestedTokenType() {