Classify exceptions better to avoid unnecessary stack traces

2 files changed, 5 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
index 8848759b415..9f4eeeb44c9 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
@@ -27,8 +27,8 @@ public class DataTypeRepo implements DataTypeCollection {
 
     public DataTypeRepo add(DataType type) {
         if (typeByName.containsKey(type.getName()) || typeById.containsKey(type.getId())) {
-            throw new IllegalStateException("Data type '" + type.getName() + "', id '" + 
-                                            type.getId() + "' is already registered.");
+            throw new IllegalArgumentException("Data type '" + type.getName() + "', id '" +
+                                               type.getId() + "' is already registered.");
         }
         typeByName.put(type.getName(), type);
         typeById.put(type.getId(), type);
@@ -43,9 +43,7 @@ public class DataTypeRepo implements DataTypeCollection {
     }
 
     public DataTypeRepo replace(DataType type) {
-        if (!typeByName.containsKey(type.getName()) ||
-            !typeById.containsKey(type.getId()))
-        {
+        if (!typeByName.containsKey(type.getName()) || !typeById.containsKey(type.getId())) {
             throw new IllegalStateException("Data type '" + type.getName() + "' is not registered.");
         }
         var oldByName = typeByName.remove(type.getName());
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
index 42572ae763a..885db34510b 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
@@ -28,10 +28,10 @@ public class DocumentTypeRepo implements DocumentTypeCollection {
 
     public DocumentTypeRepo add(NewDocumentType type) {
         if (typeByName.containsKey(type.getFullName())) {
-            throw new IllegalStateException("Document type " + type.toString() + " is already registered");
+            throw new IllegalArgumentException("Document type " + type + " is already registered");
         }
         if (typeById.containsKey(type.getFullName().getId())) {
-            throw new IllegalStateException("Document type " + type.toString() + " is already registered");
+            throw new IllegalArgumentException("Document type " + type + " is already registered");
         }
         typeByName.put(type.getFullName(), type);
         typeById.put(type.getFullName().getId(), type);