Use properties instead of supplier.

Author: OlgaMaciaszek

rsocket-broker-client-spring/src/main/java/io/rsocket/broker/client/spring/BrokerClientAutoConfiguration.java

@@ -29,7 +29,6 @@
 import reactor.core.publisher.Sinks.One;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -69,7 +68,7 @@ public BrokerClientProperties brokerClientProperties() {
 	@ConditionalOnMissingBean
 	public BrokerRSocketRequesterBuilder brokerRSocketRequesterBuilder(
 			RSocketConnectorConfigurer configurer, RSocketStrategies strategies,
-			BrokerClientProperties properties, @Autowired(required = false) BrokerClientMimeTypeSupplier brokerClientMimeTypeSupplier) {
+			BrokerClientProperties properties) {
 		RouteSetup.Builder routeSetup = RouteSetup.from(properties.getRouteId(),
 				properties.getServiceName());
 		properties.getTags().forEach((key, value) -> {
@@ -86,7 +85,7 @@ else if (key.getKey() != null) {
 
 		RSocketRequester.Builder builder = RSocketRequester.builder()
 				.setupMetadata(routeSetup.build(), MimeTypes.BROKER_FRAME_MIME_TYPE)
-				.dataMimeType(brokerClientMimeTypeSupplier != null ? brokerClientMimeTypeSupplier.get() : null)
+				.dataMimeType(properties.getDataMimeType() != null ? properties.getDataMimeType() : null)
 				.rsocketStrategies(strategies).rsocketConnector(configurer);
 
 		//TODO: BrokerRequesterBuilderCustomizer

rsocket-broker-client-spring/src/main/java/io/rsocket/broker/client/spring/BrokerClientMimeTypeSupplier.java

@@ -27,6 +27,7 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.style.ToStringCreator;
+import org.springframework.util.MimeType;
 
 import static io.rsocket.broker.client.spring.BrokerClientProperties.CONFIG_PREFIX;
 
@@ -49,6 +50,8 @@ public class BrokerClientProperties {
 
 	private boolean failIfMissingBrokerMetadata = true;
 
+	private MimeType dataMimeType;
+
 	public BrokerClientProperties() {
 	}
 
@@ -104,6 +107,14 @@ public void setFailIfMissingBrokerMetadata(boolean failIfMissingBrokerMetadata)
 		this.failIfMissingBrokerMetadata = failIfMissingBrokerMetadata;
 	}
 
+	public MimeType getDataMimeType() {
+		return dataMimeType;
+	}
+
+	public void setDataMimeType(MimeType dataMimeType) {
+		this.dataMimeType = dataMimeType;
+	}
+
 	@Override
 	public String toString() {
 		// @formatter:off
@@ -115,6 +126,7 @@ public String toString() {
 				.append("broker", getBrokers())
 				.append("address", address)
 				.append("failIfMissingBrokerMetadata", failIfMissingBrokerMetadata)
+				.append("dataMimeType", dataMimeType)
 				.toString();
 		// @formatter:on
 	}