From 99d8ca92ab997946296f6786140f1468b00efa7a Mon Sep 17 00:00:00 2001
From: Deklan Dieterly <deklan.dieterly@hp.com>
Date: Tue, 3 Mar 2015 13:48:53 -0700
Subject: [PATCH] Add error field to Series

Change how results are handled when measurement does not exist in Influxdb.

Change-Id: I89bb12ffc661e0826e27eb6105c51520b72930af
---
 .../influxdb/InfluxV9RepoReader.java          | 20 +------------------
 .../persistence/influxdb/Series.java          |  7 +++++++
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/InfluxV9RepoReader.java b/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/InfluxV9RepoReader.java
index e15eb437d..143cc9a19 100644
--- a/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/InfluxV9RepoReader.java
+++ b/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/InfluxV9RepoReader.java
@@ -99,25 +99,7 @@ public class InfluxV9RepoReader {
                    this.influxName, this.influxUrl);
 
       HttpEntity entity = response.getEntity();
-
-      if (entity != null) {
-
-        String entityString = EntityUtils.toString(entity);
-
-        if (entityString.equals("{\"results\":[{\"error\":\"measurement not found\"}]}")) {
-
-          logger.debug("Translating 'measurement not found' message to empty list");
-          return "{\"results\":[{}]}";
-
-        } else {
-
-          return entityString;
-        }
-
-      } else {
-
-        return null;
-      }
+      return entity != null ? EntityUtils.toString(entity) : null;
 
     } finally {
 
diff --git a/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/Series.java b/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/Series.java
index 1e6bad4ec..4b8f8ab0a 100644
--- a/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/Series.java
+++ b/java/src/main/java/monasca/api/infrastructure/persistence/influxdb/Series.java
@@ -16,6 +16,7 @@ package monasca.api.infrastructure.persistence.influxdb;
 public class Series {
 
   public SeriesElement[] results;
+  public String error;
 
   boolean isEmpty() {
 
@@ -27,11 +28,17 @@ public class Series {
     return this.results[0].series;
   }
 
+  public String getError() {
+
+    return this.error;
+
+  }
 }
 
 class SeriesElement {
 
   public Serie[] series;
+  public String error;
 
 }