Skip to content

Commit 0f1fa61

Browse files
authored
Fix normalize parameter when looking up schemas (confluentinc#2503)
1 parent 7aac43f commit 0f1fa61

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/Confluent.SchemaRegistry.Serdes.Avro/GenericSerializerImpl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public async Task<byte[]> Serialize(string topic, Headers headers, GenericRecord
148148
.RegisterSchemaWithResponseAsync(subject, inputSchema, normalizeSchemas)
149149
.ConfigureAwait(continueOnCapturedContext: false)
150150
: await schemaRegistryClient
151-
.LookupSchemaAsync(subject, inputSchema, normalizeSchemas)
151+
.LookupSchemaAsync(subject, inputSchema, ignoreDeletedSchemas: true, normalize: normalizeSchemas)
152152
.ConfigureAwait(continueOnCapturedContext: false);
153153

154154
schemaId = new SchemaId(SchemaType.Avro, outputSchema.Id, outputSchema.Guid);

src/Confluent.SchemaRegistry.Serdes.Avro/SpecificSerializerImpl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public async Task<byte[]> Serialize(string topic, Headers headers, T data, bool
190190
.RegisterSchemaWithResponseAsync(subject, inputSchema, normalizeSchemas)
191191
.ConfigureAwait(continueOnCapturedContext: false)
192192
: await schemaRegistryClient
193-
.LookupSchemaAsync(subject, inputSchema, normalizeSchemas)
193+
.LookupSchemaAsync(subject, inputSchema, ignoreDeletedSchemas: true, normalize: normalizeSchemas)
194194
.ConfigureAwait(continueOnCapturedContext: false);
195195

196196
schemaId = new SchemaId(SchemaType.Avro, outputSchema.Id, outputSchema.Guid);

src/Confluent.SchemaRegistry.Serdes.Json/JsonSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public override async Task<byte[]> SerializeAsync(T value, SerializationContext
224224
new Schema(this.schemaText, ReferenceList, SchemaType.Json), normalizeSchemas)
225225
.ConfigureAwait(continueOnCapturedContext: false)
226226
: await schemaRegistryClient.LookupSchemaAsync(subject,
227-
new Schema(this.schemaText, ReferenceList, SchemaType.Json), normalizeSchemas)
227+
new Schema(this.schemaText, ReferenceList, SchemaType.Json), ignoreDeletedSchemas: true, normalize: normalizeSchemas)
228228
.ConfigureAwait(continueOnCapturedContext: false);
229229

230230
schemaId = new SchemaId(SchemaType.Json, outputSchema.Id, outputSchema.Guid);

src/Confluent.SchemaRegistry.Serdes.Protobuf/ProtobufSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private async Task<List<SchemaReference>> RegisterOrGetReferences(FileDescriptor
173173
var schemaId = autoRegisterSchema
174174
? await schemaRegistryClient.RegisterSchemaAsync(subject, schema, normalizeSchemas).ConfigureAwait(continueOnCapturedContext: false)
175175
: await schemaRegistryClient.GetSchemaIdAsync(subject, schema, normalizeSchemas).ConfigureAwait(continueOnCapturedContext: false);
176-
var registeredDependentSchema = await schemaRegistryClient.LookupSchemaAsync(subject, schema, true, normalizeSchemas).ConfigureAwait(continueOnCapturedContext: false);
176+
var registeredDependentSchema = await schemaRegistryClient.LookupSchemaAsync(subject, schema, ignoreDeletedSchemas: true, normalize: normalizeSchemas).ConfigureAwait(continueOnCapturedContext: false);
177177
return new SchemaReference(dependency.Name, subject, registeredDependentSchema.Version);
178178
};
179179
tasks.Add(t(fileDescriptor));
@@ -250,7 +250,7 @@ await RegisterOrGetReferences(value.Descriptor.File, context, autoRegisterSchema
250250
.ConfigureAwait(continueOnCapturedContext: false)
251251
: await schemaRegistryClient.LookupSchemaAsync(subject,
252252
new Schema(value.Descriptor.File.SerializedData.ToBase64(), references,
253-
SchemaType.Protobuf), normalizeSchemas)
253+
SchemaType.Protobuf), ignoreDeletedSchemas: true, normalize: normalizeSchemas)
254254
.ConfigureAwait(continueOnCapturedContext: false);
255255

256256
// note: different values for schemaId should never be seen here.

0 commit comments

Comments
 (0)