Support relaxed validation for handling incompatible temporal types

ical4j · Jul 28, 2021 · 20f3c00 · 20f3c00
1 parent 1027c18
commit 20f3c00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/TemporalAmountAdapter.java b/src/main/java/net/fortuna/ical4j/model/TemporalAmountAdapter.java
@@ -12,6 +12,7 @@
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAmount;
+import java.util.Arrays;
 import java.util.Date;
 
 /**
@@ -129,12 +130,14 @@ private String durationToString(Duration duration) {
 
     public static TemporalAmountAdapter parse(String value) {
         TemporalAmount retVal = null;
-        if ("P".equals(value) && CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)) {
+        if (Arrays.asList("P", "PT").contains(value)
+                && CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)) {
             retVal = Period.ZERO;
         }
         else if (value.matches("([+-])?P.*(W|D)")) {
             retVal = java.time.Period.parse(value);
-        } else if (value.matches("P([+-]?[0-9]*[MHS])+")) {
+        } else if (CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)
+                && value.matches("P([+-]?[0-9]*[MHS])+")) {
             retVal = java.time.Duration.parse("PT" + value.substring(1));
         } else {
             retVal = java.time.Duration.parse(value);

diff --git a/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy
@@ -7,6 +7,7 @@ import spock.lang.Unroll
 
 import java.time.Duration
 import java.time.LocalDateTime
+import java.time.temporal.ChronoUnit
 
 class TemporalAmountAdapterTest extends Specification {
 
@@ -45,6 +46,8 @@ class TemporalAmountAdapterTest extends Specification {
         where:
         stringValue     | expectedDuration
         "P"             | java.time.Period.ZERO
+        "PT"            | java.time.Period.ZERO
+        "P90M"          | Duration.of(90, ChronoUnit.MINUTES)
     }
 
     def 'verify temporalamount creation'() {