From 9772ce8ee0d96e375888bd5073ee89b4d4fe086b Mon Sep 17 00:00:00 2001
From: Ben Fortuna <bfortuna@odecee.com.au>
Date: Sun, 1 Aug 2021 14:52:46 +1000
Subject: [PATCH] Refactoring

---
 src/main/java/net/fortuna/ical4j/model/Calendar.java   |  2 +-
 src/main/java/net/fortuna/ical4j/model/Component.java  |  2 +-
 .../net/fortuna/ical4j/model/PropertyContainer.java    | 10 ++++++++++
 .../fortuna/ical4j/model/TemporalAmountComparator.java |  5 +++--
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/net/fortuna/ical4j/model/PropertyContainer.java

diff --git a/src/main/java/net/fortuna/ical4j/model/Calendar.java b/src/main/java/net/fortuna/ical4j/model/Calendar.java
index eeab43d5d..4c3f6c300 100644
--- a/src/main/java/net/fortuna/ical4j/model/Calendar.java
+++ b/src/main/java/net/fortuna/ical4j/model/Calendar.java
@@ -115,7 +115,7 @@
  * 
  * @author Ben Fortuna
  */
-public class Calendar implements Serializable {
+public class Calendar implements Serializable, PropertyContainer {
 
     private static final long serialVersionUID = -1654118204678581940L;
 
diff --git a/src/main/java/net/fortuna/ical4j/model/Component.java b/src/main/java/net/fortuna/ical4j/model/Component.java
index fc13aed3e..39fdcbd2a 100644
--- a/src/main/java/net/fortuna/ical4j/model/Component.java
+++ b/src/main/java/net/fortuna/ical4j/model/Component.java
@@ -54,7 +54,7 @@
  *
  * @author Ben Fortuna
  */
-public abstract class Component implements Serializable {
+public abstract class Component implements Serializable, PropertyContainer {
 
     private static final long serialVersionUID = 4943193483665822201L;
 
diff --git a/src/main/java/net/fortuna/ical4j/model/PropertyContainer.java b/src/main/java/net/fortuna/ical4j/model/PropertyContainer.java
new file mode 100644
index 000000000..c6e5bdcfc
--- /dev/null
+++ b/src/main/java/net/fortuna/ical4j/model/PropertyContainer.java
@@ -0,0 +1,10 @@
+package net.fortuna.ical4j.model;
+
+public interface PropertyContainer {
+
+    PropertyList<Property> getProperties();
+
+    <T extends Property> PropertyList<T> getProperties(final String name);
+
+    <T extends Property> T getProperty(final String name);
+}
diff --git a/src/main/java/net/fortuna/ical4j/model/TemporalAmountComparator.java b/src/main/java/net/fortuna/ical4j/model/TemporalAmountComparator.java
index 542983ba2..84b8c9e13 100644
--- a/src/main/java/net/fortuna/ical4j/model/TemporalAmountComparator.java
+++ b/src/main/java/net/fortuna/ical4j/model/TemporalAmountComparator.java
@@ -3,6 +3,7 @@
 import java.time.Duration;
 import java.time.Period;
 import java.time.temporal.TemporalAmount;
+import java.time.temporal.TemporalUnit;
 import java.util.Comparator;
 
 public class TemporalAmountComparator implements Comparator<TemporalAmount> {
@@ -11,8 +12,8 @@ public int compare(TemporalAmount o1, TemporalAmount o2) {
         int result = 0;
         if (!o1.getClass().equals(o2.getClass())) {
 //            throw new UnsupportedOperationException("Unable to compare different Temporal types");
-            boolean o1datebased = o1.getUnits().stream().anyMatch(u -> u.isDateBased());
-            boolean o2datebased = o2.getUnits().stream().anyMatch(u -> u.isDateBased());
+            boolean o1datebased = o1.getUnits().stream().anyMatch(TemporalUnit::isDateBased);
+            boolean o2datebased = o2.getUnits().stream().anyMatch(TemporalUnit::isDateBased);
             if (o1datebased != o2datebased) {
                 if (o1datebased) {
                     result = Integer.MAX_VALUE;