From c474a6250e57cb54ea83a3ff13706cfd36f96182 Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <jonmv@gmail.com>
Date: Mon, 4 Apr 2022 11:59:40 +0200
Subject: Revert "Merge pull request #21961 from
 vespa-engine/revert-21918-jonmv/misc-6"

This reverts commit a0b02d8bd00bf8d7f3410cbf47ae432770546883, reversing
changes made to 64d0102f9931a01d31976e85b585b9e63894f08e.
---
 application-model/pom.xml                                           | 6 ++++++
 .../src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java    | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'application-model')

diff --git a/application-model/pom.xml b/application-model/pom.xml
index 3abf9851d5c..7eac247e249 100644
--- a/application-model/pom.xml
+++ b/application-model/pom.xml
@@ -21,6 +21,12 @@
             <version>${jackson2.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>vespajlib</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>config-provisioning</artifactId>
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java
index 7d94a0418e4..20aca379015 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java
@@ -31,8 +31,6 @@ public class TenantId {
         return id;
     }
 
-    public TenantName toName() { return TenantName.from(id); }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-- 
cgit v1.2.3