Add test for admin properties (#234)

Author: cbornet

spring-pulsar-spring-boot-autoconfigure/src/test/java/org/springframework/pulsar/autoconfigure/PulsarPropertiesTests.java

@@ -20,12 +20,11 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
+import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.api.CompressionType;
 import org.apache.pulsar.client.api.ConsumerCryptoFailureAction;
 import org.apache.pulsar.client.api.DeadLetterPolicy;
@@ -42,6 +41,7 @@
 import org.apache.pulsar.client.impl.conf.ConfigurationDataUtils;
 import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
 import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
@@ -79,7 +79,6 @@ class ClientPropertiesTests {
 		private final String authToken = "1234";
 
 		@Test
-		@SuppressWarnings("unchecked")
 		void clientProperties() {
 			Map<String, String> props = new HashMap<>();
 			props.put("spring.pulsar.client.service-url", "my-service-url");
@@ -141,9 +140,13 @@ void clientProperties() {
 					.containsEntry("tlsTrustStorePath", "my-trust-store-path")
 					.containsEntry("tlsTrustStorePassword", "my-trust-store-password")
 					.hasEntrySatisfying("tlsCiphers",
-							t -> assertThat(((Set<String>) t)).containsExactly("my-tls-cipher"))
+							ciphers -> assertThat(ciphers)
+									.asInstanceOf(InstanceOfAssertFactories.collection(String.class))
+									.containsExactly("my-tls-cipher"))
 					.hasEntrySatisfying("tlsProtocols",
-							t -> assertThat(((Set<String>) t)).containsExactly("my-tls-protocol"))
+							protocols -> assertThat(protocols)
+									.asInstanceOf(InstanceOfAssertFactories.collection(String.class))
+									.containsExactly("my-tls-protocol"))
 					.containsEntry("statsIntervalSeconds", 6L).containsEntry("concurrentLookupRequest", 7)
 					.containsEntry("maxLookupRequest", 8).containsEntry("maxLookupRedirects", 9)
 					.containsEntry("maxNumberOfRejectedRequestPerConnection", 10)
@@ -210,6 +213,45 @@ class AdminPropertiesTests {
 
 		private final String authToken = "1234";
 
+		@Test
+		void adminProperties() {
+			Map<String, String> props = new HashMap<>();
+			props.put("spring.pulsar.administration.service-url", "my-service-url");
+			props.put("spring.pulsar.administration.tls-hostname-verification-enable", "true");
+			props.put("spring.pulsar.administration.tls-trust-certs-file-path", "my-trust-certs-file-path");
+			props.put("spring.pulsar.administration.tls-allow-insecure-connection", "true");
+			props.put("spring.pulsar.administration.use-key-store-tls", "true");
+			props.put("spring.pulsar.administration.ssl-provider", "my-ssl-provider");
+			props.put("spring.pulsar.administration.tls-trust-store-type", "my-trust-store-type");
+			props.put("spring.pulsar.administration.tls-trust-store-path", "my-trust-store-path");
+			props.put("spring.pulsar.administration.tls-trust-store-password", "my-trust-store-password");
+			props.put("spring.pulsar.administration.tls-ciphers[0]", "my-tls-cipher");
+			props.put("spring.pulsar.administration.tls-protocols[0]", "my-tls-protocol");
+
+			bind(props);
+			Map<String, Object> adminProps = properties.buildAdminProperties();
+
+			// Verify that the props can be loaded in a ClientBuilder
+			assertThatNoException().isThrownBy(() -> PulsarAdmin.builder().loadConf(adminProps));
+
+			assertThat(adminProps).containsEntry("serviceUrl", "my-service-url")
+					.containsEntry("tlsHostnameVerificationEnable", true)
+					.containsEntry("tlsTrustCertsFilePath", "my-trust-certs-file-path")
+					.containsEntry("tlsAllowInsecureConnection", true).containsEntry("useKeyStoreTls", true)
+					.containsEntry("sslProvider", "my-ssl-provider")
+					.containsEntry("tlsTrustStoreType", "my-trust-store-type")
+					.containsEntry("tlsTrustStorePath", "my-trust-store-path")
+					.containsEntry("tlsTrustStorePassword", "my-trust-store-password")
+					.hasEntrySatisfying("tlsCiphers",
+							ciphers -> assertThat(ciphers)
+									.asInstanceOf(InstanceOfAssertFactories.collection(String.class))
+									.containsExactly("my-tls-cipher"))
+					.hasEntrySatisfying("tlsProtocols",
+							protocols -> assertThat(protocols)
+									.asInstanceOf(InstanceOfAssertFactories.collection(String.class))
+									.containsExactly("my-tls-protocol"));
+		}
+
 		@Test
 		void authenticationUsingAuthParamsString() {
 			Map<String, String> props = new HashMap<>();
@@ -254,7 +296,6 @@ void authenticationNotAllowedUsingBothAuthParamsStringAndAuthenticationMap() {
 	class ProducerPropertiesTests {
 
 		@Test
-		@SuppressWarnings("unchecked")
 		void producerProperties() {
 			Map<String, String> props = new HashMap<>();
 			props.put("spring.pulsar.producer.topic-name", "my-topic");
@@ -298,12 +339,14 @@ void producerProperties() {
 					.containsEntry("batchingMaxMessages", 7).containsEntry("batchingMaxBytes", 8)
 					.containsEntry("batchingEnabled", false).containsEntry("chunkingEnabled", true)
 					.hasEntrySatisfying("encryptionKeys",
-							keys -> assertThat(((Set<String>) keys)).containsExactly("my-key"))
+							keys -> assertThat(keys).asInstanceOf(InstanceOfAssertFactories.collection(String.class))
+									.containsExactly("my-key"))
 					.containsEntry("compressionType", CompressionType.LZ4).containsEntry("initialSequenceId", 9L)
 					.containsEntry("accessMode", ProducerAccessMode.Exclusive)
-					.containsEntry("lazyStartPartitionedProducers", true)
-					.hasEntrySatisfying("properties", properties -> assertThat(((Map<String, String>) properties))
-							.containsEntry("my-prop", "my-prop-value"));
+					.containsEntry("lazyStartPartitionedProducers", true).hasEntrySatisfying("properties",
+							properties -> assertThat(properties)
+									.asInstanceOf(InstanceOfAssertFactories.map(String.class, String.class))
+									.containsEntry("my-prop", "my-prop-value"));
 		}
 
 	}
@@ -312,7 +355,6 @@ void producerProperties() {
 	class ConsumerPropertiesTests {
 
 		@Test
-		@SuppressWarnings("unchecked")
 		void consumerProperties() {
 			Map<String, String> props = new HashMap<>();
 			props.put("spring.pulsar.consumer.topics[0]", "my-topic");
@@ -361,12 +403,16 @@ void consumerProperties() {
 
 			assertThat(consumerProps)
 					.hasEntrySatisfying("topicNames",
-							n -> assertThat((Collection<String>) n).containsExactly("my-topic"))
+							topics -> assertThat(topics)
+									.asInstanceOf(InstanceOfAssertFactories.collection(String.class))
+									.containsExactly("my-topic"))
 					.hasEntrySatisfying("topicsPattern", p -> assertThat(p.toString()).isEqualTo("my-pattern"))
 					.containsEntry("subscriptionName", "my-subscription")
 					.containsEntry("subscriptionType", SubscriptionType.Shared)
 					.hasEntrySatisfying("subscriptionProperties",
-							p -> assertThat((Map<String, String>) p).containsEntry("my-sub-prop", "my-sub-prop-value"))
+							properties -> assertThat(properties)
+									.asInstanceOf(InstanceOfAssertFactories.map(String.class, String.class))
+									.containsEntry("my-sub-prop", "my-sub-prop-value"))
 					.containsEntry("subscriptionMode", SubscriptionMode.NonDurable)
 					.containsEntry("receiverQueueSize", 1).containsEntry("acknowledgementsGroupTimeMicros", 2_000_000L)
 					.containsEntry("negativeAckRedeliveryDelayMicros", 3_000_000L)
@@ -375,7 +421,9 @@ void consumerProperties() {
 					.containsEntry("tickDurationMillis", 7_000L).containsEntry("priorityLevel", 8)
 					.containsEntry("cryptoFailureAction", ConsumerCryptoFailureAction.DISCARD)
 					.hasEntrySatisfying("properties",
-							p -> assertThat((Map<String, String>) p).containsEntry("my-prop", "my-prop-value"))
+							properties -> assertThat(properties)
+									.asInstanceOf(InstanceOfAssertFactories.map(String.class, String.class))
+									.containsEntry("my-prop", "my-prop-value"))
 					.containsEntry("readCompacted", true)
 					.containsEntry("subscriptionInitialPosition", SubscriptionInitialPosition.Earliest)
 					.containsEntry("patternAutoDiscoveryPeriod", 9)