Cleanup

3 files changed, 5 insertions, 16 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java
index 3879e7f29ca..abe09090761 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java
@@ -21,7 +21,6 @@ public class AthenzTenant extends Tenant {
     private final Property property;
     private final Optional<PropertyId> propertyId;
 
-
     /**
      * This should only be used by serialization.
      * Use {@link #create(TenantName, AthenzDomain, Property, Optional)}.
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java
index 98950ca2632..c6ed9f7b559 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java
@@ -5,7 +5,6 @@ package com.yahoo.vespa.hosted.controller.tenant;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.Contact;
 
-import javax.swing.text.html.Option;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -19,32 +18,23 @@ public abstract class Tenant {
     public static final String userPrefix = "by-";
 
     private final TenantName name;
-
-    private Optional<Contact> contact;
+    private final Optional<Contact> contact;
 
     Tenant(TenantName name, Optional<Contact> contact) {
         this.name = name;
         this.contact = contact;
     }
 
-    /*Tenant(TenantName name) {
-        this(name, Optional.empty());
-    }*/
-
     /** Name of this tenant */
     public TenantName name() {
         return name;
     }
 
+    /** Contact information for this tenant */
     public Optional<Contact> contact() {
         return contact;
     }
 
-    public Tenant withContact(Optional<Contact> contact) {
-        this.contact = contact;
-        return this;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/monitoring/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/monitoring/MetricsReporterTest.java
index 2b91262d291..1d673a2224a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/monitoring/MetricsReporterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/monitoring/MetricsReporterTest.java
@@ -229,12 +229,12 @@ public class MetricsReporterTest {
             values.put(key, val);
             if (ctx != null) {
                 //Create one context pr value added - copy the context to not have side effects
-                TestContext kontekst = (TestContext)createContext(((TestContext) ctx).properties);
+                TestContext copy = (TestContext) createContext(((TestContext) ctx).properties);
                 if (!context.containsKey(key)) {
                     context.put(key, new ArrayList<>());
                 }
-                kontekst.setValue(val);
-                context.get(key).add(kontekst);
+                copy.setValue(val);
+                context.get(key).add(copy);
             }
         }