Throw if a non-Instant field is annotated with @TimeColumn (#974)

influxdata · Dec 4, 2023 · d697143 · d697143
1 parent 5f066d1
commit d697143
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/src/main/java/org/influxdb/dto/Point.java b/src/main/java/org/influxdb/dto/Point.java
@@ -1,6 +1,7 @@
 package org.influxdb.dto;
 
 import org.influxdb.BuilderException;
+import org.influxdb.InfluxDBMapperException;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Exclude;
 import org.influxdb.annotation.Measurement;
@@ -322,20 +323,25 @@ private void addFieldByAttribute(final Object pojo, final Field field, final boo
         Object fieldValue = field.get(pojo);
 
         TimeColumn tc = field.getAnnotation(TimeColumn.class);
-        if (tc != null && Instant.class.isAssignableFrom(field.getType())) {
-          Optional.ofNullable((Instant) fieldValue).ifPresent(instant -> {
-            TimeUnit timeUnit = tc.timeUnit();
-            if (timeUnit == TimeUnit.NANOSECONDS || timeUnit == TimeUnit.MICROSECONDS) {
-              this.time = BigInteger.valueOf(instant.getEpochSecond())
-                                    .multiply(NANOSECONDS_PER_SECOND)
-                                    .add(BigInteger.valueOf(instant.getNano()))
-                                    .divide(BigInteger.valueOf(TimeUnit.NANOSECONDS.convert(1, timeUnit)));
-            } else {
-              this.time = timeUnit.convert(instant.toEpochMilli(), TimeUnit.MILLISECONDS);
-            }
-            this.precision = timeUnit;
-          });
-          return;
+        if (tc != null) {
+          if (Instant.class.isAssignableFrom(field.getType())) {
+            Optional.ofNullable((Instant) fieldValue).ifPresent(instant -> {
+              TimeUnit timeUnit = tc.timeUnit();
+              if (timeUnit == TimeUnit.NANOSECONDS || timeUnit == TimeUnit.MICROSECONDS) {
+                this.time = BigInteger.valueOf(instant.getEpochSecond())
+                        .multiply(NANOSECONDS_PER_SECOND)
+                        .add(BigInteger.valueOf(instant.getNano()))
+                        .divide(BigInteger.valueOf(TimeUnit.NANOSECONDS.convert(1, timeUnit)));
+              } else {
+                this.time = timeUnit.convert(instant.toEpochMilli(), TimeUnit.MILLISECONDS);
+              }
+              this.precision = timeUnit;
+            });
+            return;
+          }
+
+          throw new InfluxDBMapperException(
+              "Unsupported type " + field.getType() + " for time: should be of Instant type");
         }
 
         if (tag) {

diff --git a/src/test/java/org/influxdb/dto/PointTest.java b/src/test/java/org/influxdb/dto/PointTest.java
@@ -2,6 +2,7 @@
 
 import org.influxdb.BuilderException;
 import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBMapperException;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
 import org.influxdb.annotation.TimeColumn;
@@ -712,6 +713,13 @@ public void testAddFieldsFromPOJOWithTimeColumnSeconds() throws NoSuchFieldExcep
         Assertions.assertEquals(pojo.time.getEpochSecond(), timeField.get(p));
     }
 
+    @Test
+    public void testAddFieldsFromPOJOWithBadTimeColumn() {
+        BadTimeColumnPojo pojo = new BadTimeColumnPojo();
+        Assertions.assertThrows(InfluxDBMapperException.class,
+                () -> Point.measurementByPOJO(pojo.getClass()).addFieldsFromPOJO(pojo).build());
+    }
+
     @Test
     public void testAddFieldsFromPOJOWithTimeColumnNull() throws NoSuchFieldException, IllegalAccessException {
         TimeColumnPojo pojo = new TimeColumnPojo();
@@ -939,6 +947,14 @@ static class TimeColumnPojoSec {
         Instant time;
     }
 
+    @Measurement(name = "tcmeasurement", allFields = true)
+    static class BadTimeColumnPojo {
+        boolean booleanPrimitive;
+
+        @TimeColumn
+        String time;
+    }
+
     @Measurement(name = "mymeasurement")
     static class Pojo {