From 8bac297c91c5bc2e7efb0432baf9748260e4380b Mon Sep 17 00:00:00 2001
From: Stefan Negrea <snegrea@redhat.com>
Date: Thu, 6 Apr 2017 15:49:41 -0500
Subject: [PATCH] [HWKMETRICS-621] Make /m a short alternative path to
 /metrics.

---
 .../api/jaxrs/handler/MetricHandler.java      |  2 +-
 .../hawkular/metrics/rest/MetricsITest.groovy | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
index 2732b64ba..a281609f6 100644
--- a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
+++ b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
@@ -96,7 +96,7 @@
  *
  * @author Heiko W. Rupp
  */
-@Path("/metrics")
+@Path("/{dual_path:metrics|m}")
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)
 @GZIP
diff --git a/integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/MetricsITest.groovy b/integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/MetricsITest.groovy
index 99a52877f..0a01a83f2 100644
--- a/integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/MetricsITest.groovy
+++ b/integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/MetricsITest.groovy
@@ -25,6 +25,46 @@ import static org.junit.Assert.assertEquals
  */
 class MetricsITest extends RESTTest {
 
+ @Test
+  void dualPathTest() {
+    String tenantId = nextTenantId()
+    DateTime start = DateTime.now().minusMinutes(10)
+
+    def response = hawkularMetrics.post(
+        path: "metrics/raw",
+        headers: [(tenantHeaderName): tenantId],
+        body: [
+            gauges: [
+                [
+                    id: 'CG1',
+                    data:  [
+                        [timestamp: start.millis, value: 10.032],
+                        [timestamp: start.plusMinutes(1).millis, value: 9.589]
+                    ],
+                ]
+            ],
+            availabilities: [
+                [
+                    id: 'CA1',
+                    data: [
+                        [timestamp: start.millis, value: "down"],
+                        [timestamp: start.plusMinutes(1).millis, value: "up"]
+                    ]
+                ]
+            ]
+        ]
+    )
+    assertEquals(200, response.status)
+
+    response = hawkularMetrics.get(path: 'metrics', headers: [(tenantHeaderName): tenantId])
+    assertEquals(200, response.status)
+    assertEquals(2, response.data.size)
+
+    response = hawkularMetrics.get(path: 'm', headers: [(tenantHeaderName): tenantId])
+    assertEquals(200, response.status)
+    assertEquals(2, response.data.size)
+  }
+
   @Test
   void addMixedData() {
     String tenantId = nextTenantId()