Skip to content

Commit 686e53c

Browse files
Merge pull request #21 from rsocket-broker/allow-setting-data-mime-type
Allow passing data mime type.
2 parents a471ef4 + 92acd92 commit 686e53c

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,14 @@
1717
package io.rsocket.broker.client.spring;
1818

1919
import java.net.URI;
20-
import java.util.Collections;
21-
import java.util.List;
2220

2321
import io.rsocket.RSocket;
2422
import io.rsocket.broker.common.spring.ClientTransportFactory;
2523
import io.rsocket.broker.common.spring.DefaultClientTransportFactory;
2624
import io.rsocket.broker.common.spring.MimeTypes;
2725
import io.rsocket.broker.frames.RouteSetup;
28-
import io.rsocket.loadbalance.LoadbalanceTarget;
29-
import io.rsocket.loadbalance.RoundRobinLoadbalanceStrategy;
3026
import io.rsocket.transport.ClientTransport;
3127
import reactor.core.Disposable;
32-
import reactor.core.publisher.Flux;
3328
import reactor.core.publisher.Sinks;
3429
import reactor.core.publisher.Sinks.One;
3530

@@ -90,6 +85,7 @@ else if (key.getKey() != null) {
9085

9186
RSocketRequester.Builder builder = RSocketRequester.builder()
9287
.setupMetadata(routeSetup.build(), MimeTypes.BROKER_FRAME_MIME_TYPE)
88+
.dataMimeType(properties.getDataMimeType() != null ? properties.getDataMimeType() : null)
9389
.rsocketStrategies(strategies).rsocketConnector(configurer);
9490

9591
//TODO: BrokerRequesterBuilderCustomizer

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import org.springframework.boot.context.properties.ConfigurationProperties;
2929
import org.springframework.core.style.ToStringCreator;
30+
import org.springframework.util.MimeType;
3031

3132
import static io.rsocket.broker.client.spring.BrokerClientProperties.CONFIG_PREFIX;
3233

@@ -49,6 +50,8 @@ public class BrokerClientProperties {
4950

5051
private boolean failIfMissingBrokerMetadata = true;
5152

53+
private MimeType dataMimeType;
54+
5255
public BrokerClientProperties() {
5356
}
5457

@@ -104,6 +107,14 @@ public void setFailIfMissingBrokerMetadata(boolean failIfMissingBrokerMetadata)
104107
this.failIfMissingBrokerMetadata = failIfMissingBrokerMetadata;
105108
}
106109

110+
public MimeType getDataMimeType() {
111+
return dataMimeType;
112+
}
113+
114+
public void setDataMimeType(MimeType dataMimeType) {
115+
this.dataMimeType = dataMimeType;
116+
}
117+
107118
@Override
108119
public String toString() {
109120
// @formatter:off
@@ -115,6 +126,7 @@ public String toString() {
115126
.append("broker", getBrokers())
116127
.append("address", address)
117128
.append("failIfMissingBrokerMetadata", failIfMissingBrokerMetadata)
129+
.append("dataMimeType", dataMimeType)
118130
.toString();
119131
// @formatter:on
120132
}

0 commit comments

Comments
 (0)