kafka settings: test added, refactored to use configureSSL exact once
This commit is contained in:
parent
448fe341cf
commit
e621a21df3
@ -134,8 +134,6 @@ public class TbKafkaSettings {
|
|||||||
props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, servers);
|
props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, servers);
|
||||||
props.put(AdminClientConfig.RETRIES_CONFIG, retries);
|
props.put(AdminClientConfig.RETRIES_CONFIG, retries);
|
||||||
|
|
||||||
configureSSL(props);
|
|
||||||
|
|
||||||
return props;
|
return props;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,8 +145,6 @@ public class TbKafkaSettings {
|
|||||||
props.put(ConsumerConfig.FETCH_MAX_BYTES_CONFIG, fetchMaxBytes);
|
props.put(ConsumerConfig.FETCH_MAX_BYTES_CONFIG, fetchMaxBytes);
|
||||||
props.put(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG, maxPollIntervalMs);
|
props.put(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG, maxPollIntervalMs);
|
||||||
|
|
||||||
configureSSL(props);
|
|
||||||
|
|
||||||
props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
|
props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
|
||||||
props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class);
|
props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class);
|
||||||
|
|
||||||
@ -174,7 +170,7 @@ public class TbKafkaSettings {
|
|||||||
return props;
|
return props;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Properties toProps() {
|
Properties toProps() {
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
|
|
||||||
if (useConfluent) {
|
if (useConfluent) {
|
||||||
@ -193,7 +189,7 @@ public class TbKafkaSettings {
|
|||||||
return props;
|
return props;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void configureSSL(Properties props) {
|
void configureSSL(Properties props) {
|
||||||
if (sslEnabled) {
|
if (sslEnabled) {
|
||||||
props.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, "SSL");
|
props.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, "SSL");
|
||||||
props.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, sslTruststoreLocation);
|
props.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, sslTruststoreLocation);
|
||||||
|
|||||||
@ -0,0 +1,67 @@
|
|||||||
|
/**
|
||||||
|
* Copyright © 2016-2023 The Thingsboard Authors
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.thingsboard.server.queue.kafka;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.mockito.Mockito;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.test.context.TestPropertySource;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
|
||||||
|
@SpringBootTest(classes = TbKafkaSettings.class)
|
||||||
|
@TestPropertySource(properties = {
|
||||||
|
"queue.type=kafka",
|
||||||
|
"queue.kafka.bootstrap.servers=localhost:9092",
|
||||||
|
})
|
||||||
|
class TbKafkaSettingsTest {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
TbKafkaSettings settings;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void beforeEach() {
|
||||||
|
settings = spy(settings); //SpyBean is not aware on @ConditionalOnProperty, that is why the traditional spy in use
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void givenToProps_whenConfigureSSL_thenVerifyOnce() {
|
||||||
|
settings.toProps();
|
||||||
|
Mockito.verify(settings).configureSSL(any());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void givenToAdminProps_whenConfigureSSL_thenVerifyOnce() {
|
||||||
|
settings.toAdminProps();
|
||||||
|
Mockito.verify(settings).configureSSL(any());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void givenToConsumerProps_whenConfigureSSL_thenVerifyOnce() {
|
||||||
|
settings.toConsumerProps("main");
|
||||||
|
Mockito.verify(settings).configureSSL(any());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void givenTotoProducerProps_whenConfigureSSL_thenVerifyOnce() {
|
||||||
|
settings.toProducerProps();
|
||||||
|
Mockito.verify(settings).configureSSL(any());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user