aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-08-18 11:15:50 +0200
committerJon Bratseth <bratseth@gmail.com>2020-08-18 11:15:50 +0200
commitc30bbdb0fa50cedc56eec71feeadc969ba5a3edf (patch)
tree6935b4d042618900ee0f7fd291c14ed55ae06cf8 /container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
parent529694a88d48270298171fdcb87d1439f183202b (diff)
Skip logging only for IllegalInputException
- Add IllegalInputException to signal cases where we know the exception is caused by illegal input received from the requestor. - Only skip logging for IllegalInputException instead of the superclass IllegalArgumentException as that is also used to signal illegal arguments to methods due to bugs which are otherwise hard to debug. - Throw IllegalInputException rather than IllegalArgumentException where appropriate. - Deprecated QueryException as it was only used to be able to separate between query string and query parameter exceptions, and not doing that consistently, and is in a package we don't want more use of. - Clean up some cases where the wrong exception was thrown.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java')
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
index c29e9615fe8..c37ea5667c0 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
@@ -19,16 +19,16 @@ import java.util.Map;
*/
class PlaceholderMappingVisitor extends PageTemplateVisitor {
- private Map<String, MapChoice> placeholderIdToChoice=new LinkedHashMap<>();
+ private final Map<String, MapChoice> placeholderIdToChoice = new LinkedHashMap<>();
@Override
public void visit(MapChoice mapChoice) {
- List<String> placeholderIds=mapChoice.placeholderIds();
+ List<String> placeholderIds = mapChoice.placeholderIds();
for (String placeholderId : placeholderIds) {
- MapChoice existingChoice=placeholderIdToChoice.put(placeholderId,mapChoice);
- if (existingChoice!=null)
+ MapChoice existingChoice = placeholderIdToChoice.put(placeholderId,mapChoice);
+ if (existingChoice != null)
throw new IllegalArgumentException("placeholder id '" + placeholderId + "' is referenced by both " +
- mapChoice + " and " + existingChoice + ": Only one reference is allowed");
+ mapChoice + " and " + existingChoice + ": Only one reference is allowed");
}
}