Skip to content

Commit 9b47dc2

Browse files
committed
Merge remote-tracking branch 'origin/master' into 365.Add-support-of-custom-codecs-in-topics
# Conflicts: # topic/src/main/java/tech/ydb/topic/utils/Encoder.java
2 parents caa2966 + 4ece287 commit 9b47dc2

File tree

30 files changed

+447
-355
lines changed

30 files changed

+447
-355
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## 2.3.13 ##
2+
3+
* Topic: fixed reconnect after shutdown
4+
* OAuth2 provider: fixed NPE
5+
6+
## 2.3.12 ##
7+
8+
* Table: added validation of entry type in describeTable method
9+
* Table: added onLimit method for retryable exceptions
10+
* Topic: removed test dependency
11+
* Topic: improved support of LZO compression
12+
* Query: added support of pool_id
13+
* Core: prevent virtual thread deadlocks by replacing synchronized blocks
14+
* Tests: fixed test connecting with IBM jdk
15+
116
## 2.3.11 ##
217

318
* Scheme: added more simple api for describeDirectory and listDirectory

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Firstly you can import YDB Java BOM to specify correct versions of SDK modules.
3030
<dependency>
3131
<groupId>tech.ydb</groupId>
3232
<artifactId>ydb-sdk-bom</artifactId>
33-
<version>2.3.11</version>
33+
<version>2.3.13</version>
3434
<type>pom</type>
3535
<scope>import</scope>
3636
</dependency>

auth-providers/oauth2-provider/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>tech.ydb</groupId>
77
<artifactId>ydb-sdk-parent</artifactId>
8-
<version>2.3.12-SNAPSHOT</version>
8+
<version>2.3.14-SNAPSHOT</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ public static Builder fromFile(File configFile) {
184184
configFile = expandUserHomeDir(configFile);
185185
try (BufferedReader br = new BufferedReader(new FileReader(configFile))) {
186186
JsonConfig cfg = GSON.fromJson(br, JsonConfig.class);
187+
if (cfg == null) {
188+
throw new RuntimeException("Empty config");
189+
}
187190

188191
if (cfg.getTokenEndpoint() != null) {
189192
builder.withTokenEndpoint(cfg.getTokenEndpoint());
@@ -312,6 +315,9 @@ private Token updateToken() throws IOException {
312315

313316
try (Reader reader = new InputStreamReader(response.getEntity().getContent())) {
314317
OAuth2Response json = GSON.fromJson(reader, OAuth2Response.class);
318+
if (json == null) {
319+
throw new UnexpectedResultException("Empty OAuth2 response", Status.of(StatusCode.INTERNAL_ERROR));
320+
}
315321

316322
if (!"Bearer".equalsIgnoreCase(json.getTokenType())) {
317323
throw new UnexpectedResultException(

bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77

88
<groupId>tech.ydb</groupId>
9-
<version>2.3.12-SNAPSHOT</version>
9+
<version>2.3.14-SNAPSHOT</version>
1010
<artifactId>ydb-sdk-bom</artifactId>
1111
<name>Java SDK Bill of Materials</name>
1212
<description>Java SDK Bill of Materials (BOM)</description>

common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.12-SNAPSHOT</version>
11+
<version>2.3.14-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-common</artifactId>

coordination/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.12-SNAPSHOT</version>
11+
<version>2.3.14-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-coordination</artifactId>

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.12-SNAPSHOT</version>
11+
<version>2.3.14-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-core</artifactId>

export/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.12-SNAPSHOT</version>
11+
<version>2.3.14-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-export</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.12-SNAPSHOT</version>
11+
<version>2.3.14-SNAPSHOT</version>
1212

1313
<name>Java SDK for YDB</name>
1414
<description>Java SDK for YDB</description>

0 commit comments

Comments
 (0)