Issue searchbox-io#146 More changes + sample test

jest-common/src/main/java/io/searchbox/core/SearchResult.java

@@ -157,7 +157,8 @@ public <T extends Facet> List<T> getFacets(Class<T> type) {
             Constructor<T> c;
             try {
                 JsonObject facetsMap = (JsonObject) jsonObject.get("facets");
-                if (facetsMap == null) return facets;
+                if (facetsMap == null)
+                    return facets;
                 for (Map.Entry<String, JsonElement> facetEntry : facetsMap.entrySet()) {
                     JsonObject facet = facetEntry.getValue().getAsJsonObject();
                     if (facet.get("_type").getAsString().equalsIgnoreCase(type.getField("TYPE").get(null).toString())) {

jest-common/src/main/java/io/searchbox/core/search/aggregation/Aggregation.java

@@ -30,7 +30,7 @@ public List<T> getAggregations(Map<String, Class<T>> nameToTypeMap) {
         for (String nameCandidate : nameToTypeMap.keySet()) {
             if (jsonRoot.has(nameCandidate)) {
                 try {
-                    Class<T> type = nameToTypeMap.get(name);
+                    Class<T> type = nameToTypeMap.get(nameCandidate);
                     Constructor<T> c = type.getConstructor(String.class, JsonObject.class);
                     aggregations.add(c.newInstance(nameCandidate, jsonRoot.get(nameCandidate).getAsJsonObject()));
                 } catch (Exception e) {
@@ -45,7 +45,7 @@ public Aggregation getAggregation(String aggName, Class<T> aggType) {
         if(jsonRoot.has(aggName)) {
             try {
                 Constructor<T> c = aggType.getConstructor(String.class, JsonObject.class);
-                c.newInstance(aggName, jsonRoot.get(aggName).getAsJsonObject());
+                return c.newInstance(aggName, jsonRoot.get(aggName).getAsJsonObject());
             } catch(Exception e) {
                 throw new RuntimeException(e);
             }

jest-common/src/main/java/io/searchbox/core/search/aggregation/AvgAggregation.java

@@ -7,18 +7,15 @@
 /**
  * @author cfstout
  */
-public class AvgAggregation extends Aggregation {
+public class AvgAggregation extends SingleValueAggregation {
 
     public static final String TYPE = "avg";
 
-    private Double avg;
-
     public <T extends Aggregation> AvgAggregation(String name, JsonObject avgAggregation) {
         super(name, avgAggregation);
-        avg = avgAggregation.get(String.valueOf(VALUE)).getAsDouble();
     }
 
     public Double getAvg() {
-        return avg;
+        return getValue();
     }
 }

jest-common/src/main/java/io/searchbox/core/search/aggregation/MaxAggregation.java

@@ -7,18 +7,15 @@
 /**
  * @author cfstout
  */
-public class MaxAggregation extends Aggregation {
+public class MaxAggregation extends SingleValueAggregation {
 
     public static final String TYPE = "max";
 
-    private Double max;
-
     public <T extends Aggregation> MaxAggregation(String name, JsonObject maxAggregation) {
         super(name, maxAggregation);
-        max = maxAggregation.get("value").getAsDouble();
     }
 
     public Double getMax() {
-        return max;
+        return getValue();
     }
 }

jest-common/src/main/java/io/searchbox/core/search/aggregation/MinAggregation.java

@@ -7,18 +7,15 @@
 /**
  * @author cfstout
  */
-public class MinAggregation extends Aggregation {
+public class MinAggregation extends SingleValueAggregation {
 
     public static final String TYPE = "min";
 
-    private Double min;
-
     public <T extends Aggregation> MinAggregation(String name, JsonObject minAggregation) {
         super(name, minAggregation);
-        min = minAggregation.get(String.valueOf(VALUE)).getAsDouble();
     }
 
     public Double getMin() {
-        return min;
+        return getValue();
     }
 }

jest-common/src/main/java/io/searchbox/core/search/aggregation/ScriptedMetricAggregation.java

@@ -7,18 +7,11 @@
 /**
  * @author cfstout
  */
-public class ScriptedMetricAggregation extends Aggregation {
+public class ScriptedMetricAggregation extends SingleValueAggregation {
 
     public static final String TYPE = "scripted_metric";
 
-    public Double value;
-
     public <T extends Aggregation> ScriptedMetricAggregation(String name, JsonObject scriptedMetricAggregation) {
         super(name, scriptedMetricAggregation);
-        value = scriptedMetricAggregation.get(String.valueOf(VALUE)).getAsDouble();
-    }
-
-    public Double getValue() {
-        return value;
     }
 }

jest-common/src/main/java/io/searchbox/core/search/aggregation/SingleValueAggregation.java

@@ -0,0 +1,22 @@
+package io.searchbox.core.search.aggregation;
+
+import com.google.gson.JsonObject;
+
+import static io.searchbox.core.search.aggregation.AggregationField.VALUE;
+
+/**
+ * @author cfstout
+ */
+public abstract class SingleValueAggregation extends Aggregation {
+
+    private Double value;
+
+    protected SingleValueAggregation(String name, JsonObject singleValueAggregation) {
+        super(name, singleValueAggregation);
+        value = singleValueAggregation.get(String.valueOf(VALUE)).getAsDouble();
+    }
+
+    protected Double getValue() {
+        return value;
+    }
+}

jest-common/src/main/java/io/searchbox/core/search/aggregation/SumAggregation.java

@@ -7,18 +7,15 @@
 /**
  * @author cfstout
  */
-public class SumAggregation extends Aggregation {
+public class SumAggregation extends SingleValueAggregation {
 
     public static final String TYPE = "sum";
 
-    private Double sum;
-
     public <T extends Aggregation> SumAggregation(String name, JsonObject sumAggregation) {
         super(name, sumAggregation);
-        sum = sumAggregation.get(String.valueOf(VALUE)).getAsDouble();
     }
 
     public Double getSum() {
-        return sum;
+        return getValue();
     }
 }

jest-common/src/main/java/io/searchbox/core/search/aggregation/ValueCountAggregation.java

@@ -11,27 +11,14 @@ public class ValueCountAggregation extends Aggregation {
 
     public static final String TYPE = "value_count";
 
-    private ValueCount valueCount;
+    private Long valueCount;
 
     public <T extends Aggregation> ValueCountAggregation(String name, JsonObject valueCountAggregation) {
         super(name, valueCountAggregation);
-        valueCount = new ValueCount(valueCountAggregation.get(String.valueOf(VALUE)).getAsLong());
+        valueCount = valueCountAggregation.get(String.valueOf(VALUE)).getAsLong();
     }
 
-    public ValueCount getValueCount() {
+    public Long getValueCount() {
         return valueCount;
     }
-
-    public class ValueCount {
-
-        private Long value;
-
-        ValueCount(Long value) {
-            this.value = value;
-        }
-
-        public Long getValue() {
-            return value;
-        }
-    }
 }

jest/src/test/java/io/searchbox/core/search/aggregation/AvgAggregationIntegrationTest.java

@@ -0,0 +1,97 @@
+package io.searchbox.core.search.aggregation;
+
+import io.searchbox.common.AbstractIntegrationTest;
+import io.searchbox.core.Index;
+import io.searchbox.core.Search;
+import io.searchbox.core.SearchResult;
+import io.searchbox.params.Parameters;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
+import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author cfstout
+ */
+@ElasticsearchIntegrationTest.ClusterScope (scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
+public class AvgAggregationIntegrationTest extends AbstractIntegrationTest {
+
+    private SearchResult _result;
+
+    @Before
+    public void getResult()
+            throws IOException {
+        createIndex("avg_aggregation");
+        client().admin().indices().putMapping(new PutMappingRequest("avg_aggregation")
+                        .type("document")
+                        .source("{\"document\":{\"properties\":{\"delivery\":{\"store\":true,\"type\":\"date\"}}}}")
+        ).actionGet();
+
+        String query = "{\n" +
+                "    \"query\" : {\n" +
+                "        \"match_all\" : {}\n" +
+                "    },\n" +
+                "    \"aggs\" : {\n" +
+                "        \"avg1\" : {\n" +
+                "            \"avg\" : {\n" +
+                "                \"field\" : \"num\"\n" +
+                "            }\n" +
+                "        }\n" +
+                "    }\n" +
+                "}";
+
+        Index index = new Index.Builder("{\"num\":2}")
+                .index("avg_aggregation")
+                .type("document")
+                .setParameter(Parameters.REFRESH, true)
+                .build();
+        client.execute(index);
+
+        index = new Index.Builder("{\"num\":3}")
+                .index("avg_aggregation")
+                .type("document")
+                .setParameter(Parameters.REFRESH, true)
+                .build();
+        client.execute(index);
+
+        Search search = new Search.Builder(query)
+                .addIndex("avg_aggregation")
+                .addType("document")
+                .build();
+        _result = client.execute(search);
+    }
+
+    @Test
+    public void testGetAvgAggregationByName() {
+        AvgAggregation average = _result.getAggregations().getAvgAggregation("avg1");
+        assertEquals("avg1", average.getName());
+        assertEquals(new Double(2.5) , average.getAvg());
+    }
+
+    @Test
+    public void testGetAvgAggregationByType() {
+        Aggregation aggregation = _result.getAggregations().getAggregation("avg1", AvgAggregation.class);
+        assertTrue(aggregation instanceof AvgAggregation);
+        AvgAggregation average = (AvgAggregation) aggregation;
+        assertEquals("avg1", average.getName());
+        assertEquals(new Double(2.5), average.getAvg());
+    }
+
+    @Test
+    public void testGetAvgAggregationWithMap() {
+        Map<String, Class> nameToTypeMap = new HashMap<String, Class>();
+        nameToTypeMap.put("avg1", AvgAggregation.class);
+        List<Aggregation> aggregations = _result.getAggregations().getAggregations(nameToTypeMap);
+        assertEquals(1, aggregations.size());
+        assertTrue(aggregations.get(0) instanceof AvgAggregation);
+        AvgAggregation average = (AvgAggregation) aggregations.get(0);
+        assertEquals("avg1", average.getName());
+        assertEquals(new Double(2.5), average.getAvg());
+    }
+
+}