Fix creating RSocket client. Reformat.

Author: OlgaMaciaszek

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/rsocket/RSocketInterfaceClientsAutoConfiguration.java

@@ -32,10 +32,11 @@
  * @author Olga Maciaszek-Sharma
  */
 @AutoConfiguration(after = RSocketRequesterAutoConfiguration.class)
-@ConditionalOnClass({ RSocketRequester.class, io.rsocket.RSocket.class, HttpServer.class,
-		TcpServerTransport.class, RSocketServiceProxyFactory.class })
+@ConditionalOnClass({ RSocketRequester.class, io.rsocket.RSocket.class, HttpServer.class, TcpServerTransport.class,
+		RSocketServiceProxyFactory.class })
 @EnableConfigurationProperties(RSocketInterfaceClientsProperties.class)
 @ConditionalOnProperty(value = "spring.interfaceclients.enabled", havingValue = "true")
 @Import(RSocketInterfaceClientsImportRegistrar.class)
 public class RSocketInterfaceClientsAutoConfiguration {
+
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/rsocket/RSocketInterfaceClientsBaseProperties.java

@@ -35,9 +35,9 @@ public class RSocketInterfaceClientsBaseProperties {
 	 */
 	private Integer port;
 
-
 	/**
-	 * URI used to create a Websocket connection for RSocketRequester. By default, set to null.
+	 * URI used to create a Websocket connection for RSocketRequester. By default, set to
+	 * null.
 	 */
 	private URI uri;
 
@@ -64,4 +64,5 @@ public URI getUri() {
 	public void setUri(URI uri) {
 		this.uri = uri;
 	}
+
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/rsocket/RSocketInterfaceClientsFactoryBean.java

@@ -22,7 +22,6 @@
 import org.springframework.boot.autoconfigure.interfaceclients.AbstractInterfaceClientsFactoryBean;
 import org.springframework.boot.autoconfigure.interfaceclients.QualifiedBeanProvider;
 import org.springframework.messaging.rsocket.RSocketRequester;
-import org.springframework.messaging.rsocket.RSocketStrategies;
 import org.springframework.messaging.rsocket.service.RSocketServiceProxyFactory;
 
 /**
@@ -35,18 +34,19 @@ public class RSocketInterfaceClientsFactoryBean extends AbstractInterfaceClients
 	@Override
 	public Object getObject() throws Exception {
 		RSocketRequester requester = rsocketRequester();
-		return RSocketServiceProxyFactory.builder(requester).build();
+		RSocketServiceProxyFactory factory = RSocketServiceProxyFactory.builder(requester).build();
+		return factory.createClient(this.type);
 	}
 
 	private RSocketRequester rsocketRequester() {
 		RSocketRequester userProvidedRequester = QualifiedBeanProvider
-				.qualifiedBean(this.applicationContext.getBeanFactory(), RSocketRequester.class, this.clientId);
+			.qualifiedBean(this.applicationContext.getBeanFactory(), RSocketRequester.class, this.clientId);
 		if (userProvidedRequester != null) {
 			return userProvidedRequester;
 		}
 
 		RSocketRequester.Builder userProvidedRSocketRequesterBuilder = QualifiedBeanProvider
-				.qualifiedBean(this.applicationContext.getBeanFactory(), RSocketRequester.Builder.class, this.clientId);
+			.qualifiedBean(this.applicationContext.getBeanFactory(), RSocketRequester.Builder.class, this.clientId);
 		if (userProvidedRSocketRequesterBuilder != null) {
 			return toRequester(userProvidedRSocketRequesterBuilder);
 		}
@@ -63,7 +63,7 @@ private RSocketRequester toRequester(RSocketRequester.Builder requesterBuilder)
 		// If the user wants to set the baseUrl directly on the builder,
 		// it should not be set in properties.
 		RSocketInterfaceClientsProperties properties = this.applicationContext
-				.getBean(RSocketInterfaceClientsProperties.class);
+			.getBean(RSocketInterfaceClientsProperties.class);
 		if (properties.getHost() != null && properties.getPort() != null) {
 			return requesterBuilder.tcp(properties.getHost(), properties.getPort());
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/rsocket/RSocketInterfaceClientsImportRegistrar.java

@@ -34,4 +34,5 @@ protected Class<? extends Annotation> getAnnotation() {
 	protected Class<?> getFactoryBeanClass() {
 		return RSocketInterfaceClientsFactoryBean.class;
 	}
+
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/rsocket/RSocketInterfaceClientsProperties.java

@@ -45,4 +45,5 @@ public RSocketInterfaceClientsBaseProperties getProperties(String clientId) {
 		// unless overridden, is in `clientsProperties`
 		return this.getClients().get(clientId);
 	}
+
 }