Move User from controller-api to jdisc-security-filters

6 files changed, 9 insertions, 88 deletions

diff --git a/controller-api/pom.xml b/controller-api/pom.xml
index dc2ec981e66..42e96e0331a 100644
--- a/controller-api/pom.xml
+++ b/controller-api/pom.xml
@@ -60,6 +60,13 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>jdisc-security-filters</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- compile -->
 
         <dependency>
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java
index 43312f9332c..0ef76f498fb 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.api.integration.billing;
 
 import com.yahoo.config.provision.TenantName;
-import com.yahoo.vespa.hosted.controller.api.integration.user.User;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -10,7 +9,6 @@ import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 
 /**
  * A service that controls creation of bills based on the resource usage of a tenant, controls the quota for a
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
index 295c993f409..d6aa434ece4 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.api.integration.billing;
 
 import com.yahoo.config.provision.TenantName;
-import com.yahoo.vespa.hosted.controller.api.integration.user.User;
 
 import java.math.BigDecimal;
 import java.time.Clock;
@@ -15,7 +14,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java
index 73d5d443b5e..0de51795bc0 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.stubs;
 
-import com.yahoo.vespa.hosted.controller.api.integration.user.User;
+import com.yahoo.jdisc.http.filter.security.misc.User;
 import com.yahoo.vespa.hosted.controller.api.integration.user.UserId;
 import com.yahoo.vespa.hosted.controller.api.integration.user.UserManagement;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/User.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/User.java
deleted file mode 100644
index 528cfa55fbf..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/User.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.user;
-
-import java.time.LocalDate;
-import java.util.Objects;
-
-/**
- * @author smorgrav
- */
-public class User {
-
-    public static final String ATTRIBUTE_NAME = "vespa.user.attributes";
-    public static final LocalDate NO_DATE = LocalDate.EPOCH;
-
-    private final String email;
-    private final String name;
-    private final String nickname;
-    private final String picture;
-    private final boolean isVerified;
-    private final int loginCount;
-    private final LocalDate lastLogin;
-
-    public User(String email, String name, String nickname, String picture) {
-        this.email = Objects.requireNonNull(email);
-        this.name = name;
-        this.nickname = nickname;
-        this.picture = picture;
-        this.isVerified = false;
-        this.loginCount = -1;
-        this.lastLogin = NO_DATE;
-    }
-
-    public User(String email, String name, String nickname, String picture, boolean isVerified, int loginCount, LocalDate lastLogin) {
-        this.email = Objects.requireNonNull(email);
-        this.name = name;
-        this.nickname = nickname;
-        this.picture = picture;
-        this.isVerified = isVerified;
-        this.loginCount = loginCount;
-        this.lastLogin = Objects.requireNonNull(lastLogin);
-    }
-
-    public String name() {
-        return name;
-    }
-
-    public String email() {
-        return email;
-    }
-
-    public String nickname() {
-        return nickname;
-    }
-
-    public String picture() {
-        return picture;
-    }
-
-    public LocalDate lastLogin() { return lastLogin; }
-
-    public boolean isVerified() { return isVerified; }
-
-    public int loginCount() { return loginCount; }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        User user = (User) o;
-        return Objects.equals(name, user.name) &&
-                Objects.equals(email, user.email) &&
-                Objects.equals(nickname, user.nickname) &&
-                Objects.equals(picture, user.picture) &&
-                Objects.equals(lastLogin, user.lastLogin) &&
-                loginCount == user.loginCount &&
-                isVerified == user.isVerified;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, email, nickname, picture, lastLogin, loginCount, isVerified);
-    }
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java
index 9c81e1665ee..9abd318d085 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.user;
 
+import com.yahoo.jdisc.http.filter.security.misc.User;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 
 import java.util.Collection;