From f20dae85a9bbb0972b30ffdc94a34576ce039102 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colin.goodheart-smithe@elasticsearch.com>
Date: Mon, 16 Feb 2015 10:51:31 +0000
Subject: [PATCH] getProperty method in the aggregations framework now throws a
 specific exception

---
 .../InternalMultiBucketAggregation.java       |  8 ++---
 .../InvalidAggregationPathException.java      | 33 +++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java

diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java
index ebd2637ac56..5efc2180229 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.search.aggregations;
 
-import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
 import org.elasticsearch.search.aggregations.reducers.Reducer;
 
@@ -58,18 +57,19 @@ public abstract class InternalMultiBucketAggregation extends InternalAggregation
             String aggName = path.get(0);
             if (aggName.equals("_count")) {
                 if (path.size() > 1) {
-                    throw new ElasticsearchIllegalArgumentException("_count must be the last element in the path");
+                    throw new InvalidAggregationPathException("_count must be the last element in the path");
                 }
                 return getDocCount();
             } else if (aggName.equals("_key")) {
                 if (path.size() > 1) {
-                    throw new ElasticsearchIllegalArgumentException("_key must be the last element in the path");
+                    throw new InvalidAggregationPathException("_key must be the last element in the path");
                 }
                 return getKey();
             }
             InternalAggregation aggregation = aggregations.get(aggName);
             if (aggregation == null) {
-                throw new ElasticsearchIllegalArgumentException("Cannot find an aggregation named [" + aggName + "] in [" + containingAggName + "]");
+                throw new InvalidAggregationPathException("Cannot find an aggregation named [" + aggName + "] in [" + containingAggName
+                        + "]");
             }
             return aggregation.getProperty(path.subList(1, path.size()));
         }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java b/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java
new file mode 100644
index 00000000000..e2ab1f65245
--- /dev/null
+++ b/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.search.aggregations;
+
+import org.elasticsearch.ElasticsearchException;
+
+public class InvalidAggregationPathException extends ElasticsearchException {
+
+    public InvalidAggregationPathException(String msg) {
+        super(msg);
+    }
+
+    public InvalidAggregationPathException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}