value -> version

3 files changed, 12 insertions, 12 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java
index be6bf7164ad..27012ae69fe 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java
@@ -17,7 +17,7 @@ import java.util.List;
 public class DataplaneTokenSerializer {
 
     private static final String ID_FIELD = "id";
-    private static final String VALUES_FIELD = "values";
+    private static final String VERSIONS_FIELD = "versions";
     private static final String FINGERPRINT_FIELD = "fingerPrint";
     private static final String CHECKACCESSHASH_FIELD = "checkAccessHash";
 
@@ -31,15 +31,15 @@ public class DataplaneTokenSerializer {
 
     private static DataplaneToken tokenFromSlime(Inspector object) {
         String id = object.field(ID_FIELD).asString();
-        List<DataplaneToken.TokenValue> values = SlimeUtils.entriesStream(object.field(VALUES_FIELD))
+        List<DataplaneToken.Version> versions = SlimeUtils.entriesStream(object.field(VERSIONS_FIELD))
                 .filter(Inspector::valid)
                 .map(DataplaneTokenSerializer::tokenValue)
                 .toList();
-        return new DataplaneToken(id, values);
+        return new DataplaneToken(id, versions);
     }
 
-    private static DataplaneToken.TokenValue tokenValue(Inspector inspector) {
-        return new DataplaneToken.TokenValue(
+    private static DataplaneToken.Version tokenValue(Inspector inspector) {
+        return new DataplaneToken.Version(
                 inspector.field(FINGERPRINT_FIELD).asString(),
                 inspector.field(CHECKACCESSHASH_FIELD).asString());
     }
@@ -50,9 +50,9 @@ public class DataplaneTokenSerializer {
         for (DataplaneToken token : dataplaneTokens) {
             Cursor cursor = root.addObject();
             cursor.setString(ID_FIELD, token.tokenId());
-            Cursor values = cursor.setArray(VALUES_FIELD);
-            token.tokenValues().forEach(v -> {
-                Cursor val = values.addObject();
+            Cursor versions = cursor.setArray(VERSIONS_FIELD);
+            token.versions().forEach(v -> {
+                Cursor val = versions.addObject();
                 val.setString(FINGERPRINT_FIELD, v.fingerprint());
                 val.setString(CHECKACCESSHASH_FIELD, v.checkAccessHash());
             });
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 19f24f8e817..f7b2d4119a7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -366,7 +366,7 @@ public class SessionPreparerTest {
         TestModelFactory modelFactory = new TestModelFactory(version123);
         preparer = createPreparer(new ModelFactoryRegistry(List.of(modelFactory)), HostProvisionerProvider.empty());
         ApplicationId applicationId = applicationId("test");
-        List<DataplaneToken> expected = List.of(new DataplaneToken("id", List.of(new DataplaneToken.TokenValue("f1", "ch1"))));
+        List<DataplaneToken> expected = List.of(new DataplaneToken("id", List.of(new DataplaneToken.Version("f1", "ch1"))));
         PrepareParams params = new PrepareParams.Builder().applicationId(applicationId)
                 .dataplaneTokens(expected)
                 .build();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java
index cb9e29e6517..505abcb5598 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java
@@ -18,10 +18,10 @@ public class DataplaneTokenSerializerTest {
     public void testSerialization() {
         List<DataplaneToken> tokens = List.of(
                 new DataplaneToken("id1",
-                                   List.of(new DataplaneToken.TokenValue("id1_fingerPrint1", "id1_checkaccesshash1"))),
+                                   List.of(new DataplaneToken.Version("id1_fingerPrint1", "id1_checkaccesshash1"))),
                 new DataplaneToken("id2",
-                                   List.of(new DataplaneToken.TokenValue("id2_fingerPrint1", "id2_checkaccesshash1"),
-                                           new DataplaneToken.TokenValue("id3_fingerPrint1", "id3_checkaccesshash1"))));
+                                   List.of(new DataplaneToken.Version("id2_fingerPrint1", "id2_checkaccesshash1"),
+                                           new DataplaneToken.Version("id3_fingerPrint1", "id3_checkaccesshash1"))));
         Slime slime = DataplaneTokenSerializer.toSlime(tokens);
         List<DataplaneToken> deserialized = DataplaneTokenSerializer.fromSlime(slime.get());
         assertEquals(tokens, deserialized);