[DEVEX-222] Made old Read methods obsolete and used the new ones in tests

Author: oskardudycz

samples/appending-events/Program.cs

@@ -94,15 +94,11 @@ await client.AppendToStreamAsync(
 
 	#region append-with-concurrency-check
 
-	var clientOneRead = client.ReadStreamAsync(
-		Direction.Forwards,
-		"concurrency-stream",
-		StreamPosition.Start
-	);
+	var clientOneRead = client.ReadStreamAsync("concurrency-stream");
 
 	var clientOneRevision = (await clientOneRead.LastAsync()).Event.EventNumber.ToUInt64();
 
-	var clientTwoRead     = client.ReadStreamAsync(Direction.Forwards, "concurrency-stream", StreamPosition.Start);
+	var clientTwoRead     = client.ReadStreamAsync("concurrency-stream");
 	var clientTwoRevision = (await clientTwoRead.LastAsync()).Event.EventNumber.ToUInt64();
 
 	var clientOneData = MessageData.From(

samples/quick-start/Program.cs

@@ -54,9 +54,7 @@ await client.AppendToStreamAsync(
 #region readStream
 
 var result = client.ReadStreamAsync(
-	Direction.Forwards,
 	"some-stream",
-	StreamPosition.Start,
 	cancellationToken: cancellationToken
 );
 

samples/reading-events/Program.cs

@@ -25,17 +25,13 @@ await client.AppendToStreamAsync(
 static async Task ReadFromStream(KurrentDBClient client) {
 	#region read-from-stream
 
-	var events = client.ReadStreamAsync(
-		Direction.Forwards,
-		"some-stream",
-		StreamPosition.Start
-	);
+	var events = client.ReadStreamAsync("some-stream");
 
 	#endregion read-from-stream
 
 	#region iterate-stream
 
-	await foreach (var @event in events) Console.WriteLine(Encoding.UTF8.GetString(@event.Event.Data.ToArray()));
+	await foreach (var @event in events) Console.WriteLine(@event.DeserializedData);
 
 	#endregion iterate-stream
 
@@ -50,17 +46,14 @@ static async Task ReadFromStream(KurrentDBClient client) {
 static async Task ReadFromStreamMessages(KurrentDBClient client) {
 	#region read-from-stream-messages
 
-	var streamPosition = StreamPosition.Start;
-	var results = client.ReadStreamAsync(
-		Direction.Forwards,
-		"some-stream",
-		streamPosition
-	);
+	var results = client.ReadStreamAsync("some-stream");
 
 	#endregion read-from-stream-messages
 
 	#region iterate-stream-messages
 
+	var streamPosition = StreamPosition.Start;
+
 	await foreach (var message in results.Messages)
 		switch (message) {
 			case StreamMessage.Ok ok:
@@ -95,17 +88,15 @@ static async Task ReadFromStreamPosition(KurrentDBClient client) {
 	#region read-from-stream-position
 
 	var events = client.ReadStreamAsync(
-		Direction.Forwards,
 		"some-stream",
-		10,
-		20
+		new ReadStreamOptions { StreamPosition = 10, MaxCount = 20 }
 	);
 
 	#endregion read-from-stream-position
 
 	#region iterate-stream
 
-	await foreach (var @event in events) Console.WriteLine(Encoding.UTF8.GetString(@event.Event.Data.ToArray()));
+	await foreach (var @event in events) Console.WriteLine(@event.DeserializedData);
 
 	#endregion iterate-stream
 }
@@ -114,10 +105,8 @@ static async Task ReadFromStreamPositionCheck(KurrentDBClient client) {
 	#region checking-for-stream-presence
 
 	var result = client.ReadStreamAsync(
-		Direction.Forwards,
 		"some-stream",
-		10,
-		20
+		new ReadStreamOptions { StreamPosition = 10, MaxCount = 20 }
 	);
 
 	if (await result.ReadState == ReadState.StreamNotFound) return;
@@ -131,9 +120,8 @@ static async Task ReadFromStreamBackwards(KurrentDBClient client) {
 	#region reading-backwards
 
 	var events = client.ReadStreamAsync(
-		Direction.Backwards,
 		"some-stream",
-		StreamPosition.End
+		new ReadStreamOptions { Direction = Direction.Backwards, StreamPosition = StreamPosition.End }
 	);
 
 	await foreach (var e in events) Console.WriteLine(Encoding.UTF8.GetString(e.Event.Data.ToArray()));
@@ -145,9 +133,8 @@ static async Task ReadFromStreamMessagesBackwards(KurrentDBClient client) {
 	#region read-from-stream-messages-backwards
 
 	var results = client.ReadStreamAsync(
-		Direction.Forwards,
 		"some-stream",
-		StreamPosition.End
+		new ReadStreamOptions { Direction = Direction.Backwards, StreamPosition = StreamPosition.End }
 	);
 
 	#endregion read-from-stream-messages-backwards
@@ -179,13 +166,13 @@ static async Task ReadFromStreamMessagesBackwards(KurrentDBClient client) {
 static async Task ReadFromAllStream(KurrentDBClient client) {
 	#region read-from-all-stream
 
-	var events = client.ReadAllAsync(Direction.Forwards, Position.Start);
+	var events = client.ReadAllAsync();
 
 	#endregion read-from-all-stream
 
 	#region read-from-all-stream-iterate
 
-	await foreach (var e in events) Console.WriteLine(Encoding.UTF8.GetString(e.Event.Data.ToArray()));
+	await foreach (var e in events) Console.WriteLine(e.DeserializedData);
 
 	#endregion read-from-all-stream-iterate
 }
@@ -194,10 +181,7 @@ static async Task ReadFromAllStreamMessages(KurrentDBClient client) {
 	#region read-from-all-stream-messages
 
 	var position = Position.Start;
-	var results = client.ReadAllAsync(
-		Direction.Forwards,
-		position
-	);
+	var results  = client.ReadAllAsync(new ReadAllOptions { Position = position });
 
 	#endregion read-from-all-stream-messages
 
@@ -220,12 +204,12 @@ static async Task ReadFromAllStreamMessages(KurrentDBClient client) {
 static async Task IgnoreSystemEvents(KurrentDBClient client) {
 	#region ignore-system-events
 
-	var events = client.ReadAllAsync(Direction.Forwards, Position.Start);
+	var events = client.ReadAllAsync();
 
 	await foreach (var e in events) {
 		if (e.Event.EventType.StartsWith("$")) continue;
 
-		Console.WriteLine(Encoding.UTF8.GetString(e.Event.Data.ToArray()));
+		Console.WriteLine(e.DeserializedData);
 	}
 
 	#endregion ignore-system-events
@@ -234,7 +218,7 @@ static async Task IgnoreSystemEvents(KurrentDBClient client) {
 static async Task ReadFromAllStreamBackwards(KurrentDBClient client) {
 	#region read-from-all-stream-backwards
 
-	var events = client.ReadAllAsync(Direction.Backwards, Position.End);
+	var events = client.ReadAllAsync(new ReadAllOptions { Direction = Direction.Backwards, Position = Position.End });
 
 	#endregion read-from-all-stream-backwards
 
@@ -249,10 +233,7 @@ static async Task ReadFromAllStreamBackwardsMessages(KurrentDBClient client) {
 	#region read-from-all-stream-messages-backwards
 
 	var position = Position.End;
-	var results = client.ReadAllAsync(
-		Direction.Backwards,
-		position
-	);
+	var results  = client.ReadAllAsync(new ReadAllOptions { Direction = Direction.Backwards, Position = position });
 
 	#endregion read-from-all-stream-messages-backwards
 
@@ -274,7 +255,7 @@ static async Task ReadFromAllStreamBackwardsMessages(KurrentDBClient client) {
 }
 
 static async Task FilteringOutSystemEvents(KurrentDBClient client) {
-	var events = client.ReadAllAsync(Direction.Forwards, Position.Start);
+	var events = client.ReadAllAsync();
 
 	await foreach (var e in events)
 		if (!e.Event.EventType.StartsWith("$"))
@@ -285,10 +266,8 @@ static void ReadStreamOverridingUserCredentials(KurrentDBClient client, Cancella
 	#region overriding-user-credentials
 
 	var result = client.ReadStreamAsync(
-		Direction.Forwards,
 		"some-stream",
-		StreamPosition.Start,
-		userCredentials: new UserCredentials("admin", "changeit"),
+		new ReadStreamOptions { UserCredentials = new UserCredentials("admin", "changeit") },
 		cancellationToken: cancellationToken
 	);
 
@@ -299,9 +278,7 @@ static void ReadAllOverridingUserCredentials(KurrentDBClient client, Cancellatio
 	#region read-all-overriding-user-credentials
 
 	var result = client.ReadAllAsync(
-		Direction.Forwards,
-		Position.Start,
-		userCredentials: new UserCredentials("admin", "changeit"),
+		new ReadAllOptions { UserCredentials = new UserCredentials("admin", "changeit") },
 		cancellationToken: cancellationToken
 	);
 
@@ -312,9 +289,7 @@ static void ReadAllResolvingLinkTos(KurrentDBClient client, CancellationToken ca
 	#region read-from-all-stream-resolving-link-Tos
 
 	var result = client.ReadAllAsync(
-		Direction.Forwards,
-		Position.Start,
-		resolveLinkTos: true,
+		new ReadAllOptions { ResolveLinkTos = true },
 		cancellationToken: cancellationToken
 	);
 

samples/setting-up-dependency-injection/Controllers/EventStoreController.cs

@@ -14,7 +14,7 @@ public EventStoreController(KurrentDBClient KurrentDBClient) {
 
 		[HttpGet]
 		public IAsyncEnumerable<ResolvedEvent> Get() {
-			return _KurrentClient.ReadAllAsync(Direction.Forwards, Position.Start);
+			return _KurrentClient.ReadAllAsync();
 		}
 		#endregion using-dependency
 	}

src/KurrentDB.Client/Streams/KurrentDBClient.Append.cs

@@ -33,7 +33,7 @@ public Task<IWriteResult> AppendToStreamAsync(
 			CancellationToken cancellationToken = default
 		) {
 			var messageSerializationContext = new MessageSerializationContext(FromStreamName(streamName));
-			
+
 			var messageData = _messageSerializer.With(options?.SerializationSettings)
 				.Serialize(messages, messageSerializationContext);
 
@@ -507,10 +507,11 @@ public class AppendToStreamOptions : OperationOptions {
 		/// </summary>
 		/// <returns></returns>
 		public void With(KurrentDBClientOperationOptions clientOperationOptions) {
-			ThrowOnAppendFailure = clientOperationOptions.ThrowOnAppendFailure;
-			BatchAppendSize      = clientOperationOptions.BatchAppendSize;
+			ThrowOnAppendFailure ??= clientOperationOptions.ThrowOnAppendFailure;
+
+			BatchAppendSize ??= clientOperationOptions.BatchAppendSize;
 		}
-		
+
 		/// <summary>
 		/// Allows to customize or disable the automatic deserialization
 		/// </summary>