Always preserve unrecognised components, properties and parameters

ical4j · Oct 22, 2021 · 5c04533 · 5c04533
1 parent b04c15d
commit 5c04533
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 173 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/AbstractContentBuilder.java b/src/main/java/net/fortuna/ical4j/model/AbstractContentBuilder.java
@@ -4,6 +4,17 @@ public abstract class AbstractContentBuilder {
 
     private final boolean allowIllegalNames;
 
+    /**
+     * Default constructor.
+     */
+    public AbstractContentBuilder() {
+        this(true);
+    }
+
+    /**
+     *
+     * @param allowIllegalNames store unrecognised names as experimental content
+     */
     public AbstractContentBuilder(boolean allowIllegalNames) {
         this.allowIllegalNames = allowIllegalNames;
     }

diff --git a/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java b/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java
@@ -1,7 +1,6 @@
 package net.fortuna.ical4j.model;
 
 import net.fortuna.ical4j.model.component.XComponent;
-import net.fortuna.ical4j.util.CompatibilityHints;
 
 import java.util.Collections;
 import java.util.List;
@@ -16,12 +15,16 @@ public class ComponentBuilder<T extends Component> extends AbstractContentBuilde
 
     private ComponentList<Component> subComponents = new ComponentList<>();
 
-    public ComponentBuilder() {
-        this(Collections.emptyList());
+    public ComponentBuilder(boolean allowIllegalNames) {
+        this(Collections.emptyList(), allowIllegalNames);
     }
 
     public ComponentBuilder(List<ComponentFactory<?>> factories) {
-        super(CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING));
+        this(factories, true);
+    }
+
+    public ComponentBuilder(List<ComponentFactory<?>> factories, boolean allowIllegalNames) {
+        super(allowIllegalNames);
         this.factories = factories;
     }
 

diff --git a/src/main/java/net/fortuna/ical4j/model/ParameterBuilder.java b/src/main/java/net/fortuna/ical4j/model/ParameterBuilder.java
@@ -1,7 +1,6 @@
 package net.fortuna.ical4j.model;
 
 import net.fortuna.ical4j.model.parameter.XParameter;
-import net.fortuna.ical4j.util.CompatibilityHints;
 import org.apache.commons.codec.DecoderException;
 
 import java.net.URISyntaxException;
@@ -24,7 +23,6 @@ public ParameterBuilder() {
     }
 
     public ParameterBuilder(List<ParameterFactory<? extends Parameter>> factories) {
-        super(CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING));
         this.factories = factories;
     }
 

diff --git a/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java b/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java
@@ -1,7 +1,6 @@
 package net.fortuna.ical4j.model;
 
 import net.fortuna.ical4j.model.property.XProperty;
-import net.fortuna.ical4j.util.CompatibilityHints;
 import org.apache.commons.codec.DecoderException;
 
 import java.io.IOException;
@@ -30,7 +29,6 @@ public PropertyBuilder() {
     }
 
     public PropertyBuilder(List<PropertyFactory<? extends Property>> factories) {
-        super(CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING));
         this.factories = factories;
     }
 

diff --git a/src/test/groovy/net/fortuna/ical4j/model/ComponentBuilderTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/ComponentBuilderTest.groovy
@@ -1,6 +1,7 @@
 package net.fortuna.ical4j.model
 
 import net.fortuna.ical4j.model.component.VEvent
+import net.fortuna.ical4j.model.component.XComponent
 import spock.lang.Specification
 
 class ComponentBuilderTest extends Specification {
@@ -19,7 +20,7 @@ class ComponentBuilderTest extends Specification {
         c == new ContentBuilder().vevent()
     }
 
-    def 'test build invalid component'() {
+    def 'test build unrecognised component'() {
         given: 'a component builder instance'
         ComponentBuilder builder = [Arrays.asList(new VEvent.Factory())]
 
@@ -29,7 +30,7 @@ class ComponentBuilderTest extends Specification {
         when: 'build method called'
         Component c = builder.build()
 
-        then: 'an exception is thrown'
-        thrown(IllegalArgumentException)
+        then: 'component vtodo is unrecognised'
+        c instanceof XComponent
     }
 }
diff --git a/src/test/groovy/net/fortuna/ical4j/model/ParameterBuilderTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/ParameterBuilderTest.groovy
@@ -2,6 +2,7 @@ package net.fortuna.ical4j.model
 
 
 import net.fortuna.ical4j.model.parameter.Value
+import net.fortuna.ical4j.model.parameter.XParameter
 import net.fortuna.ical4j.util.CompatibilityHints
 import spock.lang.Specification
 
@@ -29,7 +30,7 @@ class ParameterBuilderTest extends Specification {
         p == new ContentBuilder().value('test')
     }
 
-    def 'test build invalid parameter'() {
+    def 'test build unrecognised parameter'() {
         given: 'a parameter builder instance'
         ParameterBuilder builder = [Arrays.asList(new Value.Factory())]
 
@@ -39,7 +40,7 @@ class ParameterBuilderTest extends Specification {
         when: 'build method called'
         Parameter p = builder.build()
 
-        then: 'an exception is thrown'
-        thrown(IllegalArgumentException)
+        then: 'type param is unrecognised'
+        p instanceof XParameter
     }
 }
diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderCustomRegistryTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderCustomRegistryTest.java
@@ -35,6 +35,7 @@
 import junit.framework.TestCase;
 import net.fortuna.ical4j.model.*;
 import net.fortuna.ical4j.model.component.VEvent;
+import net.fortuna.ical4j.model.parameter.XParameter;
 import net.fortuna.ical4j.util.Strings;
 
 import java.io.StringReader;
@@ -90,11 +91,9 @@ public void testCustomParameter() throws Exception {
 
         // try to build with a regular builder
         CalendarBuilder builder = new CalendarBuilder();
-        try {
-            builder.build(new StringReader(VEVENT_WITH_SCHEDULE_STATUS));
-            fail("expected exception");
-        } catch (ParserException ioe) {
-        }
+        Calendar cal = builder.build(new StringReader(VEVENT_WITH_SCHEDULE_STATUS));
+        assertTrue(cal.getComponent(Component.VEVENT).getProperty(Property.ATTENDEE)
+                .getParameter(SCHEDULE_STATUS) instanceof XParameter);
 
         // try to build with a custom parameter factory
         final ParameterFactoryRegistry paramFactory = new ParameterFactoryRegistry();
@@ -118,7 +117,7 @@ public Parameter createParameter(final String value) throws URISyntaxException {
                 paramFactory,
                 TimeZoneRegistryFactory.getInstance().createRegistry());
 
-        Calendar cal = builder.build(new StringReader(VEVENT_WITH_SCHEDULE_STATUS));
+        cal = builder.build(new StringReader(VEVENT_WITH_SCHEDULE_STATUS));
 
         VEvent event = (VEvent)cal.getComponent(Component.VEVENT);
         VEvent eventBis = (VEvent)event.copy();

diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarParserImplTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarParserImplTest.java
@@ -120,13 +120,8 @@ public static TestSuite suite() {
         TestSuite suite = new TestSuite();
         suite.addTest(new CalendarParserImplTest("/samples/invalid/google_aus_holidays.ics", 11));
         suite.addTest(new CalendarParserImplTest("/samples/invalid/13-MoonPhase.ics", 215));
-
-        suite.addTest(new CalendarParserImplTest("/samples/invalid/CalendarDataFile.ics", 25));
-
         suite.addTest(new CalendarParserImplTest("/samples/invalid/overlaps.ics", 1));
         suite.addTest(new CalendarParserImplTest("/samples/invalid/schedule-unstable.ics", 196));
-        suite.addTest(new CalendarParserImplTest("/samples/invalid/smallcluster.ics", 12));
-        suite.addTest(new CalendarParserImplTest("/samples/invalid/twinkle.ics", 67));
         suite.addTest(new CalendarParserImplTest("/samples/invalid/zidestoreical4jbomb.ics", 10));
         return suite;
     }