aboutsummaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-04-16 08:23:16 +0200
committerMorten Tokle <mortent@verizonmedia.com>2021-04-16 11:02:59 +0200
commit852ae37871cc7db3447dbfc8ddea5157b6a81d4d (patch)
treef210c9020afc88659c1bffda4afddae391951229 /container-search
parent96c2e442cbb798f0c85990d3f0c760c60ee9a5b3 (diff)
Changes after review
Diffstat (limited to 'container-search')
-rw-r--r--container-search/abi-spec.json6
-rw-r--r--container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java10
2 files changed, 9 insertions, 7 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 9e5963e5152..b5933936adf 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -1642,13 +1642,13 @@
"final"
],
"methods": [
+ "public void <init>()",
+ "public void <init>(int)",
+ "public void <init>(java.lang.String, int)",
"public com.yahoo.prelude.query.Item$ItemType getItemType()",
"public java.lang.String getName()",
- "public void <init>(java.lang.String, int)",
- "public void <init>(int)",
"public void setIndexName(java.lang.String)",
"public java.lang.String getIndexName()",
- "public void <init>()",
"public int getN()",
"public void setN(int)",
"public int getScoreThreshold()",
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index e95e085ed5c..e7c5511f259 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -647,13 +647,15 @@ public class SearchHandler extends LoggingRequestHandler {
case POST:
case HEAD:
case OPTIONS:
- return AclMapping.Action.read;
+ return AclMapping.Action.READ;
case PUT:
- return AclMapping.Action.update;
case DELETE:
- return AclMapping.Action.delete;
+ case CONNECT:
+ case TRACE:
+ case PATCH:
+ return AclMapping.Action.WRITE;
default:
- return AclMapping.Action.create;
+ throw new IllegalArgumentException("Illegal method " + requestMeta.method());
}
}
}