From f5ea2d7b28a61a9bd3ecef22f86449a43308fada Mon Sep 17 00:00:00 2001 From: William Chong Date: Mon, 16 Dec 2024 13:27:25 +0400 Subject: [PATCH 01/24] Rename `EventStoreDBClientSettings` to `KurrentDBClientSettings` --- README.md | 2 +- .../java/com/eventstore/dbclient/ClientTelemetry.java | 4 ++-- .../com/eventstore/dbclient/ClientTelemetryTags.java | 2 +- .../java/com/eventstore/dbclient/ClusterDiscovery.java | 2 +- .../com/eventstore/dbclient/ConnectionService.java | 4 ++-- .../eventstore/dbclient/ConnectionSettingsBuilder.java | 8 ++++---- .../java/com/eventstore/dbclient/ConnectionState.java | 6 +++--- .../com/eventstore/dbclient/EventStoreDBClient.java | 4 ++-- .../eventstore/dbclient/EventStoreDBClientBase.java | 2 +- .../dbclient/EventStoreDBConnectionString.java | 4 ++-- .../EventStoreDBPersistentSubscriptionsClient.java | 4 ++-- .../EventStoreDBProjectionManagementClient.java | 4 ++-- .../java/com/eventstore/dbclient/GossipClient.java | 2 +- .../main/java/com/eventstore/dbclient/GrpcClient.java | 6 +++--- .../main/java/com/eventstore/dbclient/GrpcUtils.java | 4 ++-- ...lientSettings.java => KurrentDBClientSettings.java} | 4 ++-- .../java/com/eventstore/dbclient/ServerFeatures.java | 2 +- .../java/com/eventstore/dbclient/WorkItemArgs.java | 5 +---- .../java/com/eventstore/dbclient/ClientTracker.java | 4 ++-- .../test/java/com/eventstore/dbclient/Database.java | 4 +--- .../dbclient/databases/DockerContainerDatabase.java | 2 +- .../dbclient/databases/ExternallyCreatedCluster.java | 2 +- .../dbclient/misc/ParseValidConnectionStringTests.java | 10 +++++----- .../samples/authentication/UserCertificate.java | 4 ++-- .../projection_management/ProjectionManagement.java | 2 +- .../dbclient/samples/quick_start/QuickStart.java | 3 +-- .../dbclient/streams/ClientLifecycleTests.java | 5 ++--- 27 files changed, 49 insertions(+), 56 deletions(-) rename db-client-java/src/main/java/com/eventstore/dbclient/{EventStoreDBClientSettings.java => KurrentDBClientSettings.java} (98%) diff --git a/README.md b/README.md index f58c194e..2089ec17 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ class AccountCreated { ``` ```java import com.eventstore.dbclient.EventStoreDBClient; -import com.eventstore.dbclient.EventStoreDBClientSettings; +import com.eventstore.dbclient.KurrentDBClientSettings; import com.eventstore.dbclient.EventStoreDBConnectionString; import com.eventstore.dbclient.EventData; import com.eventstore.dbclient.ReadStreamOptions; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java b/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java index 332e6a5c..0ebf0583 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java @@ -87,7 +87,7 @@ private static SpanContext tryExtractTracingContext(byte[] userMetadataBytes) { static CompletableFuture traceAppend( BiFunction, CompletableFuture> appendOperation, ManagedChannel channel, - List events, String streamId, EventStoreDBClientSettings settings, + List events, String streamId, KurrentDBClientSettings settings, UserCredentials optionalCallCredentials) { Span span = createSpan( ClientTelemetryConstants.Operations.APPEND, @@ -120,7 +120,7 @@ static CompletableFuture traceAppend( } static void traceSubscribe(Runnable tracedOperation, String subscriptionId, ManagedChannel channel, - EventStoreDBClientSettings settings, + KurrentDBClientSettings settings, UserCredentials optionalCallCredentials, RecordedEvent event) { if (event == null) { tracedOperation.run(); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryTags.java b/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryTags.java index 76548d15..b7594e07 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryTags.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryTags.java @@ -33,7 +33,7 @@ Builder withServerTagsFromGrpcChannel(ManagedChannel channel) { return withServerTags(authorityParts[0], authorityParts[1]); } - Builder withServerTagsFromClientSettings(EventStoreDBClientSettings settings) { + Builder withServerTagsFromClientSettings(KurrentDBClientSettings settings) { if (settings == null || !settings.isDnsDiscover()) return this; InetSocketAddress dns = settings.getHosts()[0]; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClusterDiscovery.java b/db-client-java/src/main/java/com/eventstore/dbclient/ClusterDiscovery.java index 71701360..acf1f0cf 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClusterDiscovery.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ClusterDiscovery.java @@ -19,7 +19,7 @@ class ClusterDiscovery implements Discovery { private final NodeSelector nodeSelector; private final NodeResolution resolution; - ClusterDiscovery(EventStoreDBClientSettings settings) { + ClusterDiscovery(KurrentDBClientSettings settings) { this.nodeSelector = new NodeSelector(settings.getNodePreference()); if (settings.isDnsDiscover()) { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java b/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java index 5a31b244..7e691815 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java @@ -19,12 +19,12 @@ class ConnectionService implements Runnable { private final AtomicBoolean closed; private final LinkedBlockingQueue queue; private final Discovery discovery; - private final EventStoreDBClientSettings settings; + private final KurrentDBClientSettings settings; private final ConnectionState connection; private UUID channelId = UUID.randomUUID(); private ServerInfo serverInfo = null; - ConnectionService(EventStoreDBClientSettings settings, Discovery discovery) { + ConnectionService(KurrentDBClientSettings settings, Discovery discovery) { this.settings = settings; this.discovery = discovery; this.connection = new ConnectionState(settings); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionSettingsBuilder.java b/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionSettingsBuilder.java index 8ea7c00c..57a9a60a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionSettingsBuilder.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionSettingsBuilder.java @@ -37,11 +37,11 @@ public class ConnectionSettingsBuilder { /** * Returns configured connection settings. - * @see EventStoreDBClientSettings + * @see KurrentDBClientSettings * @return configured settings. */ - public EventStoreDBClientSettings buildConnectionSettings() { - return new EventStoreDBClientSettings(_dnsDiscover, + public KurrentDBClientSettings buildConnectionSettings() { + return new KurrentDBClientSettings(_dnsDiscover, _maxDiscoverAttempts, _discoveryInterval, _gossipTimeout, @@ -256,7 +256,7 @@ void parseGossipSeed(String host) { } } - static EventStoreDBClientSettings parseFromUrl(ConnectionSettingsBuilder builder, URL url) { + static KurrentDBClientSettings parseFromUrl(ConnectionSettingsBuilder builder, URL url) { if (!url.getProtocol().equals("esdb") && !url.getProtocol().equals("esdb+discover")) throw new RuntimeException(String.format("Unknown URL scheme: %s", url.getProtocol())); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionState.java b/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionState.java index 6c71027f..f1e86269 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionState.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionState.java @@ -17,7 +17,7 @@ class ConnectionState { private final static Logger logger = LoggerFactory.getLogger(ConnectionState.class); private final static int MAX_INBOUND_MESSAGE_LENGTH = 17 * 1_024 * 1_024; // 17MiB - private final EventStoreDBClientSettings settings; + private final KurrentDBClientSettings settings; private final SslContext sslContext; private InetSocketAddress previous; private ManagedChannel currentChannel; @@ -28,7 +28,7 @@ class ConnectionState { // * If we managed to read the server features (if not, it was a not found error then it's not fatal, just old node version) private boolean confirmedChannel; - ConnectionState(EventStoreDBClientSettings settings) { + ConnectionState(KurrentDBClientSettings settings) { this.settings = settings; if (settings.isTls()) { @@ -68,7 +68,7 @@ ManagedChannel getCurrentChannel() { return this.currentChannel; } - EventStoreDBClientSettings getSettings() { + KurrentDBClientSettings getSettings() { return this.settings; } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java index 137afd6f..e67facd4 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java @@ -15,14 +15,14 @@ * Many threads can use the EventStoreDB client simultaneously, or a single thread can make many asynchronous requests. */ public class EventStoreDBClient extends EventStoreDBClientBase { - private EventStoreDBClient(EventStoreDBClientSettings settings) { + private EventStoreDBClient(KurrentDBClientSettings settings) { super(settings); } /** * Creates a gRPC client to EventStoreDB database. */ - public static EventStoreDBClient create(EventStoreDBClientSettings settings) { + public static EventStoreDBClient create(KurrentDBClientSettings settings) { return new EventStoreDBClient(settings); } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java index 6fc61cda..c7bd8909 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java @@ -15,7 +15,7 @@ public class EventStoreDBClientBase { final Logger logger = LoggerFactory.getLogger(EventStoreDBClientBase.class); final private GrpcClient client; - EventStoreDBClientBase(EventStoreDBClientSettings settings) { + EventStoreDBClientBase(KurrentDBClientSettings settings) { Discovery discovery; if (settings.getHosts().length == 1 && !settings.isDnsDiscover()) { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java index 9a6b4dc0..d7e976f2 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java @@ -14,8 +14,8 @@ public final class EventStoreDBConnectionString { * malformed. * @return a client settings. */ - public static EventStoreDBClientSettings parseOrThrow(String connectionString) { - ConnectionSettingsBuilder builder = EventStoreDBClientSettings.builder(); + public static KurrentDBClientSettings parseOrThrow(String connectionString) { + ConnectionSettingsBuilder builder = KurrentDBClientSettings.builder(); try { URL url = new URL(null, connectionString, new EsdbUrlHandler()); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java index 135662e7..3e2c2bc2 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java @@ -13,7 +13,7 @@ public class EventStoreDBPersistentSubscriptionsClient { private final EventStoreDBClientBase inner; - private EventStoreDBPersistentSubscriptionsClient(EventStoreDBClientSettings settings) { + private EventStoreDBPersistentSubscriptionsClient(KurrentDBClientSettings settings) { inner = new EventStoreDBClientBase(settings); } @@ -24,7 +24,7 @@ private EventStoreDBPersistentSubscriptionsClient(EventStoreDBClientBase inner) /** * Creates a persistent subscription client instance. */ - public static EventStoreDBPersistentSubscriptionsClient create(EventStoreDBClientSettings settings) { + public static EventStoreDBPersistentSubscriptionsClient create(KurrentDBClientSettings settings) { return new EventStoreDBPersistentSubscriptionsClient(settings); } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java index d8d7db08..0eb8d42c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java @@ -13,7 +13,7 @@ */ public class EventStoreDBProjectionManagementClient { final EventStoreDBClientBase inner; - private EventStoreDBProjectionManagementClient(EventStoreDBClientSettings settings) { + private EventStoreDBProjectionManagementClient(KurrentDBClientSettings settings) { inner = new EventStoreDBClientBase(settings); } @@ -25,7 +25,7 @@ private EventStoreDBProjectionManagementClient(EventStoreDBClientBase inner) { * Returns the Projection Management client based on the settings. * @param settings The settings to use for constructing the client. */ - public static EventStoreDBProjectionManagementClient create(EventStoreDBClientSettings settings) { + public static EventStoreDBProjectionManagementClient create(KurrentDBClientSettings settings) { return new EventStoreDBProjectionManagementClient(settings); } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GossipClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/GossipClient.java index 177e5b68..70dd13c9 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GossipClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/GossipClient.java @@ -19,7 +19,7 @@ class GossipClient { private final ManagedChannel _channel; private final GossipGrpc.GossipStub _stub; - public GossipClient(EventStoreDBClientSettings settings, ManagedChannel channel) { + public GossipClient(KurrentDBClientSettings settings, ManagedChannel channel) { _channel = channel; _stub = GrpcUtils.configureStub(GossipGrpc.newStub(_channel), settings, new GossipOption(), (long)settings.getGossipTimeout()); } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GrpcClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/GrpcClient.java index eeba12ad..97d82408 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GrpcClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/GrpcClient.java @@ -17,9 +17,9 @@ class GrpcClient { private static final Logger logger = LoggerFactory.getLogger(GrpcClient.class); private final AtomicBoolean closed; private final LinkedBlockingQueue queue; - private final EventStoreDBClientSettings settings; + private final KurrentDBClientSettings settings; - GrpcClient(EventStoreDBClientSettings settings, AtomicBoolean closed, LinkedBlockingQueue queue) { + GrpcClient(KurrentDBClientSettings settings, AtomicBoolean closed, LinkedBlockingQueue queue) { this.settings = settings; this.closed = closed; this.queue = queue; @@ -112,7 +112,7 @@ public CompletableFuture shutdown() { return this.push(new Shutdown(completion::complete)).thenComposeAsync(x -> completion); } - public EventStoreDBClientSettings getSettings() { + public KurrentDBClientSettings getSettings() { return this.settings; } } \ No newline at end of file diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GrpcUtils.java b/db-client-java/src/main/java/com/eventstore/dbclient/GrpcUtils.java index 08111bdb..d94ffe69 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GrpcUtils.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/GrpcUtils.java @@ -112,11 +112,11 @@ static public StreamsOuterClass.ReadReq.Options.StreamOptions toStreamOptions(St .build(); } - static public , O> S configureStub(S stub, EventStoreDBClientSettings settings, OptionsBase options) { + static public , O> S configureStub(S stub, KurrentDBClientSettings settings, OptionsBase options) { return configureStub(stub, settings, options, null); } - static public , O> S configureStub(S stub, EventStoreDBClientSettings settings, OptionsBase options, Long forceDeadlineInMs) { + static public , O> S configureStub(S stub, KurrentDBClientSettings settings, OptionsBase options, Long forceDeadlineInMs) { S finalStub = stub; ConnectionMetadata metadata = new ConnectionMetadata(); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientSettings.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientSettings.java rename to db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java index 8d044e61..bf2812cc 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientSettings.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java @@ -24,7 +24,7 @@ *
  • keepAliveInterval: 10000
    • * */ -public class EventStoreDBClientSettings { +public class KurrentDBClientSettings { private final boolean dnsDiscover; private final int maxDiscoverAttempts; private final int discoveryInterval; @@ -167,7 +167,7 @@ public String getTlsCaFile() { */ public Set getFeatures() { return features; } - EventStoreDBClientSettings( + KurrentDBClientSettings( boolean dnsDiscover, int maxDiscoverAttempts, int discoveryInterval, diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ServerFeatures.java b/db-client-java/src/main/java/com/eventstore/dbclient/ServerFeatures.java index 0fd42ec2..2ff0ccfe 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ServerFeatures.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ServerFeatures.java @@ -17,7 +17,7 @@ import java.util.function.Function; class ServerFeatures { - public static Optional getSupportedFeatures(EventStoreDBClientSettings settings, ManagedChannel channel) { + public static Optional getSupportedFeatures(KurrentDBClientSettings settings, ManagedChannel channel) { final ServerFeaturesGrpc.ServerFeaturesStub stub = ServerFeaturesGrpc.newStub(channel); try { return Optional.ofNullable(getSupportedFeaturesInternal(stub).get(settings.getGossipTimeout(), TimeUnit.MILLISECONDS)); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/WorkItemArgs.java b/db-client-java/src/main/java/com/eventstore/dbclient/WorkItemArgs.java index e38d6a71..cb6d061b 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/WorkItemArgs.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/WorkItemArgs.java @@ -1,8 +1,5 @@ package com.eventstore.dbclient; -import com.eventstore.dbclient.EventStoreDBClientSettings; -import com.eventstore.dbclient.OptionsBase; -import com.eventstore.dbclient.ServerInfo; import io.grpc.ManagedChannel; import java.io.IOException; @@ -46,7 +43,7 @@ public boolean supportFeature(int feature) { return info != null && info.supportFeature(feature); } - public HttpURLConnection getHttpConnection(OptionsBase options, EventStoreDBClientSettings settings, String path) { + public HttpURLConnection getHttpConnection(OptionsBase options, KurrentDBClientSettings settings, String path) { try { HttpURLConnection conn = (HttpURLConnection) getURL(settings.isTls(), this.endpoint, path).openConnection(); conn.setRequestProperty("Accept", ContentType.JSON); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java b/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java index 8fd57b6a..0f281c74 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java @@ -15,7 +15,7 @@ public class ClientTracker { private ArrayList otherClients = new ArrayList<>(); private EventStoreDBClient defaultClient = null; - public synchronized EventStoreDBClient createClient(EventStoreDBClientSettings settings) { + public synchronized EventStoreDBClient createClient(KurrentDBClientSettings settings) { EventStoreDBClient client = EventStoreDBClient.create(settings); otherClients.add(client); return client; @@ -23,7 +23,7 @@ public synchronized EventStoreDBClient createClient(EventStoreDBClientSettings s public synchronized EventStoreDBClient getDefaultClient(Database database) { if (defaultClient == null) { - EventStoreDBClientSettings settings = database.defaultSettingsBuilder().buildConnectionSettings(); + KurrentDBClientSettings settings = database.defaultSettingsBuilder().buildConnectionSettings(); defaultClient = EventStoreDBClient.create(settings); if (settings.isTls() && settings.getDefaultCredentials() != null) { diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/Database.java b/db-client-java/src/test/java/com/eventstore/dbclient/Database.java index 48eaec9c..cdf30a49 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/Database.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/Database.java @@ -3,9 +3,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Optional; -import java.util.concurrent.ExecutionException; import java.util.function.Function; public interface Database { @@ -29,7 +27,7 @@ default EventStoreDBClient defaultClient() { return getClientTracker().getDefaultClient(this); } - default EventStoreDBClient createClient(EventStoreDBClientSettings settings) { + default EventStoreDBClient createClient(KurrentDBClientSettings settings) { return getClientTracker().createClient(settings); } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/databases/DockerContainerDatabase.java b/db-client-java/src/test/java/com/eventstore/dbclient/databases/DockerContainerDatabase.java index d859f9f1..6031ee90 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/databases/DockerContainerDatabase.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/databases/DockerContainerDatabase.java @@ -106,7 +106,7 @@ public DockerContainerDatabase(Builder builder) { @Override public ConnectionSettingsBuilder defaultSettingsBuilder() { - ConnectionSettingsBuilder settingsBuilder = EventStoreDBClientSettings.builder().addHost(getHost(), getMappedPort(2113)); + ConnectionSettingsBuilder settingsBuilder = KurrentDBClientSettings.builder().addHost(getHost(), getMappedPort(2113)); if (!builder.anonymous) settingsBuilder.defaultCredentials("admin", "changeit"); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/databases/ExternallyCreatedCluster.java b/db-client-java/src/test/java/com/eventstore/dbclient/databases/ExternallyCreatedCluster.java index 039941a8..f230d3f0 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/databases/ExternallyCreatedCluster.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/databases/ExternallyCreatedCluster.java @@ -13,7 +13,7 @@ public ExternallyCreatedCluster(boolean secure) { @Override public ConnectionSettingsBuilder defaultSettingsBuilder() { - return EventStoreDBClientSettings + return KurrentDBClientSettings .builder() .dnsDiscover(true) .defaultCredentials("admin", "changeit") diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java index 9a5ed76e..755ab661 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java @@ -122,7 +122,7 @@ public static Stream validConnectionStrings() { ); } - public void assertEquals(EventStoreDBClientSettings settings, EventStoreDBClientSettings other) { + public void assertEquals(KurrentDBClientSettings settings, KurrentDBClientSettings other) { Assertions.assertEquals(settings.isDnsDiscover(), other.isDnsDiscover()); Assertions.assertEquals(settings.getMaxDiscoverAttempts(), other.getMaxDiscoverAttempts()); Assertions.assertEquals(settings.getDiscoveryInterval(), other.getDiscoveryInterval()); @@ -147,14 +147,14 @@ public void assertEquals(EventStoreDBClientSettings settings, EventStoreDBClient @MethodSource("validConnectionStrings") public void test(String connectionString, String json) throws ConnectionStringParsingException, JsonProcessingException { - EventStoreDBClientSettings expectedSettings = this.parseJson(json); - EventStoreDBClientSettings parsedSettings = EventStoreDBConnectionString.parseOrThrow(connectionString); + KurrentDBClientSettings expectedSettings = this.parseJson(json); + KurrentDBClientSettings parsedSettings = EventStoreDBConnectionString.parseOrThrow(connectionString); this.assertEquals(expectedSettings, parsedSettings); } - private EventStoreDBClientSettings parseJson(String input) throws JsonProcessingException { - ConnectionSettingsBuilder builder = EventStoreDBClientSettings.builder(); + private KurrentDBClientSettings parseJson(String input) throws JsonProcessingException { + ConnectionSettingsBuilder builder = KurrentDBClientSettings.builder(); JsonNode tree = mapper.readTree(input); if (tree.get("dnsDiscover") != null) diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java index 24a21867..de83daf6 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java @@ -1,13 +1,13 @@ package com.eventstore.dbclient.samples.authentication; import com.eventstore.dbclient.EventStoreDBClient; -import com.eventstore.dbclient.EventStoreDBClientSettings; +import com.eventstore.dbclient.KurrentDBClientSettings; import com.eventstore.dbclient.EventStoreDBConnectionString; public class UserCertificate { private static void tracing() { // region client-with-user-certificates - EventStoreDBClientSettings settings = EventStoreDBConnectionString + KurrentDBClientSettings settings = EventStoreDBConnectionString .parseOrThrow("esdb://admin:changeit@{endpoint}?tls=true&userCertFile={pathToCaFile}&userKeyFile={pathToKeyFile}"); EventStoreDBClient client = EventStoreDBClient.create(settings); // endregion client-with-user-certificates diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java index 71617614..aaf4be7e 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java @@ -37,7 +37,7 @@ public void testProjectionManagementSamples() throws Throwable { private static EventStoreDBProjectionManagementClient createClient(String connection) { // region createClient - EventStoreDBClientSettings settings = EventStoreDBConnectionString.parseOrThrow(connection); + KurrentDBClientSettings settings = EventStoreDBConnectionString.parseOrThrow(connection); EventStoreDBProjectionManagementClient client = EventStoreDBProjectionManagementClient.create(settings); // endregion createClient diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java index 7fa38d59..bef30716 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java @@ -5,14 +5,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.json.JsonMapper; -import java.util.List; import java.util.UUID; import java.util.concurrent.ExecutionException; public class QuickStart { public static void Run() throws ConnectionStringParsingException, ExecutionException, InterruptedException, JsonProcessingException { // region createClient - EventStoreDBClientSettings settings = EventStoreDBConnectionString.parseOrThrow("{connectionString}"); + KurrentDBClientSettings settings = EventStoreDBConnectionString.parseOrThrow("{connectionString}"); EventStoreDBClient client = EventStoreDBClient.create(settings); // endregion createClient diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java index f097782c..4541f1f7 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java @@ -3,11 +3,10 @@ import com.eventstore.dbclient.ConnectionAware; import com.eventstore.dbclient.ConnectionShutdownException; import com.eventstore.dbclient.EventStoreDBClient; -import com.eventstore.dbclient.EventStoreDBClientSettings; +import com.eventstore.dbclient.KurrentDBClientSettings; import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutionException; -import java.util.function.Function; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -33,7 +32,7 @@ default void testProvidesShutdownStatusAfterManualShutdown() throws Throwable { @Test default void testProvidesShutdownStatusAfterAutomaticShutdown() throws Throwable { - EventStoreDBClientSettings settings = EventStoreDBClientSettings.builder() + KurrentDBClientSettings settings = KurrentDBClientSettings.builder() .addHost("unknown.host.name", 2113) .buildConnectionSettings(); EventStoreDBClient client = EventStoreDBClient.create(settings); From b50cefb6dffca5661bd3bd9b9d084c36a01b242f Mon Sep 17 00:00:00 2001 From: William Chong Date: Mon, 16 Dec 2024 13:40:55 +0400 Subject: [PATCH 02/24] Rename `EventStoreDBClient` to `KurrentDBClient` --- README.md | 2 +- ...tStoreDBPersistentSubscriptionsClient.java | 8 +++---- ...ventStoreDBProjectionManagementClient.java | 8 +++---- ...toreDBClient.java => KurrentDBClient.java} | 8 +++---- ...ientBase.java => KurrentDBClientBase.java} | 6 ++--- .../eventstore/dbclient/ClientTracker.java | 16 ++++++------- .../eventstore/dbclient/ConnectionAware.java | 2 +- .../com/eventstore/dbclient/Database.java | 8 +++---- ...PersistentSubscriptionManagementTests.java | 7 ++---- ...stentSubscriptionToAllWithFilterTests.java | 3 +-- ...bePersistentSubscriptionToStreamTests.java | 5 ++-- .../ClientCertificateAuthenticationTests.java | 2 +- .../appending_events/AppendingEvents.java | 11 ++++----- .../authentication/UserCertificate.java | 4 ++-- .../opentelemetry/Instrumentation.java | 2 +- .../samples/quick_start/QuickStart.java | 2 +- .../samples/reading_events/ReadingEvents.java | 23 +++++++++---------- .../ServerSideFiltering.java | 14 +++++------ .../SubscribingToStream.java | 8 +++---- .../dbclient/streams/AppendTests.java | 2 +- .../streams/ClientLifecycleTests.java | 8 +++---- .../dbclient/streams/DeadlineTests.java | 5 ++-- .../dbclient/streams/DeleteTests.java | 6 ++--- .../dbclient/streams/InterceptorTests.java | 4 ++-- .../dbclient/streams/MetadataTests.java | 6 ++--- .../dbclient/streams/ReadStreamTests.java | 2 +- .../dbclient/streams/SubscriptionTests.java | 5 ++-- ...scriptionsTracingInstrumentationTests.java | 4 ++-- .../StreamsTracingInstrumentationTests.java | 14 +++++------ .../TracingContextInjectionTests.java | 3 +-- 30 files changed, 94 insertions(+), 104 deletions(-) rename db-client-java/src/main/java/com/eventstore/dbclient/{EventStoreDBClient.java => KurrentDBClient.java} (98%) rename db-client-java/src/main/java/com/eventstore/dbclient/{EventStoreDBClientBase.java => KurrentDBClientBase.java} (91%) diff --git a/README.md b/README.md index 2089ec17..cf8eb101 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ class AccountCreated { } ``` ```java -import com.eventstore.dbclient.EventStoreDBClient; +import com.eventstore.dbclient.KurrentDBClient; import com.eventstore.dbclient.KurrentDBClientSettings; import com.eventstore.dbclient.EventStoreDBConnectionString; import com.eventstore.dbclient.EventData; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java index 3e2c2bc2..1e9c560c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java @@ -11,13 +11,13 @@ * Many threads can use the EventStoreDB client simultaneously, or a single thread can make many asynchronous requests. */ public class EventStoreDBPersistentSubscriptionsClient { - private final EventStoreDBClientBase inner; + private final KurrentDBClientBase inner; private EventStoreDBPersistentSubscriptionsClient(KurrentDBClientSettings settings) { - inner = new EventStoreDBClientBase(settings); + inner = new KurrentDBClientBase(settings); } - private EventStoreDBPersistentSubscriptionsClient(EventStoreDBClientBase inner) { + private EventStoreDBPersistentSubscriptionsClient(KurrentDBClientBase inner) { this.inner = inner; } @@ -32,7 +32,7 @@ public static EventStoreDBPersistentSubscriptionsClient create(KurrentDBClientSe * Returns a Persistent Subscription Management client based on existing client. * @param existingClient Existing client. */ - public static EventStoreDBPersistentSubscriptionsClient from(EventStoreDBClientBase existingClient) { + public static EventStoreDBPersistentSubscriptionsClient from(KurrentDBClientBase existingClient) { return new EventStoreDBPersistentSubscriptionsClient(existingClient); } /** diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java index 0eb8d42c..6bed0a97 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java @@ -12,12 +12,12 @@ * Many threads can use the EventStoreDB client simultaneously, or a single thread can make many asynchronous requests. */ public class EventStoreDBProjectionManagementClient { - final EventStoreDBClientBase inner; + final KurrentDBClientBase inner; private EventStoreDBProjectionManagementClient(KurrentDBClientSettings settings) { - inner = new EventStoreDBClientBase(settings); + inner = new KurrentDBClientBase(settings); } - private EventStoreDBProjectionManagementClient(EventStoreDBClientBase inner) { + private EventStoreDBProjectionManagementClient(KurrentDBClientBase inner) { this.inner = inner; } @@ -33,7 +33,7 @@ public static EventStoreDBProjectionManagementClient create(KurrentDBClientSetti * Returns a Projection Management client based on existing client. * @param existingClient Existing client. */ - public static EventStoreDBProjectionManagementClient from(EventStoreDBClientBase existingClient) { + public static EventStoreDBProjectionManagementClient from(KurrentDBClientBase existingClient) { return new EventStoreDBProjectionManagementClient(existingClient); } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClient.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java rename to db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClient.java index e67facd4..2574ca49 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClient.java @@ -14,16 +14,16 @@ * Represents EventStoreDB client for stream operations. A client instance maintains a two-way communication to EventStoreDB. * Many threads can use the EventStoreDB client simultaneously, or a single thread can make many asynchronous requests. */ -public class EventStoreDBClient extends EventStoreDBClientBase { - private EventStoreDBClient(KurrentDBClientSettings settings) { +public class KurrentDBClient extends KurrentDBClientBase { + private KurrentDBClient(KurrentDBClientSettings settings) { super(settings); } /** * Creates a gRPC client to EventStoreDB database. */ - public static EventStoreDBClient create(KurrentDBClientSettings settings) { - return new EventStoreDBClient(settings); + public static KurrentDBClient create(KurrentDBClientSettings settings) { + return new KurrentDBClient(settings); } /** diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientBase.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java rename to db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientBase.java index c7bd8909..704804e7 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientBase.java @@ -11,11 +11,11 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; -public class EventStoreDBClientBase { - final Logger logger = LoggerFactory.getLogger(EventStoreDBClientBase.class); +public class KurrentDBClientBase { + final Logger logger = LoggerFactory.getLogger(KurrentDBClientBase.class); final private GrpcClient client; - EventStoreDBClientBase(KurrentDBClientSettings settings) { + KurrentDBClientBase(KurrentDBClientSettings settings) { Discovery discovery; if (settings.getHosts().length == 1 && !settings.isDnsDiscover()) { diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java b/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java index 0f281c74..22df1123 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java @@ -12,19 +12,19 @@ public class ClientTracker { private static final Logger logger = LoggerFactory.getLogger(ClientTracker.class); - private ArrayList otherClients = new ArrayList<>(); - private EventStoreDBClient defaultClient = null; + private ArrayList otherClients = new ArrayList<>(); + private KurrentDBClient defaultClient = null; - public synchronized EventStoreDBClient createClient(KurrentDBClientSettings settings) { - EventStoreDBClient client = EventStoreDBClient.create(settings); + public synchronized KurrentDBClient createClient(KurrentDBClientSettings settings) { + KurrentDBClient client = KurrentDBClient.create(settings); otherClients.add(client); return client; } - public synchronized EventStoreDBClient getDefaultClient(Database database) { + public synchronized KurrentDBClient getDefaultClient(Database database) { if (defaultClient == null) { KurrentDBClientSettings settings = database.defaultSettingsBuilder().buildConnectionSettings(); - defaultClient = EventStoreDBClient.create(settings); + defaultClient = KurrentDBClient.create(settings); if (settings.isTls() && settings.getDefaultCredentials() != null) { for (int count = 0; count < 50; count++) { @@ -84,7 +84,7 @@ public synchronized EventStoreDBClient getDefaultClient(Database database) { } catch (InterruptedException ex) { throw new RuntimeException(ex); } - defaultClient = EventStoreDBClient.create(settings); + defaultClient = KurrentDBClient.create(settings); continue; } @@ -107,7 +107,7 @@ public void dispose() { defaultClient = null; } - for (EventStoreDBClientBase client: otherClients) { + for (KurrentDBClientBase client: otherClients) { try { client.shutdown().get(); } catch (ExecutionException | InterruptedException e) { diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java b/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java index bce8c5b2..367346e2 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java @@ -19,7 +19,7 @@ public interface ConnectionAware { Logger getLogger(); - default EventStoreDBClient getDefaultClient() { + default KurrentDBClient getDefaultClient() { return getDatabase().defaultClient(); } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/Database.java b/db-client-java/src/test/java/com/eventstore/dbclient/Database.java index cdf30a49..b00a35af 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/Database.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/Database.java @@ -15,19 +15,19 @@ public interface Database { void cleanup(); - default EventStoreDBClient newClient() { + default KurrentDBClient newClient() { return connectWith(Function.identity()); } - default EventStoreDBClient connectWith(Function mod) { + default KurrentDBClient connectWith(Function mod) { return createClient(mod.apply(defaultSettingsBuilder()).buildConnectionSettings()); } - default EventStoreDBClient defaultClient() { + default KurrentDBClient defaultClient() { return getClientTracker().getDefaultClient(this); } - default EventStoreDBClient createClient(KurrentDBClientSettings settings) { + default KurrentDBClient createClient(KurrentDBClientSettings settings) { return getClientTracker().createClient(settings); } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java index 9818b786..a17f6ad9 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java @@ -2,14 +2,11 @@ import com.eventstore.dbclient.*; import com.fasterxml.jackson.databind.json.JsonMapper; -import io.grpc.Status; -import io.grpc.StatusRuntimeException; import org.junit.jupiter.api.*; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @@ -138,7 +135,7 @@ default void testGetPersistentSubscriptionInfoNotExisting() throws Throwable { default void testReplayParkedMessages() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - final EventStoreDBClient streamClient = getDatabase().defaultClient(); + final KurrentDBClient streamClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); final String streamName = generateName(); final String groupName = generateName(); @@ -197,7 +194,7 @@ public void onEvent(PersistentSubscription subscription, int retryCount, Resolve default void testReplayParkedMessagesToAll() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - final EventStoreDBClient streamClient = getDatabase().defaultClient(); + final KurrentDBClient streamClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); String streamName = generateName(); String groupName = generateName(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java index 8c765e5e..9dc5124a 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java @@ -6,14 +6,13 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; public interface PersistentSubscriptionToAllWithFilterTests extends ConnectionAware { @Test default void testPersistentSubscriptionToAllWithFilter() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - EventStoreDBClient streamsClient = getDatabase().defaultClient(); + KurrentDBClient streamsClient = getDatabase().defaultClient(); String groupName = generateName(); int filteredEventTypeCount = 10; String filteredEventType = "filtered-event-type"; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java index ac3f6015..40216dc2 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java @@ -6,7 +6,6 @@ import org.junit.jupiter.api.Test; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; public interface SubscribePersistentSubscriptionToStreamTests extends ConnectionAware { @Test @@ -14,7 +13,7 @@ default void testSubscribePersistentSub() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); String streamName = generateName(); EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - EventStoreDBClient streamsClient = getDatabase().defaultClient(); + KurrentDBClient streamsClient = getDatabase().defaultClient(); JsonMapper jsonMapper = new JsonMapper(); flaky(10, exceptions, () -> client.createToStream(streamName, "aGroup") @@ -67,7 +66,7 @@ default void testSubscribePersistentSubToAll() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); String streamName = generateName(); EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - EventStoreDBClient streamsClient = getDatabase().defaultClient(); + KurrentDBClient streamsClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); flaky(10, exceptions, () -> client.createToAll("aGroup") diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/plugins/ClientCertificateAuthenticationTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/plugins/ClientCertificateAuthenticationTests.java index 6294a77a..b40ec5eb 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/plugins/ClientCertificateAuthenticationTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/plugins/ClientCertificateAuthenticationTests.java @@ -10,7 +10,7 @@ public interface ClientCertificateAuthenticationTests extends ConnectionAware { @Test default void testClientCertificateAuthenticationWithValidCertificate() { Assertions.assertDoesNotThrow(() -> { - EventStoreDBClient client = getDatabase() + KurrentDBClient client = getDatabase() .createClient(getDatabase() .defaultSettingsBuilder() .defaultClientCertificate(clientCertificate("admin"), userKey("admin")) diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/appending_events/AppendingEvents.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/appending_events/AppendingEvents.java index 9a3e04e8..f06c6318 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/appending_events/AppendingEvents.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/appending_events/AppendingEvents.java @@ -3,12 +3,11 @@ import com.eventstore.dbclient.*; import com.eventstore.dbclient.samples.TestEvent; -import java.util.List; import java.util.UUID; import java.util.concurrent.ExecutionException; public class AppendingEvents { - private static void appendToStream(EventStoreDBClient client) throws ExecutionException, InterruptedException { + private static void appendToStream(KurrentDBClient client) throws ExecutionException, InterruptedException { // region append-to-stream EventData eventData = EventData .builderAsJson( @@ -28,7 +27,7 @@ private static void appendToStream(EventStoreDBClient client) throws ExecutionEx // endregion append-to-stream } - private static void appendWithSameId(EventStoreDBClient client) throws ExecutionException, InterruptedException { + private static void appendWithSameId(KurrentDBClient client) throws ExecutionException, InterruptedException { // region append-duplicate-event EventData eventData = EventData .builderAsJson( @@ -52,7 +51,7 @@ private static void appendWithSameId(EventStoreDBClient client) throws Execution // endregion append-duplicate-event } - private static void appendWithNoStream(EventStoreDBClient client) throws ExecutionException, InterruptedException { + private static void appendWithNoStream(KurrentDBClient client) throws ExecutionException, InterruptedException { // region append-with-no-stream EventData eventDataOne = EventData .builderAsJson( @@ -86,7 +85,7 @@ private static void appendWithNoStream(EventStoreDBClient client) throws Executi // endregion append-with-no-stream } - private static void appendWithConcurrencyCheck(EventStoreDBClient client) throws ExecutionException, InterruptedException { + private static void appendWithConcurrencyCheck(KurrentDBClient client) throws ExecutionException, InterruptedException { // region append-with-concurrency-check ReadStreamOptions readStreamOptions = ReadStreamOptions.get() @@ -128,7 +127,7 @@ private static void appendWithConcurrencyCheck(EventStoreDBClient client) throws // endregion append-with-concurrency-check } - public void appendOverridingUserCredentials(EventStoreDBClient client) throws ExecutionException, InterruptedException { + public void appendOverridingUserCredentials(KurrentDBClient client) throws ExecutionException, InterruptedException { EventData eventData = EventData .builderAsJson( UUID.randomUUID(), diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java index de83daf6..135a1b82 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java @@ -1,6 +1,6 @@ package com.eventstore.dbclient.samples.authentication; -import com.eventstore.dbclient.EventStoreDBClient; +import com.eventstore.dbclient.KurrentDBClient; import com.eventstore.dbclient.KurrentDBClientSettings; import com.eventstore.dbclient.EventStoreDBConnectionString; @@ -9,7 +9,7 @@ private static void tracing() { // region client-with-user-certificates KurrentDBClientSettings settings = EventStoreDBConnectionString .parseOrThrow("esdb://admin:changeit@{endpoint}?tls=true&userCertFile={pathToCaFile}&userKeyFile={pathToKeyFile}"); - EventStoreDBClient client = EventStoreDBClient.create(settings); + KurrentDBClient client = KurrentDBClient.create(settings); // endregion client-with-user-certificates } } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/opentelemetry/Instrumentation.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/opentelemetry/Instrumentation.java index e505eca7..216f493d 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/opentelemetry/Instrumentation.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/opentelemetry/Instrumentation.java @@ -17,7 +17,7 @@ import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; public class Instrumentation { - private static void tracing(EventStoreDBClient client) throws ExecutionException, InterruptedException { + private static void tracing(KurrentDBClient client) throws ExecutionException, InterruptedException { Resource resource = Resource.getDefault().toBuilder() .put(SERVICE_NAME, "sample") .build(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java index bef30716..1f660c1a 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java @@ -12,7 +12,7 @@ public class QuickStart { public static void Run() throws ConnectionStringParsingException, ExecutionException, InterruptedException, JsonProcessingException { // region createClient KurrentDBClientSettings settings = EventStoreDBConnectionString.parseOrThrow("{connectionString}"); - EventStoreDBClient client = EventStoreDBClient.create(settings); + KurrentDBClient client = KurrentDBClient.create(settings); // endregion createClient // region createEvent diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/reading_events/ReadingEvents.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/reading_events/ReadingEvents.java index 6b51e92b..552cf092 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/reading_events/ReadingEvents.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/reading_events/ReadingEvents.java @@ -4,11 +4,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.List; import java.util.concurrent.ExecutionException; public class ReadingEvents { - private static void readFromStream(EventStoreDBClient client) throws ExecutionException, InterruptedException, JsonProcessingException { + private static void readFromStream(KurrentDBClient client) throws ExecutionException, InterruptedException, JsonProcessingException { // region read-from-stream ReadStreamOptions options = ReadStreamOptions.get() .forwards() @@ -27,7 +26,7 @@ private static void readFromStream(EventStoreDBClient client) throws ExecutionEx // endregion iterate-stream } - private static void readFromStreamPosition(EventStoreDBClient client) throws ExecutionException, InterruptedException, JsonProcessingException { + private static void readFromStreamPosition(KurrentDBClient client) throws ExecutionException, InterruptedException, JsonProcessingException { // region read-from-stream-position ReadStreamOptions options = ReadStreamOptions.get() .forwards() @@ -47,7 +46,7 @@ private static void readFromStreamPosition(EventStoreDBClient client) throws Exe // endregion iterate-stream } - private static void readStreamOverridingUserCredentials(EventStoreDBClient client) throws ExecutionException, InterruptedException { + private static void readStreamOverridingUserCredentials(KurrentDBClient client) throws ExecutionException, InterruptedException { // region overriding-user-credentials ReadStreamOptions options = ReadStreamOptions.get() .forwards() @@ -59,7 +58,7 @@ private static void readStreamOverridingUserCredentials(EventStoreDBClient clien // endregion overriding-user-credentials } - private static void readFromStreamPositionCheck(EventStoreDBClient client) throws JsonProcessingException, InterruptedException { + private static void readFromStreamPositionCheck(KurrentDBClient client) throws JsonProcessingException, InterruptedException { // region checking-for-stream-presence ReadStreamOptions options = ReadStreamOptions.get() .forwards() @@ -85,7 +84,7 @@ private static void readFromStreamPositionCheck(EventStoreDBClient client) throw // endregion checking-for-stream-presence } - private static void readFromStreamBackwards(EventStoreDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { + private static void readFromStreamBackwards(KurrentDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { // region reading-backwards ReadStreamOptions options = ReadStreamOptions.get() .backwards() @@ -101,7 +100,7 @@ private static void readFromStreamBackwards(EventStoreDBClient client) throws Js // endregion reading-backwards } - private static void readFromAllStream(EventStoreDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { + private static void readFromAllStream(KurrentDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { // region read-from-all-stream ReadAllOptions options = ReadAllOptions.get() .forwards() @@ -120,7 +119,7 @@ private static void readFromAllStream(EventStoreDBClient client) throws JsonProc // endregion read-from-all-stream-iterate } - private static void readAllOverridingUserCredentials(EventStoreDBClient client) throws ExecutionException, InterruptedException { + private static void readAllOverridingUserCredentials(KurrentDBClient client) throws ExecutionException, InterruptedException { // region read-all-overriding-user-credentials ReadAllOptions options = ReadAllOptions.get() .forwards() @@ -132,7 +131,7 @@ private static void readAllOverridingUserCredentials(EventStoreDBClient client) // endregion read-all-overriding-user-credentials } - private static void ignoreSystemEvents(EventStoreDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { + private static void ignoreSystemEvents(KurrentDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { // region ignore-system-events ReadAllOptions options = ReadAllOptions.get() .forwards() @@ -151,7 +150,7 @@ private static void ignoreSystemEvents(EventStoreDBClient client) throws JsonPro // endregion ignore-system-events } - private static void readFromAllStreamBackwards(EventStoreDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { + private static void readFromAllStreamBackwards(KurrentDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { // region read-from-all-stream-backwards ReadAllOptions options = ReadAllOptions.get() .backwards() @@ -170,7 +169,7 @@ private static void readFromAllStreamBackwards(EventStoreDBClient client) throws // endregion read-from-all-stream-iterate } - private static void filteringOutSystemEvents(EventStoreDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { + private static void filteringOutSystemEvents(KurrentDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { ReadAllOptions options = ReadAllOptions.get() .forwards() .fromStart(); @@ -187,7 +186,7 @@ private static void filteringOutSystemEvents(EventStoreDBClient client) throws J } } - private static void readFromStreamResolvingLinkTos(EventStoreDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { + private static void readFromStreamResolvingLinkTos(KurrentDBClient client) throws JsonProcessingException, ExecutionException, InterruptedException { // region read-from-all-stream-resolving-link-Tos ReadAllOptions options = ReadAllOptions.get() .forwards() diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/server_side_filtering/ServerSideFiltering.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/server_side_filtering/ServerSideFiltering.java index 1995e121..0ce1f78b 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/server_side_filtering/ServerSideFiltering.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/server_side_filtering/ServerSideFiltering.java @@ -5,7 +5,7 @@ import java.util.concurrent.CompletableFuture; public class ServerSideFiltering { - private static void excludeSystemEvents(EventStoreDBClient client) { + private static void excludeSystemEvents(KurrentDBClient client) { //region exclude-system SubscriptionListener listener = new SubscriptionListener() { @Override @@ -31,7 +31,7 @@ public void onEvent(Subscription subscription, ResolvedEvent event) { //endregion exclude-system } - private static void eventTypePrefix(EventStoreDBClient client) { + private static void eventTypePrefix(KurrentDBClient client) { //region event-type-prefix SubscriptionFilter filter = SubscriptionFilter.newBuilder() .addEventTypePrefix("customer-") @@ -56,7 +56,7 @@ public void onEvent(Subscription subscription, ResolvedEvent event) { ); } - private static void eventTypeRegex(EventStoreDBClient client) { + private static void eventTypeRegex(KurrentDBClient client) { //region event-type-regex SubscriptionFilter filter = SubscriptionFilter.newBuilder() .withEventTypeRegularExpression("^user|^company") @@ -81,7 +81,7 @@ public void onEvent(Subscription subscription, ResolvedEvent event) { ); } - private static void streamPrefix(EventStoreDBClient client) { + private static void streamPrefix(KurrentDBClient client) { //region stream-prefix SubscriptionFilter filter = SubscriptionFilter.newBuilder() .addStreamNamePrefix("user-") @@ -106,7 +106,7 @@ public void onEvent(Subscription subscription, ResolvedEvent event) { ); } - private static void streamRegex(EventStoreDBClient client) { + private static void streamRegex(KurrentDBClient client) { //region stream-regex SubscriptionFilter filter = SubscriptionFilter.newBuilder() .withStreamNameRegularExpression("^account|^savings") @@ -131,7 +131,7 @@ public void onEvent(Subscription subscription, ResolvedEvent event) { ); } - private static void checkpointCallback(EventStoreDBClient client) { + private static void checkpointCallback(KurrentDBClient client) { //region checkpoint String excludeSystemEventsRegex = "/^[^\\$].*/"; @@ -166,7 +166,7 @@ public void onEvent(Subscription subscription, ResolvedEvent event) { ); } - private static void CheckpointCallbackWithInterval(EventStoreDBClient client) { + private static void CheckpointCallbackWithInterval(KurrentDBClient client) { //region checkpoint-with-interval String excludeSystemEventsRegex = "/^[^\\$].*/"; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/subscribing_to_stream/SubscribingToStream.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/subscribing_to_stream/SubscribingToStream.java index 14603d53..90ebdabe 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/subscribing_to_stream/SubscribingToStream.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/subscribing_to_stream/SubscribingToStream.java @@ -5,7 +5,7 @@ import static org.junit.Assert.fail; public class SubscribingToStream { - private static void subscribeToStream(EventStoreDBClient client) { + private static void subscribeToStream(KurrentDBClient client) { // region subscribe-to-stream SubscriptionListener listener = new SubscriptionListener() { @Override @@ -74,7 +74,7 @@ public void onCancelled(Subscription subscription, Throwable exception) { // endregion subscribe-to-stream-subscription-dropped } - private static void subscribeToAll(EventStoreDBClient client) { + private static void subscribeToAll(KurrentDBClient client) { // region subscribe-to-all SubscriptionListener listener = new SubscriptionListener() { @Override @@ -130,7 +130,7 @@ public void onCancelled(Subscription subscription, Throwable exception) { // endregion subscribe-to-all-subscription-dropped } - private static void subscribeToFiltered(EventStoreDBClient client) { + private static void subscribeToFiltered(KurrentDBClient client) { SubscriptionListener listener = new SubscriptionListener() { @Override public void onEvent(Subscription subscription, ResolvedEvent event) { @@ -160,7 +160,7 @@ public void onEvent(Subscription subscription, ResolvedEvent event) { // endregion stream-regex-filtered-subscription } - private static void overridingUserCredentials(EventStoreDBClient client) { + private static void overridingUserCredentials(KurrentDBClient client) { SubscriptionListener listener = new SubscriptionListener() { @Override public void onEvent(Subscription subscription, ResolvedEvent event) { diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/AppendTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/AppendTests.java index b2b5ff24..fff446dd 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/AppendTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/AppendTests.java @@ -10,7 +10,7 @@ public interface AppendTests extends ConnectionAware { @Test default void testAppendSingleEventNoStream() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); final String streamName = generateName(); final String eventType = "TestEvent"; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java index 4541f1f7..86d60fa6 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java @@ -2,7 +2,7 @@ import com.eventstore.dbclient.ConnectionAware; import com.eventstore.dbclient.ConnectionShutdownException; -import com.eventstore.dbclient.EventStoreDBClient; +import com.eventstore.dbclient.KurrentDBClient; import com.eventstore.dbclient.KurrentDBClientSettings; import org.junit.jupiter.api.Test; @@ -16,14 +16,14 @@ public interface ClientLifecycleTests extends ConnectionAware { @Test default void testProvidesRunningStatus() { - EventStoreDBClient client = getDatabase().newClient(); + KurrentDBClient client = getDatabase().newClient(); assertFalse(client.isShutdown()); } @Test default void testProvidesShutdownStatusAfterManualShutdown() throws Throwable { - EventStoreDBClient client = getDatabase().newClient(); + KurrentDBClient client = getDatabase().newClient(); client.shutdown().get(); @@ -35,7 +35,7 @@ default void testProvidesShutdownStatusAfterAutomaticShutdown() throws Throwable KurrentDBClientSettings settings = KurrentDBClientSettings.builder() .addHost("unknown.host.name", 2113) .buildConnectionSettings(); - EventStoreDBClient client = EventStoreDBClient.create(settings); + KurrentDBClient client = KurrentDBClient.create(settings); try { client.readAll().get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeadlineTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeadlineTests.java index f3037cc7..c7bcc54e 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeadlineTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeadlineTests.java @@ -4,7 +4,6 @@ import io.grpc.Status; import io.grpc.StatusRuntimeException; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.RetryingTest; import java.util.UUID; @@ -13,7 +12,7 @@ public interface DeadlineTests extends ConnectionAware { @RetryingTest(10) default void testDefaultDeadline() throws Throwable { - EventStoreDBClient client = getDatabase().connectWith(opts -> + KurrentDBClient client = getDatabase().connectWith(opts -> opts.defaultDeadline(1) .maxDiscoverAttempts(3)); UUID id = UUID.randomUUID(); @@ -27,7 +26,7 @@ default void testDefaultDeadline() throws Throwable { @RetryingTest(3) default void testOptionLevelDeadline() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); UUID id = UUID.randomUUID(); EventData data = EventDataBuilder.binary(id, "type", new byte[]{}).build(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeleteTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeleteTests.java index 57f9bd2f..abba85e0 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeleteTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeleteTests.java @@ -9,7 +9,7 @@ public interface DeleteTests extends ConnectionAware { @Test default void testCanDeleteStream() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); String streamName = generateName(); client.appendToStream(streamName, generateEvents(1, "foobar").iterator()).get(); @@ -19,7 +19,7 @@ default void testCanDeleteStream() throws Throwable { @Test default void testDeleteStreamWhenAlreadyDeleted() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); String streamName = generateName(); client.appendToStream(streamName, generateEvents(1, "foobar").iterator()).get(); @@ -35,7 +35,7 @@ default void testDeleteStreamWhenAlreadyDeleted() throws Throwable { @Test default void testDeleteStreamWhenDoesntExist() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); String streamName = generateName(); DeleteStreamOptions options = DeleteStreamOptions.get() diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/InterceptorTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/InterceptorTests.java index 25fa37b2..85d74581 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/InterceptorTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/InterceptorTests.java @@ -1,7 +1,7 @@ package com.eventstore.dbclient.streams; import com.eventstore.dbclient.ConnectionAware; -import com.eventstore.dbclient.EventStoreDBClient; +import com.eventstore.dbclient.KurrentDBClient; import com.eventstore.dbclient.ReadStreamOptions; import io.grpc.*; import org.junit.jupiter.api.Assertions; @@ -13,7 +13,7 @@ public interface InterceptorTests extends ConnectionAware { @Test default void testInterceptorIsCalled() { AtomicInteger atom = new AtomicInteger(0); - EventStoreDBClient client = getDatabase().connectWith(opts -> opts.addInterceptor(new MyInterceptor(atom))); + KurrentDBClient client = getDatabase().connectWith(opts -> opts.addInterceptor(new MyInterceptor(atom))); try { client.readStream("foobar", ReadStreamOptions.get()).get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/MetadataTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/MetadataTests.java index b24b2949..3e2c2c50 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/MetadataTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/MetadataTests.java @@ -9,7 +9,7 @@ public interface MetadataTests extends ConnectionAware { @Test default void testSetStreamMetadata() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); StreamMetadata metadata = new StreamMetadata(); @@ -41,7 +41,7 @@ default void testSetStreamMetadata() throws Throwable { @Test default void testReadNoExistingMetadata() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); String streamName = generateName(); client.appendToStream(streamName, EventDataBuilder.json("bar", new HashMap()).build()).get(); @@ -52,7 +52,7 @@ default void testReadNoExistingMetadata() throws Throwable { @Test default void testReadMetadataAfterStreamDeletion() throws Throwable { - EventStoreDBClient client = getDatabase().defaultClient(); + KurrentDBClient client = getDatabase().defaultClient(); String streamName = generateName(); client.appendToStream(streamName, EventDataBuilder.json("bar", new HashMap()).build()).get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ReadStreamTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/ReadStreamTests.java index b8ed09a0..e348e579 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ReadStreamTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/ReadStreamTests.java @@ -21,7 +21,7 @@ default void testReadStreamEvents() throws Throwable { events.add(serializeBazEvent(event)); } - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); client.appendToStream(streamName, events.iterator()).get(); ReadResult result = client.readStream(streamName, ReadStreamOptions.get()).get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/SubscriptionTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/streams/SubscriptionTests.java index dd591652..08218300 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/SubscriptionTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/streams/SubscriptionTests.java @@ -1,7 +1,6 @@ package com.eventstore.dbclient.streams; import com.eventstore.dbclient.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; @@ -139,7 +138,7 @@ public void onCancelled(Subscription subscription, Throwable throwable) { @Test default void testCancellingSubscriptionShouldNotRaiseAnException() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); String eventType = generateName(); @@ -163,7 +162,7 @@ public void onCancelled(Subscription subscription, Throwable exception) { @Test @Timeout(value = 5, unit = TimeUnit.MINUTES) default void testCaughtUpMessageIsReceived() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); Optional version = client.getServerVersion().get(); Assumptions.assumeTrue(version.isPresent()); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java index ce22569d..a84abdaf 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java @@ -16,7 +16,7 @@ public interface PersistentSubscriptionsTracingInstrumentationTests extends Tele @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testPersistentSubscriptionIsInstrumentedWithTracingAndRestoresRemoteContextAsExpected() throws Throwable { - EventStoreDBClient streamsClient = getDefaultClient(); + KurrentDBClient streamsClient = getDefaultClient(); EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); @@ -78,7 +78,7 @@ default void testPersistentSubscriptionIsInstrumentedWithTracingAndRestoresRemot @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testPersistentSubscriptionInstrumentationHandlesExceptionsAsExpected() throws Throwable { - EventStoreDBClient streamsClient = getDefaultClient(); + KurrentDBClient streamsClient = getDefaultClient(); EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/StreamsTracingInstrumentationTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/StreamsTracingInstrumentationTests.java index 8cb2fe07..92e21256 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/StreamsTracingInstrumentationTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/StreamsTracingInstrumentationTests.java @@ -18,7 +18,7 @@ public interface StreamsTracingInstrumentationTests extends TelemetryAware { @Test default void testAppendIsInstrumentedWithTracingAsExpected() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); client.appendToStream( @@ -37,7 +37,7 @@ default void testAppendIsInstrumentedWithTracingAsExpected() throws Throwable { @Test default void testTracingContextIsInjectedAsExpectedWhenUserMetadataIsJsonObject() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); client.appendToStream( @@ -67,7 +67,7 @@ default void testTracingContextIsInjectedAsExpectedWhenUserMetadataIsJsonObject( @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testTracingContextInjectionIsIgnoredAsExpectedWhenUserMetadataIsNonNullAndNotAJsonObject() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); byte[] userMetadata = mapper.writeValueAsBytes("clearlynotvalidjson"); @@ -124,7 +124,7 @@ default void testTracingContextInjectionIsIgnoredAsExpectedWhenUserMetadataIsNon @Test default void testAppendInstrumentationHandlesExceptionsAsExpected() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); WrongExpectedVersionException actualException = null; @@ -154,7 +154,7 @@ default void testAppendInstrumentationHandlesExceptionsAsExpected() throws Throw @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testCatchupSubscriptionIsInstrumentedWithTracingAndRestoresRemoteContextAsExpected() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); EventData[] events = { @@ -208,7 +208,7 @@ default void testCatchupSubscriptionIsInstrumentedWithTracingAndRestoresRemoteCo @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testCatchupSubscriptionInstrumentationHandlesExceptionsAsExpected() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); client.appendToStream( @@ -248,7 +248,7 @@ public void onCancelled(Subscription subscription, Throwable throwable) { @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testCatchupSubscriptionTracingIsNotRestoredOnDeletedEvents() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String category = UUID.randomUUID().toString().replace("-", ""); String streamName = category + "-test"; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java index 2fedc1a2..c76d4a77 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java @@ -1,7 +1,6 @@ package com.eventstore.dbclient.telemetry; import com.eventstore.dbclient.*; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -16,7 +15,7 @@ public interface TracingContextInjectionTests extends TelemetryAware { @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testTracingContextInjectionDoesNotAffectEventBody() throws Throwable { - EventStoreDBClient streamsClient = getDefaultClient(); + KurrentDBClient streamsClient = getDefaultClient(); EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); From aeebeabca5550994c7762508974434dcd93464cd Mon Sep 17 00:00:00 2001 From: William Chong Date: Mon, 16 Dec 2024 13:48:39 +0400 Subject: [PATCH 03/24] Rename `EventStoreDBConnectionString`, `EventStoreDBPersistentSubscriptionsClient` and `EventStoreDBProjectionManagementClient` --- README.md | 10 ++-- ...ng.java => KurrentDBConnectionString.java} | 4 +- ...rrentDBPersistentSubscriptionsClient.java} | 14 +++--- ... KurrentDBProjectionManagementClient.java} | 14 +++--- .../eventstore/dbclient/ConnectionAware.java | 8 ++-- .../ParseInvalidConnectionStringTests.java | 4 +- .../misc/ParseValidConnectionStringTests.java | 2 +- .../CreatePersistentSubscriptionTests.java | 4 +- ...tePersistentSubscriptionToStreamTests.java | 9 ++-- ...PersistentSubscriptionManagementTests.java | 20 ++++---- ...stentSubscriptionToAllWithFilterTests.java | 2 +- ...bePersistentSubscriptionToStreamTests.java | 4 +- ...tePersistentSubscriptionToStreamTests.java | 5 +- .../authentication/UserCertificate.java | 4 +- .../PersistentSubscriptions.java | 28 +++++------ .../ProjectionManagement.java | 48 +++++++++---------- .../samples/quick_start/QuickStart.java | 2 +- ...scriptionsTracingInstrumentationTests.java | 4 +- .../TracingContextInjectionTests.java | 2 +- 19 files changed, 92 insertions(+), 96 deletions(-) rename db-client-java/src/main/java/com/eventstore/dbclient/{EventStoreDBConnectionString.java => KurrentDBConnectionString.java} (96%) rename db-client-java/src/main/java/com/eventstore/dbclient/{EventStoreDBPersistentSubscriptionsClient.java => KurrentDBPersistentSubscriptionsClient.java} (94%) rename db-client-java/src/main/java/com/eventstore/dbclient/{EventStoreDBProjectionManagementClient.java => KurrentDBProjectionManagementClient.java} (93%) diff --git a/README.md b/README.md index cf8eb101..8126127e 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ class AccountCreated { ```java import com.eventstore.dbclient.KurrentDBClient; import com.eventstore.dbclient.KurrentDBClientSettings; -import com.eventstore.dbclient.EventStoreDBConnectionString; +import com.eventstore.dbclient.KurrentDBConnectionString; import com.eventstore.dbclient.EventData; import com.eventstore.dbclient.ReadStreamOptions; import com.eventstore.dbclient.ResolvedEvent; @@ -92,8 +92,8 @@ import com.eventstore.dbclient.ReadResult; public class Main { public static void main(String args[]) { - EventStoreDBClientSettings setts = EventStoreDBConnectionString.parseOrThrow("esdb://localhost:2113"); - EventStoreDBClient client = EventStoreDBClient.create(setts); + KurrentDBClientSettings setts = KurrentDBConnectionString.parseOrThrow("esdb://localhost:2113"); + KurrentDBClient client = KurrentDBClient.create(setts); AccountCreated createdEvent = new AccountCreated(); @@ -134,8 +134,8 @@ This client currently supports creating and getting the result of a continuous p Create a projection: ```java -EventStoreDbClientSettings setts = EventStoreDBConnectionString.parseOrThrow("esdb://localhost:2113"); -EventStoreDBProjectionManagementClient client = EventStoreDBProjectionManagementClient.create(setts); +KurrentDbClientSettings setts = KurrentDBConnectionString.parseOrThrow("esdb://localhost:2113"); +KurrentDBProjectionManagementClient client = KurrentDBProjectionManagementClient.create(setts); client .createContinuous(PROJECTION_NAME, PROJECTION_JS) diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBConnectionString.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java rename to db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBConnectionString.java index d7e976f2..67c5a946 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBConnectionString.java @@ -6,8 +6,8 @@ /** * Utility class to parse a connection string. */ -public final class EventStoreDBConnectionString { - EventStoreDBConnectionString() {} +public final class KurrentDBConnectionString { + KurrentDBConnectionString() {} /** * Parses a string representation of a client settings. Throws a runtime exception if the connection string is diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBPersistentSubscriptionsClient.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java rename to db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBPersistentSubscriptionsClient.java index 1e9c560c..299fe519 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBPersistentSubscriptionsClient.java @@ -10,30 +10,30 @@ * Represents EventStoreDB client for persistent subscriptions management. A client instance maintains a two-way communication to EventStoreDB. * Many threads can use the EventStoreDB client simultaneously, or a single thread can make many asynchronous requests. */ -public class EventStoreDBPersistentSubscriptionsClient { +public class KurrentDBPersistentSubscriptionsClient { private final KurrentDBClientBase inner; - private EventStoreDBPersistentSubscriptionsClient(KurrentDBClientSettings settings) { + private KurrentDBPersistentSubscriptionsClient(KurrentDBClientSettings settings) { inner = new KurrentDBClientBase(settings); } - private EventStoreDBPersistentSubscriptionsClient(KurrentDBClientBase inner) { + private KurrentDBPersistentSubscriptionsClient(KurrentDBClientBase inner) { this.inner = inner; } /** * Creates a persistent subscription client instance. */ - public static EventStoreDBPersistentSubscriptionsClient create(KurrentDBClientSettings settings) { - return new EventStoreDBPersistentSubscriptionsClient(settings); + public static KurrentDBPersistentSubscriptionsClient create(KurrentDBClientSettings settings) { + return new KurrentDBPersistentSubscriptionsClient(settings); } /** * Returns a Persistent Subscription Management client based on existing client. * @param existingClient Existing client. */ - public static EventStoreDBPersistentSubscriptionsClient from(KurrentDBClientBase existingClient) { - return new EventStoreDBPersistentSubscriptionsClient(existingClient); + public static KurrentDBPersistentSubscriptionsClient from(KurrentDBClientBase existingClient) { + return new KurrentDBPersistentSubscriptionsClient(existingClient); } /** * Creates a persistent subscription group on a stream. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBProjectionManagementClient.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java rename to db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBProjectionManagementClient.java index 6bed0a97..0ad0669a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBProjectionManagementClient.java @@ -11,13 +11,13 @@ * Represents EventStoreDB client for projections management. A client instance maintains a two-way communication to EventStoreDB. * Many threads can use the EventStoreDB client simultaneously, or a single thread can make many asynchronous requests. */ -public class EventStoreDBProjectionManagementClient { +public class KurrentDBProjectionManagementClient { final KurrentDBClientBase inner; - private EventStoreDBProjectionManagementClient(KurrentDBClientSettings settings) { + private KurrentDBProjectionManagementClient(KurrentDBClientSettings settings) { inner = new KurrentDBClientBase(settings); } - private EventStoreDBProjectionManagementClient(KurrentDBClientBase inner) { + private KurrentDBProjectionManagementClient(KurrentDBClientBase inner) { this.inner = inner; } @@ -25,16 +25,16 @@ private EventStoreDBProjectionManagementClient(KurrentDBClientBase inner) { * Returns the Projection Management client based on the settings. * @param settings The settings to use for constructing the client. */ - public static EventStoreDBProjectionManagementClient create(KurrentDBClientSettings settings) { - return new EventStoreDBProjectionManagementClient(settings); + public static KurrentDBProjectionManagementClient create(KurrentDBClientSettings settings) { + return new KurrentDBProjectionManagementClient(settings); } /** * Returns a Projection Management client based on existing client. * @param existingClient Existing client. */ - public static EventStoreDBProjectionManagementClient from(KurrentDBClientBase existingClient) { - return new EventStoreDBProjectionManagementClient(existingClient); + public static KurrentDBProjectionManagementClient from(KurrentDBClientBase existingClient) { + return new KurrentDBProjectionManagementClient(existingClient); } /** diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java b/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java index 367346e2..f44ded21 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java @@ -23,12 +23,12 @@ default KurrentDBClient getDefaultClient() { return getDatabase().defaultClient(); } - default EventStoreDBProjectionManagementClient getDefaultProjectionClient() { - return EventStoreDBProjectionManagementClient.from(getDefaultClient()); + default KurrentDBProjectionManagementClient getDefaultProjectionClient() { + return KurrentDBProjectionManagementClient.from(getDefaultClient()); } - default EventStoreDBPersistentSubscriptionsClient getDefaultPersistentSubscriptionClient() { - return EventStoreDBPersistentSubscriptionsClient.from(getDefaultClient()); + default KurrentDBPersistentSubscriptionsClient getDefaultPersistentSubscriptionClient() { + return KurrentDBPersistentSubscriptionsClient.from(getDefaultClient()); } default String generateName() { diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseInvalidConnectionStringTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseInvalidConnectionStringTests.java index f0fcb566..4eed7d03 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseInvalidConnectionStringTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseInvalidConnectionStringTests.java @@ -1,7 +1,7 @@ package com.eventstore.dbclient.misc; import com.eventstore.dbclient.ConnectionStringParsingException; -import com.eventstore.dbclient.EventStoreDBConnectionString; +import com.eventstore.dbclient.KurrentDBConnectionString; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -35,7 +35,7 @@ public static Stream invalidConnectionStrings() { @MethodSource("invalidConnectionStrings") public void test(String input) throws ConnectionStringParsingException { Assertions.assertThrows(RuntimeException.class, () -> { - EventStoreDBConnectionString.parseOrThrow(input); + KurrentDBConnectionString.parseOrThrow(input); }); } } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java index 755ab661..c65fa6ee 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java @@ -148,7 +148,7 @@ public void assertEquals(KurrentDBClientSettings settings, KurrentDBClientSettin public void test(String connectionString, String json) throws ConnectionStringParsingException, JsonProcessingException { KurrentDBClientSettings expectedSettings = this.parseJson(json); - KurrentDBClientSettings parsedSettings = EventStoreDBConnectionString.parseOrThrow(connectionString); + KurrentDBClientSettings parsedSettings = KurrentDBConnectionString.parseOrThrow(connectionString); this.assertEquals(expectedSettings, parsedSettings); } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java index 10a58a52..166eb896 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java @@ -6,7 +6,7 @@ public interface CreatePersistentSubscriptionTests extends ConnectionAware { @Test default void testCreatePersistentSub() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); client.createToStream(generateName(), generateName()) .get(); @@ -17,7 +17,7 @@ default void testCreatePersistentSub() throws Throwable { @Test default void testCreatePersistentSubToAll() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); client.createToAll(generateName()) .get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java index a0703795..390a6eec 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java @@ -1,16 +1,13 @@ package com.eventstore.dbclient.persistentsubscriptions; import com.eventstore.dbclient.ConnectionAware; -import com.eventstore.dbclient.EventStoreDBPersistentSubscriptionsClient; -import com.eventstore.dbclient.UnsupportedFeatureException; +import com.eventstore.dbclient.KurrentDBPersistentSubscriptionsClient; import org.junit.jupiter.api.Test; -import java.util.concurrent.ExecutionException; - public interface DeletePersistentSubscriptionToStreamTests extends ConnectionAware { @Test default void testDeletePersistentSub() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = generateName(); @@ -23,7 +20,7 @@ default void testDeletePersistentSub() throws Throwable { @Test default void testDeletePersistentSubToAll() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String groupName = generateName(); client.createToAll(groupName) diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java index a17f6ad9..9a500f58 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java @@ -15,7 +15,7 @@ public interface PersistentSubscriptionManagementTests extends ConnectionAware { @Test @Order(1) default void testListPersistentSubscriptions() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String groupName = generateName(); String streamA = generateName(); String streamB = generateName(); @@ -43,7 +43,7 @@ default void testListPersistentSubscriptions() throws Throwable { default void testListPersistentSubscriptionsForStream() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = generateName(); @@ -60,7 +60,7 @@ default void testListPersistentSubscriptionsForStream() throws Throwable { @Test @Order(3) default void testListPersistentSubscriptionsToAll() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String groupName = generateName(); client.createToAll(groupName) .get(); @@ -84,7 +84,7 @@ default void testListPersistentSubscriptionsToAll() throws Throwable { @Test @Order(4) default void testGetPersistentSubscriptionInfo() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = generateName(); client.createToStream(streamName, groupName) @@ -107,7 +107,7 @@ default void testGetPersistentSubscriptionInfo() throws Throwable { @Test @Order(5) default void testGetPersistentSubscriptionInfoToAll() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String groupName = generateName(); client.createToAll(groupName) @@ -123,7 +123,7 @@ default void testGetPersistentSubscriptionInfoToAll() throws Throwable { @Test @Order(6) default void testGetPersistentSubscriptionInfoNotExisting() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); Optional result = client.getInfoToStream(generateName(), generateName()).get(); Assertions.assertFalse(result.isPresent()); @@ -134,7 +134,7 @@ default void testGetPersistentSubscriptionInfoNotExisting() throws Throwable { @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testReplayParkedMessages() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); final KurrentDBClient streamClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); final String streamName = generateName(); @@ -193,7 +193,7 @@ public void onEvent(PersistentSubscription subscription, int retryCount, Resolve @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testReplayParkedMessagesToAll() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); final KurrentDBClient streamClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); String streamName = generateName(); @@ -251,7 +251,7 @@ public void onEvent(PersistentSubscription subscription, int retryCount, Resolve @Order(9) default void testEncoding() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); String streamName = String.format("/foo/%s/stream", generateName()); String groupName = String.format("/foo/%s/group", generateName()); @@ -276,7 +276,7 @@ default void testEncoding() throws Throwable { @Test @Order(10) default void testRestartSubsystem() throws Throwable { - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); client.restartSubsystem().get(); } } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java index 9dc5124a..ef282403 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java @@ -11,7 +11,7 @@ public interface PersistentSubscriptionToAllWithFilterTests extends ConnectionAw @Test default void testPersistentSubscriptionToAllWithFilter() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); KurrentDBClient streamsClient = getDatabase().defaultClient(); String groupName = generateName(); int filteredEventTypeCount = 10; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java index 40216dc2..b3cd008e 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java @@ -12,7 +12,7 @@ public interface SubscribePersistentSubscriptionToStreamTests extends Connection default void testSubscribePersistentSub() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); String streamName = generateName(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); KurrentDBClient streamsClient = getDatabase().defaultClient(); JsonMapper jsonMapper = new JsonMapper(); @@ -65,7 +65,7 @@ public void onCancelled(PersistentSubscription subscription, Throwable throwable default void testSubscribePersistentSubToAll() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); String streamName = generateName(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); KurrentDBClient streamsClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java index ed85a4cb..ab90925b 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java @@ -2,7 +2,6 @@ import com.eventstore.dbclient.*; import org.junit.jupiter.api.Test; -import java.util.concurrent.ExecutionException; public interface UpdatePersistentSubscriptionToStreamTests extends ConnectionAware { @Test @@ -10,7 +9,7 @@ default void testUpdatePersistentSub() throws Throwable { String streamName = generateName(); String groupName = generateName(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); client.createToStream(streamName, groupName) .get(); @@ -25,7 +24,7 @@ default void testUpdatePersistentSub() throws Throwable { @Test default void testUpdatePersistentSubToAll() throws Throwable { String groupName = generateName(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); client.createToAll(groupName) .get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java index 135a1b82..afafd677 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java @@ -2,12 +2,12 @@ import com.eventstore.dbclient.KurrentDBClient; import com.eventstore.dbclient.KurrentDBClientSettings; -import com.eventstore.dbclient.EventStoreDBConnectionString; +import com.eventstore.dbclient.KurrentDBConnectionString; public class UserCertificate { private static void tracing() { // region client-with-user-certificates - KurrentDBClientSettings settings = EventStoreDBConnectionString + KurrentDBClientSettings settings = KurrentDBConnectionString .parseOrThrow("esdb://admin:changeit@{endpoint}?tls=true&userCertFile={pathToCaFile}&userKeyFile={pathToKeyFile}"); KurrentDBClient client = KurrentDBClient.create(settings); // endregion client-with-user-certificates diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java index 3dd5ec04..8aa794ef 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java @@ -7,7 +7,7 @@ import java.util.concurrent.ExecutionException; public class PersistentSubscriptions { - public static void createPersistentSubscription(EventStoreDBPersistentSubscriptionsClient client) { + public static void createPersistentSubscription(KurrentDBPersistentSubscriptionsClient client) { // region create-persistent-subscription-to-stream client.createToStream( "test-stream", @@ -17,7 +17,7 @@ public static void createPersistentSubscription(EventStoreDBPersistentSubscripti // endregion create-persistent-subscription-to-stream } - public static void connectToPersistentSubscriptionToStream(EventStoreDBPersistentSubscriptionsClient client) { + public static void connectToPersistentSubscriptionToStream(KurrentDBPersistentSubscriptionsClient client) { // region subscribe-to-persistent-subscription-to-stream client.subscribeToStream( "test-stream", @@ -45,7 +45,7 @@ public void onCancelled(PersistentSubscription subscription, Throwable exception - public static void connectToPersistentSubscriptionToStreamWithManualAcks(EventStoreDBPersistentSubscriptionsClient client) { + public static void connectToPersistentSubscriptionToStreamWithManualAcks(KurrentDBPersistentSubscriptionsClient client) { // region subscribe-to-persistent-subscription-with-manual-acks client.subscribeToStream( "test-stream", @@ -67,7 +67,7 @@ public void onEvent(PersistentSubscription subscription, int retryCount, Resolve // endregion subscribe-to-persistent-subscription-with-manual-acks } - public static void createPersistentSubscriptionToAll(EventStoreDBPersistentSubscriptionsClient client) { + public static void createPersistentSubscriptionToAll(KurrentDBPersistentSubscriptionsClient client) { // region create-persistent-subscription-to-all client.createToAll( "subscription-group", @@ -76,7 +76,7 @@ public static void createPersistentSubscriptionToAll(EventStoreDBPersistentSubsc // endregion create-persistent-subscription-to-all } - public static void connectToPersistentSubscriptionToAll(EventStoreDBPersistentSubscriptionsClient client) { + public static void connectToPersistentSubscriptionToAll(KurrentDBPersistentSubscriptionsClient client) { // region subscribe-to-persistent-subscription-to-all client.subscribeToAll( "subscription-group", @@ -106,7 +106,7 @@ public void onCancelled(PersistentSubscription subscription, Throwable exception // endregion subscribe-to-persistent-subscription-to-all } - public static void updatePersistentSubscription(EventStoreDBPersistentSubscriptionsClient client) { + public static void updatePersistentSubscription(KurrentDBPersistentSubscriptionsClient client) { // region update-persistent-subscription client.updateToStream( "test-stream", @@ -117,7 +117,7 @@ public static void updatePersistentSubscription(EventStoreDBPersistentSubscripti // endregion update-persistent-subscription } - public static void deletePersistentSubscription(EventStoreDBPersistentSubscriptionsClient client) { + public static void deletePersistentSubscription(KurrentDBPersistentSubscriptionsClient client) { // region delete-persistent-subscription client.deleteToStream( "test-stream", @@ -125,7 +125,7 @@ public static void deletePersistentSubscription(EventStoreDBPersistentSubscripti // endregion delete-persistent-subscription } - public static void getPersistentSubscriptionToStreamInfo(EventStoreDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { + public static void getPersistentSubscriptionToStreamInfo(KurrentDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { // #region get-persistent-subscription-to-stream-info Optional result = client.getInfoToStream("test-stream", "subscription-group").get(); if (result.isPresent()) { @@ -136,7 +136,7 @@ public static void getPersistentSubscriptionToStreamInfo(EventStoreDBPersistentS // #endregion get-persistent-subscription-to-stream-info } - public static void getPersistentSubscriptionToAllInfo(EventStoreDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { + public static void getPersistentSubscriptionToAllInfo(KurrentDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { // #region get-persistent-subscription-to-all-info Optional result = client.getInfoToAll( "subscription-group").get(); if (result.isPresent()) { @@ -147,21 +147,21 @@ public static void getPersistentSubscriptionToAllInfo(EventStoreDBPersistentSubs // #endregion get-persistent-subscription-to-all-info } - public static void replayParkedToStream(EventStoreDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { + public static void replayParkedToStream(KurrentDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { // #region replay-parked-of-persistent-subscription-to-stream ReplayParkedMessagesOptions options = ReplayParkedMessagesOptions.get().stopAt(10); client.replayParkedMessagesToStream("test-stream", "subscription-group", options).get(); // #endregion replay-parked-of-persistent-subscription-to-stream } - public static void replayParkedToAll(EventStoreDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { + public static void replayParkedToAll(KurrentDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { // #region replay-parked-of-persistent-subscription-to-all ReplayParkedMessagesOptions options = ReplayParkedMessagesOptions.get().stopAt(10); client.replayParkedMessagesToAll("subscription-group", options).get(); // #endregion replay-parked-of-persistent-subscription-to-all } - public static void listPersistentSubscriptionToStream(EventStoreDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { + public static void listPersistentSubscriptionToStream(KurrentDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { // #region list-persistent-subscriptions-to-stream List subscriptions = client.listToStream("test-stream").get(); @@ -171,7 +171,7 @@ public static void listPersistentSubscriptionToStream(EventStoreDBPersistentSubs // #endregion list-persistent-subscriptions-to-stream } - public static void listPersistentSubscriptionToAll(EventStoreDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { + public static void listPersistentSubscriptionToAll(KurrentDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { // #region list-persistent-subscriptions-to-all List subscriptions = client.listToAll().get(); @@ -181,7 +181,7 @@ public static void listPersistentSubscriptionToAll(EventStoreDBPersistentSubscri // #endregion list-persistent-subscriptions-to-all } - public static void restartPersistentSubscriptionSubsystem(EventStoreDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { + public static void restartPersistentSubscriptionSubsystem(KurrentDBPersistentSubscriptionsClient client) throws ExecutionException, InterruptedException { // #region restart-persistent-subscription-subsystem client.restartSubsystem().get(); // #endregion restart-persistent-subscription-subsystem diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java index aaf4be7e..5402b835 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java @@ -14,7 +14,7 @@ public void testProjectionManagementSamples() throws Throwable { Database database = DatabaseFactory.spawn(); try { - EventStoreDBProjectionManagementClient client = EventStoreDBProjectionManagementClient.from(database.defaultClient()); + KurrentDBProjectionManagementClient client = KurrentDBProjectionManagementClient.from(database.defaultClient()); disable(client); disableNotFound(client); enable(client); @@ -35,10 +35,10 @@ public void testProjectionManagementSamples() throws Throwable { } } - private static EventStoreDBProjectionManagementClient createClient(String connection) { + private static KurrentDBProjectionManagementClient createClient(String connection) { // region createClient - KurrentDBClientSettings settings = EventStoreDBConnectionString.parseOrThrow(connection); - EventStoreDBProjectionManagementClient client = EventStoreDBProjectionManagementClient.create(settings); + KurrentDBClientSettings settings = KurrentDBConnectionString.parseOrThrow(connection); + KurrentDBProjectionManagementClient client = KurrentDBProjectionManagementClient.create(settings); // endregion createClient Assert.assertNotNull(client); @@ -46,14 +46,14 @@ private static EventStoreDBProjectionManagementClient createClient(String connec return client; } - private static void disable(EventStoreDBProjectionManagementClient client) + private static void disable(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Disable client.disable("$by_category").get(); // endregion Disable } - private static void disableNotFound(EventStoreDBProjectionManagementClient client) + private static void disableNotFound(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region DisableNotFound try { @@ -66,14 +66,14 @@ private static void disableNotFound(EventStoreDBProjectionManagementClient clien // endregion DisableNotFound } - private static void enable(EventStoreDBProjectionManagementClient client) + private static void enable(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Enable client.enable("$by_category").get(); // endregion Enable } - private static void enableNotFound(EventStoreDBProjectionManagementClient client) + private static void enableNotFound(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region EnableNotFound try { @@ -86,7 +86,7 @@ private static void enableNotFound(EventStoreDBProjectionManagementClient client // endregion EnableNotFound } - private static void delete(EventStoreDBProjectionManagementClient client) + private static void delete(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { String name = "to-be-deleted-projection"; client.create(name, "fromAll().when()").get(); @@ -99,7 +99,7 @@ private static void delete(EventStoreDBProjectionManagementClient client) // endregion Delete } - private static void deleteNotFound(EventStoreDBProjectionManagementClient client) + private static void deleteNotFound(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region DeleteNotFound try { @@ -112,14 +112,14 @@ private static void deleteNotFound(EventStoreDBProjectionManagementClient client // endregion DeleteNotFound } - private static void abort(EventStoreDBProjectionManagementClient client) + private static void abort(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Abort client.abort("$by_category").get(); // endregion Abort } - private static void abortNotFound(EventStoreDBProjectionManagementClient client) + private static void abortNotFound(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Abort_NotFound try { @@ -132,14 +132,14 @@ private static void abortNotFound(EventStoreDBProjectionManagementClient client) // endregion Abort_NotFound } - private static void reset(EventStoreDBProjectionManagementClient client) + private static void reset(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Reset client.reset("$by_category").get(); // endregion Reset } - private static void resetNotFound(EventStoreDBProjectionManagementClient client) + private static void resetNotFound(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Reset_NotFound try { @@ -152,7 +152,7 @@ private static void resetNotFound(EventStoreDBProjectionManagementClient client) // endregion Reset_NotFound } - private static void create(EventStoreDBProjectionManagementClient client) + private static void create(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region CreateContinuous String js = @@ -175,7 +175,7 @@ private static void create(EventStoreDBProjectionManagementClient client) // endregion CreateContinuous } - private static void createConflict(EventStoreDBProjectionManagementClient client) + private static void createConflict(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { String js = "{}"; String name = "projection" + java.util.UUID.randomUUID(); @@ -191,7 +191,7 @@ private static void createConflict(EventStoreDBProjectionManagementClient client // endregion CreateContinuous_Conflict } - private static void update(EventStoreDBProjectionManagementClient client) + private static void update(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Update String name = "countEvents_Update_" + java.util.UUID.randomUUID(); @@ -214,7 +214,7 @@ private static void update(EventStoreDBProjectionManagementClient client) // endregion Update } - private static void updateNotFound(EventStoreDBProjectionManagementClient client) + private static void updateNotFound(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region Update_NotFound try { @@ -227,7 +227,7 @@ private static void updateNotFound(EventStoreDBProjectionManagementClient client // endregion Update_NotFound } - private static void listAll(EventStoreDBProjectionManagementClient client) + private static void listAll(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region ListAll List details = client.list().get(); @@ -245,7 +245,7 @@ private static void listAll(EventStoreDBProjectionManagementClient client) Assert.assertTrue(details.size() >= 5); } - private static void list(EventStoreDBProjectionManagementClient client) + private static void list(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region ListContinuous List details = client.list().get(); @@ -263,7 +263,7 @@ private static void list(EventStoreDBProjectionManagementClient client) Assert.assertTrue(details.size() >= 5); } - private static void getStatus(EventStoreDBProjectionManagementClient client) + private static void getStatus(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region GetStatus ProjectionDetails status = client.getStatus("$by_category").get(); @@ -278,7 +278,7 @@ private static void getStatus(EventStoreDBProjectionManagementClient client) Assert.assertEquals("$by_category", status.getName()); } - private static void getState(EventStoreDBProjectionManagementClient client) + private static void getState(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region GetState // This example requires the following class to be defined: @@ -321,7 +321,7 @@ private static void getState(EventStoreDBProjectionManagementClient client) Assert.assertTrue(result.getCount() > 0); } - private static void getResult(EventStoreDBProjectionManagementClient client) + private static void getResult(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region GetResult String name = "get_result_example"; @@ -354,7 +354,7 @@ private static void getResult(EventStoreDBProjectionManagementClient client) Assert.assertTrue(result > 0); } - private static void restartSubSystem(EventStoreDBProjectionManagementClient client) + private static void restartSubSystem(KurrentDBProjectionManagementClient client) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { // region RestartSubSystem client.restartSubsystem().get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java b/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java index 1f660c1a..ee9321a5 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java @@ -11,7 +11,7 @@ public class QuickStart { public static void Run() throws ConnectionStringParsingException, ExecutionException, InterruptedException, JsonProcessingException { // region createClient - KurrentDBClientSettings settings = EventStoreDBConnectionString.parseOrThrow("{connectionString}"); + KurrentDBClientSettings settings = KurrentDBConnectionString.parseOrThrow("{connectionString}"); KurrentDBClient client = KurrentDBClient.create(settings); // endregion createClient diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java index a84abdaf..ad2f4baf 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java @@ -17,7 +17,7 @@ public interface PersistentSubscriptionsTracingInstrumentationTests extends Tele @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testPersistentSubscriptionIsInstrumentedWithTracingAndRestoresRemoteContextAsExpected() throws Throwable { KurrentDBClient streamsClient = getDefaultClient(); - EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = "aGroup"; @@ -79,7 +79,7 @@ default void testPersistentSubscriptionIsInstrumentedWithTracingAndRestoresRemot @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testPersistentSubscriptionInstrumentationHandlesExceptionsAsExpected() throws Throwable { KurrentDBClient streamsClient = getDefaultClient(); - EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = generateName(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java index c76d4a77..46939721 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java +++ b/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java @@ -16,7 +16,7 @@ public interface TracingContextInjectionTests extends TelemetryAware { @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testTracingContextInjectionDoesNotAffectEventBody() throws Throwable { KurrentDBClient streamsClient = getDefaultClient(); - EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); + KurrentDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = "aGroup"; From 6aeff7d5f86373a18ad7f66f5e1e5568deb1adbe Mon Sep 17 00:00:00 2001 From: William Chong Date: Mon, 16 Dec 2024 13:57:42 +0400 Subject: [PATCH 04/24] Rename links and build.gradle properties that contains eventstore website --- CONTRIBUTING.md | 6 +++--- README.md | 35 +++++++++++++++++------------------ db-client-java/build.gradle | 8 ++++---- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e75b2976..e4ca56ab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,8 +47,8 @@ Please ensure that the following steps have been undertaken before marking pull - Ensure that commits are atomic units of work, and that the message follows our [Commit Message Template][commit-template]. A good way to do this is to configure your local clone of the repository to use our included template, by running: `git config commit.template .git.commit.template` in the root directory of the clone. -[conduct]: https://github.com/EventStore/EventStoreDB-Client-Java/tree/master/CODE-OF-CONDUCT.md +[conduct]: https://github.com/Kurrent/Kurrent-Client-Java/tree/master/CODE-OF-CONDUCT.md [apache2]: https://www.apache.org/licenses/LICENSE-2.0 -[commit-template]: https://github.com/EventStore/EventStoreDB-Client-Java/tree/master/.git.commit.template -[github-repo]: https://github.com/EventStore/EventStoreDB-Client-Java +[commit-template]: https://github.com/Kurrent/Kurrent-Client-Java/tree/master/.git.commit.template +[github-repo]: https://github.com/Kurrent/Kurrent-Client-Java [drafts]: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests diff --git a/README.md b/README.md index 8126127e..586724bb 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# EventStoreDB Client SDK for Java +# Kurrent Client SDK for Java -EventStoreDB is the event-native database, where business events are immutably stored and streamed. Designed for event-sourced, event-driven, and microservices architectures. +KurrentDB is the event-native database, where business events are immutably stored and streamed. Designed for event-sourced, event-driven, and microservices architectures. -This repository contains an [EventStoreDB][es] Client SDK written in Java for use with languages on the JVM. It is +This repository contains an [KurrentDB][kurrent] Client SDK written in Java for use with languages on the JVM. It is compatible with Java 8 and above. *Note: This client is currently under active development and further API changes are expected. Feedback is very welcome.* ## Documentation -* General documentation can be found in [Event Store GRPC Docs]. -* The latest stable version Javadoc can be found here: https://eventstore.github.io/EventStoreDB-Client-Java +* General documentation can be found in [Kurrent GRPC Docs]. +* The latest stable version Javadoc can be found here: https://kurrent.github.io/Kurrent-Client-Java ## Access to binaries EventStore Ltd publishes GA (general availability) versions to [Maven Central]. @@ -31,8 +31,7 @@ repositories { ## Developing -The SDK is built using [`Gradle`][gradle]. Integration tests run against a server using Docker, with the [EventStoreDB gRPC -Client Test Container][container]. +The SDK is built using [`Gradle`][gradle]. Integration tests run against a server using Docker, with the [Kurrent gRPC Client Test Container][container]. ### Run tests @@ -46,7 +45,7 @@ Specific docker images can be specified via the enviroment variable `EVENTSTORE_ For more information about Open Telemetry, refer to the [official documentation](https://opentelemetry.io/docs/what-is-opentelemetry/). -## EventStoreDB Server Compatibility +## KurrentDB Server Compatibility This client is compatible with version `20.6.1` upwards. @@ -173,32 +172,32 @@ Information on support can be found on our website: [Event Store Support][suppor ## Documentation -Documentation for EventStoreDB can be found in the [docs]. +Documentation for KurrentDB can be found in the [docs]. Bear in mind that this client is not yet properly documented. We are working hard on a new version of the documentation. ## Security -If you find a vulnerability in our software, please contact us. You can find how to reach out us and report it at https://www.eventstore.com/security#security +If you find a vulnerability in our software, please contact us. You can find how to reach out us and report it at https://www.kurrent.io/security#security Thank you very much for supporting our software. ## Communities - [Discuss](https://discuss.eventstore.com/) -- [Discord (Event Store)](https://discord.gg/Phn9pmCw3t) +- [Discord (Kurrent)](https://discord.gg/Phn9pmCw3t) ## Contributing All contributions to the SDK are made via GitHub Pull Requests, and must be licensed under the Apache 2.0 license. Please review our [Contributing Guide][contributing] and [Code of Conduct][code-of-conduct] for more information. -[es]: https://eventstore.com +[kurrent]: https://kurrent.io [gradle]: https://gradle.org -[container]: https://github.com/EventStore/EventStore-Client-gRPC-TestData -[contributing]: https://github.com/EventStore/EventStoreDB-Client-Java/tree/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/EventStore/EventStoreDB-Client-Java/tree/master/CODE-OF-CONDUCT.md -[support]: https://eventstore.com/support/ -[docs]: https://developers.eventstore.com/server/v21.6/installation/ +[container]: https://github.com/Kurrent/Kurrent-Client-gRPC-TestData +[contributing]: https://github.com/Kurrent/Kurrent-Client-Java/tree/master/CONTRIBUTING.md +[code-of-conduct]: https://github.com/Kurrent/Kurrent-Client-Java/tree/master/CODE-OF-CONDUCT.md +[support]: https://kurrent.io/support/ +[docs]: https://developers.eventstore.com/server/v24.6/quick-start/installation/ [discuss]: https://discuss.eventstore.com/ [Maven Central]: https://search.maven.org/artifact/com.eventstore/db-client-java -[Event Store GRPC Docs]: https://developers.eventstore.com/clients/grpc +[Kurrent GRPC Docs]: https://developers.eventstore.com/clients/grpc diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle index 54cbf8dd..ead0f8c8 100644 --- a/db-client-java/build.gradle +++ b/db-client-java/build.gradle @@ -205,12 +205,12 @@ publishing { // packaging 'jar' // optionally artifactId can be defined here description = 'EventStoreDB gRPC Java client' - url = 'https://eventstore.com' + url = 'https://kurrent.io' scm { - connection = 'https://github.com/EventStore/EventStoreDB-Client-Java.git' - developerConnection = 'https://github.com/EventStore/EventStoreDB-Client-Java.git' - url = 'https://github.com/EventStore/EventStoreDB-Client-Java' + connection = 'https://github.com/Kurrent/Kurrent-Client-Java.git' + developerConnection = 'https://github.com/Kurrent/Kurrent-Client-Java.git' + url = 'https://github.com/Kurrent/Kurrent-Client-Java' } licenses { From fa933c89073939de9a46c1a8ba51721329f351a9 Mon Sep 17 00:00:00 2001 From: William Chong Date: Mon, 16 Dec 2024 14:21:14 +0400 Subject: [PATCH 05/24] Rename EventStoreDB in comments and otel tags --- CODE-OF-CONDUCT.md | 2 +- CONTRIBUTING.md | 6 +++--- build.gradle | 2 +- db-client-java/build.gradle | 4 ++-- .../eventstore/dbclient/ClientTelemetryAttributes.java | 8 ++++---- .../src/main/java/com/eventstore/dbclient/EventData.java | 2 +- .../java/com/eventstore/dbclient/ExpectedRevision.java | 2 +- .../java/com/eventstore/dbclient/KurrentDBClient.java | 2 +- .../com/eventstore/dbclient/KurrentDBClientSettings.java | 4 ++-- .../dbclient/KurrentDBPersistentSubscriptionsClient.java | 2 +- .../dbclient/KurrentDBProjectionManagementClient.java | 2 +- .../com/eventstore/dbclient/NamedConsumerStrategy.java | 2 +- .../dbclient/PersistentSubscriptionListener.java | 2 +- .../dbclient/PersistentSubscriptionSettings.java | 6 +++--- .../main/java/com/eventstore/dbclient/ReadAllOptions.java | 2 +- .../test/java/com/eventstore/dbclient/PluginsTests.java | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md index 640277f1..7da407a4 100644 --- a/CODE-OF-CONDUCT.md +++ b/CODE-OF-CONDUCT.md @@ -1,6 +1,6 @@ # Contributor Covenant Code of Conduct -`EventStoreDB-Client-Java` follows the widely-adopted Contributor Covenant Code of Conduct. +`Kurrent-Client-Java` follows the widely-adopted Contributor Covenant Code of Conduct. ## Our Pledge diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e4ca56ab..3f5d36d2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to `EventStoreDB-Client-Java` +# Contributing to `Kurrent-Client-Java` Welcome to the Event Store community, and thank you for contributing! The following guide outlines the basics of how to get involved. Pull requests to update and expand this guide are very welcome! @@ -10,7 +10,7 @@ We want the Event Store community to be as welcoming and inclusive as possible, ### Licensing -`EventStoreDB-Client-Java` is licensed under the [Apache-2.0][apache2] license. By submitting a pull request, you represent that you have right to license your contribution to Event Store Ltd and the community, and that by submitting a patch your contributions are licensed under the Apache-2.0 license. +`Kurrent-Client-Java` is licensed under the [Apache-2.0][apache2] license. By submitting a pull request, you represent that you have right to license your contribution to Event Store Ltd and the community, and that by submitting a patch your contributions are licensed under the Apache-2.0 license. ## Contributing @@ -22,7 +22,7 @@ Please disclose issues which you believe to be a security threat _by e-mail_ to Issues may be reported via the [GitHub Repository][github-repo]. When reporting issues, please ensure that you include relevant information which can help diagnose the problem. This includes: -- The version of `EventStoreDB-Client-Java` - including a commit SHA if using a local build +- The version of `Kurrent-Client-Java` - including a commit SHA if using a local build - The operating system on which the issue is exhibited (on Unix, the output of `uname -a`) diff --git a/build.gradle b/build.gradle index 79cfae10..add7563e 100644 --- a/build.gradle +++ b/build.gradle @@ -12,5 +12,5 @@ allprojects { } if (!JavaVersion.current().isJava8Compatible()) { - throw new Exception("Java 8 is required to build EventStoreDB-Client-Java") + throw new Exception("Java 8 is required to build Kurrent-Client-Java") } \ No newline at end of file diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle index ead0f8c8..c82b8e69 100644 --- a/db-client-java/build.gradle +++ b/db-client-java/build.gradle @@ -201,10 +201,10 @@ publishing { from components.java pom { - name = 'EventStoreDB Client Java' + name = 'Kurrent Client Java' // packaging 'jar' // optionally artifactId can be defined here - description = 'EventStoreDB gRPC Java client' + description = 'Kurrent gRPC Java client' url = 'https://kurrent.io' scm { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryAttributes.java b/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryAttributes.java index 7fd4cc13..4e61def6 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryAttributes.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryAttributes.java @@ -24,9 +24,9 @@ public static class Exceptions { } public static class EventStore { - public static final String STREAM = "db.eventstoredb.stream"; - public static final String SUBSCRIPTION_ID = "db.eventstoredb.subscription.id"; - public static final String EVENT_ID = "db.eventstoredb.event.id"; - public static final String EVENT_TYPE = "db.eventstoredb.event.type"; + public static final String STREAM = "db.kurrent.stream"; + public static final String SUBSCRIPTION_ID = "db.kurrent.subscription.id"; + public static final String EVENT_ID = "db.kurrent.event.id"; + public static final String EVENT_TYPE = "db.kurrent.event.type"; } } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventData.java b/db-client-java/src/main/java/com/eventstore/dbclient/EventData.java index b5bc0ebe..f91b4a7e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventData.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/EventData.java @@ -3,7 +3,7 @@ import java.util.UUID; /** - * Represents an event that will be sent to EventStoreDB. + * Represents an event that will be sent to KurrentDB. */ public final class EventData { private final UUID eventId; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ExpectedRevision.java b/db-client-java/src/main/java/com/eventstore/dbclient/ExpectedRevision.java index c04d8271..469b2ddc 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ExpectedRevision.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/ExpectedRevision.java @@ -9,7 +9,7 @@ * Constants used for expected revision control. *

    * - * The EventStoreDB server will assure idempotency for all requests using any value in ExpectedRevision except + * The KurrentDB server will assure idempotency for all requests using any value in ExpectedRevision except * ANY. When using ANY, the EventStoreDB server will do its best to assure idempotency but will not * guarantee it. Any other ExpectedRevision instances are meant for optimistic concurrency checks. *

    diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClient.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClient.java index 2574ca49..5528129c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClient.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClient.java @@ -20,7 +20,7 @@ private KurrentDBClient(KurrentDBClientSettings settings) { } /** - * Creates a gRPC client to EventStoreDB database. + * Creates a gRPC client to KurrentDB database. */ public static KurrentDBClient create(KurrentDBClientSettings settings) { return new KurrentDBClient(settings); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java index bf2812cc..3fee6996 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java +++ b/db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java @@ -7,10 +7,10 @@ import java.util.Set; /** - * Gathers all the settings related to a gRPC client with an EventStoreDB database. + * Gathers all the settings related to a gRPC client with an KurrentDB database. * EventStoreDBClientSettings} can only be created when parsing a connection string. * - * EventStoreDBClientSettings supports a wide range of settings. If a setting is not mentioned in the connection + * KurrentDBClientSettings supports a wide range of settings. If a setting is not mentioned in the connection * string, that setting default value is used. * *