diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
8 files changed, 10 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java index 7e19cb4a0ae..4fd4ab7c69b 100644 --- a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java @@ -188,7 +188,7 @@ public class ConvertParsedSchemas { while (true) { if (seen.contains(parsedField.name())) { throw new IllegalArgumentException("For schema '" + schema.getName() + - "' summary class '" + docsum.name() + + "' document-summary '" + docsum.name() + "' summary field '" + origName + "': Source loop detected for summary field '" + parsedField.name() + "'"); } @@ -210,7 +210,7 @@ public class ConvertParsedSchemas { return null; // Imported field, cannot resolve now } else if (source.equals(parsedField.name()) || !summaryFields.containsKey(source)) { throw new IllegalArgumentException("For schema '" + schema.getName() + - "', summary class '" + docsum.name() + + "', document-summary '" + docsum.name() + "', summary field '" + parsedField.name() + "': there is no valid source '" + source + "'."); } diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java index 82bf95eb5eb..a05450aa3a0 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java @@ -185,7 +185,7 @@ public class ImplicitSummaries extends Processor { Attribute attribute = sourceField.getAttributes().get(sourceField.getName()); if (attribute != null) { String destinations = "document summary 'default'"; - if (summaryField.getDestinations().size() >0) { + if (summaryField.getDestinations().size() > 0) { destinations = "document summaries " + summaryField.getDestinations(); } deployLogger.logApplicationPackage(Level.WARNING, diff --git a/config-model/src/main/java/com/yahoo/schema/processing/MatchedElementsOnlyResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/MatchedElementsOnlyResolver.java index d2ef467438f..e98afda34a8 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/MatchedElementsOnlyResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MatchedElementsOnlyResolver.java @@ -88,7 +88,7 @@ public class MatchedElementsOnlyResolver extends Processor { } private String formatError(Schema schema, DocumentSummary summary, SummaryField field, String msg) { - return "For " + schema + ", document summary '" + summary.getName() + return "For " + schema + ", document-summary '" + summary.getName() + "', summary field '" + field.getName() + "': " + msg; } diff --git a/config-model/src/main/java/com/yahoo/schema/processing/SummaryDiskAccessValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryDiskAccessValidator.java index 70e2bd038b8..38163058a10 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/SummaryDiskAccessValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryDiskAccessValidator.java @@ -56,7 +56,7 @@ public class SummaryDiskAccessValidator extends Processor { ": Fields " + implicitDiskFields + " references " + "non-attribute fields: Using this " + "summary will cause disk accesses. " + - "Set 'from-disk' on this summary class to silence this warning."); + "Set 'from-disk' on this document-summary to silence this warning."); } } diff --git a/config-model/src/main/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSource.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSource.java index ac9dbf73e4f..421d6a74dc8 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSource.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSource.java @@ -56,7 +56,7 @@ public class SummaryFieldsMustHaveValidSource extends Processor { private void verifySource(String source, SummaryField summaryField, DocumentSummary summary) { if ( ! isValid(source, summaryField, summary) ) { - throw new IllegalArgumentException("For " + schema + ", summary class '" + + throw new IllegalArgumentException("For " + schema + ", document-summary '" + summary.getName() + "'," + " summary field '" + summaryField.getName() + "': there is no valid source '" + source + "'."); } diff --git a/config-model/src/main/java/com/yahoo/schema/processing/SummaryNamesFieldCollisions.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryNamesFieldCollisions.java index d98f7e84b26..720cc3e5b56 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/SummaryNamesFieldCollisions.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryNamesFieldCollisions.java @@ -41,10 +41,10 @@ public class SummaryNamesFieldCollisions extends Processor { if ( ! prevClass.equals(summary.getName())) { if ( ! prevSource.equals(source.getName())) { throw new IllegalArgumentException("For " + schema + - ", summary class '" + summary.getName() + "'," + + ", document-summary '" + summary.getName() + "'," + " summary field '" + summaryField.getName() + "':" + " Can not use source '" + source.getName() + - "' for this summary field, an equally named field in summary class '" + + "' for this summary field, an equally named field in document-summary '" + prevClass + "' uses a different source: '" + prevSource + "'."); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java index 6cd2d7721d5..32807db8405 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java @@ -120,7 +120,7 @@ public class DocumentSummary extends FieldView { @Override public String toString() { - return "document summary '" + getName() + "'"; + return "document-summary '" + getName() + "'"; } public void validate(DeployLogger logger) { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java index 1c53ee36497..d50d5e36134 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java @@ -240,7 +240,7 @@ public class SummaryField extends Field implements Cloneable, TypedKey { } private String getDestinationString() { - return destinations.stream().map(destination -> "document summary '" + destination + "'").collect(Collectors.joining(", ")); + return destinations.stream().map(destination -> "document-summary '" + destination + "'").collect(Collectors.joining(", ")); } @Override |