From a1424fc4bfeed966b1f62061708e5dd5b5e34f15 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 8 Sep 2023 15:14:19 -0400 Subject: [PATCH] Schema Registry Property Migration - Schema registry property migration to spring.cloud.stream prefix - Other cleanup in Schema Registry Resolves https://github.com/spring-cloud/spring-cloud-stream/issues/2687 --- .../registry/avro/AvroMessageConverterProperties.java | 2 +- .../schema/avro/AvroSchemaWithMultipleRecordsTest.java | 6 +++--- .../cloud/stream/schema/avro/SubjectNamingStrategyTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterProperties.java b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterProperties.java index e32d3ac26..31e350376 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterProperties.java +++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterProperties.java @@ -25,7 +25,7 @@ import org.springframework.util.Assert; * @author Sercan Karaoglu * @author Christian Tzolov */ -@ConfigurationProperties(prefix = "spring.cloud.schema.avro") +@ConfigurationProperties(prefix = "spring.cloud.stream.schema.avro") public class AvroMessageConverterProperties { private boolean dynamicSchemaGenerationEnabled; diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/AvroSchemaWithMultipleRecordsTest.java b/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/AvroSchemaWithMultipleRecordsTest.java index ac78db47b..0e1057e2b 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/AvroSchemaWithMultipleRecordsTest.java +++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/AvroSchemaWithMultipleRecordsTest.java @@ -54,20 +54,20 @@ public class AvroSchemaWithMultipleRecordsTest { @Test public void schemaLocationWithMultipleRecords() throws Exception { testMultipleRecordsSchemaLoading("avroSchemaRegistryClientMessageConverter", - "--spring.cloud.schema.avro.schema-locations=classpath:schemas/user1_multiple_records.schema"); + "--spring.cloud.stream.schema.avro.schema-locations=classpath:schemas/user1_multiple_records.schema"); } @Test public void schemaImportWithMultipleRecords() throws Exception { testMultipleRecordsSchemaLoading( "avroSchemaRegistryClientMessageConverter", - "--spring.cloud.schema.avro.schema-imports=classpath:schemas/user1_multiple_records.schema"); + "--spring.cloud.stream.schema.avro.schema-imports=classpath:schemas/user1_multiple_records.schema"); } @Test public void schemaLocationWithMultipleRecords2() throws Exception { testMultipleRecordsSchemaLoading("avroSchemaMessageConverter", - "--spring.cloud.schema.avro.schema-locations=classpath:schemas/user1_multiple_records.schema"); + "--spring.cloud.stream.schema.avro.schema-locations=classpath:schemas/user1_multiple_records.schema"); } private void testMultipleRecordsSchemaLoading(String avroConvertorType, String schemaLoadingProperty) diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/SubjectNamingStrategyTest.java b/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/SubjectNamingStrategyTest.java index 08c1ffea4..244cdeff1 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/SubjectNamingStrategyTest.java +++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/avro/SubjectNamingStrategyTest.java @@ -57,7 +57,7 @@ public class SubjectNamingStrategyTest { "--spring.jmx.enabled=false", "--spring.cloud.stream.bindings.myBinding-out-0.contentType=application/*+avro", "--spring.cloud.stream.schema.avro.subjectNamingStrategy=" - + "org.springframework.cloud.schema.registry.avro.QualifiedSubjectNamingStrategy", + + "org.springframework.cloud.stream.schema.registry.avro.QualifiedSubjectNamingStrategy", "--spring.cloud.stream.schema.avro.dynamicSchemaGenerationEnabled=true")) { StreamBridge streamBridge = context.getBean(StreamBridge.class);