add unittest for timecolumn,add readme & changelog

Author: flashmouse

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.16
+
+### Fixes
+
+- Add new annotation called TimeColumn for timestamp field in POJO bean, this can set Point time and precision field correctly, also avoid UnableToParseException when flush Point to influx.
+
 ## 2.15 [2019-02-22]
 
 ### Fixes

README.md

@@ -231,11 +231,12 @@ public class Cpu {
 }
 ```
 
-2. Add @Measurement and @Column annotations:
+2. Add @Measurement,@TimeColumn and @Column annotations:
 
 ```Java
 @Measurement(name = "cpu")
 public class Cpu {
+    @TimeColumn
     @Column(name = "time")
     private Instant time;
     @Column(name = "host", tag = true)
@@ -270,7 +271,7 @@ Having the same POJO class Cpu
 ```java
 String dbName = "myTimeseries";
 String rpName = "aRetentionPolicy";
-// Cpu has annotations @Measurement and @Column
+// Cpu has annotations @Measurement,@TimeColumn and @Column
 Cpu cpu = new Cpu();
 // ... setting data
 

src/main/java/org/influxdb/dto/Point.java

@@ -11,6 +11,7 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.TreeMap;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.influxdb.BuilderException;
 import org.influxdb.annotation.Column;
@@ -263,10 +264,11 @@ private void addFieldByAttribute(final Object pojo, final Field field, final Col
 
         TimeColumn tc = field.getAnnotation(TimeColumn.class);
         if (tc != null && Instant.class.isAssignableFrom(field.getType())) {
-          Instant instant = (Instant) fieldValue;
-          TimeUnit timeUint = tc.timeUnit();
-          this.time = TimeUnit.MILLISECONDS.convert(instant.toEpochMilli(), timeUint);
-          this.precision = timeUint;
+          Optional.ofNullable((Instant) fieldValue).ifPresent(instant -> {
+            TimeUnit timeUint = tc.timeUnit();
+            this.time = TimeUnit.MILLISECONDS.convert(instant.toEpochMilli(), timeUint);
+            this.precision = timeUint;
+          });
           return;
         }
 

src/test/java/org/influxdb/dto/PointTest.java

@@ -1,6 +1,8 @@
 package org.influxdb.dto;
 
 import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.Instant;
@@ -14,6 +16,7 @@
 import org.influxdb.BuilderException;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
+import org.influxdb.annotation.TimeColumn;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
@@ -511,7 +514,42 @@ public void testAddFieldsFromPOJOWithoutData() {
   }
 
   @Test
-  public void testAddFieldsFromPOJOWithData() {
+  public void testAddFieldsFromPOJOWithTimeColumn() throws NoSuchFieldException, IllegalAccessException {
+    TimeColumnPojo pojo = new TimeColumnPojo();
+    pojo.time = Instant.now();
+    pojo.booleanPrimitive = true;
+
+    Point p = Point.measurementByPOJO(pojo.getClass()).addFieldsFromPOJO(pojo).build();
+    Field timeField = p.getClass().getDeclaredField("time");
+    Field precisionField = p.getClass().getDeclaredField("precision");
+    timeField.setAccessible(true);
+    precisionField.setAccessible(true);
+
+    Assertions.assertEquals(pojo.booleanPrimitive, p.getFields().get("booleanPrimitive"));
+    Assertions.assertEquals(TimeUnit.MILLISECONDS, precisionField.get(p));
+    Assertions.assertEquals(TimeUnit.MILLISECONDS.convert(pojo.time.toEpochMilli(),TimeUnit.MILLISECONDS), timeField.get(p));
+
+    pojo.time = null;
+  }
+
+	@Test
+	public void testAddFieldsFromPOJOWithTimeColumnNull() throws NoSuchFieldException, IllegalAccessException {
+		TimeColumnPojo pojo = new TimeColumnPojo();
+		pojo.booleanPrimitive = true;
+
+		Point p = Point.measurementByPOJO(pojo.getClass()).addFieldsFromPOJO(pojo).build();
+		Field timeField = p.getClass().getDeclaredField("time");
+		Field precisionField = p.getClass().getDeclaredField("precision");
+		timeField.setAccessible(true);
+		precisionField.setAccessible(true);
+
+		Assertions.assertEquals(pojo.booleanPrimitive, p.getFields().get("booleanPrimitive"));
+
+		pojo.time = null;
+	}
+
+  @Test
+  public void testAddFieldsFromPOJOWithData() throws NoSuchFieldException, IllegalAccessException {
     Pojo pojo = new Pojo();
     pojo.booleanObject = true;
     pojo.booleanPrimitive = false;
@@ -594,6 +632,15 @@ public void setId(String id) {
     }
   }
 
+	@Measurement(name = "tcmeasurement")
+  static class TimeColumnPojo {
+	  @Column(name = "booleanPrimitive")
+	  private boolean booleanPrimitive;
+
+	  @TimeColumn
+	  @Column(name = "time")
+	  private Instant time;
+  }
 
   @Measurement(name = "mymeasurement")
   static class Pojo {

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

@@ -34,6 +34,7 @@
 import org.influxdb.InfluxDBMapperException;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
+import org.influxdb.annotation.TimeColumn;
 import org.influxdb.dto.QueryResult;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -441,6 +442,38 @@ void testToPOJOInheritance() {
     Assertions.assertEquals(subValue, result.get(0).subValue);
   }
 
+  @Test
+  public void testToPOJO_HasTimeColumn() {
+	  // Given...
+	  mapper.cacheMeasurementClass(HasTimeColumnMeasurement.class);
+
+	  List<String> columnList = Arrays.asList("time");
+	  List<List<Object>> valuesList = Arrays.asList(
+			  Arrays.asList("2015-08-17T19:00:00-05:00"), // Chicago (UTC-5)
+			  Arrays.asList("2015-08-17T19:00:00.000000001-05:00"), // Chicago (UTC-5)
+			  Arrays.asList("2000-01-01T00:00:00-00:00"),
+			  Arrays.asList("2000-01-02T00:00:00+00:00")
+	  );
+
+	  QueryResult.Series series = new QueryResult.Series();
+	  series.setColumns(columnList);
+	  series.setValues(valuesList);
+
+	  // When...
+	  List<HasTimeColumnMeasurement> result = new LinkedList<>();
+	  mapper.parseSeriesAs(series, HasTimeColumnMeasurement.class, result);
+
+	  // Then...
+	  Assertions.assertEquals(4, result.size(), "incorrect number of elemets");
+	  // Note: RFC3339 timestamp with TZ from InfluxDB are parsed into an Instant (UTC)
+	  Assertions.assertTrue(result.get(0).time.equals(Instant.parse("2015-08-18T00:00:00Z")));
+	  Assertions.assertTrue(result.get(1).time.equals(Instant.parse("2015-08-18T00:00:00.000000001Z")));
+	  // RFC3339 section 4.3 https://tools.ietf.org/html/rfc3339#section-4.3
+	  Assertions.assertTrue(result.get(2).time.equals(Instant.parse("2000-01-01T00:00:00Z")));
+	  Assertions.assertTrue(result.get(3).time.equals(Instant.parse("2000-01-02T00:00:00Z")));
+
+  }
+
   @Test
   public void testToPOJO_ticket573() {
     // Given...
@@ -472,9 +505,35 @@ public void testToPOJO_ticket573() {
     Assertions.assertTrue(result.get(3).time.equals(Instant.parse("2000-01-02T00:00:00Z")));
   }
 
+	@Measurement(name = "HasTimeColumnMeasurement")
+	static class HasTimeColumnMeasurement {
+  		@TimeColumn
+		@Column(name = "time")
+		private Instant time;
+
+  		@Column(name = "value")
+  		private Integer value;
+
+		public Instant getTime() {
+			return time;
+		}
+
+		public void setTime(Instant time) {
+			this.time = time;
+		}
+
+		public Integer getValue() {
+			return value;
+		}
+
+		public void setValue(Integer value) {
+			this.value = value;
+		}
+	}
+
+
 	@Measurement(name = "CustomMeasurement")
 	static class MyCustomMeasurement {
-
 		@Column(name = "time")
 		private Instant time;
 
@@ -555,7 +614,6 @@ static class MyPojoWithUnsupportedField {
    */
   @Measurement(name = "tb_network")
   static class GroupByCarrierDeviceOS {
-
     @Column(name = "time")
     private Instant time;