Clarify error handling

2 files changed, 2 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index f7d4fe28c6e..9d1b27d4bfe 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -377,8 +377,7 @@ public abstract class Container extends AbstractService implements
 
     @Override
     public void getConfig(ContainerHttpConfig.Builder builder) {
-        if (hostResponseHeaderKey.isPresent())
-            builder.hostResponseHeaderKey(hostResponseHeaderKey.get());
+        hostResponseHeaderKey.ifPresent(builder::hostResponseHeaderKey);
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
index 896a916aa50..800b3a1ba89 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
@@ -169,7 +169,6 @@ public class QueryProperties extends Properties {
             return;
         }
 
-        //TODO Why is there error handling in set path and not in get path ?
         if (key.first().equals(Ranking.RANKING)) {
             if (key.size() > 2) {
                 String restKey = key.rest().rest().toString();
@@ -189,6 +188,7 @@ public class QueryProperties extends Properties {
             }
         }
         if (reservedPrefix.contains(key.first())) {
+            // Setting a property under the reserved paths are illegal, while retrieving(get) one is not.
             throwIllegalParameter(key.rest().toString(), key.first());
         } else {
             super.set(key, value, context);