Rename EventStoreDBClientSettings to KurrentDBClientSettings

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;

db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java

@@ -87,7 +87,7 @@ private static SpanContext tryExtractTracingContext(byte[] userMetadataBytes) {
     static CompletableFuture<WriteResult> traceAppend(
             BiFunction<ManagedChannel, List<EventData>, CompletableFuture<WriteResult>> appendOperation,
             ManagedChannel channel,
-            List<EventData> events, String streamId, EventStoreDBClientSettings settings,
+            List<EventData> events, String streamId, KurrentDBClientSettings settings,
             UserCredentials optionalCallCredentials) {
         Span span = createSpan(
                 ClientTelemetryConstants.Operations.APPEND,
@@ -120,7 +120,7 @@ static CompletableFuture<WriteResult> traceAppend(
     }
 
     static void traceSubscribe(Runnable tracedOperation, String subscriptionId, ManagedChannel channel,
-                               EventStoreDBClientSettings settings,
+                               KurrentDBClientSettings settings,
                                UserCredentials optionalCallCredentials, RecordedEvent event) {
         if (event == null) {
             tracedOperation.run();

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];

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()) {

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<Msg> 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);

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()));
 

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;
     }
 

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);
     }
 

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()) {

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());

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);
     }
 

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);
     }
 

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());
     }

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<Msg> queue;
-    private final EventStoreDBClientSettings settings;
+    private final KurrentDBClientSettings settings;
 
-    GrpcClient(EventStoreDBClientSettings settings, AtomicBoolean closed, LinkedBlockingQueue<Msg> queue) {
+    GrpcClient(KurrentDBClientSettings settings, AtomicBoolean closed, LinkedBlockingQueue<Msg> queue) {
         this.settings = settings;
         this.closed = closed;
         this.queue = queue;
@@ -112,7 +112,7 @@ public CompletableFuture<Void> shutdown() {
         return this.push(new Shutdown(completion::complete)).thenComposeAsync(x -> completion);
     }
 
-    public EventStoreDBClientSettings getSettings() {
+    public KurrentDBClientSettings getSettings() {
         return this.settings;
     }
 }

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 <S extends AbstractAsyncStub<S>, O> S configureStub(S stub, EventStoreDBClientSettings settings, OptionsBase<O> options) {
+    static public <S extends AbstractAsyncStub<S>, O> S configureStub(S stub, KurrentDBClientSettings settings, OptionsBase<O> options) {
         return configureStub(stub, settings, options, null);
     }
 
-    static public <S extends AbstractAsyncStub<S>, O> S configureStub(S stub, EventStoreDBClientSettings settings, OptionsBase<O> options, Long forceDeadlineInMs) {
+    static public <S extends AbstractAsyncStub<S>, O> S configureStub(S stub, KurrentDBClientSettings settings, OptionsBase<O> options, Long forceDeadlineInMs) {
         S finalStub = stub;
         ConnectionMetadata metadata = new ConnectionMetadata();
 

db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientSettings.java → db-client-java/src/main/java/com/eventstore/dbclient/KurrentDBClientSettings.java

@@ -24,7 +24,7 @@
  *     <li>keepAliveInterval: 10000</li>
  * </ul>
  */
-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<String> getFeatures() { return features; }
 
-    EventStoreDBClientSettings(
+    KurrentDBClientSettings(
             boolean dnsDiscover,
             int maxDiscoverAttempts,
             int discoveryInterval,

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<ServerInfo> getSupportedFeatures(EventStoreDBClientSettings settings, ManagedChannel channel) {
+    public static Optional<ServerInfo> getSupportedFeatures(KurrentDBClientSettings settings, ManagedChannel channel) {
         final ServerFeaturesGrpc.ServerFeaturesStub stub = ServerFeaturesGrpc.newStub(channel);
         try {
             return Optional.ofNullable(getSupportedFeaturesInternal(stub).get(settings.getGossipTimeout(), TimeUnit.MILLISECONDS));

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 <A> HttpURLConnection getHttpConnection(OptionsBase<A> options, EventStoreDBClientSettings settings, String path) {
+    public <A> HttpURLConnection getHttpConnection(OptionsBase<A> options, KurrentDBClientSettings settings, String path) {
         try {
             HttpURLConnection conn = (HttpURLConnection) getURL(settings.isTls(), this.endpoint, path).openConnection();
             conn.setRequestProperty("Accept", ContentType.JSON);

db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java

@@ -15,15 +15,15 @@ public class ClientTracker {
     private ArrayList<EventStoreDBClientBase> 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;
     }
 
     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) {

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);
     }
 

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");

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")

db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java

@@ -122,7 +122,7 @@ public static Stream<Arguments> 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)

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

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
 

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