@@ -108,25 +108,6 @@ void setUp() {
108108
109109 topicName = "buffer-" + RandomStringUtils .randomAlphabetic (5 );
110110
111- final Map <String , Object > topicConfigMap = Map .of (
112- "name" , topicName ,
113- "group_id" , "buffergroup-" + RandomStringUtils .randomAlphabetic (6 ),
114- "create_topic" , true
115- );
116-
117- topicConfig = objectMapper .convertValue (topicConfigMap , BufferTopicConfig .class );
118-
119- bootstrapServersCommaDelimited = System .getProperty ("tests.kafka.bootstrap_servers" );
120-
121- LOG .info ("Using Kafka bootstrap servers: {}" , bootstrapServersCommaDelimited );
122-
123- final Map <String , Object > bufferConfigMap = Map .of (
124- "topics" , List .of (topicConfigMap ),
125- "bootstrap_servers" , List .of (bootstrapServersCommaDelimited ),
126- "encryption" , Map .of ("type" , "none" )
127- );
128- kafkaBufferConfig = objectMapper .convertValue (bufferConfigMap , KafkaBufferConfig .class );
129-
130111 kmsKey = System .getProperty ("tests.kafka.kms_key" );
131112 kmsClient = KmsClient .create ();
132113
@@ -164,14 +145,25 @@ void setUp() throws NoSuchAlgorithmException, InvalidKeyException, NoSuchPadding
164145 encryptCipher = Cipher .getInstance ("AES" );
165146 encryptCipher .init (Cipher .ENCRYPT_MODE , secretKey );
166147
148+ final Map <String , Object > topicConfigMap = Map .of (
149+ "name" , topicName ,
150+ "group_id" , "buffergroup-" + RandomStringUtils .randomAlphabetic (6 ),
151+ "create_topic" , true ,
152+ "encryption_key" , aesKey ,
153+ "kms" , Map .of ("key_id" , kmsKey )
154+ );
155+
156+ topicConfig = objectMapper .convertValue (topicConfigMap , BufferTopicConfig .class );
157+
158+ bootstrapServersCommaDelimited = System .getProperty ("tests.kafka.bootstrap_servers" );
159+
160+ LOG .info ("Using Kafka bootstrap servers: {}" , bootstrapServersCommaDelimited );
167161
168- final Map <String , Object > topicConfigMap = objectMapper .convertValue (topicConfig , Map .class );
169- topicConfigMap .put ("encryption_key" , aesKey );
170- topicConfigMap .put ("kms" , Map .of (
171- "key_id" , kmsKey
172- ));
173- final Map <String , Object > bufferConfigMap = objectMapper .convertValue (kafkaBufferConfig , Map .class );
174- bufferConfigMap .put ("topics" , List .of (topicConfigMap ));
162+ final Map <String , Object > bufferConfigMap = Map .of (
163+ "topics" , List .of (topicConfigMap ),
164+ "bootstrap_servers" , List .of (bootstrapServersCommaDelimited ),
165+ "encryption" , Map .of ("type" , "none" )
166+ );
175167 kafkaBufferConfig = objectMapper .convertValue (bufferConfigMap , KafkaBufferConfig .class );
176168 }
177169
0 commit comments