diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-02-24 10:25:32 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-02-24 18:05:19 +0000 |
commit | 2682ad84efc8a2edc09afb318797ad20bdc68d53 (patch) | |
tree | 00f83239caba300d6c31e17ce39f941c1e7388d1 /config-model/src/main/java/com/yahoo | |
parent | e5bf42755eee897deb85a769a810f7461beca711 (diff) |
more readable using verifyThat
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
5 files changed, 21 insertions, 59 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java index 4238cef2b6f..65cfa433dc0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java @@ -30,9 +30,7 @@ class ParsedDocumentSummary extends ParsedBlock { void addField(ParsedSummaryField field) { String fieldName = field.name(); - if (fields.containsKey(fieldName)) { - throw new IllegalArgumentException("document-summary "+name()+" already has field "+fieldName); - } + verifyThat(! fields.containsKey(fieldName), "already has field", fieldName); fields.put(fieldName, field); } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java index 974ff53edb2..a8e8c1399e8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java @@ -65,17 +65,13 @@ class ParsedField extends ParsedBlock { Map<String, String> getRankTypes() { return Map.copyOf(rankTypes); } void addAlias(String from, String to) { - if (aliases.containsKey(to)) { - throw new IllegalArgumentException("field "+name()+" already has alias "+to); - } + verifyThat(! aliases.containsKey(to), "already has alias", to); aliases.put(to, from); } void addIndex(ParsedIndex index) { String idxName = index.name(); - if (fieldIndexes.containsKey(idxName)) { - throw new IllegalArgumentException("field "+name()+" already has index "+idxName); - } + verifyThat(! fieldIndexes.containsKey(idxName), "already has index", idxName); fieldIndexes.put(idxName, index); } @@ -98,23 +94,17 @@ class ParsedField extends ParsedBlock { void addAttribute(ParsedAttribute attribute) { String attrName = attribute.name(); - if (attributes.containsKey(attrName)) { - throw new IllegalArgumentException("field "+name()+" already has attribute "+attrName); - } + verifyThat(! attributes.containsKey(attrName), "already has attribute", attrName); attributes.put(attrName, attribute); } void setIndexingOperation(ParsedIndexingOp idxOp) { - if (indexingOp != null) { - throw new IllegalArgumentException("field "+name()+" already has indexing"); - } + verifyThat(indexingOp == null, "already has indexing"); indexingOp = idxOp; } void setSorting(ParsedSorting sorting) { - if (sortSettings != null) { - throw new IllegalArgumentException("field "+name()+" already has sorting"); - } + verifyThat(sortSettings == null, "already has sorting"); this.sortSettings = sorting; } @@ -124,17 +114,13 @@ class ParsedField extends ParsedBlock { void addStructField(ParsedField structField) { String fieldName = structField.name(); - if (structFields.containsKey(fieldName)) { - throw new IllegalArgumentException("field "+name()+" already has struct-field "+fieldName); - } + verifyThat(! structFields.containsKey(fieldName), "already has struct-field", fieldName); structFields.put(fieldName, structField); } void addSummaryField(ParsedSummaryField summaryField) { String fieldName = summaryField.name(); - if (summaryFields.containsKey(fieldName)) { - throw new IllegalArgumentException("field "+name()+" already has summary field "+fieldName); - } + verifyThat(! summaryFields.containsKey(fieldName), "already has summary field", fieldName); summaryFields.put(fieldName, summaryField); } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankFunction.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankFunction.java index 5b37f356199..a8ee9a24e69 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankFunction.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankFunction.java @@ -25,9 +25,7 @@ class ParsedRankFunction extends ParsedBlock { List<String> getParameters() { return List.copyOf(parameters); } void addParameter(String param) { - if (parameters.contains(param)) { - throw new IllegalArgumentException("function "+name()+" cannot have parameter "+param+" twice"); - } + verifyThat(! parameters.contains(param), "cannot have parameter", param, "twice"); parameters.add(param); } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java index 2cb9e3dc064..3fb59c3d54d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java @@ -67,41 +67,31 @@ public class ParsedSchema extends ParsedBlock { void addAnnotation(ParsedAnnotation annotation) { String annName = annotation.name(); - if (extraAnnotations.containsKey(annName)) { - throw new IllegalArgumentException("schema "+name()+" already has annotation "+annName); - } + verifyThat(! extraAnnotations.containsKey(annName), "already has annotation", annName); extraAnnotations.put(annName, annotation); } void addDocument(ParsedDocument document) { - if (myDocument != null) { - throw new IllegalArgumentException("schema "+name()+" already has "+myDocument.name() - + "cannot add document "+document.name()); - } + verifyThat(myDocument == null, + "already has", myDocument.name(), "cannot add document", document.name()); myDocument = document; } void addDocumentSummary(ParsedDocumentSummary docsum) { String dsName = docsum.name(); - if (docSums.containsKey(dsName)) { - throw new IllegalArgumentException("schema "+name()+" already has document-summary "+dsName); - } + verifyThat(! docSums.containsKey(dsName), "already has document-summary", dsName); docSums.put(dsName, docsum); } void addField(ParsedField field) { String fieldName = field.name(); - if (extraFields.containsKey(fieldName)) { - throw new IllegalArgumentException("schema "+name()+" already has field "+fieldName); - } + verifyThat(! extraFields.containsKey(fieldName), "already has field", fieldName); extraFields.put(fieldName, field); } void addFieldSet(ParsedFieldSet fieldSet) { String fsName = fieldSet.name(); - if (fieldSets.containsKey(fsName)) { - throw new IllegalArgumentException("schema "+name()+" already has fieldset "+fsName); - } + verifyThat(! fieldSets.containsKey(fsName), "already has fieldset", fsName); fieldSets.put(fsName, fieldSet); } @@ -111,9 +101,7 @@ public class ParsedSchema extends ParsedBlock { void addIndex(ParsedIndex index) { String idxName = index.name(); - if (extraIndexes.containsKey(idxName)) { - throw new IllegalArgumentException("schema "+name()+" already has index "+idxName); - } + verifyThat(! extraIndexes.containsKey(idxName), "already has index", idxName); extraIndexes.put(idxName, index); } @@ -123,9 +111,7 @@ public class ParsedSchema extends ParsedBlock { void addRankProfile(ParsedRankProfile profile) { String rpName = profile.name(); - if (rankProfiles.containsKey(rpName)) { - throw new IllegalArgumentException("schema "+name()+" already has rank-profile "+rpName); - } + verifyThat(! rankProfiles.containsKey(rpName), "already has rank-profile", rpName); rankProfiles.put(rpName, profile); } @@ -135,9 +121,7 @@ public class ParsedSchema extends ParsedBlock { void addStruct(ParsedStruct struct) { String sName = struct.name(); - if (extraStructs.containsKey(sName)) { - throw new IllegalArgumentException("schema "+name()+" already has struct "+sName); - } + verifyThat(! extraStructs.containsKey(sName), "already has struct", sName); extraStructs.put(sName, struct); } @@ -148,10 +132,8 @@ public class ParsedSchema extends ParsedBlock { void inherit(String other) { inherited.add(other); } void setStemming(Stemming value) { - if ((defaultStemming != null) && (defaultStemming != value)) { - throw new IllegalArgumentException("schema " + name() + " already has stemming " - + defaultStemming + "cannot also set " + value); - } + verifyThat((defaultStemming == null) || (defaultStemming == value), + "already has stemming", defaultStemming, "cannot also set", value); defaultStemming = value; } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java index 61abf96a7ec..67f2f137bc1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java @@ -25,9 +25,7 @@ public class ParsedStruct extends ParsedBlock { void addField(ParsedField field) { String fieldName = field.name(); - if (fields.containsKey(fieldName)) { - throw new IllegalArgumentException("struct "+name()+" already has field "+fieldName); - } + verifyThat(! fields.containsKey(fieldName), "already has field", fieldName); fields.put(fieldName, field); } |