Checkstyle issues

glorrian · Jun 6, 2018 · 275163f · 275163f
1 parent cf3b54e
commit 275163f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/...ery-client/src/main/java/io/micronaut/discovery/kubernetes/KubernetesDiscoveryClient.java b/...ery-client/src/main/java/io/micronaut/discovery/kubernetes/KubernetesDiscoveryClient.java
@@ -54,6 +54,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
     private static final String HTTPS_PORT_SUFFIX = SERVICE_SUFFIX + "_PORT_HTTPS";
 
     private final Map<String, ServiceInstance> serviceIds;
+
     /**
      * Default constructor.
      */
@@ -72,15 +73,14 @@ public KubernetesDiscoveryClient() {
                     port = env.get(serviceId + HTTPS_PORT_SUFFIX);
                     if (StringUtils.isEmpty(port)) {
                         port = env.get(serviceId + PORT_SUFFIX);
-                    }
-                    else {
+                    } else {
                         isSecure = true;
                     }
+
                     if (port != null) {
                         if (serviceId.endsWith(PUBLISHED_SUFFIX)) {
                             serviceId = serviceId.substring(0, serviceId.length() - PUBLISHED_SUFFIX.length());
-                        }
-                        else if (serviceId.endsWith(RANDOM_PORTS_SUFFIX)) {
+                        } else if (serviceId.endsWith(RANDOM_PORTS_SUFFIX)) {
                             serviceId = serviceId.substring(0, serviceId.length() - RANDOM_PORTS_SUFFIX.length());
                         }
 

diff --git a/function-web/src/main/java/io/micronaut/function/web/AnnotatedFunctionRouteBuilder.java b/function-web/src/main/java/io/micronaut/function/web/AnnotatedFunctionRouteBuilder.java
@@ -111,8 +111,7 @@ public void process(BeanDefinition<?> beanDefinition, ExecutableMethod<?, ?> met
                             String functionPath = resolveFunctionPath(methodName, declaringType, functionName);
                             if (argCount == 0) {
                                 route = GET(functionPath, method);
-                            }
-                            else {
+                            } else {
                                 route = POST(functionPath, method);
                             }
                         }

diff --git a/http-client/src/main/java/io/micronaut/http/client/ssl/NettyClientSslBuilder.java b/http-client/src/main/java/io/micronaut/http/client/ssl/NettyClientSslBuilder.java
@@ -23,7 +23,6 @@
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.net.ssl.KeyManagerFactory;

diff --git a/http-client/src/test/groovy/io/micronaut/http/client/StreamRequestSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/StreamRequestSpec.groovy
@@ -46,6 +46,7 @@ import java.nio.charset.StandardCharsets
  * @author graemerocher
  * @since 1.0
  */
+@IgnoreIf({System.getenv("TRAVIS")})
 class StreamRequestSpec extends Specification {
     @Shared @AutoCleanup EmbeddedServer embeddedServer =
             ApplicationContext.run(EmbeddedServer)