google format and test fixes

Author: OlegDokuka

netifi-spring-boot-autoconfigure/src/main/java/com/netifi/spring/boot/BrokerClientAutoConfiguration.java

@@ -35,7 +35,6 @@
 import io.rsocket.transport.netty.client.WebsocketClientTransport;
 import java.util.List;
 import java.util.Optional;
-
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

netifi-spring-boot-autoconfigure/src/main/java/com/netifi/spring/boot/BrokerClientMessagingAutoConfiguration.java

@@ -29,7 +29,6 @@
 import io.rsocket.RSocketFactory;
 import io.rsocket.frame.SetupFrameFlyweight;
 import io.rsocket.transport.netty.server.TcpServerTransport;
-
 import java.time.Duration;
 import java.util.Optional;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -69,8 +68,7 @@ public MessageHandlerAcceptor messageHandlerAcceptor(
       DefaultListableBeanFactory factory,
       RSocketStrategies rSocketStrategies,
       BrokerClient brokerClient) {
-    BrokerClientProperties.KeepAliveProperties keepalive =
-        brokerClientProperties.getKeepalive();
+    BrokerClientProperties.KeepAliveProperties keepalive = brokerClientProperties.getKeepalive();
     Duration tickPeriod = Duration.ofSeconds(keepalive.getTickPeriodSeconds());
     Duration ackTimeout = Duration.ofSeconds(keepalive.getAckTimeoutSeconds());
     int missedAcks = keepalive.getMissedAcks();
@@ -87,9 +85,7 @@ public MessageHandlerAcceptor messageHandlerAcceptor(
                 "text/plain",
                 "text/plain",
                 Unpooled.EMPTY_BUFFER,
-                Unpooled.EMPTY_BUFFER
-            )
-        );
+                Unpooled.EMPTY_BUFFER));
     MessageHandlerAcceptor acceptor = new MessageHandlerAcceptor();
     acceptor.setRSocketStrategies(rSocketStrategies);
     acceptor
@@ -104,8 +100,7 @@ public MessageHandlerAcceptor messageHandlerAcceptor(
                 properties.getName(), brokerClient, factory, rSocketStrategies));
 
     brokerClient.addNamedRSocket(
-        properties.getName(),
-        acceptor.apply(connectionSetupPayload, STUB_RSOCKET));
+        properties.getName(), acceptor.apply(connectionSetupPayload, STUB_RSOCKET));
 
     return acceptor;
   }

netifi-spring-boot-autoconfigure/src/main/java/com/netifi/spring/boot/BrokerClientProperties.java

@@ -148,11 +148,10 @@ public static final class Tags {}
 
   public static final class KeepAliveProperties {
 
-    @NotNull
-    private Boolean enabled           = true;
-    private long    tickPeriodSeconds = 20;
-    private long    ackTimeoutSeconds = 30;
-    private int     missedAcks        = 3;
+    @NotNull private Boolean enabled = true;
+    private long tickPeriodSeconds = 20;
+    private long ackTimeoutSeconds = 30;
+    private int missedAcks = 3;
 
     public long getAckTimeoutSeconds() {
       return ackTimeoutSeconds;

netifi-spring-boot-autoconfigure/src/test/java/com/netifi/spring/boot/test/BrokerClientSpringIntegrationTest.java

@@ -46,12 +46,6 @@
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
-@DirtiesContext
-@ImportAutoConfiguration({
-  BrokerClientAutoConfiguration.class,
-  BrokerClientConfiguration.class,
-  BrokerClientSpringIntegrationTest.TestConfiguration.class
-})
 public class BrokerClientSpringIntegrationTest {
 
   @Autowired ConfigurableListableBeanFactory beanFactory;

netifi-spring-boot-autoconfigure/src/test/java/com/netifi/spring/boot/test/ClientConfigurationIntegrationTest.java

@@ -34,19 +34,19 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = {
-    ClientConfigurationIntegrationTest.TestConfiguration.class,
-    BrokerClientAutoConfiguration.class,
-    BrokerClientConfiguration.class
-})
+@SpringBootTest
 public class ClientConfigurationIntegrationTest {
 
   @Autowired
   @Qualifier("mock2")
   BrokerClientConfigurer configurer;
 
+  @Autowired
+  BrokerClient brokerClient;
+
   @Test
   public void testThatConfigurerWorks() {
+    Assertions.assertNotNull(brokerClient);
     ArgumentCaptor<BrokerClient.CustomizableBuilder> captor =
         ArgumentCaptor.forClass(BrokerClient.CustomizableBuilder.class);
 
@@ -56,7 +56,7 @@ public void testThatConfigurerWorks() {
   }
 
   @org.springframework.boot.test.context.TestConfiguration
-  @ComponentScan
+//  @ComponentScan
   static class TestConfiguration {
 
     @Bean

netifi-spring-boot-autoconfigure/src/test/java/com/netifi/spring/boot/test/MessageHandler.java

@@ -1,18 +1,31 @@
+/*
+ *    Copyright 2019 The Netifi Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package com.netifi.spring.boot.test;
 
-import reactor.core.publisher.Mono;
-
-import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.stereotype.Controller;
+import reactor.core.publisher.Mono;
 
 @Controller
 @MessageMapping("test")
 public class MessageHandler {
 
-    @MessageMapping("process")
-    public Mono<String> process(@Payload Mono<String> data) {
-        return Mono.just("Echo: " + data);
-    }
+  @MessageMapping("process")
+  public Mono<String> process(@Payload Mono<String> data) {
+    return Mono.just("Echo: " + data);
+  }
 }

netifi-spring-boot-autoconfigure/src/test/java/com/netifi/spring/boot/test/SpringMessagingIntegrationTest.java

@@ -17,26 +17,15 @@
 
 import com.netifi.spring.core.annotation.Group;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.containers.wait.strategy.WaitStrategy;
-import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
-
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.messaging.rsocket.RSocketRequester;
-import org.springframework.test.context.event.annotation.BeforeTestClass;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.testcontainers.containers.GenericContainer;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
-//@TestPropertySource(locations="classpath:application.properties")
 public class SpringMessagingIntegrationTest {
 
   public static GenericContainer redis =
@@ -45,17 +34,14 @@ public class SpringMessagingIntegrationTest {
           .withEnv(
               "BROKER_SERVER_OPTS",
               "-Dnetifi.authentication.0.accessKey=9007199254740991 "
-            + "-Dnetifi.authentication.0.accessToken=kTBDVtfRBO4tHOnZzSyY5ym2kfY= "
-            + "-Dnetifi.broker.admin.accessKey=9007199254740991 "
-            + "-Dnetifi.broker.admin.accessToken=kTBDVtfRBO4tHOnZzSyY5ym2kfY="
-          );
-
+                  + "-Dnetifi.authentication.0.accessToken=kTBDVtfRBO4tHOnZzSyY5ym2kfY= "
+                  + "-Dnetifi.broker.admin.accessKey=9007199254740991 "
+                  + "-Dnetifi.broker.admin.accessToken=kTBDVtfRBO4tHOnZzSyY5ym2kfY=");
 
   static {
     redis.start();
     System.setProperty("netifi.client.broker.hostname", redis.getContainerIpAddress());
-    System.setProperty("netifi.client.broker.port",
-        String.valueOf(redis.getMappedPort(8001)));
+    System.setProperty("netifi.client.broker.port", String.valueOf(redis.getMappedPort(8001)));
   }
 
   @Group("com.netifi.client.demo.vowelcount")
@@ -65,10 +51,6 @@ public class SpringMessagingIntegrationTest {
   public void tests() {
     Assert.assertNotNull(requester.rsocket());
 
-    requester.route("test.process")
-             .data("test")
-             .retrieveMono(String.class)
-             .log()
-             .block();
+    requester.route("test.process").data("test").retrieveMono(String.class).log().block();
   }
 }

netifi-spring-boot-autoconfigure/src/test/java/com/netifi/spring/boot/test/TestApplication.java

@@ -18,16 +18,15 @@
 import com.netifi.spring.boot.BrokerClientAutoConfiguration;
 import com.netifi.spring.boot.BrokerClientMessagingAutoConfiguration;
 import com.netifi.spring.core.config.BrokerClientConfiguration;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 @ImportAutoConfiguration({
-    BrokerClientMessagingAutoConfiguration.class,
-    BrokerClientAutoConfiguration.class,
-    BrokerClientConfiguration.class,
+  BrokerClientMessagingAutoConfiguration.class,
+  BrokerClientAutoConfiguration.class,
+  BrokerClientConfiguration.class,
 })
 public class TestApplication {
   public static void main(String[] args) {

netifi-spring-core/src/main/java/com/netifi/spring/core/annotation/BrokerClientBeanDefinitionRegistryPostProcessor.java

@@ -67,7 +67,8 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
           @Override
           public Object getSuggestedValue(DependencyDescriptor descriptor) {
             List<BrokerClientFactorySupport> brokerClientFactories =
-                new ArrayList<>(beanFactory.getBeansOfType(BrokerClientFactorySupport.class).values());
+                new ArrayList<>(
+                    beanFactory.getBeansOfType(BrokerClientFactorySupport.class).values());
 
             AnnotationAwareOrderComparator.sort(brokerClientFactories);
 
@@ -80,8 +81,7 @@ public Object getSuggestedValue(DependencyDescriptor descriptor) {
 
             if (annotation != null) {
               Class<?> descriptorDeclaredType = descriptor.getDeclaredType();
-              String[] beanNamesForType =
-                  beanFactory.getBeanNamesForType(descriptorDeclaredType);
+              String[] beanNamesForType = beanFactory.getBeanNamesForType(descriptorDeclaredType);
 
               for (String beanName : beanNamesForType) {
                 BeanDefinition beanDefinition = beanFactory.getMergedBeanDefinition(beanName);
@@ -119,9 +119,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
       throws BeansException {}
 
   private static boolean isSuportedByFactories(
-      Collection<BrokerClientFactorySupport> brokerClientFactories,
-      Class<?> clazz
-  ) {
+      Collection<BrokerClientFactorySupport> brokerClientFactories, Class<?> clazz) {
     for (BrokerClientFactorySupport factory : brokerClientFactories) {
       if (factory.support(clazz)) {
         return true;

netifi-spring-core/src/main/java/com/netifi/spring/core/config/BrokerClientConfiguration.java

@@ -22,7 +22,6 @@
 import com.netifi.broker.info.BrokerInfoService;
 import com.netifi.broker.info.BrokerInfoServiceClient;
 import com.netifi.broker.info.BrokerInfoServiceServer;
-import com.netifi.common.tags.Tags;
 import com.netifi.spring.core.BrokerClientApplicationEventListener;
 import com.netifi.spring.core.annotation.BrokerClientBeanDefinitionRegistryPostProcessor;
 import com.netifi.spring.core.annotation.RpcBrokerClientFactorySupport;
@@ -42,8 +41,6 @@
 import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-
 import reactor.core.scheduler.Scheduler;
 
 @Configuration