Applied most of code review comments

Author: Piotr Buchman

query/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     testCompile 'junit:junit:4.11'
     testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.mockito:mockito-core:1.9.5'
-    testCompile project(":core").sourceSets.test.output
+    testCompile project(':core').sourceSets.test.output
 }
 
 jar {

query/src/main/java/io/keen/client/java/CachedDatasetRequest.java

@@ -91,7 +91,7 @@ URL getRequestURL(RequestUrlBuilder urlBuilder, String projectId) throws KeenQue
         };
     }
 
-    static KeenQueryRequest deleteRequest(String datasetName) {
+    static KeenQueryRequest deletionRequest(String datasetName) {
         return new CachedDatasetRequest(HttpMethods.DELETE, true, datasetName) {
 
             @Override

query/src/main/java/io/keen/client/java/CachedDatasetsClient.java

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Set;
 
-public class CachedDatasetsClient implements CachedDatasets {
+class CachedDatasetsClient implements CachedDatasets {
 
     private KeenQueryClient keenQueryClient;
 
@@ -44,12 +44,12 @@ public List<DatasetDefinition> getDefinitionsByProject() throws IOException {
     public List<DatasetDefinition> getDefinitionsByProject(Integer limit, String afterName) throws IOException {
         KeenQueryRequest request = CachedDatasetRequest.definitionsByProjectRequest(limit, afterName);
 
-        return DatasetDefinition.collectionFromMap(keenQueryClient.getMapResponse(request));
+        return DatasetDefinition.definitionsFromMap(keenQueryClient.getMapResponse(request));
     }
 
     @Override
     public boolean delete(String datasetName) throws IOException {
-        KeenQueryRequest request = CachedDatasetRequest.deleteRequest(datasetName);
+        KeenQueryRequest request = CachedDatasetRequest.deletionRequest(datasetName);
 
         return keenQueryClient.getMapResponse(request).isEmpty();
     }

query/src/main/java/io/keen/client/java/DatasetDefinition.java

@@ -25,7 +25,8 @@ public class DatasetDefinition {
 
     private DatasetQuery query;
 
-    static DatasetDefinition fromMap(Map<String, Object> properties) {
+    @SuppressWarnings("unchecked")
+    static DatasetDefinition fromMap(Map<String, ?> properties) {
         DatasetDefinition definition = new DatasetDefinition();
         definition.datasetName = (String) properties.get("dataset_name");
         definition.displayName = (String) properties.get("display_name");
@@ -34,18 +35,16 @@ static DatasetDefinition fromMap(Map<String, Object> properties) {
         definition.lastScheduledDate = (String) properties.get("last_scheduled_date");
         definition.latestSubtimeframeAvailable = (String) properties.get("latest_subtimeframe_available");
         definition.millisecondsBehind = String.valueOf(properties.get("milliseconds_behind"));
-        //noinspection unchecked
         definition.indexBy = (List<String>) properties.get("index_by");
-        //noinspection unchecked
         definition.query = DatasetQuery.fromMap((Map<String, Object>) properties.get("query"));
         return definition;
     }
 
-    static List<DatasetDefinition> collectionFromMap(Map<String, Object> properties) {
+    @SuppressWarnings("unchecked")
+    static List<DatasetDefinition> definitionsFromMap(Map<String, ?> properties) {
         if (properties.get("datasets") == null) {
             return Collections.emptyList();
         }
-        //noinspection unchecked
         List<Map<String, Object>> datasets = (List<Map<String, Object>>) properties.get("datasets");
         List<DatasetDefinition> definitions = new LinkedList<DatasetDefinition>();
 

query/src/main/java/io/keen/client/java/DatasetQuery.java

@@ -23,6 +23,7 @@ public class DatasetQuery {
 
     private List<Filter> filters;
 
+    @SuppressWarnings("unchecked")
     static DatasetQuery fromMap(Map<String, Object> properties) {
         DatasetQuery query = new DatasetQuery();
         query.projectId = (String) properties.get("project_id");
@@ -31,12 +32,10 @@ static DatasetQuery fromMap(Map<String, Object> properties) {
         query.timezone = (String) properties.get("timezone");
         query.interval = (String) properties.get("interval");
         query.timeframe = (String) properties.get("timeframe");
-        //noinspection unchecked
         query.groupBy = (List<String>) properties.get("group_by");
 
         if (properties.get("filters") != null) {
             query.filters = new LinkedList<Filter>();
-            //noinspection unchecked
             for (Map<String, Object> filter : (List<Map<String, Object>>) properties.get("filters")) {
                 query.filters.add(new Filter(
                         (String) filter.get("property_name"),