Remove all unofficial holidays

* Countries: be, mx, at
focus-shift · Apr 9, 2024 · eaa0992 · eaa0992
1 parent 2029fc6
commit eaa0992
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -210,7 +210,6 @@ The following holiday types are supported:
 |------------|---------------------------------------------------------------------------------------------------------|
 | Public     | Public holiday                                                                                          |
 | Bank       | Bank holiday, banks and offices are closed                                                              |
-| Unofficial | Unofficial holiday that is no <br/>public or bank holiday <br/>(Deprecated, please use the other types) |
 
 ## Development
 

diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayType.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayType.java
@@ -8,8 +8,5 @@ public enum HolidayType {
 
   PUBLIC_HOLIDAY,
 
-  BANK_HOLIDAY,
-
-  @Deprecated(since = "0.26.0", forRemoval = true)
-  UNOFFICIAL_HOLIDAY;
+  BANK_HOLIDAY
 }
diff --git a/jollyday-core/src/main/resources/focus_shift.de/jollyday/schema/holiday/holiday.xsd b/jollyday-core/src/main/resources/focus_shift.de/jollyday/schema/holiday/holiday.xsd
@@ -194,7 +194,6 @@
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="PUBLIC_HOLIDAY"/>
       <xsd:enumeration value="BANK_HOLIDAY"/>
-      <xsd:enumeration value="UNOFFICIAL_HOLIDAY"/>
     </xsd:restriction>
   </xsd:simpleType>
 

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_at.xml b/jollyday-core/src/main/resources/holidays/Holidays_at.xml
@@ -12,10 +12,8 @@
     <Fixed month="OCTOBER" day="26" descriptionPropertiesKey="NATIONAL_DAY"/>
     <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
     <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="IMMACULATE_CONCEPTION"/>
-    <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE" localizedType="UNOFFICIAL_HOLIDAY"/>
     <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
     <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
-    <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE" localizedType="UNOFFICIAL_HOLIDAY"/>
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
     <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"/>

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_be.xml b/jollyday-core/src/main/resources/holidays/Holidays_be.xml
@@ -10,11 +10,8 @@
     <Fixed month="JULY" day="21" descriptionPropertiesKey="NATIONAL_DAY"/>
     <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
     <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
-    <Fixed month="NOVEMBER" day="2" descriptionPropertiesKey="ALL_SOULS" localizedType="UNOFFICIAL_HOLIDAY"/>
     <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="ARMISTICE"/>
     <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-    <Fixed month="NOVEMBER" day="15" descriptionPropertiesKey="KINGS_FEAST" localizedType="UNOFFICIAL_HOLIDAY"/>
-    <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE" localizedType="UNOFFICIAL_HOLIDAY"/>
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
     <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"/>

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_mx.xml b/jollyday-core/src/main/resources/holidays/Holidays_mx.xml
@@ -5,12 +5,6 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
   <Holidays>
-    <Fixed month="FEBRUARY" day="19" localizedType="UNOFFICIAL_HOLIDAY" descriptionPropertiesKey="ARMY_DAY"/>
-    <Fixed month="FEBRUARY" day="24" validFrom="1937" localizedType="UNOFFICIAL_HOLIDAY"
-               descriptionPropertiesKey="FLAG_DAY"/>
-    <Fixed month="MARCH" day="18" validFrom="1938" localizedType="UNOFFICIAL_HOLIDAY"
-               descriptionPropertiesKey="OIL_EXPROPRIATION_DAY"/>
-    <Fixed month="OCTOBER" day="12" localizedType="UNOFFICIAL_HOLIDAY" descriptionPropertiesKey="COLUMBUS_DAY"/>
     <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR">
       <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
       <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
@@ -35,10 +29,4 @@
     <FixedWeekday which="THIRD" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="JUAREZ_BIRTHDAY"/>
     <FixedWeekday which="THIRD" weekday="MONDAY" month="NOVEMBER" descriptionPropertiesKey="REVOLUTION"/>
   </Holidays>
-
-  <SubConfigurations hierarchy="pue" description="Puebla">
-    <Holidays>
-      <Fixed month="MAY" day="5" descriptionPropertiesKey="MAY_DAY" localizedType="UNOFFICIAL_HOLIDAY"/>
-    </Holidays>
-  </SubConfigurations>
 </Configuration>
diff --git a/jollyday-core/src/test/java/de/focus_shift/jollyday/core/HolidayTest.java b/jollyday-core/src/test/java/de/focus_shift/jollyday/core/HolidayTest.java
@@ -5,8 +5,8 @@
 import java.time.LocalDate;
 import java.util.Locale;
 
+import static de.focus_shift.jollyday.core.HolidayType.BANK_HOLIDAY;
 import static de.focus_shift.jollyday.core.HolidayType.PUBLIC_HOLIDAY;
-import static de.focus_shift.jollyday.core.HolidayType.UNOFFICIAL_HOLIDAY;
 import static java.util.Locale.ENGLISH;
 import static java.util.Locale.GERMAN;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -64,7 +64,7 @@ void testHolidayEquals() {
     final Holiday h3 = new Holiday(LocalDate.of(2011, 2, 2), "NEW_YEAR", PUBLIC_HOLIDAY);
     assertThat(h1).isNotEqualTo(h3);
 
-    final Holiday h4 = new Holiday(LocalDate.of(2011, 2, 2), "CHRISTMAS", UNOFFICIAL_HOLIDAY);
+    final Holiday h4 = new Holiday(LocalDate.of(2011, 2, 2), "CHRISTMAS", BANK_HOLIDAY);
     assertThat(h1).isNotEqualTo(h4);
   }
 }
diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/mapping/HolidayType.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/mapping/HolidayType.java
@@ -3,8 +3,7 @@
 public enum HolidayType {
 
   PUBLIC_HOLIDAY,
-  BANK_HOLIDAY,
-  UNOFFICIAL_HOLIDAY;
+  BANK_HOLIDAY;
 
   public String value() {
     return name();

diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/HolidayManagerTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/HolidayManagerTest.java
@@ -23,8 +23,8 @@
 import java.util.stream.Stream;
 
 import static de.focus_shift.jollyday.core.HolidayCalendar.GERMANY;
+import static de.focus_shift.jollyday.core.HolidayType.BANK_HOLIDAY;
 import static de.focus_shift.jollyday.core.HolidayType.PUBLIC_HOLIDAY;
-import static de.focus_shift.jollyday.core.HolidayType.UNOFFICIAL_HOLIDAY;
 import static de.focus_shift.jollyday.core.ManagerParameters.create;
 import static java.time.Month.APRIL;
 import static java.time.Month.AUGUST;
@@ -180,7 +180,7 @@ void ensureIsHolidayMethodReturnsTrueFalseForCalendarChronologyAndHolidayType()
     calendar.set(YEAR, 2010);
     calendar.set(MONTH, Calendar.JANUARY);
     calendar.set(DAY_OF_MONTH, 4);
-    assertThat(sut.isHoliday(calendar, UNOFFICIAL_HOLIDAY)).isTrue();
+    assertThat(sut.isHoliday(calendar, BANK_HOLIDAY)).isTrue();
     assertThat(sut.isHoliday(calendar, PUBLIC_HOLIDAY)).isFalse();
   }
 
@@ -195,7 +195,7 @@ void ensureIsHolidayMethodReturnsTrueFalseForLocalDate() {
   void ensureIsHolidayMethodReturnsTrueFalseForLocalDateWithHolidayType() {
     final HolidayManager sut = HolidayManager.getInstance(create("test"));
     assertThat(sut.isHoliday(LocalDate.of(2010, 1, 4), PUBLIC_HOLIDAY)).isFalse();
-    assertThat(sut.isHoliday(LocalDate.of(2010, 1, 4), UNOFFICIAL_HOLIDAY)).isTrue();
+    assertThat(sut.isHoliday(LocalDate.of(2010, 1, 4), BANK_HOLIDAY)).isTrue();
   }
 
   @Test
@@ -247,9 +247,9 @@ void ensureToRetrieveHolidaysFromBaseLevelHierarchy() {
   @Test
   void ensureToRetrieveHolidaysByType() {
     final HolidayManager sut = HolidayManager.getInstance(create("test"));
-    final Set<Holiday> holidays = sut.getHolidays(2010, UNOFFICIAL_HOLIDAY);
+    final Set<Holiday> holidays = sut.getHolidays(2010, BANK_HOLIDAY);
     assertThat(holidays)
-      .containsOnly(new Holiday(LocalDate.of(2010, 1, 4), "", UNOFFICIAL_HOLIDAY));
+      .containsOnly(new Holiday(LocalDate.of(2010, 1, 4), "", BANK_HOLIDAY));
   }
 
   private static Stream<Arguments> firstLevel() {
@@ -295,9 +295,9 @@ void ensureToTestIntervalToRetrieveHolidays() {
   @Test
   void ensureToTestIntervalToRetrieveHolidaysByType() {
     final HolidayManager sut = HolidayManager.getInstance(create("test"));
-    final Set<Holiday> holidays = sut.getHolidays(LocalDate.of(2010, 1, 1), LocalDate.of(2010, 1, 31), UNOFFICIAL_HOLIDAY);
+    final Set<Holiday> holidays = sut.getHolidays(LocalDate.of(2010, 1, 1), LocalDate.of(2010, 1, 31), BANK_HOLIDAY);
     assertThat(holidays)
-      .containsOnly(new Holiday(LocalDate.of(2010, 1, 4), "", UNOFFICIAL_HOLIDAY));
+      .containsOnly(new Holiday(LocalDate.of(2010, 1, 4), "", BANK_HOLIDAY));
   }
 
   @Test

diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test.xml
@@ -5,7 +5,7 @@
                xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
   <Holidays>
     <Fixed month="JANUARY" day="1"/>
-    <Fixed month="JANUARY" day="4" localizedType="UNOFFICIAL_HOLIDAY"/>
+    <Fixed month="JANUARY" day="4" localizedType="BANK_HOLIDAY"/>
     <Fixed month="JANUARY" day="16">
       <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
       <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>