Added version of query method (influxdata#687)

* Added version of query method 

InfluxDBResultMapper was recently updated with this version of .toPojo:
  public <T> List<T> toPOJO(final QueryResult queryResult, final Class<T> clazz, final String measurementName)
      throws InfluxDBMapperException {
    return toPOJO(queryResult, clazz, measurementName, TimeUnit.MILLISECONDS);
  }

Adding  InfluxDBMapper.query(final Query query, final Class<T> clazz, String measurementName) to take advantage of the new toPojo variation to map a db with variable measurement names to a POJO. Without this pull, mapping Query to Pojo requires both an InfluxDB instance to fetch the query result and an influxDBMapper instance to map to call toPojo directly.

CHANGELOG.md

@@ -4,7 +4,11 @@
 
 ### Features
 - Add an option in `BatchOption` to prevent `InfluxDB#write` from blocking when actions queue is exhausted. [Issue #668](https://github.com/influxdata/influxdb-java/issues/688)
+- Added new signature to InfluxDBMapper.query() with params final Query query, final Class<T> clazz, final String measurementName to leverage InfluxDBResultMapper.toPojo method with identical signature.
 
+### Improvements
+
+- Test: Added test for new InfluxDBMapper.query() signature, as well as test for existing InfluxDBMapper.query(Class clazz) signature (previously only InfluxDBMapper.query(Query query, Class clazz) was tested).
 
 ## 2.19 [2020-05-18]
 

src/main/java/org/influxdb/impl/InfluxDBMapper.java

@@ -21,6 +21,11 @@ public InfluxDBMapper(final InfluxDB influxDB) {
     this.influxDB = influxDB;
   }
 
+  public <T> List<T> query(final Query query, final Class<T> clazz, final String measurementName) {
+    QueryResult queryResult = influxDB.query(query);
+    return toPOJO(queryResult, clazz, measurementName);
+  }
+
   public <T> List<T> query(final Query query, final Class<T> clazz) {
     throwExceptionIfMissingAnnotation(clazz);
     QueryResult queryResult = influxDB.query(query);

src/test/java/org/influxdb/impl/InfluxDBMapperTest.java

@@ -55,6 +55,24 @@ public void testQuery() {
     Assert.assertTrue(persistedMeasures.size()>0);
   }
 
+  @Test
+  public void testQueryWhenCalledWithClassOnly() {
+    ServerMeasure serverMeasure = createMeasure();
+    influxDBMapper.save(serverMeasure);
+
+    List<ServerMeasure> persistedMeasures = influxDBMapper.query(ServerMeasure.class);
+    Assert.assertTrue(persistedMeasures.size()>0);
+  }
+
+  @Test
+  public void testQueryWhenCalledWithQuery_Class_MeasurementName() {
+    ServerMeasure serverMeasure = createMeasure();
+    influxDBMapper.save(serverMeasure);
+
+    List<NonAnnotatedServerMeasure> persistedMeasures = influxDBMapper.query(new Query("SELECT * FROM server_measure",UDP_DATABASE), NonAnnotatedServerMeasure.class, "server_measure");
+    Assert.assertTrue(persistedMeasures.size()>0);
+  }
+
   @Test
   public void testIllegalField() {
     InvalidMeasure invalidMeasure = new InvalidMeasure();
@@ -185,6 +203,87 @@ public void setIp(String ip) {
     }
   }
 
+  static class NonAnnotatedServerMeasure {
+
+    /** Check the instant conversions */
+    @Column(name = "time")
+    private Instant time;
+
+    @Column(name = "name", tag = true)
+    private String name;
+
+    @Column(name = "cpu")
+    private double cpu;
+
+    @Column(name = "healthy")
+    private boolean healthy;
+
+    @Column(name = "min")
+    private long uptime;
+
+    @Column(name = "memory_utilization")
+    private Double memoryUtilization;
+
+    @Column(name = "ip")
+    private String ip;
+
+    public Instant getTime() {
+      return time;
+    }
+
+    public void setTime(Instant time) {
+      this.time = time;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public void setName(String name) {
+      this.name = name;
+    }
+
+    public double getCpu() {
+      return cpu;
+    }
+
+    public void setCpu(double cpu) {
+      this.cpu = cpu;
+    }
+
+    public boolean isHealthy() {
+      return healthy;
+    }
+
+    public void setHealthy(boolean healthy) {
+      this.healthy = healthy;
+    }
+
+    public long getUptime() {
+      return uptime;
+    }
+
+    public void setUptime(long uptime) {
+      this.uptime = uptime;
+    }
+
+    public Double getMemoryUtilization() {
+      return memoryUtilization;
+    }
+
+    public void setMemoryUtilization(Double memoryUtilization) {
+      this.memoryUtilization = memoryUtilization;
+    }
+
+    public String getIp() {
+      return ip;
+    }
+
+    public void setIp(String ip) {
+      this.ip = ip;
+    }
+  }
+
   @Measurement(name = "invalid_measure", database = UDP_DATABASE)
   static class InvalidMeasure {