Skip to content

Commit 26bc358

Browse files
committed
Merge branch '1.0.x'
2 parents 026d320 + 5dc99a7 commit 26bc358

40 files changed

+193
-146
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# 1.0.0-RC7
2+
3+
## Changes
4+
5+
- Moved SyncOverAsync functionality to the Confluent.Kafka.SyncOverAsync namespace.
6+
- Marked DependentProducerBuilder as API-SUBJECT-TO-CHANGE.
7+
- No-op handlers are no longer registered with librdkafka if corresponding handlers are not specified in client builder classes.
8+
- Renamed AsyncAvroSerializer to AvroSerializer and AsyncAvroDeserializer to AvroDeserializer
9+
10+
111
# 1.0.0-RC6
212

313
## New Features

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ confluent-kafka-dotnet is distributed via NuGet. We provide three packages:
4242
To install Confluent.Kafka from within Visual Studio, search for Confluent.Kafka in the NuGet Package Manager UI, or run the following command in the Package Manager Console:
4343

4444
```
45-
Install-Package Confluent.Kafka -Version 1.0.0-RC6
45+
Install-Package Confluent.Kafka -Version 1.0.0-RC7
4646
```
4747

4848
To add a reference to a dotnet core project, execute the following at the command line:
4949

5050
```
51-
dotnet add package -v 1.0.0-RC6 Confluent.Kafka
51+
dotnet add package -v 1.0.0-RC7 Confluent.Kafka
5252
```
5353

54-
**Note:** We recommend using the `1.0.0-RC6` version of Confluent.Kafka for new projects in preference to the most recent stable release (0.11.6).
54+
**Note:** We recommend using the `1.0.0-RC7` version of Confluent.Kafka for new projects in preference to the most recent stable release (0.11.6).
5555
The 1.0 API provides more features, is considerably improved and is more performant than 0.11.x releases.
5656

5757
### Branch builds

examples/AdminClient/AdminClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0-RC6" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0-RC7" /> -->
1313
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1414
</ItemGroup>
1515

examples/AvroBlogExamples/AvroBlogExamples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0-RC6" /> -->
11+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0-RC7" /> -->
1212
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
1313
</ItemGroup>
1414

examples/AvroBlogExamples/Program.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
using Avro.Generic;
1818
using Confluent.Kafka;
19+
using Confluent.Kafka.SyncOverAsync;
1920
using Confluent.SchemaRegistry.Serdes;
2021
using Confluent.SchemaRegistry;
2122
using System;
@@ -39,7 +40,7 @@ async static Task ProduceGeneric(string bootstrapServers, string schemaRegistryU
3940
using (var schemaRegistry = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = schemaRegistryUrl }))
4041
using (var producer =
4142
new ProducerBuilder<Null, GenericRecord>(new ProducerConfig { BootstrapServers = bootstrapServers })
42-
.SetValueSerializer(new AsyncAvroSerializer<GenericRecord>(schemaRegistry))
43+
.SetValueSerializer(new AvroSerializer<GenericRecord>(schemaRegistry))
4344
.Build())
4445
{
4546
var logLevelSchema = (Avro.EnumSchema)Avro.Schema.Parse(
@@ -71,7 +72,7 @@ async static Task ProduceSpecific(string bootstrapServers, string schemaRegistry
7172
using (var schemaRegistry = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = schemaRegistryUrl }))
7273
using (var producer =
7374
new ProducerBuilder<Null, MessageTypes.LogMessage>(new ProducerConfig { BootstrapServers = bootstrapServers })
74-
.SetValueSerializer(new AsyncAvroSerializer<MessageTypes.LogMessage>(schemaRegistry))
75+
.SetValueSerializer(new AvroSerializer<MessageTypes.LogMessage>(schemaRegistry))
7576
.Build())
7677
{
7778
await producer.ProduceAsync("log-messages",
@@ -108,7 +109,7 @@ static void ConsumeSpecific(string bootstrapServers, string schemaRegistryUrl)
108109
using (var schemaRegistry = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = schemaRegistryUrl }))
109110
using (var consumer =
110111
new ConsumerBuilder<Null, MessageTypes.LogMessage>(consumerConfig)
111-
.SetValueDeserializer(new AsyncAvroDeserializer<MessageTypes.LogMessage>(schemaRegistry).AsSyncOverAsync())
112+
.SetValueDeserializer(new AvroDeserializer<MessageTypes.LogMessage>(schemaRegistry).AsSyncOverAsync())
112113
.Build())
113114
{
114115
consumer.Subscribe("log-messages");

examples/AvroGeneric/AvroGeneric.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0-RC6" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0-RC7" /> -->
1313
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
1414
</ItemGroup>
1515

examples/AvroGeneric/Program.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
using Avro;
1818
using Avro.Generic;
19+
using Confluent.Kafka.SyncOverAsync;
1920
using Confluent.SchemaRegistry.Serdes;
2021
using Confluent.SchemaRegistry;
2122
using System;
@@ -61,8 +62,8 @@ static async Task Main(string[] args)
6162
using (var schemaRegistry = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = schemaRegistryUrl }))
6263
using (var consumer =
6364
new ConsumerBuilder<string, GenericRecord>(new ConsumerConfig { BootstrapServers = bootstrapServers, GroupId = groupName })
64-
.SetKeyDeserializer(new AsyncAvroDeserializer<string>(schemaRegistry).AsSyncOverAsync())
65-
.SetValueDeserializer(new AsyncAvroDeserializer<GenericRecord>(schemaRegistry).AsSyncOverAsync())
65+
.SetKeyDeserializer(new AvroDeserializer<string>(schemaRegistry).AsSyncOverAsync())
66+
.SetValueDeserializer(new AvroDeserializer<GenericRecord>(schemaRegistry).AsSyncOverAsync())
6667
.SetErrorHandler((_, e) => Console.WriteLine($"Error: {e.Reason}"))
6768
.Build())
6869
{
@@ -95,8 +96,8 @@ static async Task Main(string[] args)
9596
using (var schemaRegistry = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = schemaRegistryUrl }))
9697
using (var producer =
9798
new ProducerBuilder<string, GenericRecord>(new ProducerConfig { BootstrapServers = bootstrapServers })
98-
.SetKeySerializer(new AsyncAvroSerializer<string>(schemaRegistry))
99-
.SetValueSerializer(new AsyncAvroSerializer<GenericRecord>(schemaRegistry))
99+
.SetKeySerializer(new AvroSerializer<string>(schemaRegistry))
100+
.SetValueSerializer(new AvroSerializer<GenericRecord>(schemaRegistry))
100101
.Build())
101102
{
102103
Console.WriteLine($"{producer.Name} producing on {topicName}. Enter user names, q to exit.");

examples/AvroSpecific/AvroSpecific.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0-RC6" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0-RC7" /> -->
1313
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
1414
</ItemGroup>
1515

examples/AvroSpecific/Program.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Collections.Generic;
1919
using System.Threading;
2020
using System.Threading.Tasks;
21+
using Confluent.Kafka.SyncOverAsync;
2122
using Confluent.SchemaRegistry;
2223
using Confluent.SchemaRegistry.Serdes;
2324

@@ -80,8 +81,8 @@ static async Task Main(string[] args)
8081
using (var schemaRegistry = new CachedSchemaRegistryClient(schemaRegistryConfig))
8182
using (var consumer =
8283
new ConsumerBuilder<string, User>(consumerConfig)
83-
.SetKeyDeserializer(new AsyncAvroDeserializer<string>(schemaRegistry).AsSyncOverAsync())
84-
.SetValueDeserializer(new AsyncAvroDeserializer<User>(schemaRegistry).AsSyncOverAsync())
84+
.SetKeyDeserializer(new AvroDeserializer<string>(schemaRegistry).AsSyncOverAsync())
85+
.SetValueDeserializer(new AvroDeserializer<User>(schemaRegistry).AsSyncOverAsync())
8586
.SetErrorHandler((_, e) => Console.WriteLine($"Error: {e.Reason}"))
8687
.Build())
8788
{
@@ -113,8 +114,8 @@ static async Task Main(string[] args)
113114
using (var schemaRegistry = new CachedSchemaRegistryClient(schemaRegistryConfig))
114115
using (var producer =
115116
new ProducerBuilder<string, User>(producerConfig)
116-
.SetKeySerializer(new AsyncAvroSerializer<string>(schemaRegistry))
117-
.SetValueSerializer(new AsyncAvroSerializer<User>(schemaRegistry))
117+
.SetKeySerializer(new AvroSerializer<string>(schemaRegistry))
118+
.SetValueSerializer(new AvroSerializer<User>(schemaRegistry))
118119
.Build())
119120
{
120121
Console.WriteLine($"{producer.Name} producing on {topicName}. Enter user names, q to exit.");

examples/ConfluentCloud/ConfluentCloud.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0-RC6" /> -->
10+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0-RC7" /> -->
1111
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1212
</ItemGroup>
1313

0 commit comments

Comments
 (0)