summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2022-02-25 15:25:17 +0000
committerArne H Juul <arnej@yahooinc.com>2022-02-25 15:25:17 +0000
commitc08469d34727330e2e783ce75c43b4bae2d8e92f (patch)
tree54e4e9ca1b10d78000d68bea193409baf388ee97 /config-model
parent442a36dab875212162d202095e9b618eb773eff3 (diff)
add spaces
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java4
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java12
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java6
4 files changed, 12 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java
index 655285c8462..488464ccd1f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java
@@ -39,7 +39,7 @@ public class InheritanceResolver {
for (String inherit : schema.getInherited()) {
var parent = parsedSchemas.get(inherit);
if (parent == null) {
- throw new IllegalArgumentException("schema "+schema.name()+" inherits from unavailable schema "+inherit);
+ throw new IllegalArgumentException("schema " + schema.name() + " inherits from unavailable schema " + inherit);
}
schema.resolveInherit(inherit, parent);
}
@@ -67,7 +67,7 @@ public class InheritanceResolver {
for (String inherit : doc.getInherited()) {
var parentDoc = parsedDocs.get(inherit);
if (parentDoc == null) {
- throw new IllegalArgumentException("document "+doc.name()+" inherits from unavailable document "+inherit);
+ throw new IllegalArgumentException("document " + doc.name() + " inherits from unavailable document " + inherit);
}
doc.resolveInherit(inherit, parentDoc);
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java
index 0ba34287293..a93fb441563 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java
@@ -47,7 +47,7 @@ public class IntermediateCollection {
var parser = new IntermediateParser(stream, deployLogger, modelProperties);
var schema = parser.schema();
if (parsedSchemas.containsKey(schema.name())) {
- throw new IllegalArgumentException("Duplicate schemas named: "+schema.name());
+ throw new IllegalArgumentException("Duplicate schemas named: " + schema.name());
}
parsedSchemas.put(schema.name(), schema);
return schema;
@@ -67,7 +67,7 @@ public class IntermediateCollection {
private String baseName(String filename) {
int pos = filename.lastIndexOf('/');
if (pos != -1) {
- filename = filename.substring(pos+1);
+ filename = filename.substring(pos + 1);
}
pos = filename.lastIndexOf('.');
if (pos != -1) {
@@ -93,7 +93,7 @@ public class IntermediateCollection {
} catch (java.io.IOException ex) {
throw new IllegalArgumentException("Failed reading from " + reader.getName() + ": " + ex.getMessage());
} catch (ParseException ex) {
- throw new IllegalArgumentException("Failed parsing schema from " + reader.getName() + ": "+ex.getMessage());
+ throw new IllegalArgumentException("Failed parsing schema from " + reader.getName() + ": " + ex.getMessage());
}
}
@@ -105,7 +105,7 @@ public class IntermediateCollection {
} catch (java.io.IOException ex) {
throw new IllegalArgumentException("Could not read file " + fileName + ": " + ex.getMessage());
} catch (ParseException ex) {
- throw new IllegalArgumentException("Failed parsing schema file " + fileName + ": "+ex.getMessage());
+ throw new IllegalArgumentException("Failed parsing schema file " + fileName + ": " + ex.getMessage());
}
}
@@ -117,7 +117,7 @@ public class IntermediateCollection {
try {
ParsedSchema schema = parsedSchemas.get(schemaName);
if (schema == null) {
- throw new IllegalArgumentException("No schema named: "+schemaName);
+ throw new IllegalArgumentException("No schema named: " + schemaName);
}
var stream = new SimpleCharStream(IOUtils.readAll(reader.getReader()));
var parser = new IntermediateParser(stream, deployLogger, modelProperties);
@@ -125,7 +125,7 @@ public class IntermediateCollection {
} catch (java.io.IOException ex) {
throw new IllegalArgumentException("Failed reading from " + reader.getName() + ": " + ex.getMessage());
} catch (ParseException ex) {
- throw new IllegalArgumentException("Failed parsing rank-profile from " + reader.getName() + ": "+ex.getMessage());
+ throw new IllegalArgumentException("Failed parsing rank-profile from " + reader.getName() + ": " + ex.getMessage());
}
}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java
index bf30654abc7..8cd64ef16f7 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java
@@ -52,7 +52,7 @@ public class ParsedDocument extends ParsedBlock {
docAnnotations.put(annName, annotation);
}
- public String toString() { return "document "+name(); }
+ public String toString() { return "document " + name(); }
void resolveInherit(String name, ParsedDocument parsed) {
verifyThat(inherited.contains(name), "resolveInherit for non-inherited name", name);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java
index 4d5280d29eb..9f02c5247ef 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java
@@ -104,14 +104,14 @@ class ParsedType {
void setCreateIfNonExistent(boolean value) {
if (variant != Variant.WSET) {
- throw new IllegalArgumentException("CreateIfNonExistent only valid for weightedset, not "+variant);
+ throw new IllegalArgumentException("CreateIfNonExistent only valid for weightedset, not " + variant);
}
this.createIfNonExistent = value;
}
void setRemoveIfZero(boolean value) {
if (variant != Variant.WSET) {
- throw new IllegalArgumentException("RemoveIfZero only valid for weightedset, not "+variant);
+ throw new IllegalArgumentException("RemoveIfZero only valid for weightedset, not " + variant);
}
this.removeIfZero = value;
}
@@ -119,7 +119,7 @@ class ParsedType {
void setVariant(Variant value) {
if (variant == value) return; // already OK
if (variant != Variant.UNKNOWN) {
- throw new IllegalArgumentException("setVariant("+value+") only valid for UNKNOWN, not: "+variant);
+ throw new IllegalArgumentException("setVariant(" + value + ") only valid for UNKNOWN, not: " + variant);
}
// maybe even more checking would be useful
this.variant = value;