From 62ce18365131adff631e2c2b6299c1d8e743af0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=A4rki?= <fabian.maerki@psi.ch>
Date: Thu, 13 Jul 2017 11:33:30 +0200
Subject: [PATCH] Remove deprecated stuff.

---
 Readme.md                                     |  2 +-
 .../controller/QueryRestController.java       | 81 -------------------
 2 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/Readme.md b/Readme.md
index 12083f9..b4677d3 100644
--- a/Readme.md
+++ b/Readme.md
@@ -239,7 +239,7 @@ Queries are applied to a range. The following types of ranges are supported.
 ```json
 "range":{
    "startDate":"2015-08-06T18:00:00.000",
-   "endDate":"2015-08-06T18:59:59.999",
+   "endDate":"2015-08-06T18:59:59.999"
 }
 ```
 
diff --git a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
index f758015..1196050 100644
--- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
+++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
@@ -215,17 +215,6 @@ public class QueryRestController {
       }
    }
 
-   /**
-    * Returns the current list of {@link Ordering}s available.
-    * 
-    * @return list of {@link Ordering}s as String array
-    */
-   @Deprecated
-   @RequestMapping(value = "ordering", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
-   public @ResponseBody List<Ordering> getOrderingValuesDeprecated() {
-      return Lists.newArrayList(Ordering.values());
-   }
-
    /**
     * Returns the current list of {@link Ordering}s available.
     * 
@@ -237,18 +226,6 @@ public class QueryRestController {
       return Lists.newArrayList(Ordering.values());
    }
 
-   /**
-    * Returns the current list of {@link ResponseFormat}s available.
-    * 
-    * @return list of {@link Ordering}s as String array
-    */
-   @Deprecated
-   @RequestMapping(value = "responseformat", method = {RequestMethod.GET},
-         produces = {MediaType.APPLICATION_JSON_VALUE})
-   public @ResponseBody List<ResponseFormat> getResponseFormatValuesDeprecated() {
-      return Lists.newArrayList(ResponseFormat.values());
-   }
-
    /**
     * Returns the current list of {@link ResponseFormat}s available.
     * 
@@ -260,19 +237,6 @@ public class QueryRestController {
       return Lists.newArrayList(ResponseFormat.values());
    }
 
-   /**
-    * Returns the current list of {@link QueryField}s available.
-    * 
-    * @return list of {@link QueryField}s as String array
-    */
-   @Deprecated
-   @RequestMapping(value = "queryfields", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
-   public @ResponseBody List<QueryField> getQueryFieldValuesDeprecated() {
-      return Arrays.stream(QueryField.values())
-            .filter(queryField -> queryField.isPublish())
-            .collect(Collectors.toList());
-   }
-
    /**
     * Returns the current list of {@link QueryField}s available.
     * 
@@ -286,17 +250,6 @@ public class QueryRestController {
             .collect(Collectors.toList());
    }
 
-   /**
-    * Returns the current list of {@link Aggregation}s available.
-    * 
-    * @return list of {@link Aggregation}s as String array
-    */
-   @Deprecated
-   @RequestMapping(value = "aggregations", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
-   public @ResponseBody List<Aggregation> getAggregationValuesDeprecated() {
-      return Lists.newArrayList(Aggregation.values());
-   }
-
    /**
     * Returns the current list of {@link Aggregation}s available.
     * 
@@ -308,18 +261,6 @@ public class QueryRestController {
       return Lists.newArrayList(Aggregation.values());
    }
 
-   /**
-    * Returns the current list of {@link AggregationType}s available.
-    * 
-    * @return list of {@link AggregationType}s as String array
-    */
-   @Deprecated
-   @RequestMapping(value = "aggregationtypes", method = {RequestMethod.GET},
-         produces = {MediaType.APPLICATION_JSON_VALUE})
-   public @ResponseBody List<AggregationType> getAggregationTypeValuesDeprecated() {
-      return Lists.newArrayList(AggregationType.values());
-   }
-
    /**
     * Returns the current list of {@link AggregationType}s available.
     * 
@@ -331,17 +272,6 @@ public class QueryRestController {
       return Lists.newArrayList(AggregationType.values());
    }
 
-   /**
-    * Returns the current list of {@link Backend} values.
-    * 
-    * @return list of {@link Backend}s as String array
-    */
-   @Deprecated
-   @RequestMapping(value = "backends", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
-   public @ResponseBody List<Backend> getBackendValuesDeprecated() {
-      return getBackendValues();
-   }
-
    /**
     * Returns the current list of {@link Backend} values.
     * 
@@ -356,17 +286,6 @@ public class QueryRestController {
       // return Lists.newArrayList(Backend.values());
    }
 
-   /**
-    * Returns the current list of {@link Compression}s available.
-    * 
-    * @return list of {@link Compression}s as String array
-    */
-   @Deprecated
-   @RequestMapping(value = "compression", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
-   public @ResponseBody List<Compression> getCompressionValuesDeprecated() {
-      return Lists.newArrayList(Compression.values());
-   }
-
    /**
     * Returns the current list of {@link Compression}s available.
     *