diff --git a/.github/workflows/plugins-tests.yml b/.github/workflows/plugins-tests.yml index 3ce282bc..2883e91e 100644 --- a/.github/workflows/plugins-tests.yml +++ b/.github/workflows/plugins-tests.yml @@ -8,7 +8,7 @@ on: type: string default: enterprise - esdb_version: + kdb_version: required: true type: string @@ -57,9 +57,9 @@ jobs: - name: Execute Gradle build run: ./gradlew ci --tests ${{ matrix.test }}Tests env: - EVENTSTORE_DOCKER_REGISTRY_ENV: docker.eventstore.com - EVENTSTORE_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} - EVENTSTORE_DOCKER_TAG_ENV: ${{ inputs.esdb_version }} + KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com + KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} + KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }} SECURE: true - uses: actions/upload-artifact@v4 @@ -97,7 +97,7 @@ jobs: env: CONTAINER_REGISTRY: docker.eventstore.com CONTAINER_IMAGE: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} - CONTAINER_IMAGE_VERSION: ${{ inputs.esdb_version }} + CONTAINER_IMAGE_VERSION: ${{ inputs.kdb_version }} - name: Generate user certificates run: docker compose --file configure-user-certs-for-tests.yml up diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index bfa50150..9423717f 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -42,7 +42,7 @@ jobs: uses: ./.github/workflows/tests.yml with: - esdb_version: ${{ matrix.version }} + kdb_version: ${{ matrix.version }} plugins-tests: needs: build @@ -55,5 +55,5 @@ jobs: uses: ./.github/workflows/plugins-tests.yml with: - esdb_version: ${{ matrix.version }} + kdb_version: ${{ matrix.version }} secrets: inherit \ No newline at end of file diff --git a/.github/workflows/test-dispatch.yml b/.github/workflows/test-dispatch.yml index c4e6294b..008c72be 100644 --- a/.github/workflows/test-dispatch.yml +++ b/.github/workflows/test-dispatch.yml @@ -18,5 +18,5 @@ jobs: name: Test uses: ./.github/workflows/tests.yml with: - esdb_version: ${{ inputs.version }} + kdb_version: ${{ inputs.version }} runtime_env: ${{ inputs.runtime_env }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7c938a46..2f83aeeb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: type: string default: release - esdb_version: + kdb_version: required: true type: string @@ -44,9 +44,9 @@ jobs: - name: Execute Gradle build run: ./gradlew ci --tests ${{ matrix.test }}Tests env: - EVENTSTORE_DOCKER_REGISTRY_ENV: docker.eventstore.com - EVENTSTORE_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} - EVENTSTORE_DOCKER_TAG_ENV: ${{ inputs.esdb_version }} + KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com + KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} + KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }} - uses: actions/upload-artifact@v4 if: failure() @@ -85,9 +85,9 @@ jobs: - name: Execute Gradle build run: ./gradlew ci --tests ${{ matrix.test }}Tests env: - EVENTSTORE_DOCKER_REGISTRY_ENV: docker.eventstore.com - EVENTSTORE_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} - EVENTSTORE_DOCKER_TAG_ENV: ${{ inputs.esdb_version }} + KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com + KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} + KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }} SECURE: true - uses: actions/upload-artifact@v4 @@ -114,7 +114,7 @@ jobs: env: CONTAINER_REGISTRY: docker.eventstore.com CONTAINER_IMAGE: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }} - CONTAINER_IMAGE_VERSION: ${{ inputs.esdb_version }} + CONTAINER_IMAGE_VERSION: ${{ inputs.kdb_version }} - name: Set up JDK 8 uses: actions/setup-java@v3 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 e75b2976..3ecfd0b8 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`) @@ -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/EventStore/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/EventStore/Kurrent-Client-Java/tree/master/.git.commit.template +[github-repo]: https://github.com/EventStore/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 f58c194e..65ed5c55 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# EventStoreDB Client SDK for Java +# KurrentDB 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,14 +31,13 @@ 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. ### Run tests Tests are written using [TestContainers](https://www.testcontainers.org/) and require [Docker](https://www.docker.com/) to be installed. -Specific docker images can be specified via the enviroment variable `EVENTSTORE_IMAGE`. +Specific docker images can be specified via the environment variable `EVENTSTORE_IMAGE`. ## Open Telemetry @@ -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. @@ -56,7 +55,7 @@ Server setup instructions can be found in the [docs], follow the docker setup fo The following snippet showcases a simple example where we form a connection, then write and read events from the server. -Note: If testing locally using `--insecure` the url should be `esdb://localhost:2113?tls=false`. +Note: If testing locally using `--insecure` the url should be `kurrentdb://localhost:2113?tls=false`. ```java class AccountCreated { @@ -81,19 +80,19 @@ class AccountCreated { } ``` ```java -import com.eventstore.dbclient.EventStoreDBClient; -import com.eventstore.dbclient.EventStoreDBClientSettings; -import com.eventstore.dbclient.EventStoreDBConnectionString; -import com.eventstore.dbclient.EventData; -import com.eventstore.dbclient.ReadStreamOptions; -import com.eventstore.dbclient.ResolvedEvent; -import com.eventstore.dbclient.WriteResult; -import com.eventstore.dbclient.ReadResult; +import io.kurrent.dbclient.KurrentDBClient; +import io.kurrent.dbclient.KurrentDBClientSettings; +import io.kurrent.dbclient.KurrentDBConnectionString; +import io.kurrent.dbclient.EventData; +import io.kurrent.dbclient.ReadStreamOptions; +import io.kurrent.dbclient.ResolvedEvent; +import io.kurrent.dbclient.WriteResult; +import io.kurrent.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("kurrentdb://localhost:2113"); + KurrentDBClient client = KurrentDBClient.create(setts); AccountCreated createdEvent = new AccountCreated(); @@ -134,8 +133,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("kurrentdb://localhost:2113"); +KurrentDBProjectionManagementClient client = KurrentDBProjectionManagementClient.create(setts); client .createContinuous(PROJECTION_NAME, PROJECTION_JS) @@ -165,40 +164,39 @@ CountResult result = client .get(); ``` -For further details please see [the projection management tests](src/test/java/com/eventstore/dbclient/ProjectionManagementTests.java). +For further details please see [the projection management tests](src/test/java/io/kurrent/dbclient/ProjectionManagementTests.java). ## Support -Information on support can be found on our website: [Event Store Support][support] +Information on support can be found on our website: [Kurrent Support][support] ## 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/ +[contributing]: https://github.com/EventStore/Kurrent-Client-Java/tree/master/CONTRIBUTING.md +[code-of-conduct]: https://github.com/EventStore/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 +[Maven Central]: https://search.maven.org/artifact/io.kurrent/db-client-java +[Kurrent GRPC Docs]: https://developers.eventstore.com/clients/grpc 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 404d12e0..7ff66926 100644 --- a/db-client-java/build.gradle +++ b/db-client-java/build.gradle @@ -18,8 +18,8 @@ tasks.withType(JavaCompile) { options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked'] } -group = 'com.eventstore' -version = '5.4.5' +group = 'io.kurrent' +version = '1.0.0' java { withJavadocJar() @@ -196,20 +196,20 @@ javadoc { publishing { publications { mavenJava(MavenPublication) { - artifactId = 'db-client-java' + artifactId = 'kurrentdb-client' from components.java pom { - name = 'EventStoreDB Client Java' + name = 'KurrentDB Client Java' // packaging 'jar' // optionally artifactId can be defined here - description = 'EventStoreDB gRPC Java client' - url = 'https://eventstore.com' + description = 'KurrentDB gRPC Java client' + 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/EventStore/KurrentDB-Client-Java.git' + developerConnection = 'https://github.com/EventStore/KurrentDB-Client-Java.git' + url = 'https://github.com/EventStore/KurrentDB-Client-Java' } licenses { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithExpectedRevisionBase.java b/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithExpectedRevisionBase.java deleted file mode 100644 index 470e5c17..00000000 --- a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithExpectedRevisionBase.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.eventstore.dbclient; - -class OptionsWithExpectedRevisionBase extends OptionsBase { - private ExpectedRevision expectedRevision; - - protected OptionsWithExpectedRevisionBase() { - this.expectedRevision = ExpectedRevision.any(); - } - - ExpectedRevision getExpectedRevision() { - return this.expectedRevision; - } - - /** - * Asks the server to check that the stream receiving is at the given expected version. - - * @param revision - expected revision. - * @return updated options. - */ - @SuppressWarnings("unchecked") - public T expectedRevision(ExpectedRevision revision) { - this.expectedRevision = revision; - return (T) this; - } - - - /** - * Asks the server to check that the stream receiving is at the given expected version. - - * @param revision - expected revision. - * @return updated options. - */ - public T expectedRevision(long revision) { - return expectedRevision(ExpectedRevision.expectedRevision(revision)); - } -} diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/WrongExpectedVersionException.java b/db-client-java/src/main/java/com/eventstore/dbclient/WrongExpectedVersionException.java deleted file mode 100644 index 7c7e31e3..00000000 --- a/db-client-java/src/main/java/com/eventstore/dbclient/WrongExpectedVersionException.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.eventstore.dbclient; - -import javax.validation.constraints.NotNull; - -/** - * When append request failed the optimistic concurrency on the server. - */ -public class WrongExpectedVersionException extends RuntimeException { - private final String streamName; - private final ExpectedRevision nextExpectedRevision; - private final ExpectedRevision actualRevision; - - WrongExpectedVersionException( - @NotNull String streamName, - @NotNull ExpectedRevision nextExpected, - @NotNull ExpectedRevision actualRevision) { - super(String.format("Expected %s but got %s instead", nextExpected, actualRevision)); - this.streamName = streamName; - this.nextExpectedRevision = nextExpected; - this.actualRevision = actualRevision; - } - - /** - * Returns on which stream the error occurred. - */ - public String getStreamName() { - return streamName; - } - - /** - * Returns the expected revision by the request. - */ - public ExpectedRevision getNextExpectedRevision() { - return nextExpectedRevision; - } - - /** - * Returns the actual revision of the stream when the check was performed. - */ - public ExpectedRevision getActualVersion() { - return actualRevision; - } -} diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbortProjection.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjection.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbortProjection.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbortProjection.java index 41776c98..e87b1b4f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbortProjection.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjection.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbortProjectionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbortProjectionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java index 44a1bb25..357b64a0 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbortProjectionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the abort projection request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractCreatePersistentSubscription.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbstractCreatePersistentSubscription.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java index fffd929d..a7d24ade 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractCreatePersistentSubscription.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractDeletePersistentSubscription.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbstractDeletePersistentSubscription.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java index 63e7fe38..fff38d2e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractDeletePersistentSubscription.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java similarity index 99% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java index 4634f5db..a8e5f674 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.time.Duration; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractRead.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRead.java similarity index 86% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbstractRead.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbstractRead.java index 5ae0b2f7..55e0ba8e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractRead.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRead.java @@ -1,13 +1,11 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsGrpc; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsGrpc; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; -import java.util.concurrent.CompletableFuture; - abstract class AbstractRead implements Publisher { protected static final StreamsOuterClass.ReadReq.Options.Builder defaultReadOptions; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractRegularSubscription.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java similarity index 86% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbstractRegularSubscription.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java index 1a66a814..34446efd 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractRegularSubscription.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java @@ -1,8 +1,15 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsGrpc; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsGrpc; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; +import io.grpc.Metadata; +import io.grpc.Status; +import io.grpc.StatusRuntimeException; +import io.grpc.stub.ClientCallStreamObserver; +import io.grpc.stub.ClientResponseObserver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import io.grpc.ManagedChannel; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractSubscribePersistentSubscription.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbstractSubscribePersistentSubscription.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java index 9419bf88..22a36804 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractSubscribePersistentSubscription.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import io.grpc.Metadata; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractUpdatePersistentSubscription.java b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/AbstractUpdatePersistentSubscription.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java index 372e7b0b..5d7c0e34 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AbstractUpdatePersistentSubscription.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Acl.java b/db-client-java/src/main/java/io/kurrent/dbclient/Acl.java similarity index 70% rename from db-client-java/src/main/java/com/eventstore/dbclient/Acl.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Acl.java index ef849da0..cb24b96d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Acl.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Acl.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Common access control list (ACL) interface. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Acls.java b/db-client-java/src/main/java/io/kurrent/dbclient/Acls.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/Acls.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Acls.java index c0ac1a79..cfe71ef8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Acls.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Acls.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Access control list (ACL) utility class. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/AppendToStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/AppendToStream.java similarity index 84% rename from db-client-java/src/main/java/com/eventstore/dbclient/AppendToStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/AppendToStream.java index 2f3a8140..11ef0060 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/AppendToStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/AppendToStream.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsGrpc; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsGrpc; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import com.google.protobuf.ByteString; import io.grpc.ManagedChannel; import io.grpc.Metadata; @@ -42,7 +42,7 @@ public CompletableFuture execute() { private CompletableFuture append(ManagedChannel channel, List events) { CompletableFuture result = new CompletableFuture<>(); - StreamsOuterClass.AppendReq.Options.Builder options = this.options.getExpectedRevision().applyOnWire(StreamsOuterClass.AppendReq.Options.newBuilder() + StreamsOuterClass.AppendReq.Options.Builder options = this.options.getStreamState().applyOnWire(StreamsOuterClass.AppendReq.Options.newBuilder() .setStreamIdentifier(Shared.StreamIdentifier.newBuilder() .setStreamName(ByteString.copyFromUtf8(streamName)) .build())); @@ -58,33 +58,33 @@ private CompletableFuture append(ManagedChannel channel, List { +public class AppendToStreamOptions extends OptionsWithStreamStateBase { private AppendToStreamOptions() { } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Checkpointer.java b/db-client-java/src/main/java/io/kurrent/dbclient/Checkpointer.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/Checkpointer.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Checkpointer.java index b26a4f16..0bfc8feb 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Checkpointer.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Checkpointer.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientCertificate.java b/db-client-java/src/main/java/io/kurrent/dbclient/ClientCertificate.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClientCertificate.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClientCertificate.java index d2f834ff..bdc7327e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientCertificate.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClientCertificate.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Objects; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientFeatureFlags.java b/db-client-java/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClientFeatureFlags.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java index 619353e5..8409fec1 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientFeatureFlags.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; public final class ClientFeatureFlags { /** diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java index 332e6a5c..4ed0be83 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetry.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -87,14 +87,14 @@ 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, SpanKind.CLIENT, null, ClientTelemetryTags.builder() - .withRequiredTag(ClientTelemetryAttributes.EventStore.STREAM, streamId) + .withRequiredTag(ClientTelemetryAttributes.Kurrent.STREAM, streamId) .withServerTagsFromGrpcChannel(channel) .withServerTagsFromClientSettings(settings) .withOptionalDatabaseUserTag(settings.getDefaultCredentials()) @@ -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(); @@ -139,10 +139,10 @@ static void traceSubscribe(Runnable tracedOperation, String subscriptionId, Mana SpanKind.CONSUMER, remoteParentContext, ClientTelemetryTags.builder() - .withRequiredTag(ClientTelemetryAttributes.EventStore.STREAM, event.getStreamId()) - .withRequiredTag(ClientTelemetryAttributes.EventStore.SUBSCRIPTION_ID, subscriptionId) - .withRequiredTag(ClientTelemetryAttributes.EventStore.EVENT_ID, event.getEventId().toString()) - .withRequiredTag(ClientTelemetryAttributes.EventStore.EVENT_TYPE, event.getEventType()) + .withRequiredTag(ClientTelemetryAttributes.Kurrent.STREAM, event.getStreamId()) + .withRequiredTag(ClientTelemetryAttributes.Kurrent.SUBSCRIPTION_ID, subscriptionId) + .withRequiredTag(ClientTelemetryAttributes.Kurrent.EVENT_ID, event.getEventId().toString()) + .withRequiredTag(ClientTelemetryAttributes.Kurrent.EVENT_TYPE, event.getEventType()) .withServerTagsFromGrpcChannel(channel) .withServerTagsFromClientSettings(settings) .withOptionalDatabaseUserTag(settings.getDefaultCredentials()) diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryAttributes.java b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java similarity index 71% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryAttributes.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java index 7fd4cc13..6dceab3b 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryAttributes.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java @@ -1,7 +1,6 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.opentelemetry.semconv.ExceptionAttributes; -import io.opentelemetry.semconv.OtelAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; @@ -23,10 +22,10 @@ public static class Exceptions { public static final String STACK_TRACE = ExceptionAttributes.EXCEPTION_STACKTRACE.getKey(); } - 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 class Kurrent { + 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/ClientTelemetryConstants.java b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java similarity index 78% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryConstants.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java index e7de5ac0..e7479d7c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryConstants.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; public class ClientTelemetryConstants { - public static final String INSTRUMENTATION_NAME = "eventstoredb"; + public static final String INSTRUMENTATION_NAME = "kurrent"; public static class Metadata { public static final String TRACE_ID = "$traceId"; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryTags.java b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryTags.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java index 76548d15..4c94f0dc 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClientTelemetryTags.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.ManagedChannel; @@ -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/io/kurrent/dbclient/ClusterDiscovery.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClusterDiscovery.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java index 71701360..b645a367 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClusterDiscovery.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java @@ -1,9 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.resolution.DeferredNodeResolution; -import com.eventstore.dbclient.resolution.DeprecatedNodeResolution; -import com.eventstore.dbclient.resolution.FixedSeedsNodeResolution; -import com.eventstore.dbclient.resolution.NodeResolution; +import io.kurrent.dbclient.resolution.DeferredNodeResolution; +import io.kurrent.dbclient.resolution.DeprecatedNodeResolution; +import io.kurrent.dbclient.resolution.FixedSeedsNodeResolution; +import io.kurrent.dbclient.resolution.NodeResolution; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -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/ClusterInfo.java b/db-client-java/src/main/java/io/kurrent/dbclient/ClusterInfo.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/ClusterInfo.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ClusterInfo.java index faf50d0d..157e6b53 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ClusterInfo.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ClusterInfo.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.gossip.GossipOuterClass; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.gossip.GossipOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionMetadata.java b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/ConnectionMetadata.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java index 23b9d6d8..209df5fb 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionMetadata.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.Metadata; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionService.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ConnectionService.java index 98561034..cf6e2b99 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionService.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -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/io/kurrent/dbclient/ConnectionSettingsBuilder.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/ConnectionSettingsBuilder.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java index 8ea7c00c..df4cfe4e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionSettingsBuilder.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.ClientInterceptor; @@ -16,6 +16,10 @@ */ public class ConnectionSettingsBuilder { private static final Logger logger = LoggerFactory.getLogger(ConnectionSettingsBuilder.class); + private static final Set SUPPORTED_PROTOCOLS = new HashSet<>(Arrays.asList( + "esdb", "esdb+discover", "kurrent", "kurrent+discover", "kdb", "kdb+discover", "kurrentdb", "kurrentdb+discover" + )); + private boolean _dnsDiscover = false; private int _maxDiscoverAttempts = 3; private int _discoveryInterval = 500; @@ -37,11 +41,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,11 +260,14 @@ void parseGossipSeed(String host) { } } - static EventStoreDBClientSettings parseFromUrl(ConnectionSettingsBuilder builder, URL url) { - if (!url.getProtocol().equals("esdb") && !url.getProtocol().equals("esdb+discover")) + static KurrentDBClientSettings parseFromUrl(ConnectionSettingsBuilder builder, URL url) { + if (!SUPPORTED_PROTOCOLS.contains(url.getProtocol())) throw new RuntimeException(String.format("Unknown URL scheme: %s", url.getProtocol())); - builder.dnsDiscover(url.getProtocol().equals("esdb+discover")); + if (url.getProtocol().contains("esdb")) + logger.warn("The 'esdb' protocol is deprecated. Please use 'kurrentdb' instead."); + + builder.dnsDiscover(url.getProtocol().endsWith("+discover")); if (url.getUserInfo() != null && !url.getUserInfo().isEmpty()) { String[] splits = url.getUserInfo().split(":", 2); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionShutdownException.java b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java similarity index 86% rename from db-client-java/src/main/java/com/eventstore/dbclient/ConnectionShutdownException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java index d83b2863..aa6410aa 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionShutdownException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * When a connection is already closed. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionState.java b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionState.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/ConnectionState.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ConnectionState.java index 6c71027f..eac85ee8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionState.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionState.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.ManagedChannel; import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts; @@ -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/ConnectionStringParsingException.java b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/ConnectionStringParsingException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java index df5d694a..97c86af1 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ConnectionStringParsingException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * When the provided connection string is malformed. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Consts.java b/db-client-java/src/main/java/io/kurrent/dbclient/Consts.java similarity index 83% rename from db-client-java/src/main/java/com/eventstore/dbclient/Consts.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Consts.java index 3d5b92f6..b3bb8198 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Consts.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Consts.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class Consts { public static long DEFAULT_KEEP_ALIVE_TIMEOUT_IN_MS = 10000; // 10secs diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ContentType.java b/db-client-java/src/main/java/io/kurrent/dbclient/ContentType.java similarity index 81% rename from db-client-java/src/main/java/com/eventstore/dbclient/ContentType.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ContentType.java index c22b3f31..72874fb8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ContentType.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ContentType.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class ContentType { public static final String JSON = "application/json"; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CreateChannel.java b/db-client-java/src/main/java/io/kurrent/dbclient/CreateChannel.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/CreateChannel.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CreateChannel.java index e1576c36..919c36cf 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CreateChannel.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CreateChannel.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.net.InetSocketAddress; import java.util.StringJoiner; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToAll.java b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToAll.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java index c7aa87b7..310a70f6 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToAll.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; class CreatePersistentSubscriptionToAll extends AbstractCreatePersistentSubscription { private final CreatePersistentSubscriptionToAllOptions options; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToAllOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToAllOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java index 437baa6e..b20e6b2c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToAllOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of create persistent subscription to $all request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java index 76a57e61..971a285e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; import com.google.protobuf.ByteString; class CreatePersistentSubscriptionToStream extends AbstractCreatePersistentSubscription { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToStreamOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToStreamOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java index 07504655..dde50c88 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CreatePersistentSubscriptionToStreamOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options for the create persistent subscription to stream request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CreateProjection.java b/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjection.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/CreateProjection.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CreateProjection.java index 3464bdc6..480927b6 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CreateProjection.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjection.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CreateProjectionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/CreateProjectionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java index 178477ac..532a87e6 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CreateProjectionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options for create projection request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/CustomAclCodec.java b/db-client-java/src/main/java/io/kurrent/dbclient/CustomAclCodec.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/CustomAclCodec.java rename to db-client-java/src/main/java/io/kurrent/dbclient/CustomAclCodec.java index 37e55c74..4d25b6f7 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/CustomAclCodec.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/CustomAclCodec.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java index 90078949..7cce2086 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the delete persistent subscription request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionToAll.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java similarity index 76% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionToAll.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java index 879d34aa..f5966b44 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionToAll.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; class DeletePersistentSubscriptionToAll extends AbstractDeletePersistentSubscription { public DeletePersistentSubscriptionToAll(GrpcClient client, String group, diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionToStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java similarity index 83% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionToStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java index 98f0ee99..37a92656 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeletePersistentSubscriptionToStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; import com.google.protobuf.ByteString; class DeletePersistentSubscriptionToStream extends AbstractDeletePersistentSubscription { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteProjection.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjection.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeleteProjection.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjection.java index 786b5d54..2a7ab8fc 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteProjection.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjection.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteProjectionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeleteProjectionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java index 64ae0dbb..cd88e436 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteProjectionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the delete projection request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteResult.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteResult.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeleteResult.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeleteResult.java index 26e82b65..2765f748 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteResult.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteResult.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStream.java similarity index 83% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeleteStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeleteStream.java index ffd13568..05777c34 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStream.java @@ -1,10 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsGrpc; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsGrpc; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import com.google.protobuf.ByteString; -import io.grpc.Metadata; import java.util.concurrent.CompletableFuture; @@ -28,7 +27,7 @@ public CompletableFuture execute() { if (this.softDelete) { StreamsOuterClass.DeleteReq req = StreamsOuterClass.DeleteReq.newBuilder() - .setOptions(this.options.getExpectedRevision().applyOnWire(StreamsOuterClass.DeleteReq.Options.newBuilder() + .setOptions(this.options.getStreamState().applyOnWire(StreamsOuterClass.DeleteReq.Options.newBuilder() .setStreamIdentifier(Shared.StreamIdentifier.newBuilder() .setStreamName(ByteString.copyFromUtf8(streamName)) .build()))) @@ -45,7 +44,7 @@ public CompletableFuture execute() { } StreamsOuterClass.TombstoneReq req = StreamsOuterClass.TombstoneReq.newBuilder() - .setOptions(this.options.getExpectedRevision().applyOnWire(StreamsOuterClass.TombstoneReq.Options.newBuilder() + .setOptions(this.options.getStreamState().applyOnWire(StreamsOuterClass.TombstoneReq.Options.newBuilder() .setStreamIdentifier(Shared.StreamIdentifier.newBuilder() .setStreamName(ByteString.copyFromUtf8(streamName)) .build()))) diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteStreamOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java similarity index 63% rename from db-client-java/src/main/java/com/eventstore/dbclient/DeleteStreamOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java index 062af4d4..6ed6a8d3 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DeleteStreamOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java @@ -1,9 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the delete or tombstone stream request. */ -public class DeleteStreamOptions extends OptionsWithExpectedRevisionBase { +public class DeleteStreamOptions extends OptionsWithStreamStateBase { DeleteStreamOptions() {} /** diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Direction.java b/db-client-java/src/main/java/io/kurrent/dbclient/Direction.java similarity index 86% rename from db-client-java/src/main/java/com/eventstore/dbclient/Direction.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Direction.java index c435c4c3..41471154 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Direction.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Direction.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Specifies the direction of a read operation. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DisableProjection.java b/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjection.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/DisableProjection.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DisableProjection.java index c47bc614..faa2a188 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DisableProjection.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjection.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/DisableProjectionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/DisableProjectionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java index d835a950..8f59ee9a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/DisableProjectionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the disable projection request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Discovery.java b/db-client-java/src/main/java/io/kurrent/dbclient/Discovery.java similarity index 80% rename from db-client-java/src/main/java/com/eventstore/dbclient/Discovery.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Discovery.java index c6501041..5522c2f1 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Discovery.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Discovery.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EnableProjection.java b/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjection.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/EnableProjection.java rename to db-client-java/src/main/java/io/kurrent/dbclient/EnableProjection.java index bf5d5671..402ea05a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EnableProjection.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjection.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EnableProjectionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/EnableProjectionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java index 85b0d21c..00f6f58c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EnableProjectionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the enable projection request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventData.java b/db-client-java/src/main/java/io/kurrent/dbclient/EventData.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventData.java rename to db-client-java/src/main/java/io/kurrent/dbclient/EventData.java index b5bc0ebe..3cd5ba4c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventData.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/EventData.java @@ -1,9 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; 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/EventDataBuilder.java b/db-client-java/src/main/java/io/kurrent/dbclient/EventDataBuilder.java similarity index 99% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventDataBuilder.java rename to db-client-java/src/main/java/io/kurrent/dbclient/EventDataBuilder.java index fe1d7c81..4de45daf 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventDataBuilder.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/EventDataBuilder.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.json.JsonMapper; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventFilter.java b/db-client-java/src/main/java/io/kurrent/dbclient/EventFilter.java similarity index 86% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventFilter.java rename to db-client-java/src/main/java/io/kurrent/dbclient/EventFilter.java index e6013922..aebd9e97 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventFilter.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/EventFilter.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Optional; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventTypeFilter.java b/db-client-java/src/main/java/io/kurrent/dbclient/EventTypeFilter.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventTypeFilter.java rename to db-client-java/src/main/java/io/kurrent/dbclient/EventTypeFilter.java index 5bba17b3..7686ae7c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventTypeFilter.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/EventTypeFilter.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import javax.validation.constraints.NotNull; import java.util.Arrays; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/FeatureFlags.java b/db-client-java/src/main/java/io/kurrent/dbclient/FeatureFlags.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/FeatureFlags.java rename to db-client-java/src/main/java/io/kurrent/dbclient/FeatureFlags.java index 4410fb49..83e755a5 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/FeatureFlags.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/FeatureFlags.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class FeatureFlags { public final static int NOTHING = 0; public final static int BATCH_APPEND = 1; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetPersistentSubscriptionInfo.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetPersistentSubscriptionInfo.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java index 54931bbe..6a1ab8ab 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetPersistentSubscriptionInfo.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import com.fasterxml.jackson.databind.JsonNode; import com.google.protobuf.ByteString; import io.grpc.Status; @@ -13,7 +13,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; -import static com.eventstore.dbclient.HttpUtils.*; +import static io.kurrent.dbclient.HttpUtils.*; final class GetPersistentSubscriptionInfo { public static CompletableFuture> execute(GrpcClient client, GetPersistentSubscriptionInfoOptions options, String stream, String groupName) { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetPersistentSubscriptionInfoOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetPersistentSubscriptionInfoOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java index 8c792df0..a878b185 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetPersistentSubscriptionInfoOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the get persistent subscription info request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionResult.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResult.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionResult.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResult.java index cb9abf6c..3fcce2b5 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionResult.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResult.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.json.JsonMapper; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionResultOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionResultOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java index ef3267c6..14b5509d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionResultOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the get projection result request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionState.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionState.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionState.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionState.java index e1905c64..cf876e2b 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionState.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionState.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.json.JsonMapper; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStateOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStateOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java index 7b2b4e48..90d307f8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStateOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the get projection state request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatistics.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatistics.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java index d9025975..ebc2853b 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatistics.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatisticsOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatisticsOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java index 9e354c46..fddf4c6e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatisticsOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the get projection statistics request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatus.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatus.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java index 18e2332f..7c8260fd 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatus.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatusOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatusOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java index 620e373c..6de16da6 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GetProjectionStatusOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the get projection status request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/GossipClient.java b/db-client-java/src/main/java/io/kurrent/dbclient/GossipClient.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/GossipClient.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GossipClient.java index 177e5b68..3ba89b7c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GossipClient.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GossipClient.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.gossip.GossipGrpc; -import com.eventstore.dbclient.proto.gossip.GossipOuterClass; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.gossip.GossipGrpc; +import io.kurrent.dbclient.proto.gossip.GossipOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; import io.grpc.ManagedChannel; import io.grpc.stub.ClientCallStreamObserver; import io.grpc.stub.ClientResponseObserver; @@ -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/io/kurrent/dbclient/GrpcClient.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/GrpcClient.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GrpcClient.java index 68504d2c..0cce2e00 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GrpcClient.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GrpcClient.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.ManagedChannel; import io.grpc.Status; @@ -18,9 +18,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; @@ -117,7 +117,7 @@ public CompletableFuture shutdown() { return 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/io/kurrent/dbclient/GrpcUtils.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/GrpcUtils.java rename to db-client-java/src/main/java/io/kurrent/dbclient/GrpcUtils.java index 08111bdb..9dce2240 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/GrpcUtils.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/GrpcUtils.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import com.google.protobuf.ByteString; import io.grpc.Metadata; import io.grpc.Status; @@ -61,8 +61,8 @@ public void onError(Throwable t) { } try { - ExpectedRevision expected = ExpectedRevision.fromRawLong(Long.parseLong(expectedStr)); - ExpectedRevision actual = ExpectedRevision.fromRawLong(Long.parseLong(actualStr)); + StreamState expected = StreamState.fromRawLong(Long.parseLong(expectedStr)); + StreamState actual = StreamState.fromRawLong(Long.parseLong(actualStr)); dest.completeExceptionally(new WrongExpectedVersionException(streamName, expected, actual)); return; @@ -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/HttpUtils.java b/db-client-java/src/main/java/io/kurrent/dbclient/HttpUtils.java similarity index 99% rename from db-client-java/src/main/java/com/eventstore/dbclient/HttpUtils.java rename to db-client-java/src/main/java/io/kurrent/dbclient/HttpUtils.java index 64201192..8127a5cd 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/HttpUtils.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/HttpUtils.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClient.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java rename to db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClient.java index 137afd6f..22cbe548 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClient.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClient.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.json.JsonMapper; @@ -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(EventStoreDBClientSettings settings) { +public class KurrentDBClient extends KurrentDBClientBase { + private KurrentDBClient(KurrentDBClientSettings settings) { super(settings); } /** - * Creates a gRPC client to EventStoreDB database. + * Creates a gRPC client to KurrentDB database. */ - public static EventStoreDBClient create(EventStoreDBClientSettings 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/io/kurrent/dbclient/KurrentDBClientBase.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java rename to db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java index 6fc61cda..c552c3e7 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientBase.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.slf4j.Logger; @@ -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(EventStoreDBClientSettings settings) { + KurrentDBClientBase(KurrentDBClientSettings settings) { Discovery discovery; if (settings.getHosts().length == 1 && !settings.isDnsDiscover()) { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientSettings.java b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientSettings.java rename to db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java index 8d044e61..8b0ae2a9 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBClientSettings.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.ClientInterceptor; @@ -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. * *
    @@ -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/EventStoreDBConnectionString.java b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java similarity index 87% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java rename to db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java index 9a6b4dc0..e90668c9 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBConnectionString.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.io.IOException; import java.net.*; @@ -6,16 +6,16 @@ /** * 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 * 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/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java rename to db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java index 135662e7..d9e51794 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBPersistentSubscriptionsClient.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.List; import java.util.Optional; @@ -8,32 +8,32 @@ /** * 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. + * Many threads can use the KurrentDB client simultaneously, or a single thread can make many asynchronous requests. */ -public class EventStoreDBPersistentSubscriptionsClient { - private final EventStoreDBClientBase inner; +public class KurrentDBPersistentSubscriptionsClient { + private final KurrentDBClientBase inner; - private EventStoreDBPersistentSubscriptionsClient(EventStoreDBClientSettings settings) { - inner = new EventStoreDBClientBase(settings); + private KurrentDBPersistentSubscriptionsClient(KurrentDBClientSettings settings) { + inner = new KurrentDBClientBase(settings); } - private EventStoreDBPersistentSubscriptionsClient(EventStoreDBClientBase inner) { + private KurrentDBPersistentSubscriptionsClient(KurrentDBClientBase inner) { this.inner = inner; } /** * Creates a persistent subscription client instance. */ - public static EventStoreDBPersistentSubscriptionsClient create(EventStoreDBClientSettings 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(EventStoreDBClientBase 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/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java rename to db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java index d8d7db08..8ecceac7 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/EventStoreDBProjectionManagementClient.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.TypeFactory; @@ -8,16 +8,16 @@ import java.util.function.Function; /** - * Represents EventStoreDB client for projections management. A client instance maintains a two-way communication to EventStoreDB. + * Represents KurrentDB 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 { - final EventStoreDBClientBase inner; - private EventStoreDBProjectionManagementClient(EventStoreDBClientSettings settings) { - inner = new EventStoreDBClientBase(settings); +public class KurrentDBProjectionManagementClient { + final KurrentDBClientBase inner; + private KurrentDBProjectionManagementClient(KurrentDBClientSettings settings) { + inner = new KurrentDBClientBase(settings); } - private EventStoreDBProjectionManagementClient(EventStoreDBClientBase inner) { + private KurrentDBProjectionManagementClient(KurrentDBClientBase inner) { this.inner = inner; } @@ -25,16 +25,16 @@ 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) { - 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(EventStoreDBClientBase existingClient) { - return new EventStoreDBProjectionManagementClient(existingClient); + public static KurrentDBProjectionManagementClient from(KurrentDBClientBase existingClient) { + return new KurrentDBProjectionManagementClient(existingClient); } /** diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ListPersistentSubscriptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/ListPersistentSubscriptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java index 18fcb839..07d5b9df 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ListPersistentSubscriptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java @@ -1,9 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import com.fasterxml.jackson.databind.JsonNode; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; import com.google.protobuf.ByteString; import java.io.IOException; @@ -13,7 +13,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import static com.eventstore.dbclient.HttpUtils.*; +import static io.kurrent.dbclient.HttpUtils.*; final class ListPersistentSubscriptions { public static CompletableFuture> execute(GrpcClient client, ListPersistentSubscriptionsOptions options, String stream, Function func) { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ListPersistentSubscriptionsOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/ListPersistentSubscriptionsOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java index 21a4e8b4..ed37beb4 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ListPersistentSubscriptionsOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the list persistent subscriptions request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ListProjections.java b/db-client-java/src/main/java/io/kurrent/dbclient/ListProjections.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/ListProjections.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ListProjections.java index 058b3d84..d845337a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ListProjections.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ListProjections.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import io.grpc.stub.StreamObserver; import java.util.ArrayList; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ListProjectionsOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/ListProjectionsOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java index 8b0b5d94..1afb1fb4 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ListProjectionsOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the list projections options. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ListProjectionsResult.java b/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/ListProjectionsResult.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java index de3e62f5..b4a0fc06 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ListProjectionsResult.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.List; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Msg.java b/db-client-java/src/main/java/io/kurrent/dbclient/Msg.java similarity index 65% rename from db-client-java/src/main/java/com/eventstore/dbclient/Msg.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Msg.java index 8ddee155..25cd750e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Msg.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Msg.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; interface Msg { void accept(ConnectionService handler); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/NackAction.java b/db-client-java/src/main/java/io/kurrent/dbclient/NackAction.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/NackAction.java rename to db-client-java/src/main/java/io/kurrent/dbclient/NackAction.java index 4db2406b..a6e1587c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/NackAction.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/NackAction.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Gathers every possible Nak actions. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/NamedConsumerStrategy.java b/db-client-java/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/NamedConsumerStrategy.java rename to db-client-java/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java index 8d5e66e4..78275d92 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/NamedConsumerStrategy.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Named consumer strategies for use with persistent subscriptions. @@ -19,7 +19,7 @@ public class NamedConsumerStrategy { public static final NamedConsumerStrategy ROUND_ROBIN = new NamedConsumerStrategy("RoundRobin"); /** - * For use with an indexing projection such as the system $by_category projection. EventStoreDB inspects event for + * For use with an indexing projection such as the system $by_category projection. KurrentDB inspects event for * its source stream id, hashing the id to one of 1024 buckets assigned to individual clients. When a client * disconnects, its buckets are assigned to other clients. When a client connects, it is assigned some existing * buckets. This naively attempts to maintain a balanced workload. The main goal of this strategy is to decrease the diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/NoClusterNodeFoundException.java b/db-client-java/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java similarity index 84% rename from db-client-java/src/main/java/com/eventstore/dbclient/NoClusterNodeFoundException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java index f6936c8e..8feaacd0 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/NoClusterNodeFoundException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * When no node was found based on the connection string provided. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/NodePreference.java b/db-client-java/src/main/java/io/kurrent/dbclient/NodePreference.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/NodePreference.java rename to db-client-java/src/main/java/io/kurrent/dbclient/NodePreference.java index 381a386f..293f7ae6 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/NodePreference.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/NodePreference.java @@ -1,5 +1,5 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Indicates which order of preferred nodes for connecting to. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/NodeSelector.java b/db-client-java/src/main/java/io/kurrent/dbclient/NodeSelector.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/NodeSelector.java rename to db-client-java/src/main/java/io/kurrent/dbclient/NodeSelector.java index 25768cd3..8eb1677e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/NodeSelector.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/NodeSelector.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.*; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/NotLeaderException.java b/db-client-java/src/main/java/io/kurrent/dbclient/NotLeaderException.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/NotLeaderException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/NotLeaderException.java index bd8b8c59..0e52a38f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/NotLeaderException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/NotLeaderException.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.net.InetSocketAddress; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/OperationKind.java b/db-client-java/src/main/java/io/kurrent/dbclient/OperationKind.java similarity index 61% rename from db-client-java/src/main/java/com/eventstore/dbclient/OperationKind.java rename to db-client-java/src/main/java/io/kurrent/dbclient/OperationKind.java index 3aa9b6b3..27aa2a46 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/OperationKind.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/OperationKind.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; enum OperationKind { Regular, diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsBase.java b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsBase.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/OptionsBase.java rename to db-client-java/src/main/java/io/kurrent/dbclient/OptionsBase.java index 97536c4a..f7199a88 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsBase.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsBase.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.HashMap; import java.util.Map; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithBackPressure.java b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithBackPressure.java rename to db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java index fddbd258..5a8369a4 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithBackPressure.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class OptionsWithBackPressure extends OptionsWithResolveLinkTosBase { private int batchSize; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithPositionAndResolveLinkTosBase.java b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithPositionAndResolveLinkTosBase.java rename to db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java index 3ce339f8..543126af 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithPositionAndResolveLinkTosBase.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class OptionsWithPositionAndResolveLinkTosBase extends OptionsWithBackPressure { private StreamPosition position; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithResolveLinkTosBase.java b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithResolveLinkTosBase.java rename to db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java index 86212f0f..ce10487f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithResolveLinkTosBase.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class OptionsWithResolveLinkTosBase extends OptionsBase { private boolean resolveLinkTos; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java rename to db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java index be8f9244..9b978972 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class OptionsWithStartRevisionAndResolveLinkTosBase extends OptionsWithBackPressure { private StreamPosition startRevision; diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java new file mode 100644 index 00000000..48eef358 --- /dev/null +++ b/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java @@ -0,0 +1,36 @@ +package io.kurrent.dbclient; + +class OptionsWithStreamStateBase extends OptionsBase { + private StreamState streamState; + + protected OptionsWithStreamStateBase() { + this.streamState = StreamState.any(); + } + + StreamState getStreamState() { + return this.streamState; + } + + /** + * Asks the server to check that the stream receiving is at the expected state. + + * @param state - expected revision. + * @return updated options. + */ + @SuppressWarnings("unchecked") + public T streamState(StreamState state) { + this.streamState = state; + return (T) this; + } + + + /** + * Asks the server to check that the stream receiving is at the given expected revision. + + * @param revision - expected revision. + * @return updated options. + */ + public T streamRevision(long revision) { + return streamState(StreamState.streamRevision(revision)); + } +} diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscription.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscription.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscription.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscription.java index 35a470a2..3fdb0124 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscription.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscription.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; import com.google.protobuf.ByteString; import io.grpc.stub.ClientCallStreamObserver; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionConnectionInfo.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java similarity index 99% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionConnectionInfo.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java index 1c1d131f..d041ccdb 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionConnectionInfo.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Map; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionInfo.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionInfo.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java index 9a137dff..0872c3aa 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionInfo.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.List; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionListener.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionListener.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java index 11518225..e7795682 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionListener.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java @@ -1,11 +1,11 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Listener used to handle persistent subscription notifications raised throughout its lifecycle. */ public abstract class PersistentSubscriptionListener { /** - * Called when EventStoreDB sends an event to the persistent subscription. + * Called when KurrentDB sends an event to the persistent subscription. * @param subscription handle to the persistent subscription. * @param retryCount how many times the event was retried. * @param event a resolved event. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionSettings.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionSettings.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java index e1ff7a94..8aff4293 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionSettings.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.time.Duration; @@ -96,7 +96,7 @@ public boolean isExtraStatistics() { * * The best way to explain link resolution is when using system projections. When reading the stream $streams * , each event is actually a link pointing to the first event of a stream. By enabling link resolution feature, - * EventStoreDB will also return the event targeted by the link. + * KurrentDB will also return the event targeted by the link. */ public boolean shouldResolveLinkTos() { return resolveLinkTos; @@ -191,7 +191,7 @@ void setExtraStatistics(boolean extraStatistics) { * * The best way to explain link resolution is when using system projections. When reading the stream $streams * , each event is actually a link pointing to the first event of a stream. By enabling link resolution feature, - * EventStoreDB will also return the event targeted by the link. + * KurrentDB will also return the event targeted by the link. */ public boolean isResolveLinkTos() { return resolveLinkTos; @@ -202,7 +202,7 @@ public boolean isResolveLinkTos() { * * The best way to explain link resolution is when using system projections. When reading the stream $streams * , each event is actually a link pointing to the first event of a stream. By enabling link resolution feature, - * EventStoreDB will also return the event targeted by the link. + * KurrentDB will also return the event targeted by the link. */ void setResolveLinkTos(boolean resolveLinkTos) { this.resolveLinkTos = resolveLinkTos; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionStats.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionStats.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java index 78f3ad63..3785ac27 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionStats.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Processing-related persistent subscription statistics. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllInfo.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllInfo.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java index e69e3207..a8e14c6c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllInfo.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Persistent subscription to $all info. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllSettings.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllSettings.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java index d5966242..4c453cd2 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllSettings.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Persistent subscription to $all settings. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllStats.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllStats.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java index 2e0e9e3f..3da383f1 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToAllStats.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Optional; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamInfo.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamInfo.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java index 26945d01..ccf2ba50 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamInfo.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Persistent subscription to stream info. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamSettings.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamSettings.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java index c2c46375..7960b4e7 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamSettings.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Persistent subscription to stream settings. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamStats.java b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamStats.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java index 4b62245d..d16f69a4 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PersistentSubscriptionToStreamStats.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Optional; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Position.java b/db-client-java/src/main/java/io/kurrent/dbclient/Position.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/Position.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Position.java index da00b195..cb290c9f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Position.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Position.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import javax.validation.constraints.NotNull; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/PrefixFilterExpression.java b/db-client-java/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/PrefixFilterExpression.java rename to db-client-java/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java index d833d338..58730206 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/PrefixFilterExpression.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ProjectionDetails.java b/db-client-java/src/main/java/io/kurrent/dbclient/ProjectionDetails.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/ProjectionDetails.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ProjectionDetails.java index 305721b6..53f26132 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ProjectionDetails.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ProjectionDetails.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; /** * Provides the details for a projection. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadAll.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadAll.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadAll.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadAll.java index ce6192b5..252fc07d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadAll.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadAll.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; class ReadAll extends AbstractRead { private final ReadAllOptions options; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadAllOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadAllOptions.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadAllOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadAllOptions.java index 310d60dc..49aee11e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadAllOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadAllOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the read $all stream request. @@ -51,7 +51,7 @@ public ReadAllOptions backwards() { } /** - * The maximum event count EventStoreDB will return. + * The maximum event count KurrentDB will return. */ public ReadAllOptions maxCount(long maxCount) { this.maxCount = maxCount; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadMessage.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadMessage.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadMessage.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadMessage.java index a06dca3f..04aad9dd 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadMessage.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadMessage.java @@ -1,4 +1,6 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; + +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; /** * Received when performing a regular read operation (not a subscription). diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadResponseObserver.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadResponseObserver.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java index 585e35a6..da6408c8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadResponseObserver.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import io.grpc.Metadata; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadResult.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadResult.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadResult.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadResult.java index 4936082a..7e928397 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadResult.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadResult.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.List; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadStream.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadStream.java index 7a36e2ee..37f208d1 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadStream.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; class ReadStream extends AbstractRead { private final String streamName; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadStreamConsumer.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadStreamConsumer.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java index 2679482a..492f0088 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadStreamConsumer.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import org.reactivestreams.Subscriber; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadStreamOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadStreamOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java index 18ff8200..4875087e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadStreamOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the read stream request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReadSubscriber.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReadSubscriber.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReadSubscriber.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReadSubscriber.java index 4920b1e8..ba031ab3 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReadSubscriber.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReadSubscriber.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RecordedEvent.java b/db-client-java/src/main/java/io/kurrent/dbclient/RecordedEvent.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/RecordedEvent.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RecordedEvent.java index 628af9ac..dfdd3241 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RecordedEvent.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RecordedEvent.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import com.fasterxml.jackson.databind.json.JsonMapper; import javax.validation.constraints.NotNull; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RegularFilterExpression.java b/db-client-java/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/RegularFilterExpression.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java index 7bccb432..c766676b 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RegularFilterExpression.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReplayParkedMessages.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReplayParkedMessages.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java index ede9c436..f74aeb7d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReplayParkedMessages.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java @@ -1,15 +1,15 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import com.google.protobuf.ByteString; import java.io.IOException; import java.net.HttpURLConnection; import java.util.concurrent.CompletableFuture; -import static com.eventstore.dbclient.HttpUtils.*; +import static io.kurrent.dbclient.HttpUtils.*; final class ReplayParkedMessages { @SuppressWarnings("unchecked") diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ReplayParkedMessagesOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/ReplayParkedMessagesOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java index a7684087..f15a9bf0 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ReplayParkedMessagesOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the replay parked messages request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ResetProjection.java b/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjection.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/ResetProjection.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ResetProjection.java index f48fa106..7d16ce9e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ResetProjection.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjection.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ResetProjectionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/ResetProjectionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java index 887d01ea..95faece8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ResetProjectionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the reset projection request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ResolvedEvent.java b/db-client-java/src/main/java/io/kurrent/dbclient/ResolvedEvent.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/ResolvedEvent.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ResolvedEvent.java index d9e65f7a..8f5a8e3d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ResolvedEvent.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ResolvedEvent.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import java.util.Objects; import java.util.Optional; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ResourceNotFoundException.java b/db-client-java/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/ResourceNotFoundException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java index ddd15855..cfa5c446 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ResourceNotFoundException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * A remote resource was not found or because its access was denied. Could only happen when a request was performed diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RestartPersistentSubscriptionSubsystem.java b/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java similarity index 87% rename from db-client-java/src/main/java/com/eventstore/dbclient/RestartPersistentSubscriptionSubsystem.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java index 2b34a699..1a2588a5 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RestartPersistentSubscriptionSubsystem.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java @@ -1,13 +1,13 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.PersistentSubscriptionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import java.io.IOException; import java.net.HttpURLConnection; import java.util.concurrent.CompletableFuture; -import static com.eventstore.dbclient.HttpUtils.checkForError; +import static io.kurrent.dbclient.HttpUtils.checkForError; class RestartPersistentSubscriptionSubsystem { @SuppressWarnings("unchecked") diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RestartPersistentSubscriptionSubsystemOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/RestartPersistentSubscriptionSubsystemOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java index e843b4af..59d9da07 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RestartPersistentSubscriptionSubsystemOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the restart persistent subscription subsystem request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RestartProjectionSubsystem.java b/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java similarity index 85% rename from db-client-java/src/main/java/com/eventstore/dbclient/RestartProjectionSubsystem.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java index 8d3e3403..41d2081a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RestartProjectionSubsystem.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RestartProjectionSubsystemOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/RestartProjectionSubsystemOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java index 46cf31aa..b81d5929 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RestartProjectionSubsystemOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the restart projection subsystem request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RevisionOrPosition.java b/db-client-java/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/RevisionOrPosition.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java index 5502bb50..bb4cb222 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RevisionOrPosition.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Optional; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/RunWorkItem.java b/db-client-java/src/main/java/io/kurrent/dbclient/RunWorkItem.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/RunWorkItem.java rename to db-client-java/src/main/java/io/kurrent/dbclient/RunWorkItem.java index b19caa85..a3970bb3 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/RunWorkItem.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/RunWorkItem.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.UUID; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ServerFeatures.java b/db-client-java/src/main/java/io/kurrent/dbclient/ServerFeatures.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/ServerFeatures.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ServerFeatures.java index 0fd42ec2..12d377c4 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ServerFeatures.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ServerFeatures.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.serverfeatures.ServerFeaturesGrpc; -import com.eventstore.dbclient.proto.serverfeatures.Serverfeatures; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.serverfeatures.ServerFeaturesGrpc; +import io.kurrent.dbclient.proto.serverfeatures.Serverfeatures; +import io.kurrent.dbclient.proto.shared.Shared; import io.grpc.ManagedChannel; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -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/ServerInfo.java b/db-client-java/src/main/java/io/kurrent/dbclient/ServerInfo.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/ServerInfo.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ServerInfo.java index 05163157..a5a72604 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ServerInfo.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ServerInfo.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class ServerInfo { private final ServerVersion version; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ServerVersion.java b/db-client-java/src/main/java/io/kurrent/dbclient/ServerVersion.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/ServerVersion.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ServerVersion.java index 46086a35..f61f9a1d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ServerVersion.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ServerVersion.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; public class ServerVersion { private final int major; private final int minor; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Shutdown.java b/db-client-java/src/main/java/io/kurrent/dbclient/Shutdown.java similarity index 93% rename from db-client-java/src/main/java/com/eventstore/dbclient/Shutdown.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Shutdown.java index d63902c9..2422bca3 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Shutdown.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Shutdown.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.function.Consumer; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SingleNodeDiscovery.java b/db-client-java/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/SingleNodeDiscovery.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java index 3b86385e..a0eba2f5 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SingleNodeDiscovery.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.net.InetSocketAddress; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/StreamAcl.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamAcl.java similarity index 99% rename from db-client-java/src/main/java/com/eventstore/dbclient/StreamAcl.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamAcl.java index 3c83f614..f0642bfe 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/StreamAcl.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamAcl.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/StreamConsumer.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamConsumer.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/StreamConsumer.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamConsumer.java index af7a9c2f..36613e22 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/StreamConsumer.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamConsumer.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; public interface StreamConsumer { default void onSubscribe(org.reactivestreams.Subscription subscription) {} diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/StreamDeletedException.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamDeletedException.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/StreamDeletedException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamDeletedException.java index 858d03a2..fb978bcf 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/StreamDeletedException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamDeletedException.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * When a read or write operation was performed on a deleted stream. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/StreamFilter.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamFilter.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/StreamFilter.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamFilter.java index cb498aff..62b4a2e9 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/StreamFilter.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamFilter.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import javax.validation.constraints.NotNull; import java.util.Arrays; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/StreamMetadata.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamMetadata.java similarity index 99% rename from db-client-java/src/main/java/com/eventstore/dbclient/StreamMetadata.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamMetadata.java index cc11858b..f9b6405a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/StreamMetadata.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamMetadata.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/StreamNotFoundException.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/StreamNotFoundException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java index 4d38872b..2a12350b 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/StreamNotFoundException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * When a stream is not found. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/StreamPosition.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamPosition.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/StreamPosition.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamPosition.java index c90392dc..dfe2e295 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/StreamPosition.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamPosition.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Optional; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ExpectedRevision.java b/db-client-java/src/main/java/io/kurrent/dbclient/StreamState.java similarity index 72% rename from db-client-java/src/main/java/com/eventstore/dbclient/ExpectedRevision.java rename to db-client-java/src/main/java/io/kurrent/dbclient/StreamState.java index c04d8271..71831b8d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ExpectedRevision.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/StreamState.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import java.util.Objects; @@ -9,71 +9,71 @@ * 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. *

*/ -public abstract class ExpectedRevision { +public abstract class StreamState { /** * This writes should not conflict with anything and should always succeed. */ - public static ExpectedRevision any() { - return new AnyExpectedRevision(); + public static StreamState any() { + return new AnyStreamState(); } /** * The stream being written to should not yet exist. If it does exist, treats that as a concurrency problem. */ - public static ExpectedRevision noStream() { - return new NoStreamExpectedRevision(); + public static StreamState noStream() { + return new NoStreamState(); } /** * The stream should exist. If it or a metadata stream does not exist, treats that as a concurrency problem. */ - public static ExpectedRevision streamExists() { - return new StreamExistsExpectedRevision(); + public static StreamState streamExists() { + return new StreamExistsState(); } /** * States that the last event written to the stream should have an event revision matching your expected value. */ - public static ExpectedRevision expectedRevision(long revision) { - return new SpecificExpectedRevision(revision); + public static StreamState streamRevision(long revision) { + return new StreamRevisionStreamState(revision); } - public static ExpectedRevision fromRawLong(long revision) { + public static StreamState fromRawLong(long revision) { if (revision == -1) - return ExpectedRevision.noStream(); + return StreamState.noStream(); if (revision == -2) - return ExpectedRevision.any(); + return StreamState.any(); if (revision == -4) - return ExpectedRevision.streamExists(); + return StreamState.streamExists(); if (revision < 0) - throw new RuntimeException(String.format("Invalid expected revision long representation '%s'", revision)); + throw new RuntimeException(String.format("Invalid stream revision long representation '%s'", revision)); - return ExpectedRevision.expectedRevision(revision); + return StreamState.streamRevision(revision); } - ExpectedRevision() {} + StreamState() {} abstract StreamsOuterClass.AppendReq.Options.Builder applyOnWire(StreamsOuterClass.AppendReq.Options.Builder options); abstract StreamsOuterClass.DeleteReq.Options.Builder applyOnWire(StreamsOuterClass.DeleteReq.Options.Builder options); abstract StreamsOuterClass.TombstoneReq.Options.Builder applyOnWire(StreamsOuterClass.TombstoneReq.Options.Builder options); public long toRawLong() { - if (this instanceof NoStreamExpectedRevision) + if (this instanceof NoStreamState) return -1; - if (this instanceof AnyExpectedRevision) + if (this instanceof AnyStreamState) return -2; - if (this instanceof StreamExistsExpectedRevision) + if (this instanceof StreamExistsState) return -4; - SpecificExpectedRevision revision = (SpecificExpectedRevision) this; + StreamRevisionStreamState revision = (StreamRevisionStreamState) this; return revision.version; } @@ -89,7 +89,7 @@ public int hashCode() { return Objects.hash(getClass()); } - public static class NoStreamExpectedRevision extends ExpectedRevision { + public static class NoStreamState extends StreamState { @Override public StreamsOuterClass.AppendReq.Options.Builder applyOnWire(StreamsOuterClass.AppendReq.Options.Builder options) { return options.setNoStream(Shared.Empty.getDefaultInstance()); @@ -107,11 +107,11 @@ public StreamsOuterClass.TombstoneReq.Options.Builder applyOnWire(StreamsOuterCl @Override public String toString() { - return "ExpectedNoStream"; + return "NoStreamState"; } } - public static class AnyExpectedRevision extends ExpectedRevision { + public static class AnyStreamState extends StreamState { @Override public StreamsOuterClass.AppendReq.Options.Builder applyOnWire(StreamsOuterClass.AppendReq.Options.Builder options) { return options.setAny(Shared.Empty.getDefaultInstance()); @@ -129,11 +129,11 @@ public StreamsOuterClass.TombstoneReq.Options.Builder applyOnWire(StreamsOuterCl @Override public String toString() { - return "ExpectedAny"; + return "AnyStreamState"; } } - public static class StreamExistsExpectedRevision extends ExpectedRevision { + public static class StreamExistsState extends StreamState { @Override public StreamsOuterClass.AppendReq.Options.Builder applyOnWire(StreamsOuterClass.AppendReq.Options.Builder options) { return options.setStreamExists(Shared.Empty.getDefaultInstance()); @@ -151,14 +151,14 @@ public StreamsOuterClass.TombstoneReq.Options.Builder applyOnWire(StreamsOuterCl @Override public String toString() { - return "ExpectedStreamExists"; + return "StreamExistsState"; } } - public static class SpecificExpectedRevision extends ExpectedRevision { + public static class StreamRevisionStreamState extends StreamState { final long version; - SpecificExpectedRevision(long version) { + StreamRevisionStreamState(long version) { this.version = version; } @@ -166,7 +166,7 @@ public static class SpecificExpectedRevision extends ExpectedRevision { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - SpecificExpectedRevision that = (SpecificExpectedRevision) o; + StreamRevisionStreamState that = (StreamRevisionStreamState) o; return version == that.version; } diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java index 6d305241..70cfa70a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the subscribe persistent subscription request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionToAll.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java similarity index 79% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionToAll.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java index 07d6eaeb..ba1abbb4 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionToAll.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; class SubscribePersistentSubscriptionToAll extends AbstractSubscribePersistentSubscription { public SubscribePersistentSubscriptionToAll(GrpcClient connection, String group, diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionToStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java similarity index 85% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionToStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java index b758226b..7be619ca 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribePersistentSubscriptionToStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; import com.google.protobuf.ByteString; class SubscribePersistentSubscriptionToStream extends AbstractSubscribePersistentSubscription { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToAll.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAll.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToAll.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAll.java index 81c5258e..684eb14f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToAll.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAll.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; class SubscribeToAll extends AbstractRegularSubscription { private final SubscribeToAllOptions options; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToAllOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToAllOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java index 73f4a89b..b49d27f9 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToAllOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of a subscription to $all request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStream.java similarity index 84% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStream.java index ac817c44..1529dc7a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStream.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; class SubscribeToStream extends AbstractRegularSubscription { private final SubscribeToStreamOptions options; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToStreamOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToStreamOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java index 26e3e533..6cb8bad8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscribeToStreamOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the subscribe to stream request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Subscription.java b/db-client-java/src/main/java/io/kurrent/dbclient/Subscription.java similarity index 89% rename from db-client-java/src/main/java/com/eventstore/dbclient/Subscription.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Subscription.java index 8d727425..2ee51086 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Subscription.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Subscription.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import io.grpc.stub.ClientCallStreamObserver; /** diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionFilter.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionFilter.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java index 3516b449..1f90a8b8 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionFilter.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; -import com.eventstore.dbclient.proto.streams.StreamsOuterClass; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.streams.StreamsOuterClass; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionFilterBuilder.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java similarity index 99% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionFilterBuilder.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java index 147050c3..a0c650f0 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionFilterBuilder.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import javax.validation.constraints.NotNull; import java.util.ArrayList; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionListener.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionListener.java similarity index 97% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionListener.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionListener.java index b31a1825..afd62fa1 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionListener.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionListener.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Listener used to handle catch-up subscription notifications raised throughout its lifecycle. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionStreamConsumer.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionStreamConsumer.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java index e02049cd..4770cfef 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionStreamConsumer.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java @@ -1,9 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.concurrent.CompletableFuture; -class SubscriptionStreamConsumer implements StreamConsumer{ +class SubscriptionStreamConsumer implements StreamConsumer { private final SubscriptionListener listener; private final Checkpointer checkpointer; private final CompletableFuture future; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionTracingCallback.java b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java similarity index 81% rename from db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionTracingCallback.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java index 562121b1..b86f4a24 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SubscriptionTracingCallback.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; @FunctionalInterface public interface SubscriptionTracingCallback { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SystemMetadataKeys.java b/db-client-java/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java similarity index 86% rename from db-client-java/src/main/java/com/eventstore/dbclient/SystemMetadataKeys.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java index e41991d7..d5ae2cc7 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SystemMetadataKeys.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class SystemMetadataKeys { static final String CONTENT_TYPE = "content-type"; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SystemStreamAcl.java b/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java similarity index 96% rename from db-client-java/src/main/java/com/eventstore/dbclient/SystemStreamAcl.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java index 4e2adb51..16e81ee9 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SystemStreamAcl.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Admin stream access control list (ACL). diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/SystemStreams.java b/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreams.java similarity index 85% rename from db-client-java/src/main/java/com/eventstore/dbclient/SystemStreams.java rename to db-client-java/src/main/java/io/kurrent/dbclient/SystemStreams.java index 22f07fd0..a51ae25a 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/SystemStreams.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreams.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class SystemStreams { public static final String ALL_STREAM = "$all"; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ThrowingBiFunction.java b/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java similarity index 84% rename from db-client-java/src/main/java/com/eventstore/dbclient/ThrowingBiFunction.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java index 9b2b1950..ae17ab6f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ThrowingBiFunction.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; @FunctionalInterface interface ThrowingBiFunction { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/ThrowingFunction.java b/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingFunction.java similarity index 82% rename from db-client-java/src/main/java/com/eventstore/dbclient/ThrowingFunction.java rename to db-client-java/src/main/java/io/kurrent/dbclient/ThrowingFunction.java index d79484db..abb8c6e6 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/ThrowingFunction.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingFunction.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; @FunctionalInterface interface ThrowingFunction { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/Tuple.java b/db-client-java/src/main/java/io/kurrent/dbclient/Tuple.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/Tuple.java rename to db-client-java/src/main/java/io/kurrent/dbclient/Tuple.java index 5edeefb6..feccbfd0 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/Tuple.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/Tuple.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; class Tuple { private final A _1; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UnsupportedFeatureException.java b/db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java similarity index 61% rename from db-client-java/src/main/java/com/eventstore/dbclient/UnsupportedFeatureException.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java index 5214106f..79899787 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UnsupportedFeatureException.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** - * A request not supported by the targeted EventStoreDB node was sent. + * A request not supported by the targeted KurrentDB node was sent. */ public class UnsupportedFeatureException extends RuntimeException { UnsupportedFeatureException(){ diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToAll.java b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToAll.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java index 502672c8..71213876 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToAll.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; class UpdatePersistentSubscriptionToAll extends AbstractUpdatePersistentSubscription { private final UpdatePersistentSubscriptionToAllOptions options; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToAllOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToAllOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java index ff465b0b..6cf6b33f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToAllOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the update persistent subscription to $all stream request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToStream.java b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java similarity index 92% rename from db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToStream.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java index ce517fe8..81009e87 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToStream.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.persistentsubscriptions.Persistent; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.persistentsubscriptions.Persistent; +import io.kurrent.dbclient.proto.shared.Shared; import com.google.protobuf.ByteString; class UpdatePersistentSubscriptionToStream extends AbstractUpdatePersistentSubscription { diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToStreamOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java similarity index 98% rename from db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToStreamOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java index 1ba83c45..2224321c 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UpdatePersistentSubscriptionToStreamOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the update persistent subscription to stream request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UpdateProjection.java b/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjection.java similarity index 88% rename from db-client-java/src/main/java/com/eventstore/dbclient/UpdateProjection.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjection.java index d98043f3..9edd08d7 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UpdateProjection.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjection.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.proto.projections.Projectionmanagement; -import com.eventstore.dbclient.proto.projections.ProjectionsGrpc; -import com.eventstore.dbclient.proto.shared.Shared; +import io.kurrent.dbclient.proto.projections.Projectionmanagement; +import io.kurrent.dbclient.proto.projections.ProjectionsGrpc; +import io.kurrent.dbclient.proto.shared.Shared; import java.util.concurrent.CompletableFuture; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UpdateProjectionOptions.java b/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/UpdateProjectionOptions.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java index 31b41a98..07769c6f 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UpdateProjectionOptions.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Options of the update projection request. diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UserCredentials.java b/db-client-java/src/main/java/io/kurrent/dbclient/UserCredentials.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/UserCredentials.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UserCredentials.java index 3a2529e9..cb0ed84e 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UserCredentials.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UserCredentials.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/UserStreamAcl.java b/db-client-java/src/main/java/io/kurrent/dbclient/UserStreamAcl.java similarity index 95% rename from db-client-java/src/main/java/com/eventstore/dbclient/UserStreamAcl.java rename to db-client-java/src/main/java/io/kurrent/dbclient/UserStreamAcl.java index f0180d75..d996ba4d 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/UserStreamAcl.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/UserStreamAcl.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; /** * Default user stream access control list (ACL). diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/WorkItem.java b/db-client-java/src/main/java/io/kurrent/dbclient/WorkItem.java similarity index 69% rename from db-client-java/src/main/java/com/eventstore/dbclient/WorkItem.java rename to db-client-java/src/main/java/io/kurrent/dbclient/WorkItem.java index 3bfcac76..b6c6de42 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/WorkItem.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/WorkItem.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; interface WorkItem { void accept(WorkItemArgs args, Exception error); diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/WorkItemArgs.java b/db-client-java/src/main/java/io/kurrent/dbclient/WorkItemArgs.java similarity index 91% rename from db-client-java/src/main/java/com/eventstore/dbclient/WorkItemArgs.java rename to db-client-java/src/main/java/io/kurrent/dbclient/WorkItemArgs.java index ac30de9b..2ee246f3 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/WorkItemArgs.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/WorkItemArgs.java @@ -1,8 +1,5 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.EventStoreDBClientSettings; -import com.eventstore.dbclient.OptionsBase; -import com.eventstore.dbclient.ServerInfo; import io.grpc.ManagedChannel; import java.io.IOException; @@ -49,7 +46,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/main/java/com/eventstore/dbclient/WriteResult.java b/db-client-java/src/main/java/io/kurrent/dbclient/WriteResult.java similarity index 83% rename from db-client-java/src/main/java/com/eventstore/dbclient/WriteResult.java rename to db-client-java/src/main/java/io/kurrent/dbclient/WriteResult.java index 941fa1d6..b4feadae 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/WriteResult.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/WriteResult.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Objects; @@ -6,10 +6,10 @@ * Returned after writing to a stream. */ public class WriteResult { - private final ExpectedRevision nextExpectedRevision; + private final StreamState nextExpectedRevision; private final Position logPosition; - WriteResult(ExpectedRevision nextExpectedRevision, Position logPosition) { + WriteResult(StreamState nextExpectedRevision, Position logPosition) { this.nextExpectedRevision = nextExpectedRevision; this.logPosition = logPosition; } @@ -17,7 +17,7 @@ public class WriteResult { /** * Next expected version of the stream. */ - public ExpectedRevision getNextExpectedRevision() { + public StreamState getNextExpectedRevision() { return nextExpectedRevision; } diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java b/db-client-java/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java new file mode 100644 index 00000000..06dab32f --- /dev/null +++ b/db-client-java/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java @@ -0,0 +1,43 @@ +package io.kurrent.dbclient; + +import javax.validation.constraints.NotNull; + +/** + * When append request failed the optimistic concurrency on the server. + */ +public class WrongExpectedVersionException extends RuntimeException { + private final String streamName; + private final StreamState expectedState; + private final StreamState actualState; + + WrongExpectedVersionException( + @NotNull String streamName, + @NotNull StreamState expectedState, + @NotNull StreamState actualState) { + super(String.format("Expected %s but got %s instead", expectedState, actualState)); + this.streamName = streamName; + this.expectedState = expectedState; + this.actualState = actualState; + } + + /** + * Returns on which stream the error occurred. + */ + public String getStreamName() { + return streamName; + } + + /** + * Returns the expected stream state by the request. + */ + public StreamState getExpectedState() { + return expectedState; + } + + /** + * Returns the actual stream state when the check was performed. + */ + public StreamState getActualState() { + return actualState; + } +} diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/DeferredNodeResolution.java b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/resolution/DeferredNodeResolution.java rename to db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java index 56cb39f9..fece6c9b 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/DeferredNodeResolution.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient.resolution; +package io.kurrent.dbclient.resolution; import java.net.InetSocketAddress; import java.util.Collections; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/DeprecatedNodeResolution.java b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java similarity index 94% rename from db-client-java/src/main/java/com/eventstore/dbclient/resolution/DeprecatedNodeResolution.java rename to db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java index 17b861b0..774f9417 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/DeprecatedNodeResolution.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient.resolution; +package io.kurrent.dbclient.resolution; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/FixedSeedsNodeResolution.java b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java similarity index 90% rename from db-client-java/src/main/java/com/eventstore/dbclient/resolution/FixedSeedsNodeResolution.java rename to db-client-java/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java index 858d316f..09c0cf44 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/FixedSeedsNodeResolution.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient.resolution; +package io.kurrent.dbclient.resolution; import java.net.InetSocketAddress; import java.util.Arrays; diff --git a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/NodeResolution.java b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java similarity index 75% rename from db-client-java/src/main/java/com/eventstore/dbclient/resolution/NodeResolution.java rename to db-client-java/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java index 6cd87420..b3169e92 100644 --- a/db-client-java/src/main/java/com/eventstore/dbclient/resolution/NodeResolution.java +++ b/db-client-java/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient.resolution; +package io.kurrent.dbclient.resolution; import java.net.InetSocketAddress; import java.util.List; diff --git a/db-client-java/src/main/proto/gossip.proto b/db-client-java/src/main/proto/gossip.proto index 25058a6c..4faaa61c 100644 --- a/db-client-java/src/main/proto/gossip.proto +++ b/db-client-java/src/main/proto/gossip.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package event_store.client.gossip; -option java_package = "com.eventstore.dbclient.proto.gossip"; +option java_package = "io.kurrent.dbclient.proto.gossip"; import "shared.proto"; diff --git a/db-client-java/src/main/proto/persistent.proto b/db-client-java/src/main/proto/persistent.proto index 43a8ef79..22762bcd 100644 --- a/db-client-java/src/main/proto/persistent.proto +++ b/db-client-java/src/main/proto/persistent.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package event_store.client.persistent_subscriptions; -option java_package = "com.eventstore.dbclient.proto.persistentsubscriptions"; +option java_package = "io.kurrent.dbclient.proto.persistentsubscriptions"; import "shared.proto"; diff --git a/db-client-java/src/main/proto/projectionmanagement.proto b/db-client-java/src/main/proto/projectionmanagement.proto index 1fe8f367..88badaa0 100644 --- a/db-client-java/src/main/proto/projectionmanagement.proto +++ b/db-client-java/src/main/proto/projectionmanagement.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package event_store.client.projections; -option java_package = "com.eventstore.dbclient.proto.projections"; +option java_package = "io.kurrent.dbclient.proto.projections"; import "google/protobuf/struct.proto"; import "shared.proto"; diff --git a/db-client-java/src/main/proto/serverfeatures.proto b/db-client-java/src/main/proto/serverfeatures.proto index a870d43b..e0bede70 100644 --- a/db-client-java/src/main/proto/serverfeatures.proto +++ b/db-client-java/src/main/proto/serverfeatures.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package event_store.client.server_features; -option java_package = "com.eventstore.dbclient.proto.serverfeatures"; +option java_package = "io.kurrent.dbclient.proto.serverfeatures"; import "shared.proto"; service ServerFeatures { diff --git a/db-client-java/src/main/proto/shared.proto b/db-client-java/src/main/proto/shared.proto index adb97db0..5929d77d 100644 --- a/db-client-java/src/main/proto/shared.proto +++ b/db-client-java/src/main/proto/shared.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package event_store.client; -option java_package = "com.eventstore.dbclient.proto.shared"; +option java_package = "io.kurrent.dbclient.proto.shared"; import "google/protobuf/empty.proto"; message UUID { diff --git a/db-client-java/src/main/proto/streams.proto b/db-client-java/src/main/proto/streams.proto index ac599fb8..0eb05295 100644 --- a/db-client-java/src/main/proto/streams.proto +++ b/db-client-java/src/main/proto/streams.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package event_store.client.streams; -option java_package = "com.eventstore.dbclient.proto.streams"; +option java_package = "io.kurrent.dbclient.proto.streams"; import "shared.proto"; import "status.proto"; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ExpectedRevisionTests.java b/db-client-java/src/test/java/com/eventstore/dbclient/misc/ExpectedRevisionTests.java deleted file mode 100644 index 8c3c8ed4..00000000 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ExpectedRevisionTests.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.eventstore.dbclient.misc; - - -import com.eventstore.dbclient.ExpectedRevision; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class ExpectedRevisionTests { - - @Test - public void testExpectedRevisionEquality() { - Assertions.assertEquals(ExpectedRevision.any(), new ExpectedRevision.AnyExpectedRevision()); - Assertions.assertEquals(ExpectedRevision.noStream(), new ExpectedRevision.NoStreamExpectedRevision()); - Assertions.assertEquals(ExpectedRevision.streamExists(), new ExpectedRevision.StreamExistsExpectedRevision()); - Assertions.assertEquals(ExpectedRevision.expectedRevision(1L), ExpectedRevision.expectedRevision(1L)); - } - - @Test - public void testExpectedRevisionNonEquality() { - Assertions.assertNotEquals(ExpectedRevision.any(), ExpectedRevision.noStream()); - Assertions.assertNotEquals(ExpectedRevision.any(), ExpectedRevision.streamExists()); - Assertions.assertNotEquals(ExpectedRevision.any(), ExpectedRevision.expectedRevision(0L)); - Assertions.assertNotEquals(ExpectedRevision.noStream(), ExpectedRevision.streamExists()); - Assertions.assertNotEquals(ExpectedRevision.noStream(), ExpectedRevision.expectedRevision(0L)); - Assertions.assertNotEquals(ExpectedRevision.streamExists(), ExpectedRevision.expectedRevision(0L)); - } - - @Test - public void testExpectedRevisionHashCode() { - Assertions.assertEquals(ExpectedRevision.any().hashCode(), new ExpectedRevision.AnyExpectedRevision().hashCode()); - Assertions.assertEquals(ExpectedRevision.noStream().hashCode(), new ExpectedRevision.NoStreamExpectedRevision().hashCode()); - Assertions.assertEquals(ExpectedRevision.streamExists().hashCode(), new ExpectedRevision.StreamExistsExpectedRevision().hashCode()); - Assertions.assertEquals(ExpectedRevision.expectedRevision(1L).hashCode(), ExpectedRevision.expectedRevision(1L).hashCode()); - } - - @Test - public void testHumanRepresentation() { - Assertions.assertEquals("ExpectedAny", ExpectedRevision.any().toString()); - Assertions.assertEquals("ExpectedStreamExists", ExpectedRevision.streamExists().toString()); - Assertions.assertEquals("ExpectedNoStream", ExpectedRevision.noStream().toString()); - Assertions.assertEquals("42", ExpectedRevision.expectedRevision(42).toString()); - } - - @Test - public void testRawLong() { - Assertions.assertEquals(-2, ExpectedRevision.any().toRawLong()); - Assertions.assertEquals(-1, ExpectedRevision.noStream().toRawLong()); - Assertions.assertEquals(-4, ExpectedRevision.streamExists().toRawLong()); - Assertions.assertEquals(42, ExpectedRevision.expectedRevision(42).toRawLong()); - } - - @Test - public void testRawLongConversion() { - Assertions.assertEquals(ExpectedRevision.fromRawLong(-2), ExpectedRevision.any()); - Assertions.assertEquals(ExpectedRevision.fromRawLong(-1), ExpectedRevision.noStream()); - Assertions.assertEquals(ExpectedRevision.fromRawLong(-4), ExpectedRevision.streamExists()); - Assertions.assertEquals(ExpectedRevision.fromRawLong(42), ExpectedRevision.expectedRevision(42)); - Assertions.assertThrowsExactly(RuntimeException.class, () -> ExpectedRevision.fromRawLong(-5)); - } -} 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 deleted file mode 100644 index f0fcb566..00000000 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseInvalidConnectionStringTests.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.eventstore.dbclient.misc; - -import com.eventstore.dbclient.ConnectionStringParsingException; -import com.eventstore.dbclient.EventStoreDBConnectionString; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - -public class ParseInvalidConnectionStringTests { - public static Stream invalidConnectionStrings() { - return Stream.of( - Arguments.of("localhost"), - Arguments.of("https://console.eventstore.cloud/"), - Arguments.of("esbd+discovery://localhost"), - Arguments.of("esdb://my:great@username:UyeXx8$^PsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false"), - Arguments.of("esdb://host1,host2:200:300?tlsVerifyCert=false"), - Arguments.of("esdb://localhost/&tlsVerifyCert=false"), - Arguments.of("esdb://localhost?tlsVerifyCert=false?nodePreference=follower"), - Arguments.of("esdb://localhost?tlsVerifyCert=false&nodePreference=any"), - Arguments.of("esdb://localhost?tlsVerifyCert=if you feel like it"), - Arguments.of("esdb://localhost?keepAliveInterval=-3"), - Arguments.of("esdb://localhost?keepAliveInterval=sdfksjsfl"), - Arguments.of("esdb://localhost?keepAliveTimeout=sdfksjsfl"), - Arguments.of("esdb://localhost?keepAliveTimeout=-3"), - Arguments.of("esdb://localhost?nodePreference=read_only_replica"), - Arguments.of("esdb://localhost?userCertFile=/path/to/cert"), - Arguments.of("esdb://localhost?userKeyFile=/path/to/key") - ); - } - - @ParameterizedTest - @MethodSource("invalidConnectionStrings") - public void test(String input) throws ConnectionStringParsingException { - Assertions.assertThrows(RuntimeException.class, () -> { - EventStoreDBConnectionString.parseOrThrow(input); - }); - } -} 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 deleted file mode 100644 index 24a21867..00000000 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/authentication/UserCertificate.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.eventstore.dbclient.samples.authentication; - -import com.eventstore.dbclient.EventStoreDBClient; -import com.eventstore.dbclient.EventStoreDBClientSettings; -import com.eventstore.dbclient.EventStoreDBConnectionString; - -public class UserCertificate { - private static void tracing() { - // region client-with-user-certificates - EventStoreDBClientSettings 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/Action.java b/db-client-java/src/test/java/io/kurrent/dbclient/Action.java similarity index 71% rename from db-client-java/src/test/java/com/eventstore/dbclient/Action.java rename to db-client-java/src/test/java/io/kurrent/dbclient/Action.java index b132cd13..7e6dc3d2 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/Action.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/Action.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; @FunctionalInterface public interface Action { diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/BazEvent.java b/db-client-java/src/test/java/io/kurrent/dbclient/BazEvent.java similarity index 96% rename from db-client-java/src/test/java/com/eventstore/dbclient/BazEvent.java rename to db-client-java/src/test/java/io/kurrent/dbclient/BazEvent.java index bc7f174e..3ea46878 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/BazEvent.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/BazEvent.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Objects; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java b/db-client-java/src/test/java/io/kurrent/dbclient/ClientTracker.java similarity index 86% rename from db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java rename to db-client-java/src/test/java/io/kurrent/dbclient/ClientTracker.java index 8fd57b6a..2b56a697 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/ClientTracker.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/ClientTracker.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -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(EventStoreDBClientSettings 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) { - EventStoreDBClientSettings settings = database.defaultSettingsBuilder().buildConnectionSettings(); - defaultClient = EventStoreDBClient.create(settings); + KurrentDBClientSettings settings = database.defaultSettingsBuilder().buildConnectionSettings(); + 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/io/kurrent/dbclient/ConnectionAware.java similarity index 88% rename from db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java rename to db-client-java/src/test/java/io/kurrent/dbclient/ConnectionAware.java index bce8c5b2..fc02396b 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/ConnectionAware.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/ConnectionAware.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.json.JsonMapper; @@ -19,16 +19,16 @@ public interface ConnectionAware { Logger getLogger(); - default EventStoreDBClient getDefaultClient() { + 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/Database.java b/db-client-java/src/test/java/io/kurrent/dbclient/Database.java similarity index 73% rename from db-client-java/src/test/java/com/eventstore/dbclient/Database.java rename to db-client-java/src/test/java/io/kurrent/dbclient/Database.java index 48eaec9c..c8ad58a2 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/Database.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/Database.java @@ -1,11 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; 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 { @@ -17,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(EventStoreDBClientSettings settings) { + default KurrentDBClient createClient(KurrentDBClientSettings settings) { return getClientTracker().createClient(settings); } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/DatabaseFactory.java b/db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java similarity index 79% rename from db-client-java/src/test/java/com/eventstore/dbclient/DatabaseFactory.java rename to db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java index cde34e2b..def0103a 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/DatabaseFactory.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.databases.DockerContainerDatabase; -import com.eventstore.dbclient.databases.ExternallyCreatedCluster; +import io.kurrent.dbclient.databases.DockerContainerDatabase; +import io.kurrent.dbclient.databases.ExternallyCreatedCluster; import java.util.Optional; @@ -37,13 +37,13 @@ private static DockerContainerDatabase.Builder singleNodeBuilder() { return DockerContainerDatabase .builder() .registry(Optional - .ofNullable(System.getenv("EVENTSTORE_DOCKER_REGISTRY_ENV")) + .ofNullable(System.getenv("KURRENT_DOCKER_REGISTRY_ENV")) .orElse(DockerContainerDatabase.DEFAULT_REGISTRY)) .image(Optional - .ofNullable(System.getenv("EVENTSTORE_DOCKER_IMAGE_ENV")) + .ofNullable(System.getenv("KURRENT_DOCKER_IMAGE_ENV")) .orElse(DockerContainerDatabase.DEFAULT_IMAGE)) .version(Optional - .ofNullable(System.getenv("EVENTSTORE_DOCKER_TAG_ENV")) + .ofNullable(System.getenv("KURRENT_DOCKER_TAG_ENV")) .orElse(DockerContainerDatabase.DEFAULT_VERSION)); } } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/Exceptions.java b/db-client-java/src/test/java/io/kurrent/dbclient/Exceptions.java similarity index 97% rename from db-client-java/src/test/java/com/eventstore/dbclient/Exceptions.java rename to db-client-java/src/test/java/io/kurrent/dbclient/Exceptions.java index 42a5944e..eaf7d777 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/Exceptions.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/Exceptions.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/Foo.java b/db-client-java/src/test/java/io/kurrent/dbclient/Foo.java similarity index 93% rename from db-client-java/src/test/java/com/eventstore/dbclient/Foo.java rename to db-client-java/src/test/java/io/kurrent/dbclient/Foo.java index 7e559991..abd989a0 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/Foo.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/Foo.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import java.util.Objects; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/MiscTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/MiscTests.java similarity index 61% rename from db-client-java/src/test/java/com/eventstore/dbclient/MiscTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/MiscTests.java index 5adfd475..ec7cf76e 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/MiscTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/MiscTests.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; import org.junit.platform.suite.api.SelectPackages; import org.junit.platform.suite.api.Suite; @Suite -@SelectPackages("com.eventstore.dbclient.misc") +@SelectPackages("io.kurrent.dbclient.misc") public class MiscTests {} diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/PersistentSubscriptionsTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java similarity index 83% rename from db-client-java/src/test/java/com/eventstore/dbclient/PersistentSubscriptionsTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java index 90127055..c8a3e54b 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/PersistentSubscriptionsTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.persistentsubscriptions.*; -import com.eventstore.dbclient.persistentsubscriptions.PersistentSubscriptionToAllWithFilterTests; +import io.kurrent.dbclient.persistentsubscriptions.*; +import io.kurrent.dbclient.persistentsubscriptions.PersistentSubscriptionToAllWithFilterTests; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/PluginsTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/PluginsTests.java similarity index 80% rename from db-client-java/src/test/java/com/eventstore/dbclient/PluginsTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/PluginsTests.java index 40da4d0d..9cbd3bbd 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/PluginsTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/PluginsTests.java @@ -1,13 +1,13 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.plugins.ClientCertificateAuthenticationTests; +import io.kurrent.dbclient.plugins.ClientCertificateAuthenticationTests; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * PluginsTests require the enterprise edition of EventStoreDB (>= 24.2.0). + * PluginsTests require the enterprise edition of KurrentDB (>= 24.2.0). */ public class PluginsTests implements ClientCertificateAuthenticationTests { static private Database database; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/StreamsTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/StreamsTests.java similarity index 86% rename from db-client-java/src/test/java/com/eventstore/dbclient/StreamsTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/StreamsTests.java index 481be84e..571ef250 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/StreamsTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/StreamsTests.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.streams.*; -import com.eventstore.dbclient.streams.ReadStreamTests; +import io.kurrent.dbclient.streams.*; +import io.kurrent.dbclient.streams.ReadStreamTests; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/TelemetryTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/TelemetryTests.java similarity index 88% rename from db-client-java/src/test/java/com/eventstore/dbclient/TelemetryTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/TelemetryTests.java index fe57a5ec..2ee48799 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/TelemetryTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/TelemetryTests.java @@ -1,9 +1,9 @@ -package com.eventstore.dbclient; +package io.kurrent.dbclient; -import com.eventstore.dbclient.telemetry.PersistentSubscriptionsTracingInstrumentationTests; -import com.eventstore.dbclient.telemetry.SpanProcessorSpy; -import com.eventstore.dbclient.telemetry.StreamsTracingInstrumentationTests; -import com.eventstore.dbclient.telemetry.TracingContextInjectionTests; +import io.kurrent.dbclient.telemetry.PersistentSubscriptionsTracingInstrumentationTests; +import io.kurrent.dbclient.telemetry.SpanProcessorSpy; +import io.kurrent.dbclient.telemetry.StreamsTracingInstrumentationTests; +import io.kurrent.dbclient.telemetry.TracingContextInjectionTests; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.sdk.OpenTelemetrySdk; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/databases/DockerContainerDatabase.java b/db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java similarity index 96% rename from db-client-java/src/test/java/com/eventstore/dbclient/databases/DockerContainerDatabase.java rename to db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java index d859f9f1..69f84d11 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/databases/DockerContainerDatabase.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.databases; +package io.kurrent.dbclient.databases; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import com.github.dockerjava.api.model.HealthCheck; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; @@ -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/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java similarity index 87% rename from db-client-java/src/test/java/com/eventstore/dbclient/databases/ExternallyCreatedCluster.java rename to db-client-java/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java index 039941a8..e0f86a53 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/databases/ExternallyCreatedCluster.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.databases; +package io.kurrent.dbclient.databases; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; public class ExternallyCreatedCluster implements Database { final private boolean secure; @@ -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/EventDataTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java similarity index 83% rename from db-client-java/src/test/java/com/eventstore/dbclient/misc/EventDataTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java index 6e0adc33..f0bb8a7a 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/EventDataTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient.misc; +package io.kurrent.dbclient.misc; -import com.eventstore.dbclient.EventData; -import com.eventstore.dbclient.EventDataBuilder; +import io.kurrent.dbclient.EventData; +import io.kurrent.dbclient.EventDataBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java new file mode 100644 index 00000000..cf974d51 --- /dev/null +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java @@ -0,0 +1,60 @@ +package io.kurrent.dbclient.misc; + + +import io.kurrent.dbclient.StreamState; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ExpectedRevisionTests { + + @Test + public void testExpectedRevisionEquality() { + Assertions.assertEquals(StreamState.any(), new StreamState.AnyStreamState()); + Assertions.assertEquals(StreamState.noStream(), new StreamState.NoStreamState()); + Assertions.assertEquals(StreamState.streamExists(), new StreamState.StreamExistsState()); + Assertions.assertEquals(StreamState.streamRevision(1L), StreamState.streamRevision(1L)); + } + + @Test + public void testExpectedRevisionNonEquality() { + Assertions.assertNotEquals(StreamState.any(), StreamState.noStream()); + Assertions.assertNotEquals(StreamState.any(), StreamState.streamExists()); + Assertions.assertNotEquals(StreamState.any(), StreamState.streamRevision(0L)); + Assertions.assertNotEquals(StreamState.noStream(), StreamState.streamExists()); + Assertions.assertNotEquals(StreamState.noStream(), StreamState.streamRevision(0L)); + Assertions.assertNotEquals(StreamState.streamExists(), StreamState.streamRevision(0L)); + } + + @Test + public void testExpectedRevisionHashCode() { + Assertions.assertEquals(StreamState.any().hashCode(), new StreamState.AnyStreamState().hashCode()); + Assertions.assertEquals(StreamState.noStream().hashCode(), new StreamState.NoStreamState().hashCode()); + Assertions.assertEquals(StreamState.streamExists().hashCode(), new StreamState.StreamExistsState().hashCode()); + Assertions.assertEquals(StreamState.streamRevision(1L).hashCode(), StreamState.streamRevision(1L).hashCode()); + } + + @Test + public void testHumanRepresentation() { + Assertions.assertEquals("AnyStreamState", StreamState.any().toString()); + Assertions.assertEquals("StreamExistsState", StreamState.streamExists().toString()); + Assertions.assertEquals("NoStreamState", StreamState.noStream().toString()); + Assertions.assertEquals("42", StreamState.streamRevision(42).toString()); + } + + @Test + public void testRawLong() { + Assertions.assertEquals(-2, StreamState.any().toRawLong()); + Assertions.assertEquals(-1, StreamState.noStream().toRawLong()); + Assertions.assertEquals(-4, StreamState.streamExists().toRawLong()); + Assertions.assertEquals(42, StreamState.streamRevision(42).toRawLong()); + } + + @Test + public void testRawLongConversion() { + Assertions.assertEquals(StreamState.fromRawLong(-2), StreamState.any()); + Assertions.assertEquals(StreamState.fromRawLong(-1), StreamState.noStream()); + Assertions.assertEquals(StreamState.fromRawLong(-4), StreamState.streamExists()); + Assertions.assertEquals(StreamState.fromRawLong(42), StreamState.streamRevision(42)); + Assertions.assertThrowsExactly(RuntimeException.class, () -> StreamState.fromRawLong(-5)); + } +} diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/misc/NodeSelectorTest.java b/db-client-java/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java similarity index 96% rename from db-client-java/src/test/java/com/eventstore/dbclient/misc/NodeSelectorTest.java rename to db-client-java/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java index 4b4b63a0..fe2f48bf 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/NodeSelectorTest.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient.misc; +package io.kurrent.dbclient.misc; -import com.eventstore.dbclient.ClusterInfo; -import com.eventstore.dbclient.NodePreference; -import com.eventstore.dbclient.NodeSelector; +import io.kurrent.dbclient.ClusterInfo; +import io.kurrent.dbclient.NodePreference; +import io.kurrent.dbclient.NodeSelector; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/misc/OfflineMetadataTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java similarity index 90% rename from db-client-java/src/test/java/com/eventstore/dbclient/misc/OfflineMetadataTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java index f71ecf94..541e2b3e 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/OfflineMetadataTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient.misc; +package io.kurrent.dbclient.misc; -import com.eventstore.dbclient.Acl; -import com.eventstore.dbclient.Acls; -import com.eventstore.dbclient.StreamMetadata; +import io.kurrent.dbclient.Acl; +import io.kurrent.dbclient.Acls; +import io.kurrent.dbclient.StreamMetadata; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java new file mode 100644 index 00000000..149eb975 --- /dev/null +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java @@ -0,0 +1,41 @@ +package io.kurrent.dbclient.misc; + +import io.kurrent.dbclient.ConnectionStringParsingException; +import io.kurrent.dbclient.KurrentDBConnectionString; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + +public class ParseInvalidConnectionStringTests { + public static Stream invalidConnectionStrings() { + return Stream.of( + Arguments.of("localhost"), + Arguments.of("https://console.eventstore.cloud/"), + Arguments.of("kurnt+discovery://localhost"), + Arguments.of("kurrent://my:great@username:UyeXx8$^PsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false"), + Arguments.of("kurrent://host1,host2:200:300?tlsVerifyCert=false"), + Arguments.of("kurrent://localhost/&tlsVerifyCert=false"), + Arguments.of("kurrent://localhost?tlsVerifyCert=false?nodePreference=follower"), + Arguments.of("kurrent://localhost?tlsVerifyCert=false&nodePreference=any"), + Arguments.of("kurrent://localhost?tlsVerifyCert=if you feel like it"), + Arguments.of("kurrent://localhost?keepAliveInterval=-3"), + Arguments.of("kurrent://localhost?keepAliveInterval=sdfksjsfl"), + Arguments.of("kurrent://localhost?keepAliveTimeout=sdfksjsfl"), + Arguments.of("kurrent://localhost?keepAliveTimeout=-3"), + Arguments.of("kurrent://localhost?nodePreference=read_only_replica"), + Arguments.of("kurrent://localhost?userCertFile=/path/to/cert"), + Arguments.of("kurrent://localhost?userKeyFile=/path/to/key") + ); + } + + @ParameterizedTest + @MethodSource("invalidConnectionStrings") + public void test(String input) throws ConnectionStringParsingException { + Assertions.assertThrows(RuntimeException.class, () -> { + 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/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java similarity index 83% rename from db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java index 9a5ed76e..8000293f 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ParseValidConnectionStringTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java @@ -1,10 +1,12 @@ -package com.eventstore.dbclient.misc; +package io.kurrent.dbclient.misc; import java.net.InetSocketAddress; +import java.util.Arrays; +import java.util.List; import java.util.stream.IntStream; import java.util.stream.Stream; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.json.JsonMapper; @@ -16,113 +18,118 @@ public class ParseValidConnectionStringTests { private final JsonMapper mapper = new JsonMapper(); + private static final List PROTOCOLS = Arrays.asList("esdb", "kurrent", "kdb"); public static Stream validConnectionStrings() { - return Stream.of( + List baseConnectionStrings = Arrays.asList( Arguments.of( - "esdb://localhost", + "://localhost", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}]}" ), Arguments.of( - "esdb://localhost:2114", + "://localhost:2114", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}" ), Arguments.of( - "esdb://user:pass@localhost:2114", + "://user:pass@localhost:2114", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}" ), Arguments.of( - "esdb://user:pass@localhost:2114/", + "://user:pass@localhost:2114/", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}" ), Arguments.of( - "esdb://user:pass@localhost:2114/?tlsVerifyCert=false", + "://user:pass@localhost:2114/?tlsVerifyCert=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}" ), Arguments.of( - "esdb://user:pass@localhost:2114?tlsVerifyCert=false", + "://user:pass@localhost:2114?tlsVerifyCert=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}" ), Arguments.of( - "esdb://user:pass@localhost:2114?tls=false", + "://user:pass@localhost:2114?tls=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"localhost\",\"port\":2114}]}" ), Arguments.of( - "esdb://host1,host2,host3", + "://host1,host2,host3", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":2113},{\"address\":\"host2\",\"port\":2113},{\"address\":\"host3\",\"port\":2113}]}" ), Arguments.of( - "esdb://host1:1234,host2:4321,host3:3231", + "://host1:1234,host2:4321,host3:3231", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":1234},{\"address\":\"host2\",\"port\":4321},{\"address\":\"host3\",\"port\":3231}]}" ), Arguments.of( - "esdb://bubaqp2rh41uf5akmj0g-0.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-1.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-2.mesdb.eventstore.cloud:2113", + "://bubaqp2rh41uf5akmj0g-0.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-1.mesdb.eventstore.cloud:2113,bubaqp2rh41uf5akmj0g-2.mesdb.eventstore.cloud:2113", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"bubaqp2rh41uf5akmj0g-0.mesdb.eventstore.cloud\",\"port\":2113},{\"address\":\"bubaqp2rh41uf5akmj0g-1.mesdb.eventstore.cloud\",\"port\":2113},{\"address\":\"bubaqp2rh41uf5akmj0g-2.mesdb.eventstore.cloud\",\"port\":2113}]}" ), Arguments.of( - "esdb://user:pass@host1:1234,host2:4321,host3:3231?nodePreference=follower", + "://user:pass@host1:1234,host2:4321,host3:3231?nodePreference=follower", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"follower\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"host1\",\"port\":1234},{\"address\":\"host2\",\"port\":4321},{\"address\":\"host3\",\"port\":3231}]}" ), Arguments.of( - "esdb://host1,host2,host3?tls=false", + "://host1,host2,host3?tls=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":2113},{\"address\":\"host2\",\"port\":2113},{\"address\":\"host3\",\"port\":2113}]}" ), Arguments.of( - "esdb://127.0.0.1:21573?tls=false", + "://127.0.0.1:21573?tls=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}]}" ), Arguments.of( - "esdb://host1,host2,host3?tlsVerifyCert=false", + "://host1,host2,host3?tlsVerifyCert=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"host1\",\"port\":2113},{\"address\":\"host2\",\"port\":2113},{\"address\":\"host3\",\"port\":2113}]}" ), Arguments.of( - "esdb+discover://user:pass@host?nodePreference=follower&tlsVerifyCert=false", + "+discover://user:pass@host?nodePreference=follower&tlsVerifyCert=false", "{\"dnsDiscover\":true,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"follower\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"user\",\"password\":\"pass\"},\"hosts\":[{\"address\":\"host\",\"port\":2113}]}" ), Arguments.of( - "esdb://my%3Agreat%40username:UyeXx8%24%5EPsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false", + "://my%3Agreat%40username:UyeXx8%24%5EPsOo4jG88FlCauR1Coz25q@host?nodePreference=follower&tlsVerifyCert=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"follower\",\"tls\":true,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":true,\"defaultCredentials\":{\"login\":\"my:great@username\",\"password\":\"UyeXx8$^PsOo4jG88FlCauR1Coz25q\"},\"hosts\":[{\"address\":\"host\",\"port\":2113}]}" ), Arguments.of( - "esdb://host?maxDiscoverAttempts=200&discoveryInterval=1000&gossipTimeout=1&nodePreference=leader&tls=false&tlsVerifyCert=false&throwOnAppendFailure=false", + "://host?maxDiscoverAttempts=200&discoveryInterval=1000&gossipTimeout=1&nodePreference=leader&tls=false&tlsVerifyCert=false&throwOnAppendFailure=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":200,\"discoveryInterval\":1000,\"gossipTimeout\":1,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":false,\"hosts\":[{\"address\":\"host\",\"port\":2113}]}" ), Arguments.of( - "esdb://host?MaxDiscoverAttempts=200&discoveryinterval=1000&GOSSIPTIMEOUT=1&nOdEpReFeReNcE=leader&TLS=false&TlsVerifyCert=false&THROWOnAppendFailure=false", + "://host?MaxDiscoverAttempts=200&discoveryinterval=1000&GOSSIPTIMEOUT=1&nOdEpReFeReNcE=leader&TLS=false&TlsVerifyCert=false&THROWOnAppendFailure=false", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":200,\"discoveryInterval\":1000,\"gossipTimeout\":1,\"nodePreference\":\"leader\",\"tls\":false,\"tlsVerifyCert\":false,\"throwOnAppendFailure\":false,\"hosts\":[{\"address\":\"host\",\"port\":2113}]}" ), Arguments.of( - "esdb://localhost?keepAliveTimeout=20&keepAliveInterval=10", + "://localhost?keepAliveTimeout=20&keepAliveInterval=10", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"keepAliveTimeout\": \"20\", \"keepAliveInterval\": \"10\"}" ), Arguments.of( - "esdb://localhost?keepAliveTimeout=20&keepAliveInterval=10&nodePreference=readOnlyReplica", + "://localhost?keepAliveTimeout=20&keepAliveInterval=10&nodePreference=readOnlyReplica", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"readOnlyReplica\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"keepAliveTimeout\": \"20\", \"keepAliveInterval\": \"10\"}" ), Arguments.of( - "esdb://127.0.0.1:21573?defaultDeadline=60000", + "://127.0.0.1:21573?defaultDeadline=60000", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}], \"defaultDeadline\": 60000}" ), Arguments.of( - "esdb://127.0.0.1:21573?tlsCaFile=/path/to/cert", + "://127.0.0.1:21573?tlsCaFile=/path/to/cert", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}], \"tlsCaFile\": \"/path/to/cert\"}" ), Arguments.of( - "esdb://127.0.0.1:21573?userCertFile=/path/to/cert&userKeyFile=/path/to/key", + "://127.0.0.1:21573?userCertFile=/path/to/cert&userKeyFile=/path/to/key", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"127.0.0.1\",\"port\":21573}], \"defaultClientCertificate\": {\"clientCertFile\": \"/path/to/cert\", \"clientKeyFile\": \"/path/to/key\"}}" ), Arguments.of( - "esdb://localhost?feature=foobar", + "://localhost?feature=foobar", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"features\": \"foobar\"}" ), Arguments.of( - "esdb://localhost?feature=foobar&feature=baz", + "://localhost?feature=foobar&feature=baz", "{\"dnsDiscover\":false,\"maxDiscoverAttempts\":3,\"discoveryInterval\":500,\"gossipTimeout\":3000,\"nodePreference\":\"leader\",\"tls\":true,\"tlsVerifyCert\":true,\"throwOnAppendFailure\":true,\"hosts\":[{\"address\":\"localhost\",\"port\":2113}], \"features\": [\"foobar\", \"baz\"]}" ) ); + + return baseConnectionStrings.stream() + .flatMap(base -> PROTOCOLS.stream() + .map(protocol -> Arguments.of(protocol + base.get()[0], base.get()[1]))); } - 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 +154,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 = KurrentDBConnectionString.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/misc/PositionTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/misc/PositionTests.java similarity index 96% rename from db-client-java/src/test/java/com/eventstore/dbclient/misc/PositionTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/misc/PositionTests.java index f03fa32a..25ecb1ea 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/PositionTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/PositionTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.misc; +package io.kurrent.dbclient.misc; -import com.eventstore.dbclient.Position; +import io.kurrent.dbclient.Position; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ServerVersionTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java similarity index 95% rename from db-client-java/src/test/java/com/eventstore/dbclient/misc/ServerVersionTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java index 9e817d6a..660a2a54 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/misc/ServerVersionTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.misc; +package io.kurrent.dbclient.misc; -import com.eventstore.dbclient.ServerVersion; +import io.kurrent.dbclient.ServerVersion; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java similarity index 70% rename from db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java index 10a58a52..0d2c6756 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java @@ -1,12 +1,12 @@ -package com.eventstore.dbclient.persistentsubscriptions; +package io.kurrent.dbclient.persistentsubscriptions; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import org.junit.jupiter.api.Test; 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/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java similarity index 58% rename from db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java index a0703795..c5191ffe 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java @@ -1,16 +1,13 @@ -package com.eventstore.dbclient.persistentsubscriptions; +package io.kurrent.dbclient.persistentsubscriptions; -import com.eventstore.dbclient.ConnectionAware; -import com.eventstore.dbclient.EventStoreDBPersistentSubscriptionsClient; -import com.eventstore.dbclient.UnsupportedFeatureException; +import io.kurrent.dbclient.ConnectionAware; +import io.kurrent.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/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java similarity index 87% rename from db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java index 9818b786..0fe9ce63 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java @@ -1,15 +1,12 @@ -package com.eventstore.dbclient.persistentsubscriptions; +package io.kurrent.dbclient.persistentsubscriptions; -import com.eventstore.dbclient.*; +import io.kurrent.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) @@ -18,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(); @@ -46,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(); @@ -63,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(); @@ -87,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) @@ -110,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) @@ -126,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()); @@ -137,8 +134,8 @@ default void testGetPersistentSubscriptionInfoNotExisting() throws Throwable { @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testReplayParkedMessages() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - final EventStoreDBClient streamClient = getDatabase().defaultClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + final KurrentDBClient streamClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); final String streamName = generateName(); final String groupName = generateName(); @@ -196,8 +193,8 @@ 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(); - final EventStoreDBClient streamClient = getDatabase().defaultClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + final KurrentDBClient streamClient = getDatabase().defaultClient(); final JsonMapper jsonMapper = new JsonMapper(); String streamName = generateName(); String groupName = generateName(); @@ -254,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()); @@ -279,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/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java similarity index 89% rename from db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java index 8c765e5e..2df00e02 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java @@ -1,19 +1,18 @@ -package com.eventstore.dbclient.persistentsubscriptions; +package io.kurrent.dbclient.persistentsubscriptions; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; 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(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + 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/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java similarity index 89% rename from db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java index ac3f6015..016396c2 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java @@ -1,20 +1,19 @@ -package com.eventstore.dbclient.persistentsubscriptions; +package io.kurrent.dbclient.persistentsubscriptions; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import com.fasterxml.jackson.databind.json.JsonMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; public interface SubscribePersistentSubscriptionToStreamTests extends ConnectionAware { @Test default void testSubscribePersistentSub() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); String streamName = generateName(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - EventStoreDBClient streamsClient = getDatabase().defaultClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + KurrentDBClient streamsClient = getDatabase().defaultClient(); JsonMapper jsonMapper = new JsonMapper(); flaky(10, exceptions, () -> client.createToStream(streamName, "aGroup") @@ -66,8 +65,8 @@ public void onCancelled(PersistentSubscription subscription, Throwable throwable default void testSubscribePersistentSubToAll() throws Throwable { Exceptions exceptions = new Exceptions().registerGoAwayError(); String streamName = generateName(); - EventStoreDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); - EventStoreDBClient streamsClient = getDatabase().defaultClient(); + KurrentDBPersistentSubscriptionsClient client = getDefaultPersistentSubscriptionClient(); + 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/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java similarity index 76% rename from db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java index ed85a4cb..bd5414c8 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java @@ -1,8 +1,7 @@ -package com.eventstore.dbclient.persistentsubscriptions; +package io.kurrent.dbclient.persistentsubscriptions; -import com.eventstore.dbclient.*; +import io.kurrent.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/plugins/ClientCertificateAuthenticationTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java similarity index 89% rename from db-client-java/src/test/java/com/eventstore/dbclient/plugins/ClientCertificateAuthenticationTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java index 6294a77a..43438973 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/plugins/ClientCertificateAuthenticationTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.plugins; +package io.kurrent.dbclient.plugins; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -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/TestEvent.java b/db-client-java/src/test/java/io/kurrent/dbclient/samples/TestEvent.java similarity index 88% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/TestEvent.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/TestEvent.java index a774697b..cd2a0e1a 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/TestEvent.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/TestEvent.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient.samples; +package io.kurrent.dbclient.samples; public class TestEvent { private String id; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/appending_events/AppendingEvents.java b/db-client-java/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java similarity index 80% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/appending_events/AppendingEvents.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java index 9a3e04e8..01154920 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/appending_events/AppendingEvents.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java @@ -1,14 +1,13 @@ -package com.eventstore.dbclient.samples.appending_events; +package io.kurrent.dbclient.samples.appending_events; -import com.eventstore.dbclient.*; -import com.eventstore.dbclient.samples.TestEvent; +import io.kurrent.dbclient.*; +import io.kurrent.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( @@ -21,14 +20,14 @@ private static void appendToStream(EventStoreDBClient client) throws ExecutionEx .build(); AppendToStreamOptions options = AppendToStreamOptions.get() - .expectedRevision(ExpectedRevision.noStream()); + .streamState(StreamState.noStream()); client.appendToStream("some-stream", options, eventData) .get(); // 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( @@ -41,7 +40,7 @@ private static void appendWithSameId(EventStoreDBClient client) throws Execution .build(); AppendToStreamOptions options = AppendToStreamOptions.get() - .expectedRevision(ExpectedRevision.any()); + .streamState(StreamState.any()); client.appendToStream("same-event-stream", options, eventData) .get(); @@ -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( @@ -75,7 +74,7 @@ private static void appendWithNoStream(EventStoreDBClient client) throws Executi .build(); AppendToStreamOptions options = AppendToStreamOptions.get() - .expectedRevision(ExpectedRevision.noStream()); + .streamState(StreamState.noStream()); client.appendToStream("no-stream-stream", options, eventDataOne) .get(); @@ -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() @@ -118,7 +117,7 @@ private static void appendWithConcurrencyCheck(EventStoreDBClient client) throws AppendToStreamOptions options = AppendToStreamOptions.get() - .expectedRevision(result.getLastStreamPosition()); + .streamRevision(result.getLastStreamPosition()); client.appendToStream("concurrency-stream", options, clientOneData) .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/io/kurrent/dbclient/samples/authentication/UserCertificate.java b/db-client-java/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java new file mode 100644 index 00000000..ede2d2e3 --- /dev/null +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java @@ -0,0 +1,15 @@ +package io.kurrent.dbclient.samples.authentication; + +import io.kurrent.dbclient.KurrentDBClient; +import io.kurrent.dbclient.KurrentDBClientSettings; +import io.kurrent.dbclient.KurrentDBConnectionString; + +public class UserCertificate { + private static void tracing() { + // region client-with-user-certificates + 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/opentelemetry/Instrumentation.java b/db-client-java/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java similarity index 85% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/opentelemetry/Instrumentation.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java index e505eca7..c94d89f4 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/opentelemetry/Instrumentation.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java @@ -1,7 +1,7 @@ -package com.eventstore.dbclient.samples.opentelemetry; +package io.kurrent.dbclient.samples.opentelemetry; -import com.eventstore.dbclient.*; -import com.eventstore.dbclient.samples.TestEvent; +import io.kurrent.dbclient.*; +import io.kurrent.dbclient.samples.TestEvent; // region import-required-packages import io.opentelemetry.exporter.logging.LoggingSpanExporter; import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; @@ -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(); @@ -55,7 +55,7 @@ private static void tracing(EventStoreDBClient client) throws ExecutionException // endregion setup-client-for-tracing AppendToStreamOptions options = AppendToStreamOptions.get() - .expectedRevision(ExpectedRevision.any()); + .streamState(StreamState.any()); WriteResult appendResult = client.appendToStream("some-stream", options, eventData) .get(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java b/db-client-java/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java similarity index 81% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java index 3dd5ec04..6a68c938 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java @@ -1,13 +1,13 @@ -package com.eventstore.dbclient.samples.persistent_subscriptions; +package io.kurrent.dbclient.samples.persistent_subscriptions; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import java.util.List; import java.util.Optional; 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/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java similarity index 84% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java index 71617614..a2daa192 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/projection_management/ProjectionManagement.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.samples.projection_management; +package io.kurrent.dbclient.samples.projection_management; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import org.junit.*; import org.junit.jupiter.api.Test; @@ -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 - EventStoreDBClientSettings 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/io/kurrent/dbclient/samples/quick_start/QuickStart.java similarity index 80% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java index 7fa38d59..7fa72c25 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/quick_start/QuickStart.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java @@ -1,19 +1,18 @@ -package com.eventstore.dbclient.samples.quick_start; +package io.kurrent.dbclient.samples.quick_start; -import com.eventstore.dbclient.*; -import com.eventstore.dbclient.samples.TestEvent; +import io.kurrent.dbclient.*; +import io.kurrent.dbclient.samples.TestEvent; 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}"); - EventStoreDBClient client = EventStoreDBClient.create(settings); + KurrentDBClientSettings settings = KurrentDBConnectionString.parseOrThrow("{connectionString}"); + 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/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java similarity index 78% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/reading_events/ReadingEvents.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java index 6b51e92b..02064b36 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/reading_events/ReadingEvents.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java @@ -1,14 +1,13 @@ -package com.eventstore.dbclient.samples.reading_events; +package io.kurrent.dbclient.samples.reading_events; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; 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/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java similarity index 90% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/server_side_filtering/ServerSideFiltering.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java index f31f3e1a..1b678c27 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/server_side_filtering/ServerSideFiltering.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java @@ -1,11 +1,11 @@ -package com.eventstore.dbclient.samples.server_side_filtering; +package io.kurrent.dbclient.samples.server_side_filtering; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; 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 = "/^[^\\$].*/"; @@ -167,7 +167,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/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java similarity index 92% rename from db-client-java/src/test/java/com/eventstore/dbclient/samples/subscribing_to_stream/SubscribingToStream.java rename to db-client-java/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java index 14603d53..6135feb3 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/samples/subscribing_to_stream/SubscribingToStream.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java @@ -1,11 +1,11 @@ -package com.eventstore.dbclient.samples.subscribing_to_stream; +package io.kurrent.dbclient.samples.subscribing_to_stream; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; 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/io/kurrent/dbclient/streams/AppendTests.java similarity index 85% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/AppendTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/AppendTests.java index b2b5ff24..72701fd0 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/AppendTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/AppendTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import com.fasterxml.jackson.databind.json.JsonMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -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"; @@ -24,12 +24,12 @@ default void testAppendSingleEventNoStream() throws Throwable { .build(); AppendToStreamOptions appendOptions = AppendToStreamOptions.get() - .expectedRevision(ExpectedRevision.noStream()); + .streamState(StreamState.noStream()); WriteResult appendResult = client.appendToStream(streamName, appendOptions, event) .get(); - Assertions.assertEquals(ExpectedRevision.expectedRevision(0), appendResult.getNextExpectedRevision()); + Assertions.assertEquals(StreamState.streamRevision(0), appendResult.getNextExpectedRevision()); ReadStreamOptions readStreamOptions = ReadStreamOptions.get() .fromEnd() diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java similarity index 65% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java index f097782c..ad7a4d75 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ClientLifecycleTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java @@ -1,13 +1,12 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.ConnectionAware; -import com.eventstore.dbclient.ConnectionShutdownException; -import com.eventstore.dbclient.EventStoreDBClient; -import com.eventstore.dbclient.EventStoreDBClientSettings; +import io.kurrent.dbclient.ConnectionAware; +import io.kurrent.dbclient.ConnectionShutdownException; +import io.kurrent.dbclient.KurrentDBClient; +import io.kurrent.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; @@ -17,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(); @@ -33,10 +32,10 @@ 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); + 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/io/kurrent/dbclient/streams/DeadlineTests.java similarity index 85% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/DeadlineTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java index f3037cc7..e3b05d71 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeadlineTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java @@ -1,10 +1,9 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; 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/io/kurrent/dbclient/streams/DeleteTests.java similarity index 81% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/DeleteTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java index 57f9bd2f..60cae722 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/DeleteTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -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,11 +35,11 @@ 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() - .expectedRevision(ExpectedRevision.streamExists()); + .streamState(StreamState.streamExists()); Assertions.assertThrows(WrongExpectedVersionException.class, () -> { try { diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/streams/InterceptorTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java similarity index 75% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/InterceptorTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java index 25fa37b2..761e5bf8 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/InterceptorTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.ConnectionAware; -import com.eventstore.dbclient.EventStoreDBClient; -import com.eventstore.dbclient.ReadStreamOptions; +import io.kurrent.dbclient.ConnectionAware; +import io.kurrent.dbclient.KurrentDBClient; +import io.kurrent.dbclient.ReadStreamOptions; import io.grpc.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -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/io/kurrent/dbclient/streams/MetadataTests.java similarity index 86% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/MetadataTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java index b24b2949..cbacc8ac 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/MetadataTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -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/io/kurrent/dbclient/streams/ReadStreamTests.java similarity index 92% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/ReadStreamTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java index b8ed09a0..50fa83bf 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/ReadStreamTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -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/io/kurrent/dbclient/streams/SubscriptionTests.java similarity index 96% rename from db-client-java/src/test/java/com/eventstore/dbclient/streams/SubscriptionTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java index dd591652..c05e6f68 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/streams/SubscriptionTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java @@ -1,7 +1,6 @@ -package com.eventstore.dbclient.streams; +package io.kurrent.dbclient.streams; -import com.eventstore.dbclient.*; -import com.fasterxml.jackson.databind.json.JsonMapper; +import io.kurrent.dbclient.*; 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/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java similarity index 92% rename from db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java index ce22569d..f069722d 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.telemetry; +package io.kurrent.dbclient.telemetry; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.sdk.trace.ReadableSpan; import org.junit.jupiter.api.Assertions; @@ -16,8 +16,8 @@ public interface PersistentSubscriptionsTracingInstrumentationTests extends Tele @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testPersistentSubscriptionIsInstrumentedWithTracingAndRestoresRemoteContextAsExpected() throws Throwable { - EventStoreDBClient streamsClient = getDefaultClient(); - EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); + KurrentDBClient streamsClient = getDefaultClient(); + KurrentDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = "aGroup"; @@ -78,8 +78,8 @@ default void testPersistentSubscriptionIsInstrumentedWithTracingAndRestoresRemot @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testPersistentSubscriptionInstrumentationHandlesExceptionsAsExpected() throws Throwable { - EventStoreDBClient streamsClient = getDefaultClient(); - EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); + KurrentDBClient streamsClient = getDefaultClient(); + KurrentDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = generateName(); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/SpanProcessorSpy.java b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java similarity index 95% rename from db-client-java/src/test/java/com/eventstore/dbclient/telemetry/SpanProcessorSpy.java rename to db-client-java/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java index b64548f5..e17e9c48 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/SpanProcessorSpy.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java @@ -1,4 +1,4 @@ -package com.eventstore.dbclient.telemetry; +package io.kurrent.dbclient.telemetry; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.trace.ReadWriteSpan; diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/StreamsTracingInstrumentationTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java similarity index 92% rename from db-client-java/src/test/java/com/eventstore/dbclient/telemetry/StreamsTracingInstrumentationTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java index 8cb2fe07..892814b7 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/StreamsTracingInstrumentationTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java @@ -1,6 +1,6 @@ -package com.eventstore.dbclient.telemetry; +package io.kurrent.dbclient.telemetry; -import com.eventstore.dbclient.*; +import io.kurrent.dbclient.*; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import io.opentelemetry.api.trace.SpanContext; @@ -18,12 +18,12 @@ public interface StreamsTracingInstrumentationTests extends TelemetryAware { @Test default void testAppendIsInstrumentedWithTracingAsExpected() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); client.appendToStream( streamName, - AppendToStreamOptions.get().expectedRevision(ExpectedRevision.noStream()), + AppendToStreamOptions.get().streamState(StreamState.noStream()), EventData.builderAsJson("TestEvent", mapper.writeValueAsBytes(new Foo())) .eventId(UUID.randomUUID()) .build()) @@ -37,12 +37,12 @@ default void testAppendIsInstrumentedWithTracingAsExpected() throws Throwable { @Test default void testTracingContextIsInjectedAsExpectedWhenUserMetadataIsJsonObject() throws Throwable { - EventStoreDBClient client = getDefaultClient(); + KurrentDBClient client = getDefaultClient(); String streamName = generateName(); client.appendToStream( streamName, - AppendToStreamOptions.get().expectedRevision(ExpectedRevision.noStream()), + AppendToStreamOptions.get().streamState(StreamState.noStream()), EventData.builderAsJson("TestEvent", mapper.writeValueAsBytes(new Foo())) .metadataAsBytes(mapper.writeValueAsBytes(new Foo())) .eventId(UUID.randomUUID()) @@ -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"); @@ -82,7 +82,7 @@ default void testTracingContextInjectionIsIgnoredAsExpectedWhenUserMetadataIsNon client.appendToStream( streamName, - AppendToStreamOptions.get().expectedRevision(ExpectedRevision.noStream()), + AppendToStreamOptions.get().streamState(StreamState.noStream()), eventWithValidMetadata, eventWithInvalidMetadata) .get(); @@ -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; @@ -132,7 +132,7 @@ default void testAppendInstrumentationHandlesExceptionsAsExpected() throws Throw client.appendToStream( streamName, // Force WrongExpectedVersionException to be thrown. - AppendToStreamOptions.get().expectedRevision(ExpectedRevision.streamExists()), + AppendToStreamOptions.get().streamState(StreamState.streamExists()), EventData.builderAsJson("TestEvent", mapper.writeValueAsBytes(new Foo())) .eventId(UUID.randomUUID()) .build()) @@ -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"; @@ -263,7 +263,7 @@ default void testCatchupSubscriptionTracingIsNotRestoredOnDeletedEvents() throws WriteResult appendResult = client.appendToStream(streamName, events).get(); Assertions.assertNotNull(appendResult); - DeleteResult deleteResult = client.deleteStream(streamName, DeleteStreamOptions.get().expectedRevision(ExpectedRevision.streamExists())).get(); + DeleteResult deleteResult = client.deleteStream(streamName, DeleteStreamOptions.get().streamState(StreamState.streamExists())).get(); Assertions.assertNotNull(deleteResult); CountDownLatch subscribeSpansLatch = new CountDownLatch(events.length); diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TelemetryAware.java b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java similarity index 88% rename from db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TelemetryAware.java rename to db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java index 7353d0ed..5c5c24ae 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TelemetryAware.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java @@ -1,8 +1,8 @@ -package com.eventstore.dbclient.telemetry; +package io.kurrent.dbclient.telemetry; -import com.eventstore.dbclient.ClientTelemetryAttributes; -import com.eventstore.dbclient.ClientTelemetryConstants; -import com.eventstore.dbclient.ConnectionAware; +import io.kurrent.dbclient.ClientTelemetryAttributes; +import io.kurrent.dbclient.ClientTelemetryConstants; +import io.kurrent.dbclient.ConnectionAware; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.api.trace.StatusCode; @@ -21,7 +21,7 @@ public interface TelemetryAware extends ConnectionAware { default void assertAppendSpanHasExpectedAttributes(ReadableSpan span, String streamName) { assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.SYSTEM, ClientTelemetryConstants.INSTRUMENTATION_NAME); assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.OPERATION, ClientTelemetryConstants.Operations.APPEND); - assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.STREAM, streamName); + assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.STREAM, streamName); assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.USER, "admin"); Assertions.assertEquals(StatusCode.OK, span.toSpanData().getStatus().getStatusCode()); Assertions.assertEquals(SpanKind.CLIENT, span.getKind()); @@ -42,10 +42,10 @@ default void assertSubscriptionActivityHasExpectedAttributes(ReadableSpan span, assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.SYSTEM, ClientTelemetryConstants.INSTRUMENTATION_NAME); assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.OPERATION, ClientTelemetryConstants.Operations.SUBSCRIBE); assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.USER, "admin"); - assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.STREAM, streamName); - assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.SUBSCRIPTION_ID, subscriptionId); - assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.EVENT_ID, eventId); - assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.EVENT_TYPE, eventType); + assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.STREAM, streamName); + assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.SUBSCRIPTION_ID, subscriptionId); + assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.EVENT_ID, eventId); + assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.EVENT_TYPE, eventType); Assertions.assertEquals(StatusCode.OK, span.toSpanData().getStatus().getStatusCode()); Assertions.assertEquals(SpanKind.CONSUMER, span.getKind()); } diff --git a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java similarity index 90% rename from db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java rename to db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java index 2fedc1a2..da13e05f 100644 --- a/db-client-java/src/test/java/com/eventstore/dbclient/telemetry/TracingContextInjectionTests.java +++ b/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java @@ -1,7 +1,6 @@ -package com.eventstore.dbclient.telemetry; +package io.kurrent.dbclient.telemetry; -import com.eventstore.dbclient.*; -import org.junit.Assert; +import io.kurrent.dbclient.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -16,8 +15,8 @@ public interface TracingContextInjectionTests extends TelemetryAware { @Test @Timeout(value = 2, unit = TimeUnit.MINUTES) default void testTracingContextInjectionDoesNotAffectEventBody() throws Throwable { - EventStoreDBClient streamsClient = getDefaultClient(); - EventStoreDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); + KurrentDBClient streamsClient = getDefaultClient(); + KurrentDBPersistentSubscriptionsClient psClient = getDefaultPersistentSubscriptionClient(); String streamName = generateName(); String groupName = "aGroup"; diff --git a/db-client-java/src/test/resources/simplelogger.properties b/db-client-java/src/test/resources/simplelogger.properties index f73f8cdb..9b4876a2 100644 --- a/db-client-java/src/test/resources/simplelogger.properties +++ b/db-client-java/src/test/resources/simplelogger.properties @@ -1,2 +1,2 @@ org.slf4j.simpleLogger.defaultLogLevel=error -org.slf4j.simpleLogger.log.com.eventstore.dbclient=debug \ No newline at end of file +org.slf4j.simpleLogger.log.io.kurrent.dbclient=debug \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 26e8260f..2f5f4ae4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -group=com.eventstore +group=io.kurrent version=1.0-SNAPSHOT # Dependencies diff --git a/settings.gradle b/settings.gradle index b788c47d..6c704471 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,5 +7,5 @@ * in the user manual at https://docs.gradle.org/6.6.1/userguide/multi_project_builds.html */ -rootProject.name = 'eventstore-db-client' +rootProject.name = 'kurrent-db-client' include 'db-client-java'