Polish

Author: rstoyanchev

spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultMetadataExtractor.java

@@ -38,13 +38,11 @@
 import org.springframework.util.MimeType;
 
 /**
- * Default {@link MetadataExtractor} implementation that relies on {@link Decoder}s
- * to deserialize the content of metadata entries.
- *
+ * Default {@link MetadataExtractor} implementation that relies on
+ * {@link Decoder}s to deserialize the content of metadata entries.
  * <p>By default only {@code "message/x.rsocket.routing.v0""} is extracted and
- * saved under {@link MetadataExtractor#ROUTE_KEY}. Use the
- * {@code metadataToExtract} methods to specify other metadata mime types of
- * interest to extract.
+ * saved under {@link MetadataExtractor#ROUTE_KEY}. Use {@code metadataToExtract}
+ * methods to specify other metadata mime types of interest to extract.
  *
  * @author Rossen Stoyanchev
  * @since 5.2

spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequester.java

@@ -49,18 +49,13 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Default, package-private {@link RSocketRequester} implementation.
+ * Default implementation of {@link RSocketRequester}.
  *
  * @author Rossen Stoyanchev
  * @since 5.2
  */
 final class DefaultRSocketRequester implements RSocketRequester {
 
-	static final MimeType COMPOSITE_METADATA = new MimeType("message", "x.rsocket.composite-metadata.v0");
-
-	static final MimeType ROUTING = new MimeType("message", "x.rsocket.routing.v0");
-
-
 	/** For route variable replacement. */
 	private static final Pattern VARS_PATTERN = Pattern.compile("\\{([^/]+?)\\}");
 
@@ -114,7 +109,7 @@ public MimeType metadataMimeType() {
 	public RequestSpec route(String route, Object... vars) {
 		Assert.notNull(route, "'route' is required");
 		route = expand(route, vars);
-		return new DefaultRequestSpec(route, metadataMimeType().equals(COMPOSITE_METADATA) ? ROUTING : null);
+		return new DefaultRequestSpec(route, isCompositeMetadata() ? MetadataExtractor.ROUTING : null);
 	}
 
 	private static String expand(String route, Object... vars) {
@@ -134,6 +129,10 @@ private static String expand(String route, Object... vars) {
 		return sb.toString();
 	}
 
+	private boolean isCompositeMetadata() {
+		return metadataMimeType().equals(MetadataExtractor.COMPOSITE_METADATA);
+	}
+
 	@Override
 	public RequestSpec metadata(Object metadata, @Nullable MimeType mimeType) {
 		return new DefaultRequestSpec(metadata, mimeType);
@@ -154,16 +153,12 @@ private class DefaultRequestSpec implements RequestSpec {
 		private final Map<Object, MimeType> metadata = new LinkedHashMap<>(4);
 
 
-		public DefaultRequestSpec(Object metadata, @Nullable MimeType mimeType) {
+		DefaultRequestSpec(Object metadata, @Nullable MimeType mimeType) {
 			mimeType = (mimeType == null && !isCompositeMetadata() ? metadataMimeType() : mimeType);
 			Assert.notNull(mimeType, "MimeType is required for composite metadata");
 			metadata(metadata, mimeType);
 		}
 
-		private boolean isCompositeMetadata() {
-			return metadataMimeType().equals(COMPOSITE_METADATA);
-		}
-
 		@Override
 		public RequestSpec metadata(Object metadata, MimeType mimeType) {
 			Assert.notNull(metadata, "Metadata content is required");
@@ -184,22 +179,27 @@ public ResponseSpec data(Object data) {
 		public ResponseSpec data(Object producer, Class<?> elementClass) {
 			Assert.notNull(producer, "'producer' must not be null");
 			Assert.notNull(elementClass, "'elementClass' must not be null");
-			ReactiveAdapter adapter = strategies.reactiveAdapterRegistry().getAdapter(producer.getClass());
+			ReactiveAdapter adapter = getAdapter(producer.getClass());
 			Assert.notNull(adapter, "'producer' type is unknown to ReactiveAdapterRegistry");
 			return toResponseSpec(adapter.toPublisher(producer), ResolvableType.forClass(elementClass));
 		}
 
+		@Nullable
+		private ReactiveAdapter getAdapter(Class<?> aClass) {
+			return strategies.reactiveAdapterRegistry().getAdapter(aClass);
+		}
+
 		@Override
 		public ResponseSpec data(Object producer, ParameterizedTypeReference<?> elementTypeRef) {
 			Assert.notNull(producer, "'producer' must not be null");
 			Assert.notNull(elementTypeRef, "'elementTypeRef' must not be null");
-			ReactiveAdapter adapter = strategies.reactiveAdapterRegistry().getAdapter(producer.getClass());
+			ReactiveAdapter adapter = getAdapter(producer.getClass());
 			Assert.notNull(adapter, "'producer' type is unknown to ReactiveAdapterRegistry");
 			return toResponseSpec(adapter.toPublisher(producer), ResolvableType.forType(elementTypeRef));
 		}
 
 		private ResponseSpec toResponseSpec(Object input, ResolvableType elementType) {
-			ReactiveAdapter adapter = strategies.reactiveAdapterRegistry().getAdapter(input.getClass());
+			ReactiveAdapter adapter = getAdapter(input.getClass());
 			Publisher<?> publisher;
 			if (input instanceof Publisher) {
 				publisher = (Publisher<?>) input;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java

@@ -48,7 +48,7 @@ final class DefaultRSocketRequesterBuilder implements RSocketRequester.Builder {
 	@Nullable
 	private MimeType dataMimeType;
 
-	private MimeType metadataMimeType = DefaultRSocketRequester.COMPOSITE_METADATA;
+	private MimeType metadataMimeType = MetadataExtractor.COMPOSITE_METADATA;
 
 	@Nullable
 	private RSocketStrategies strategies;
@@ -109,18 +109,18 @@ private Mono<RSocketRequester> doConnect(ClientTransport transport) {
 		Assert.isTrue(!rsocketStrategies.encoders().isEmpty(), "No encoders");
 		Assert.isTrue(!rsocketStrategies.decoders().isEmpty(), "No decoders");
 
-		RSocketFactory.ClientRSocketFactory rsocketFactory = RSocketFactory.connect();
-		MimeType dataMimeType = getDataMimeType(rsocketStrategies);
-		rsocketFactory.dataMimeType(dataMimeType.toString());
-		rsocketFactory.metadataMimeType(this.metadataMimeType.toString());
+		RSocketFactory.ClientRSocketFactory factory = RSocketFactory.connect();
+		this.rsocketConfigurers.forEach(configurer -> configurer.configure(factory));
 
 		if (rsocketStrategies.dataBufferFactory() instanceof NettyDataBufferFactory) {
-			rsocketFactory.frameDecoder(PayloadDecoder.ZERO_COPY);
+			factory.frameDecoder(PayloadDecoder.ZERO_COPY);
 		}
 
-		this.rsocketConfigurers.forEach(configurer -> configurer.configure(rsocketFactory));
+		MimeType dataMimeType = getDataMimeType(rsocketStrategies);
+		factory.dataMimeType(dataMimeType.toString());
+		factory.metadataMimeType(this.metadataMimeType.toString());
 
-		return rsocketFactory.transport(transport)
+		return factory.transport(transport)
 				.start()
 				.map(rsocket -> new DefaultRSocketRequester(
 						rsocket, dataMimeType, this.metadataMimeType, rsocketStrategies));

spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketStrategies.java

@@ -43,7 +43,7 @@
 import org.springframework.util.SimpleRouteMatcher;
 
 /**
- * Default, package-private {@link RSocketStrategies} implementation.
+ * Default implementation of {@link RSocketStrategies}.
  *
  * @author Rossen Stoyanchev
  * @since 5.2
@@ -108,7 +108,7 @@ public ReactiveAdapterRegistry reactiveAdapterRegistry() {
 
 
 	/**
-	 * Default RSocketStrategies.Builder implementation.
+	 * Default implementation of {@link RSocketStrategies.Builder}.
 	 */
 	static class DefaultRSocketStrategiesBuilder implements RSocketStrategies.Builder {
 

spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataExtractor.java

@@ -22,10 +22,10 @@
 import org.springframework.util.MimeType;
 
 /**
- * Strategy to extract a map of values from the metadata of a {@link Payload}.
- * This includes decoding metadata entries based on their mime type and
- * assigning a name to the decoded value. The resulting name-value pairs can
- * be added to the headers of a
+ * Strategy to extract a map of value(s) from {@link Payload} metadata, which
+ * could be composite metadata with multiple entries. Each metadata entry
+ * is decoded based on its {@code MimeType} and a name is assigned to the decoded
+ * value. The resulting name-value pairs can be added to the headers of a
  * {@link org.springframework.messaging.Message Message}.
  *
  * @author Rossen Stoyanchev
@@ -39,26 +39,22 @@ public interface MetadataExtractor {
 	String ROUTE_KEY = "route";
 
 	/**
-	 * Constant for mime type {@code message/x.rsocket.composite-metadata.v0}.
+	 * Constant MimeType {@code "message/x.rsocket.composite-metadata.v0"}.
 	 */
 	MimeType COMPOSITE_METADATA = new MimeType("message", "x.rsocket.composite-metadata.v0");
 
 	/**
-	 * Constant for mime type {@code message/x.rsocket.routing.v0}.
+	 * Constant for MimeType {@code "message/x.rsocket.routing.v0"}.
 	 */
 	MimeType ROUTING = new MimeType("message", "x.rsocket.routing.v0");
 
 
 	/**
 	 * Extract a map of values from the given {@link Payload} metadata.
-	 * <p>Metadata may be composite and consist of multiple entries
-	 * Implementations are free to extract any number of name-value pairs per
-	 * metadata entry. The Payload "route" should be saved under the
-	 * {@link #ROUTE_KEY}.
+	 * The Payload "route", if present, should be saved under {@link #ROUTE_KEY}.
 	 * @param payload the payload whose metadata should be read
-	 * @param metadataMimeType the mime type of the metadata; this is what was
-	 * specified by the client at the start of the RSocket connection.
-	 * @return a map of 0 or more decoded metadata values with assigned names
+	 * @param metadataMimeType the metadata MimeType for the connection.
+	 * @return name values pairs extracted from the metadata
 	 */
 	Map<String, Object> extract(Payload payload, MimeType metadataMimeType);