Refactor

ical4j · Jun 3, 2023 · afd3179 · afd3179
1 parent 91449d2
commit afd3179
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/data/CalendarBuilder.java b/src/main/java/net/fortuna/ical4j/data/CalendarBuilder.java
@@ -40,7 +40,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -55,7 +54,7 @@
  *                         </pre>
  * @version 2.0
  */
-public class CalendarBuilder implements Consumer<Calendar> {
+public class CalendarBuilder {
 
     private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
@@ -76,7 +75,7 @@ public class CalendarBuilder implements Consumer<Calendar> {
     public CalendarBuilder() {
         this.parser = CalendarParserFactory.getInstance().get();
         this.tzRegistry = TimeZoneRegistryFactory.getInstance().createRegistry();
-        this.contentHandler = new DefaultContentHandler(this, tzRegistry);
+        this.contentHandler = new DefaultContentHandler(calendar -> {this.calendar = calendar;}, tzRegistry);
     }
 
     /**
@@ -87,7 +86,7 @@ public CalendarBuilder() {
     public CalendarBuilder(final CalendarParser parser) {
         this.parser = parser;
         this.tzRegistry = TimeZoneRegistryFactory.getInstance().createRegistry();
-        this.contentHandler = new DefaultContentHandler(this, tzRegistry);
+        this.contentHandler = new DefaultContentHandler(calendar -> {this.calendar = calendar;}, tzRegistry);
     }
 
     /**
@@ -98,7 +97,7 @@ public CalendarBuilder(final CalendarParser parser) {
     public CalendarBuilder(final TimeZoneRegistry tzRegistry) {
         this.parser = CalendarParserFactory.getInstance().get();
         this.tzRegistry = tzRegistry;
-        this.contentHandler = new DefaultContentHandler(this, tzRegistry);
+        this.contentHandler = new DefaultContentHandler(calendar -> {this.calendar = calendar;}, tzRegistry);
     }
 
     /**
@@ -112,7 +111,7 @@ public CalendarBuilder(final TimeZoneRegistry tzRegistry) {
     public CalendarBuilder(CalendarParser parser, TimeZoneRegistry tzRegistry) {
         this.parser = parser;
         this.tzRegistry = tzRegistry;
-        this.contentHandler = new DefaultContentHandler(this, tzRegistry);
+        this.contentHandler = new DefaultContentHandler(calendar -> {this.calendar = calendar;}, tzRegistry);
     }
 
     /**
@@ -152,12 +151,7 @@ public CalendarBuilder(CalendarParser parser, ContentHandlerContext contentHandl
 
         this.parser = parser;
         this.tzRegistry = tzRegistry;
-        this.contentHandler = new DefaultContentHandler(this, tzRegistry, contentHandlerContext);
-    }
-
-    @Override
-    public void accept(Calendar calendar) {
-        this.calendar = calendar;
+        this.contentHandler = new DefaultContentHandler(calendar -> {this.calendar = calendar;}, tzRegistry, contentHandlerContext);
     }
 
     /**