From 0b3579b8af74a1bdbab5759a51bd592fdbc11cb8 Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahooinc.com>
Date: Fri, 3 Jun 2022 10:55:18 +0000
Subject: more cleanup of DocumentTypeManager API

---
 .../java/com/yahoo/document/DocumentTestCase.java    | 20 ++++++++++----------
 .../yahoo/document/DocumentTypeManagerTestCase.java  | 16 ++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'document/src/test/java/com')

diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index 3c1c7ae86e5..8d6fe7a8fa1 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -105,19 +105,19 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         docMan = new DocumentTypeManager();
 
         DocumentType docInDocType = new DocumentType("docindoc");
-        docInDocType.addField(new Field("tull", 2, docMan.getDataType(2)));
+        docInDocType.addField(new Field("tull", 2, DataType.STRING));
 
         docMan.registerDocumentType(docInDocType);
 
         DocumentType sertestDocType = new DocumentType("sertest");
-        sertestDocType.addField(new Field("mailid", 2, docMan.getDataType(2)));
-        sertestDocType.addField(new Field("date", 3, docMan.getDataType(0)));
-        sertestDocType.addField(new Field("from", 4, docMan.getDataType(2)));
-        sertestDocType.addField(new Field("to", 6, docMan.getDataType(2)));
-        sertestDocType.addField(new Field("subject", 9, docMan.getDataType(2)));
-        sertestDocType.addField(new Field("body", 10, docMan.getDataType(2)));
-        sertestDocType.addField(new Field("attachmentcount", 11, docMan.getDataType(0)));
-        sertestDocType.addField(new Field("attachments", 1081629685, DataType.getArray(docMan.getDataType(2))));
+        sertestDocType.addField(new Field("mailid", 2, DataType.STRING));
+        sertestDocType.addField(new Field("date", 3, DataType.INT));
+        sertestDocType.addField(new Field("from", 4, DataType.STRING));
+        sertestDocType.addField(new Field("to", 6, DataType.STRING));
+        sertestDocType.addField(new Field("subject", 9, DataType.STRING));
+        sertestDocType.addField(new Field("body", 10, DataType.STRING));
+        sertestDocType.addField(new Field("attachmentcount", 11, DataType.INT));
+        sertestDocType.addField(new Field("attachments", 1081629685, DataType.getArray(DataType.STRING)));
         sertestDocType.addField(new Field("rawfield", 879, DataType.RAW));
         sertestDocType.addField(new Field("weightedfield", 880, DataType.getWeightedSet(DataType.STRING)));
         sertestDocType.addField(new Field("weightedfieldCreate", 881, DataType.getWeightedSet(DataType.STRING, true, false)));
@@ -1114,7 +1114,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
             docWithDinner.serialize(buf);
             buf.flip();
 
-            docTypeManasjer.clear();
+            docTypeManasjer.internalClear();
         }
 
         {
diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
index f6cf589cce5..5cc4263d037 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
@@ -77,11 +77,11 @@ public class DocumentTypeManagerTestCase {
         DocumentTypeManager manager = new DocumentTypeManager();
         manager.register(docType2);
 
-        assertEquals(struct, manager.getDataType(struct.getId()));
+        assertEquals(struct, manager.getDataTypeByCode(struct.getId()));
         assertEquals(struct, manager.getDataTypeInternal("mystruct"));
-        assertEquals(wset1, manager.getDataType(wset1.getId()));
-        assertEquals(wset2, manager.getDataType(wset2.getId()));
-        assertEquals(array, manager.getDataType(array.getId()));
+        assertEquals(wset1, manager.getDataTypeByCode(wset1.getId()));
+        assertEquals(wset2, manager.getDataTypeByCode(wset2.getId()));
+        assertEquals(array, manager.getDataTypeByCode(array.getId()));
         assertEquals(docType, manager.getDataTypeInternal("mydoc"));
         assertEquals(docType2, manager.getDataTypeInternal("myotherdoc"));
         assertEquals(docType, manager.getDocumentType(new DataTypeName("mydoc")));
@@ -104,7 +104,7 @@ public class DocumentTypeManagerTestCase {
         docType4.addField("bar", DataType.RAW);
 
         DocumentTypeManager manager = new DocumentTypeManager();
-        manager.clear();
+        manager.internalClear();
         manager.register(docType1);
         manager.register(docType2);
         manager.register(docType3);
@@ -127,8 +127,8 @@ public class DocumentTypeManagerTestCase {
     public void testReverseMapOrder() {
         DocumentTypeManager manager = createConfiguredManager("file:src/test/document/documentmanager.map.cfg");
 
-        assertNotNull(manager.getDataType(1000));
-        assertNotNull(manager.getDataType(1001));
+        assertNotNull(manager.getDataTypeByCode(1000));
+        assertNotNull(manager.getDataTypeByCode(1001));
     }
 
     @SuppressWarnings("deprecation")
@@ -505,7 +505,7 @@ search annotationsimplicitstruct {
     @SuppressWarnings("deprecation")
     private static void assertReferenceTypePresentInManager(DocumentTypeManager manager, int refTypeId,
                                                             String refTargetTypeName) {
-        DataType type = manager.getDataType(refTypeId);
+        DataType type = manager.getDataTypeByCode(refTypeId);
         assertTrue(type instanceof ReferenceDataType);
         ReferenceDataType refType = (ReferenceDataType) type;
 
-- 
cgit v1.2.3