Merge pull request #8225 from vespa-engine/bratseth/nonfunctional-changes-only

Nonfunctional changes only

3 files changed, 6 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
index 20e8c664761..7835ab2cf03 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
@@ -60,18 +60,16 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
         ab.activeRotation(getActiveRotation(app));
         app.getModel().getHosts().stream()
                 .sorted((a, b) -> a.getHostname().compareTo(b.getHostname()))
-                .forEach(hostInfo -> {
-            ab.hosts(hostInfo.getHostname(), getHostsConfig(hostInfo));
-        });
+                .forEach(hostInfo -> ab.hosts(hostInfo.getHostname(), getHostsConfig(hostInfo)));
         return ab;
     }
 
     private boolean getActiveRotation(ApplicationInfo app) {
         boolean activeRotation = false;
         for (HostInfo hostInfo : app.getModel().getHosts()) {
-            final Optional<ServiceInfo> container = hostInfo.getServices().stream().filter(
+            Optional<ServiceInfo> container = hostInfo.getServices().stream().filter(
                     serviceInfo -> serviceInfo.getServiceType().equals("container") ||
-                            serviceInfo.getServiceType().equals("qrserver")).
+                                   serviceInfo.getServiceType().equals("qrserver")).
                     findAny();
             if (container.isPresent()) {
                 activeRotation |= Boolean.valueOf(container.get().getProperty("activeRotation").orElse("false"));
@@ -91,7 +89,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
     }
 
     private LbServicesConfig.Tenants.Applications.Hosts.Services.Builder getServiceConfig(ServiceInfo serviceInfo) {
-        final List<String> endpointAliases = Stream.of(serviceInfo.getProperty("endpointaliases").orElse("").split(",")).
+        List<String> endpointAliases = Stream.of(serviceInfo.getProperty("endpointaliases").orElse("").split(",")).
                 filter(prop -> !"".equals(prop)).collect(Collectors.toList());
         endpointAliases.addAll(Stream.of(serviceInfo.getProperty("rotations").orElse("").split(",")).filter(prop -> !"".equals(prop)).collect(Collectors.toList()));
         Collections.sort(endpointAliases);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
index 236cb4e9b97..7c85b51c920 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
@@ -18,6 +18,7 @@ import java.util.Set;
  * @author Christian Andersen
  */
 public class RoutingProducer implements RoutingConfig.Producer {
+
     static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing");
 
     private final Map<TenantName, Set<ApplicationInfo>> models;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index ed1e649e1d0..a7c4131d620 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -87,7 +87,7 @@ public class LbServicesProducerTest {
     }
 
     private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) throws IOException, SAXException {
-        final Zone zone = new Zone(Environment.prod, regionName);
+        Zone zone = new Zone(Environment.prod, regionName);
         Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()
                                                                                 .zone(zone)
                                                                                 .properties(new TestProperties()));