From 73e4f18c1b25372eeb74626d53ff2498c550f1bb Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Wed, 8 Nov 2023 16:51:05 +0000 Subject: Align with other similar error messages. --- .../src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java | 4 ++-- .../src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java | 4 ++-- config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java index bc0e16abbe3..b5d091cca8d 100644 --- a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java @@ -154,8 +154,8 @@ public class ConvertParsedFields { var dataType = field.getDataType(); var otherType = summaryField.getType(); if (otherType != null && summaryField.getHasExplicitType()) { - schema.getDeployLogger().log(Level.FINE, () -> "For " + schema.getName() + - ", field '" + field.getName() + + schema.getDeployLogger().log(Level.FINE, () -> "For schema '" + schema.getName() + + "', field '" + field.getName() + "', summary '" + summaryField.name() + "': Specifying the type is deprecated, ignored and will be an error in Vespa 9." + " Remove the type specification to silence this warning."); 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 4fd4ab7c69b..ee15b95b198 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 @@ -233,8 +233,8 @@ public class ConvertParsedSchemas { var parsedType = parsedField.getType(); if (parsedType != null) { var log = schema.getDeployLogger(); - log.log(Level.FINE, () -> "For " + schema.getName() + - ", document-summary '" + parsed.name() + + log.log(Level.FINE, () -> "For schema '" + schema.getName() + + "', document-summary '" + parsed.name() + "', summary field '" + parsedField.name() + "': Specifying the type is deprecated, ignored and will be an error in Vespa 9." + " Remove the type specification to silence this warning."); diff --git a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java index 4f008e661c8..6442edd547d 100644 --- a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java @@ -360,7 +360,7 @@ public class SummaryTestCase { if (explicit) { assertEquals(1, logger.entries.size()); assertEquals(Level.FINE, logger.entries.get(0).level); - assertEquals("For test, field 'foo', summary 'bar':" + + assertEquals("For schema 'test', field 'foo', summary 'bar':" + " Specifying the type is deprecated, ignored and will be an error in Vespa 9." + " Remove the type specification to silence this warning.", logger.entries.get(0).message); } else { @@ -393,7 +393,7 @@ public class SummaryTestCase { if (explicit) { assertEquals(1, logger.entries.size()); assertEquals(Level.FINE, logger.entries.get(0).level); - assertEquals("For test, document-summary 'bar', summary field 'foo':" + + assertEquals("For schema 'test', document-summary 'bar', summary field 'foo':" + " Specifying the type is deprecated, ignored and will be an error in Vespa 9." + " Remove the type specification to silence this warning.", logger.entries.get(0).message); } else { -- cgit v1.2.3