Skip to content

Commit b6f41fe

Browse files
authored
PersistenceStatus -> Status + integration tests (#807)
1 parent c214b42 commit b6f41fe

File tree

8 files changed

+11
-6
lines changed

8 files changed

+11
-6
lines changed

src/Confluent.Kafka/DeliveryResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public TopicPartitionOffset TopicPartitionOffset
6464
/// <summary>
6565
/// The persistence status of the message
6666
/// </summary>
67-
public PersistenceStatus PersistenceStatus { get; set; }
67+
public PersistenceStatus Status { get; set; }
6868

6969
/// <summary>
7070
/// The Kafka message.

src/Confluent.Kafka/Producer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private void DeliveryReportCallbackImpl(IntPtr rk, IntPtr rkmessage, IntPtr opaq
196196
Partition = msg.partition,
197197
Offset = msg.offset,
198198
Error = KafkaHandle.CreatePossiblyFatalError(msg.err, null),
199-
PersistenceStatus = messageStatus,
199+
Status = messageStatus,
200200
Message = new Message<Null, Null> { Timestamp = new Timestamp(timestamp, (TimestampType)timestampType), Headers = headers }
201201
}
202202
);
@@ -932,7 +932,7 @@ public void HandleDeliveryReport(DeliveryReport<Null, Null> deliveryReport)
932932
var dr = new DeliveryResult<K, V>
933933
{
934934
TopicPartitionOffset = deliveryReport.TopicPartitionOffset,
935-
PersistenceStatus = deliveryReport.PersistenceStatus,
935+
Status = deliveryReport.Status,
936936
Message = new Message<K, V>
937937
{
938938
Key = Key,
@@ -995,7 +995,7 @@ public void HandleDeliveryReport(DeliveryReport<Null, Null> deliveryReport)
995995
var dr = new DeliveryReport<K, V>
996996
{
997997
TopicPartitionOffsetError = deliveryReport.TopicPartitionOffsetError,
998-
PersistenceStatus = deliveryReport.PersistenceStatus,
998+
Status = deliveryReport.Status,
999999
Message = new Message<K, V>
10001000
{
10011001
Key = Key,

test/Confluent.Kafka.IntegrationTests/Tests/Producer_BeginProduce.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public void Producer_BeginProduce(string bootstrapServers)
4646
Action<DeliveryReport<string, string>> dh = (DeliveryReport<string, string> dr) =>
4747
{
4848
Assert.Equal(ErrorCode.NoError, dr.Error.Code);
49+
Assert.Equal(PersistenceStatus.Persisted, dr.Status);
4950
Assert.Equal((Partition)0, dr.Partition);
5051
Assert.Equal(singlePartitionTopic, dr.Topic);
5152
Assert.True(dr.Offset >= 0);
@@ -78,6 +79,7 @@ public void Producer_BeginProduce(string bootstrapServers)
7879
Action<DeliveryReport<byte[], byte[]>> dh2 = (DeliveryReport<byte[], byte[]> dr) =>
7980
{
8081
Assert.Equal(ErrorCode.NoError, dr.Error.Code);
82+
Assert.Equal(PersistenceStatus.Persisted, dr.Status);
8183
Assert.Equal((Partition)0, dr.Partition);
8284
Assert.Equal(singlePartitionTopic, dr.Topic);
8385
Assert.True(dr.Offset >= 0);

test/Confluent.Kafka.IntegrationTests/Tests/Producer_BeginProduce_Error.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void Producer_BeginProduce_Error(string bootstrapServers)
4848
Assert.Equal(Offset.Invalid, dr.Offset);
4949
Assert.Null(dr.Message.Key);
5050
Assert.Equal("test", dr.Message.Value);
51-
Assert.Equal(PersistenceStatus.NotPersisted, dr.PersistenceStatus);
51+
Assert.Equal(PersistenceStatus.NotPersisted, dr.Status);
5252
Assert.Equal(TimestampType.NotAvailable, dr.Message.Timestamp.Type);
5353
count += 1;
5454
};

test/Confluent.Kafka.IntegrationTests/Tests/Producer_BeginProduce_Null.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public void Producer_BeginProduce_Null(string bootstrapServers)
4141
Action<DeliveryReport<Null, Null>> dh = (DeliveryReport<Null, Null> dr) =>
4242
{
4343
Assert.Equal(ErrorCode.NoError, dr.Error.Code);
44+
Assert.Equal(PersistenceStatus.Persisted, dr.Status);
4445
Assert.False(dr.Error.IsFatal);
4546
Assert.Equal((Partition)0, dr.Partition);
4647
Assert.Equal(singlePartitionTopic, dr.Topic);

test/Confluent.Kafka.IntegrationTests/Tests/Producer_ProduceAsync_Error.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void Producer_ProduceAsync_Error(string bootstrapServers)
6161
var err = ((ProduceException<string, string>)inner).Error;
6262

6363
Assert.True(err.IsError);
64+
Assert.Equal(PersistenceStatus.NotPersisted, dr.Status);
6465
Assert.False(err.IsFatal);
6566
Assert.Equal(partitionedTopic, dr.Topic);
6667
Assert.Equal(Offset.Invalid, dr.Offset);

test/Confluent.Kafka.IntegrationTests/Tests/Producer_ProduceAsync_Task.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public void Producer_ProduceAsync_Task(string bootstrapServers)
5656
for (int i=0; i<2; ++i)
5757
{
5858
var dr = drs[i].Result;
59+
Assert.Equal(PersistenceStatus.Persisted, dr.Status);
5960
Assert.Equal(partitionedTopic, dr.Topic);
6061
Assert.True(dr.Offset >= 0);
6162
Assert.True(dr.Partition == 0 || dr.Partition == 1);

test/Confluent.SchemaRegistry.Serdes.IntegrationTests/Tests/AutoRegisterSchemaDisabled.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static void AutoRegisterSchemaDisabled(string bootstrapServers, string sc
8282
Assert.Equal(Offset.Invalid, ((ProduceException<string, int>)e).DeliveryResult.Offset);
8383
Assert.Equal(Partition.Any, ((ProduceException<string, int>)e).DeliveryResult.Partition);
8484
Assert.Equal(guidTopic, ((ProduceException<string, int>)e).DeliveryResult.Topic);
85-
Assert.Equal(PersistenceStatus.NotPersisted, ((ProduceException<string, int>)e).DeliveryResult.PersistenceStatus);
85+
Assert.Equal(PersistenceStatus.NotPersisted, ((ProduceException<string, int>)e).DeliveryResult.Status);
8686
Assert.Equal(Timestamp.Default, ((ProduceException<string, int>)e).DeliveryResult.Timestamp);
8787
Assert.Null(((ProduceException<string, int>)e).DeliveryResult.Headers);
8888

0 commit comments

Comments
 (0)