svn commit: r1898124 - in /poi/trunk: poi-ooxml/src/test/java/org/apache/poi/ooxml/ poi/src/main/java/org/apache/poi/ss/usermodel/ poi/src/main/java/org/apache/poi/util/ poi/src/test/java/org/apache/poi/ss/usermodel/

[fanningpj]

Author: fanningpj
Date: Wed Feb 16 10:14:05 2022
New Revision: 1898124

URL: http://svn.apache.org/viewvc?rev=1898124&view=rev
Log:
improve performance of time zone lookup

Modified:
    
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
    poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
    poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java
    poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java

Modified: 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java?rev=1898124&r1=1898123&r2=1898124&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
 Wed Feb 16 10:14:05 2022
@@ -27,6 +27,7 @@ import static org.junit.jupiter.api.Asse
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Optional;
@@ -329,7 +330,7 @@ public final class TestPOIXMLProperties
         try (OPCPackage pkg = 
OPCPackage.open(_ssTests.openResourceAsStream("sample.strict.xlsx"))) {
             POIXMLProperties props = new POIXMLProperties(pkg);
             assertNotNull(props.getCoreProperties().getCreated());
-            assertEquals(2007, 
props.getCoreProperties().getCreated().toInstant().atZone(ZoneId.of("UTC")).getYear());
+            assertEquals(2007, 
props.getCoreProperties().getCreated().toInstant().atZone(ZoneOffset.UTC).getYear());
         }
     }
 

Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java?rev=1898124&r1=1898123&r2=1898124&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java 
[UTF-8] (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java 
[UTF-8] Wed Feb 16 10:14:05 2022
@@ -23,6 +23,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
@@ -92,7 +93,7 @@ public class DateUtil {
      */
     public static LocalDateTime toLocalDateTime(Date date) {
         return date.toInstant()
-                .atZone(TimeZone.getTimeZone("UTC").toZoneId()) // 
java.util.Date uses UTC
+                .atZone(TimeZone.getTimeZone(ZoneOffset.UTC).toZoneId()) // 
java.util.Date uses UTC
                 .toLocalDateTime();
     }
 
@@ -103,7 +104,7 @@ public class DateUtil {
      */
     public static LocalDateTime toLocalDateTime(Calendar date) {
         return date.toInstant()
-                .atZone(TimeZone.getTimeZone("UTC").toZoneId()) // 
java.util.Date uses UTC
+                .atZone(TimeZone.getTimeZone(ZoneOffset.UTC).toZoneId()) // 
java.util.Date uses UTC
                 .toLocalDateTime();
     }
 

Modified: poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java?rev=1898124&r1=1898123&r2=1898124&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java Wed Feb 16 
10:14:05 2022
@@ -19,6 +19,7 @@
 package org.apache.poi.util;
 
 import java.nio.charset.Charset;
+import java.time.ZoneOffset;
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -45,7 +46,7 @@ public final class LocaleUtil {
      * Excel doesn't store TimeZone information in the file, so if in doubt,
      *  use UTC to perform calculations
      */
-    public static final TimeZone TIMEZONE_UTC = TimeZone.getTimeZone("UTC");
+    public static final TimeZone TIMEZONE_UTC = 
TimeZone.getTimeZone(ZoneOffset.UTC);
 
     /**
      * Default encoding for unknown byte encodings of native files

Modified: 
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java?rev=1898124&r1=1898123&r2=1898124&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java 
(original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java 
Wed Feb 16 10:14:05 2022
@@ -33,6 +33,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -1093,7 +1094,7 @@ public abstract class BaseTestCell {
             cell.setCellValue(new Date());
             assertEquals(CellType.FORMULA, cell.getCellType());
 
-            
cell.setCellValue(GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC"), 
Locale.ROOT));
+            
cell.setCellValue(GregorianCalendar.getInstance(TimeZone.getTimeZone(ZoneOffset.UTC),
 Locale.ROOT));
             assertEquals(CellType.FORMULA, cell.getCellType());
 
             cell.setCellValue(1.0);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org