Skip to content

Commit 0e6c0fa

Browse files
w1amw1am
committed
Add support for kdb and kurrent protocols
1 parent 82d0c02 commit 0e6c0fa

File tree

3 files changed

+54
-42
lines changed

3 files changed

+54
-42
lines changed

‎db-client-java/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
public class ConnectionSettingsBuilder {
1818
private static final Logger logger = LoggerFactory.getLogger(ConnectionSettingsBuilder.class);
19+
private static final Set<String> SUPPORTED_PROTOCOLS = new HashSet<>(Arrays.asList("esdb", "esdb+discover", "kurrent", "kdb", "kdb+discover", "kurrent+discover"));
20+
1921
private boolean _dnsDiscover = false;
2022
private int _maxDiscoverAttempts = 3;
2123
private int _discoveryInterval = 500;
@@ -257,10 +259,13 @@ void parseGossipSeed(String host) {
257259
}
258260

259261
static KurrentDBClientSettings parseFromUrl(ConnectionSettingsBuilder builder, URL url) {
260-
if (!url.getProtocol().equals("esdb") && !url.getProtocol().equals("esdb+discover"))
262+
if (!SUPPORTED_PROTOCOLS.contains(url.getProtocol()))
261263
throw new RuntimeException(String.format("Unknown URL scheme: %s", url.getProtocol()));
262264

263-
builder.dnsDiscover(url.getProtocol().equals("esdb+discover"));
265+
if (url.getProtocol().startsWith("esdb"))
266+
logger.warn("The 'esdb' protocol is deprecated. Please use 'kurrent' or 'kdb' instead.");
267+
268+
builder.dnsDiscover(url.getProtocol().endsWith("+discover"));
264269

265270
if (url.getUserInfo() != null && !url.getUserInfo().isEmpty()) {
266271
String[] splits = url.getUserInfo().split(":", 2);

‎db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ public static Stream<Arguments> invalidConnectionStrings() {
1414
return Stream.of(
1515
Arguments.of("localhost"),
1616
Arguments.of("https://console.eventstore.cloud/"),
17-
Arguments.of("esbd+discovery://localhost"),
18-
Arguments.of("esdb://my:great@username:UyeXx8$^PsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false"),
19-
Arguments.of("esdb://host1,host2:200:300?tlsVerifyCert=false"),
20-
Arguments.of("esdb://localhost/&tlsVerifyCert=false"),
21-
Arguments.of("esdb://localhost?tlsVerifyCert=false?nodePreference=follower"),
22-
Arguments.of("esdb://localhost?tlsVerifyCert=false&nodePreference=any"),
23-
Arguments.of("esdb://localhost?tlsVerifyCert=if you feel like it"),
24-
Arguments.of("esdb://localhost?keepAliveInterval=-3"),
25-
Arguments.of("esdb://localhost?keepAliveInterval=sdfksjsfl"),
26-
Arguments.of("esdb://localhost?keepAliveTimeout=sdfksjsfl"),
27-
Arguments.of("esdb://localhost?keepAliveTimeout=-3"),
28-
Arguments.of("esdb://localhost?nodePreference=read_only_replica"),
29-
Arguments.of("esdb://localhost?userCertFile=/path/to/cert"),
30-
Arguments.of("esdb://localhost?userKeyFile=/path/to/key")
17+
Arguments.of("kurnt+discovery://localhost"),
18+
Arguments.of("kurrent://my:great@username:UyeXx8$^PsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false"),
19+
Arguments.of("kurrent://host1,host2:200:300?tlsVerifyCert=false"),
20+
Arguments.of("kurrent://localhost/&tlsVerifyCert=false"),
21+
Arguments.of("kurrent://localhost?tlsVerifyCert=false?nodePreference=follower"),
22+
Arguments.of("kurrent://localhost?tlsVerifyCert=false&nodePreference=any"),
23+
Arguments.of("kurrent://localhost?tlsVerifyCert=if you feel like it"),
24+
Arguments.of("kurrent://localhost?keepAliveInterval=-3"),
25+
Arguments.of("kurrent://localhost?keepAliveInterval=sdfksjsfl"),
26+
Arguments.of("kurrent://localhost?keepAliveTimeout=sdfksjsfl"),
27+
Arguments.of("kurrent://localhost?keepAliveTimeout=-3"),
28+
Arguments.of("kurrent://localhost?nodePreference=read_only_replica"),
29+
Arguments.of("kurrent://localhost?userCertFile=/path/to/cert"),
30+
Arguments.of("kurrent://localhost?userKeyFile=/path/to/key")
3131
);
3232
}
3333

‎db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.kurrent.dbclient.misc;
22

33
import java.net.InetSocketAddress;
4+
import java.util.Arrays;
5+
import java.util.List;
46
import java.util.stream.IntStream;
57
import java.util.stream.Stream;
68

@@ -16,110 +18,115 @@
1618
public class ParseValidConnectionStringTests {
1719
private final JsonMapper mapper = new JsonMapper();
1820

21+
private static final List<String> PROTOCOLS = Arrays.asList("esdb", "kurrent", "kdb");
1922

2023
public static Stream<Arguments> validConnectionStrings() {
21-
return Stream.of(
24+
List<Arguments> baseConnectionStrings = Arrays.asList(
2225
Arguments.of(
23-
"esdb://localhost",
26+
"://localhost",
2427
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}]}"
2528
),
2629
Arguments.of(
27-
"esdb://localhost:2114",
30+
"://localhost:2114",
2831
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}"
2932
),
3033
Arguments.of(
31-
"esdb://user:pass@localhost:2114",
34+
"://user:pass@localhost:2114",
3235
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}"
3336
),
3437
Arguments.of(
35-
"esdb://user:pass@localhost:2114/",
38+
"://user:pass@localhost:2114/",
3639
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}"
3740
),
3841
Arguments.of(
39-
"esdb://user:pass@localhost:2114/?tlsVerifyCert=false",
42+
"://user:pass@localhost:2114/?tlsVerifyCert=false",
4043
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}"
4144
),
4245
Arguments.of(
43-
"esdb://user:pass@localhost:2114?tlsVerifyCert=false",
46+
"://user:pass@localhost:2114?tlsVerifyCert=false",
4447
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}"
4548
),
4649
Arguments.of(
47-
"esdb://user:pass@localhost:2114?tls=false",
50+
"://user:pass@localhost:2114?tls=false",
4851
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}"
4952
),
5053
Arguments.of(
51-
"esdb://host1,host2,host3",
54+
"://host1,host2,host3",
5255
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":2113},{\"address\":\"host2\",\"port\":2113},{\"address\":\"host3\",\"port\":2113}]}"
5356
),
5457
Arguments.of(
55-
"esdb://host1:1234,host2:4321,host3:3231",
58+
"://host1:1234,host2:4321,host3:3231",
5659
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":1234},{\"address\":\"host2\",\"port\":4321},{\"address\":\"host3\",\"port\":3231}]}"
5760
),
5861
Arguments.of(
59-
"esdb://bubaqp2rh41uf5akmj0g-0.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-1.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-2.mesdb.eventstore.cloud:2113",
62+
"://bubaqp2rh41uf5akmj0g-0.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-1.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-2.mesdb.eventstore.cloud:2113",
6063
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"bubaqp2rh41uf5akmj0g-0.mesdb.eventstore.cloud\",\"port\":2113},{\"address\":\"bubaqp2rh41uf5akmj0g-1.mesdb.eventstore.cloud\",\"port\":2113},{\"address\":\"bubaqp2rh41uf5akmj0g-2.mesdb.eventstore.cloud\",\"port\":2113}]}"
6164
),
6265
Arguments.of(
63-
"esdb://user:pass@host1:1234,host2:4321,host3:3231?nodePreference=follower",
66+
"://user:pass@host1:1234,host2:4321,host3:3231?nodePreference=follower",
6467
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"follower\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"host1\",\"port\":1234},{\"address\":\"host2\",\"port\":4321},{\"address\":\"host3\",\"port\":3231}]}"
6568
),
6669
Arguments.of(
67-
"esdb://host1,host2,host3?tls=false",
70+
"://host1,host2,host3?tls=false",
6871
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":2113},{\"address\":\"host2\",\"port\":2113},{\"address\":\"host3\",\"port\":2113}]}"
6972
),
7073
Arguments.of(
71-
"esdb://127.0.0.1:21573?tls=false",
74+
"://127.0.0.1:21573?tls=false",
7275
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}]}"
7376
),
7477
Arguments.of(
75-
"esdb://host1,host2,host3?tlsVerifyCert=false",
78+
"://host1,host2,host3?tlsVerifyCert=false",
7679
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":2113},{\"address\":\"host2\",\"port\":2113},{\"address\":\"host3\",\"port\":2113}]}"
7780
),
7881
Arguments.of(
79-
"esdb+discover://user:pass@host?nodePreference=follower&tlsVerifyCert=false",
82+
"+discover://user:pass@host?nodePreference=follower&tlsVerifyCert=false",
8083
"{\"dnsDiscover\":true,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"follower\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"host\",\"port\":2113}]}"
8184
),
8285
Arguments.of(
83-
"esdb://my%3Agreat%40username:UyeXx8%24%5EPsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false",
86+
"://my%3Agreat%40username:UyeXx8%24%5EPsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false",
8487
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"follower\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"my:great@username\",\"password\":\"UyeXx8$^PsOo4jG88FlCauR1Coz25q\"},\"hosts\":[{\"address\":\"host\",\"port\":2113}]}"
8588
),
8689
Arguments.of(
87-
"esdb://host?maxDiscoverAttempts=200&discoveryInterval=1000&gossipTimeout=1&nodePreference=leader&tls=false&tlsVerifyCert=false&throwOnAppendFailure=false",
90+
"://host?maxDiscoverAttempts=200&discoveryInterval=1000&gossipTimeout=1&nodePreference=leader&tls=false&tlsVerifyCert=false&throwOnAppendFailure=false",
8891
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":200,\"discoveryInterval\":1000,\"gossipTimeout\":1,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":false,\"hosts\":[{\"address\":\"host\",\"port\":2113}]}"
8992
),
9093
Arguments.of(
91-
"esdb://host?MaxDiscoverAttempts=200&discoveryinterval=1000&GOSSIPTIMEOUT=1&nOdEpReFeReNcE=leader&TLS=false&TlsVerifyCert=false&THROWOnAppendFailure=false",
94+
"://host?MaxDiscoverAttempts=200&discoveryinterval=1000&GOSSIPTIMEOUT=1&nOdEpReFeReNcE=leader&TLS=false&TlsVerifyCert=false&THROWOnAppendFailure=false",
9295
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":200,\"discoveryInterval\":1000,\"gossipTimeout\":1,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":false,\"hosts\":[{\"address\":\"host\",\"port\":2113}]}"
9396
),
9497
Arguments.of(
95-
"esdb://localhost?keepAliveTimeout=20&keepAliveInterval=10",
98+
"://localhost?keepAliveTimeout=20&keepAliveInterval=10",
9699
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"keepAliveTimeout\": \"20\", \"keepAliveInterval\": \"10\"}"
97100
),
98101
Arguments.of(
99-
"esdb://localhost?keepAliveTimeout=20&keepAliveInterval=10&nodePreference=readOnlyReplica",
102+
"://localhost?keepAliveTimeout=20&keepAliveInterval=10&nodePreference=readOnlyReplica",
100103
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"readOnlyReplica\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"keepAliveTimeout\": \"20\", \"keepAliveInterval\": \"10\"}"
101104
),
102105
Arguments.of(
103-
"esdb://127.0.0.1:21573?defaultDeadline=60000",
106+
"://127.0.0.1:21573?defaultDeadline=60000",
104107
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}], \"defaultDeadline\": 60000}"
105108
),
106109
Arguments.of(
107-
"esdb://127.0.0.1:21573?tlsCaFile=/path/to/cert",
110+
"://127.0.0.1:21573?tlsCaFile=/path/to/cert",
108111
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}], \"tlsCaFile\": \"/path/to/cert\"}"
109112
),
110113
Arguments.of(
111-
"esdb://127.0.0.1:21573?userCertFile=/path/to/cert&userKeyFile=/path/to/key",
114+
"://127.0.0.1:21573?userCertFile=/path/to/cert&userKeyFile=/path/to/key",
112115
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}], \"defaultClientCertificate\": {\"clientCertFile\": \"/path/to/cert\", \"clientKeyFile\": \"/path/to/key\"}}"
113116
),
114117
Arguments.of(
115-
"esdb://localhost?feature=foobar",
118+
"://localhost?feature=foobar",
116119
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"features\": \"foobar\"}"
117120
),
118121
Arguments.of(
119-
"esdb://localhost?feature=foobar&feature=baz",
122+
"://localhost?feature=foobar&feature=baz",
120123
"{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"features\": [\"foobar\", \"baz\"]}"
121124
)
122125
);
126+
127+
return baseConnectionStrings.stream()
128+
.flatMap(base -> PROTOCOLS.stream()
129+
.map(protocol -> Arguments.of(protocol + base.get()[0], base.get()[1])));
123130
}
124131

125132
public void assertEquals(KurrentDBClientSettings settings, KurrentDBClientSettings other) {

0 commit comments

Comments
 (0)