use lightweight Instant

yuzawa-san · yuzawa-san · commit 4017730c1725 · 2025-04-14T16:35:44.000-04:00
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/bitstring/BitString.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/bitstring/BitString.java
@@ -1,9 +1,6 @@
 package com.iab.gpp.encoder.bitstring;
 
 import java.util.BitSet;
-import java.util.PrimitiveIterator.OfInt;
-import java.util.stream.IntStream;
-import com.iab.gpp.encoder.datatype.encoder.BaseIntegerSet;
 import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.error.DecodingException;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableDatetime.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableDatetime.java
@@ -1,20 +1,20 @@
 package com.iab.gpp.encoder.datatype;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
 import com.iab.gpp.encoder.datatype.encoder.DatetimeEncoder;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
 
-public final class EncodableDatetime extends AbstractEncodableBitStringDataType<ZonedDateTime> {
+public final class EncodableDatetime extends AbstractEncodableBitStringDataType<Instant> {
 
   protected EncodableDatetime() {
     super(true);
   }
 
-  public EncodableDatetime(ZonedDateTime value) {
+  public EncodableDatetime(Instant value) {
     super(true);
     setValue(value);
   }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/DatetimeEncoder.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/DatetimeEncoder.java
@@ -1,8 +1,6 @@
 package com.iab.gpp.encoder.datatype.encoder;
 
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
@@ -11,21 +9,20 @@
 public class DatetimeEncoder {
 
   private DatetimeEncoder() {}
-  public static final ZoneId UTC = ZoneId.of("UTC");
 
-  public static void encode(BitStringBuilder builder, ZonedDateTime value) {
+  public static void encode(BitStringBuilder builder, Instant value) {
     if (value != null) {
-      FixedLongEncoder.encode(builder, value.toInstant().toEpochMilli() / 100, 36);
+      FixedLongEncoder.encode(builder, value.toEpochMilli() / 100, 36);
     } else {
       FixedLongEncoder.encode(builder, 0, 36);
     }
   }
 
-  public static ZonedDateTime decode(BitString bitString) throws DecodingException {
+  public static Instant decode(BitString bitString) throws DecodingException {
     if (bitString.length() != 36) {
       throw new DecodingException("Undecodable Datetime '" + bitString + "'");
     }
 
-    return ZonedDateTime.ofInstant(Instant.ofEpochMilli(FixedLongEncoder.decode(bitString) * 100L), UTC);
+    return Instant.ofEpochMilli(FixedLongEncoder.decode(bitString) * 100L);
   }
 }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/AbstractLazilyEncodableSection.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/AbstractLazilyEncodableSection.java
@@ -1,7 +1,6 @@
 package com.iab.gpp.encoder.section;
 
 import java.util.List;
-import javax.swing.plaf.synth.SynthProgressBarUI;
 import com.iab.gpp.encoder.error.InvalidFieldException;
 import com.iab.gpp.encoder.segment.EncodableSegment;
 
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/TcfCaV1.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/TcfCaV1.java
@@ -1,11 +1,10 @@
 package com.iab.gpp.encoder.section;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import com.iab.gpp.encoder.datatype.RangeEntry;
-import com.iab.gpp.encoder.datatype.encoder.DatetimeEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.InvalidFieldException;
@@ -105,20 +104,20 @@ public void setFieldValue(String fieldName, Object value) throws InvalidFieldExc
     super.setFieldValue(fieldName, value);
 
     if (!fieldName.equals(TcfCaV1Field.CREATED) && !fieldName.equals(TcfCaV1Field.LAST_UPDATED)) {
-      ZonedDateTime utcDateTime = ZonedDateTime.now(DatetimeEncoder.UTC);
+      Instant utcDateTime = Instant.now();
 
       super.setFieldValue(TcfCaV1Field.CREATED, utcDateTime);
       super.setFieldValue(TcfCaV1Field.LAST_UPDATED, utcDateTime);
     }
   }
 
 
-  public ZonedDateTime getCreated() {
-    return (ZonedDateTime) this.getFieldValue(TcfCaV1Field.CREATED);
+  public Instant getCreated() {
+    return (Instant) this.getFieldValue(TcfCaV1Field.CREATED);
   }
 
-  public ZonedDateTime getLastUpdated() {
-    return (ZonedDateTime) this.getFieldValue(TcfCaV1Field.LAST_UPDATED);
+  public Instant getLastUpdated() {
+    return (Instant) this.getFieldValue(TcfCaV1Field.LAST_UPDATED);
   }
 
   public Integer getCmpId() {
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/TcfEuV2.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/TcfEuV2.java
@@ -1,11 +1,10 @@
 package com.iab.gpp.encoder.section;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import com.iab.gpp.encoder.datatype.RangeEntry;
-import com.iab.gpp.encoder.datatype.encoder.DatetimeEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.InvalidFieldException;
@@ -122,20 +121,20 @@ public void setFieldValue(String fieldName, Object value) throws InvalidFieldExc
     super.setFieldValue(fieldName, value);
 
     if (!fieldName.equals(TcfEuV2Field.CREATED) && !fieldName.equals(TcfEuV2Field.LAST_UPDATED)) {
-      ZonedDateTime utcDateTime = ZonedDateTime.now(DatetimeEncoder.UTC);
+      Instant utcDateTime = Instant.now();
 
       super.setFieldValue(TcfEuV2Field.CREATED, utcDateTime);
       super.setFieldValue(TcfEuV2Field.LAST_UPDATED, utcDateTime);
     }
   }
 
 
-  public ZonedDateTime getCreated() {
-    return (ZonedDateTime) this.getFieldValue(TcfEuV2Field.CREATED);
+  public Instant getCreated() {
+    return (Instant) this.getFieldValue(TcfEuV2Field.CREATED);
   }
 
-  public ZonedDateTime getLastUpdated() {
-    return (ZonedDateTime) this.getFieldValue(TcfEuV2Field.LAST_UPDATED);
+  public Instant getLastUpdated() {
+    return (Instant) this.getFieldValue(TcfEuV2Field.LAST_UPDATED);
   }
 
   public Integer getCmpId() {
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1CoreSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1CoreSegment.java
@@ -1,6 +1,6 @@
 package com.iab.gpp.encoder.segment;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.CompressedBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
@@ -34,7 +34,7 @@ public TcfCaV1CoreSegment(String encodedString) {
 
   @Override
   protected EncodableBitStringFields initializeFields() {
-    ZonedDateTime date = ZonedDateTime.now();
+    Instant date = Instant.now();
 
     EncodableBitStringFields fields = new EncodableBitStringFields(TcfCaV1Field.TCFCAV1_CORE_SEGMENT_FIELD_NAMES);
     fields.put(TcfCaV1Field.VERSION, new EncodableFixedInteger(6, TcfCaV1.VERSION));
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2CoreSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2CoreSegment.java
@@ -1,6 +1,6 @@
 package com.iab.gpp.encoder.segment;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.TraditionalBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
@@ -34,7 +34,7 @@ public TcfEuV2CoreSegment(String encodedString) {
 
   @Override
   protected EncodableBitStringFields initializeFields() {
-    ZonedDateTime date = ZonedDateTime.now();
+    Instant date = Instant.now();
 
     EncodableBitStringFields fields = new EncodableBitStringFields(TcfEuV2Field.TCFEUV2_CORE_SEGMENT_FIELD_NAMES);
     fields.put(TcfEuV2Field.VERSION, new EncodableFixedInteger(6, TcfEuV2.VERSION));
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/GppModelTest.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/GppModelTest.java
@@ -1,5 +1,6 @@
 package com.iab.gpp.encoder;
 
+import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -8,7 +9,6 @@
 import java.util.Set;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.field.TcfCaV1Field;
 import com.iab.gpp.encoder.field.TcfEuV2Field;
@@ -45,7 +45,7 @@
 
 public class GppModelTest {
 
-  private ZonedDateTime utcDateTime = ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
+  private Instant utcDateTime = ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant();
 
   @Test
   public void testEncodeDefault() {
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/DatetimeEncoderTest.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/DatetimeEncoderTest.java
@@ -1,7 +1,6 @@
 package com.iab.gpp.encoder.datatype.encoder;
 
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -13,12 +12,12 @@ public class DatetimeEncoderTest {
 
   @Test
   public void test1() throws DecodingException {
-    ZonedDateTime date1 = ZonedDateTime.now(ZoneId.of("UTC"));
+    Instant date1 = Instant.now();
     BitStringBuilder builder = new BitStringBuilder();
     DatetimeEncoder.encode(builder, date1);
     String encodedDate1 = builder.build().toString();
-    ZonedDateTime date2 = DatetimeEncoder.decode(BitString.of(encodedDate1));
+    Instant date2 = DatetimeEncoder.decode(BitString.of(encodedDate1));
 
-    Assertions.assertEquals((date1.toInstant().toEpochMilli() / 100L) * 100L, date2.toInstant().toEpochMilli());
+    Assertions.assertEquals((date1.toEpochMilli() / 100L) * 100L, date2.toEpochMilli());
   }
 }
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfCaV1Test.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfCaV1Test.java
@@ -21,8 +21,8 @@ public class TcfCaV1Test {
   public void testEncode1() {
 
     TcfCaV1 tcfCaV1 = new TcfCaV1();
-    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
-    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
+    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
+    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
     Assertions.assertEquals("BPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAAAA.YAAAAAAAAAA", tcfCaV1.encode());
   }
 
@@ -50,8 +50,8 @@ public void testEncode2() {
     tcfCaV1.setFieldValue(TcfCaV1Field.CUSTOM_PURPOSES_EXPRESS_CONSENT, Set.of(1));
     tcfCaV1.setFieldValue(TcfCaV1Field.CUSTOM_PURPOSES_IMPLIED_CONSENT, Set.of(0,2));
 
-    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
-    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
+    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
+    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
 
     Assertions.assertEquals("BPSG_8APSG_8AAyACAENGdCgf_gfgAfgfgBgABABAAABAB4AACACAAA.fHHHA4444ao", tcfCaV1.encode());
   }
@@ -62,8 +62,8 @@ public void testEncode3() throws EncodingException, InvalidFieldException {
     TcfCaV1 tcfCaV1 = new TcfCaV1();
     tcfCaV1.setFieldValue(TcfCaV1Field.DISCLOSED_VENDORS, Arrays.asList(1, 2, 3, 5, 6, 7, 10, 11, 12));
 
-    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
-    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
+    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
+    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
 
     Assertions.assertEquals("BPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAAAA.YAAAAAAAAAA.IAGO5w", tcfCaV1.encode());
   }
@@ -77,8 +77,8 @@ public void testEncode4() throws EncodingException, InvalidFieldException {
     TcfCaV1 tcfCaV1 = new TcfCaV1();
     tcfCaV1.setFieldValue(TcfCaV1Field.PUB_RESTRICTIONS, pubRestrictions);
 
-    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
-    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
+    tcfCaV1.setFieldValue(TcfCaV1Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
+    tcfCaV1.setFieldValue(TcfCaV1Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
     Assertions.assertEquals("BPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAACCgBwABAAOAAoADgAJA.YAAAAAAAAAA", tcfCaV1.encode());
   }
 
@@ -112,8 +112,8 @@ public void testDecode1() {
     Assertions.assertEquals(0, tcfCaV1.getNumCustomPurposes());
     Assertions.assertEquals(Set.of(), tcfCaV1.getCustomPurposesExpressConsent());
     Assertions.assertEquals(Set.of(), tcfCaV1.getCustomPurposesImpliedConsent());
-    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfCaV1.getCreated());
-    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfCaV1.getLastUpdated());
+    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfCaV1.getCreated());
+    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfCaV1.getLastUpdated());
 
     Assertions.assertEquals("EN", tcfCaV1.getConsentLanguage());
     Assertions.assertEquals(5, tcfCaV1.getId());
@@ -147,8 +147,8 @@ public void testDecode2() {
     Assertions.assertEquals(3, tcfCaV1.getNumCustomPurposes());
     Assertions.assertEquals(Set.of(2), tcfCaV1.getCustomPurposesExpressConsent());
     Assertions.assertEquals(Set.of(1, 3), tcfCaV1.getCustomPurposesImpliedConsent());
-    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfCaV1.getCreated());
-    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfCaV1.getLastUpdated());
+    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfCaV1.getCreated());
+    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfCaV1.getLastUpdated());
 
     Assertions.assertEquals("EN", tcfCaV1.getConsentLanguage());
     Assertions.assertEquals(5, tcfCaV1.getId());
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfEuV2Test.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfEuV2Test.java
@@ -18,17 +18,17 @@ public class TcfEuV2Test {
   @Test
   public void testEncode1() {
     TcfEuV2 tcfEuV2 = new TcfEuV2();
-    tcfEuV2.setFieldValue(TcfEuV2Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
-    tcfEuV2.setFieldValue(TcfEuV2Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
+    tcfEuV2.setFieldValue(TcfEuV2Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
+    tcfEuV2.setFieldValue(TcfEuV2Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
     Assertions.assertEquals("CPSG_8APSG_8AAAAAAENAACAAAAAAAAAAAAAAAAAAAAA.QAAA.IAAA", tcfEuV2.encode());
   }
 
   @Test
   public void testEncode2() {
     TcfEuV2 tcfEuV2 = new TcfEuV2();
     tcfEuV2.setFieldValue(TcfEuV2Field.IS_SERVICE_SPECIFIC, true);
-    tcfEuV2.setFieldValue(TcfEuV2Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
-    tcfEuV2.setFieldValue(TcfEuV2Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")));
+    tcfEuV2.setFieldValue(TcfEuV2Field.CREATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
+    tcfEuV2.setFieldValue(TcfEuV2Field.LAST_UPDATED, ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant());
 
     Assertions.assertEquals(3, tcfEuV2.getFieldValue(TcfEuV2Field.PUBLISHER_PURPOSES_SEGMENT_TYPE));
     Assertions.assertEquals(
@@ -49,8 +49,8 @@ public void testDecode1() {
     TcfEuV2 tcfEuV2 = new TcfEuV2("CAAAAAAAAAAAAAAAAAENAACAAAAAAAAAAAAAAAAAAAAA.QAAA.IAAA");
 
     Assertions.assertEquals(2, tcfEuV2.getVersion());
-    Assertions.assertEquals(ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfEuV2.getCreated());
-    Assertions.assertEquals(ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfEuV2.getLastUpdated());
+    Assertions.assertEquals(ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfEuV2.getCreated());
+    Assertions.assertEquals(ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfEuV2.getLastUpdated());
     Assertions.assertEquals(0, tcfEuV2.getCmpId());
     Assertions.assertEquals(0, tcfEuV2.getCmpVersion());
     Assertions.assertEquals(0, tcfEuV2.getConsentScreen());
@@ -98,8 +98,8 @@ public void testDecode2() {
     TcfEuV2 tcfEuV2 = new TcfEuV2("CPSG_8APSG_8AAAAAAENAACgAAAAAAAAAAAAAAAAAAAA.YAAAAAAAAAAA");
 
     Assertions.assertEquals(2, tcfEuV2.getVersion());
-    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfEuV2.getCreated());
-    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), tcfEuV2.getLastUpdated());
+    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfEuV2.getCreated());
+    Assertions.assertEquals(ZonedDateTime.of(2022, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")).toInstant(), tcfEuV2.getLastUpdated());
     Assertions.assertEquals(0, tcfEuV2.getCmpId());
     Assertions.assertEquals(0, tcfEuV2.getCmpVersion());
     Assertions.assertEquals(0, tcfEuV2.getConsentScreen());
@@ -352,8 +352,8 @@ public void testDecode7() throws DecodingException {
     TcfEuV2 tcfEuV2 = new TcfEuV2("COoC-kUOoC-kUAHABAENAwCoAIAAAELAAAwIF5wAoAAgAGAvMACX_ABBAAQAFA");
 
     Assertions.assertEquals(2, tcfEuV2.getFieldValue("Version"));
-    Assertions.assertEquals("2019-10-07T05:17:54Z[UTC]", tcfEuV2.getFieldValue("Created").toString());
-    Assertions.assertEquals("2019-10-07T05:17:54Z[UTC]", tcfEuV2.getFieldValue("LastUpdated").toString());
+    Assertions.assertEquals("2019-10-07T05:17:54Z", tcfEuV2.getFieldValue("Created").toString());
+    Assertions.assertEquals("2019-10-07T05:17:54Z", tcfEuV2.getFieldValue("LastUpdated").toString());
     Assertions.assertEquals(7, tcfEuV2.getFieldValue("CmpId"));
     Assertions.assertEquals(1, tcfEuV2.getFieldValue("CmpVersion"));
     Assertions.assertEquals(0, tcfEuV2.getFieldValue("ConsentScreen"));

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`package com.iab.gpp.encoder.datatype.encoder;`
`2`	`2`
`3`	`3`	`import java.time.Instant;`
`4`		`-import java.time.ZoneId;`
`5`		`-import java.time.ZonedDateTime;`
`6`	`4`
`7`	`5`	`import com.iab.gpp.encoder.bitstring.BitString;`
`8`	`6`	`import com.iab.gpp.encoder.bitstring.BitStringBuilder;`
`@@ -11,21 +9,20 @@`
`11`	`9`	`public class DatetimeEncoder {`
`12`	`10`
`13`	`11`	`private DatetimeEncoder() {}`
`14`		`- public static final ZoneId UTC = ZoneId.of("UTC");`
`15`	`12`
`16`		`- public static void encode(BitStringBuilder builder, ZonedDateTime value) {`
	`13`	`+ public static void encode(BitStringBuilder builder, Instant value) {`
`17`	`14`	`if (value != null) {`
`18`		`- FixedLongEncoder.encode(builder, value.toInstant().toEpochMilli() / 100, 36);`
	`15`	`+ FixedLongEncoder.encode(builder, value.toEpochMilli() / 100, 36);`
`19`	`16`	`} else {`
`20`	`17`	`FixedLongEncoder.encode(builder, 0, 36);`
`21`	`18`	`}`
`22`	`19`	`}`
`23`	`20`
`24`		`- public static ZonedDateTime decode(BitString bitString) throws DecodingException {`
	`21`	`+ public static Instant decode(BitString bitString) throws DecodingException {`
`25`	`22`	`if (bitString.length() != 36) {`
`26`	`23`	`throw new DecodingException("Undecodable Datetime '" + bitString + "'");`
`27`	`24`	`}`
`28`	`25`
`29`		`- return ZonedDateTime.ofInstant(Instant.ofEpochMilli(FixedLongEncoder.decode(bitString) * 100L), UTC);`
	`26`	`+ return Instant.ofEpochMilli(FixedLongEncoder.decode(bitString) * 100L);`
`30`	`27`	`}`
`31`	`28`	`}`