Simplify

4 files changed, 7 insertions, 12 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java
index 9d0e6481d38..5b3cd18403b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/ResourceTagger.java
@@ -18,11 +18,7 @@ public interface ResourceTagger {
     int tagResources(ZoneApi zone, Map<HostName, ApplicationId> tenantOfHosts);
 
     static ResourceTagger empty() {
-        return new ResourceTagger() {
-            @Override
-            public int tagResources(ZoneApi zone, Map<HostName, ApplicationId> tenantOfHosts) {
-                return 0;
-            }
-        };
+        return (zone, tenantOfHosts) -> 0;
     }
+
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index dd2390a1281..5dba40f249c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -122,7 +122,7 @@ public interface NodeRepository {
                         clusterTypeOf(node.getMembership()),
                         node.getWantToRetire(),
                         node.getWantToDeprovision(),
-                        Optional.ofNullable(node.getReservedTo()).map(name -> TenantName.from(name)));
+                        Optional.ofNullable(node.getReservedTo()).map(TenantName::from));
     }
 
     private static String clusterIdOf(NodeMembership nodeMembership) {
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
index 9c024d32457..30fd8fad1bd 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
@@ -99,7 +99,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
         return String.format("%s.%d-%s",
                              majorVersion,
                              buildNumber.getAsLong(),
-                             source.map(SourceRevision::commit).map(commit -> abbreviateCommit(commit))
+                             source.map(SourceRevision::commit).map(ApplicationVersion::abbreviateCommit)
                                    .or(this::commit)
                                    .orElse("unknown"));
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ControllerFlagsTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ControllerFlagsTarget.java
index a22a9cc63de..695a3c28761 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ControllerFlagsTarget.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ControllerFlagsTarget.java
@@ -1,10 +1,6 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.systemflags.v1;
 
-/**
- * @author bjorncs
- */
-
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
 
@@ -17,6 +13,9 @@ import static com.yahoo.vespa.hosted.controller.api.systemflags.v1.FlagsTarget.c
 import static com.yahoo.vespa.hosted.controller.api.systemflags.v1.FlagsTarget.defaultFile;
 import static com.yahoo.vespa.hosted.controller.api.systemflags.v1.FlagsTarget.systemFile;
 
+/**
+ * @author bjorncs
+ */
 class ControllerFlagsTarget implements FlagsTarget {
     private final SystemName system;