more cleanup of DocumentTypeManager API

1 files changed, 8 insertions, 8 deletions

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;