Merge pull request #953 from focus-shift/952-target2-securities

Fix target 2 securities hierarchy name

Author: derTobsch

jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java

@@ -28,7 +28,7 @@ public enum HolidayCalendar {
   PANAMA("PA"), PARAGUAY("PY"), PERU("PE"), POLAND("PL"), PORTUGAL("PT"),
   ROMANIA("RO"), RUSSIA("RU"),
   SAN_MARINO("SM"), SAUDI_ARABIA("SA"), SERBIA("RS"), SINGAPORE("SG"), SLOWAKIA("SK"), SLOWENIA("SI"), SOUTH_AFRICA("ZA"), SPAIN("ES"), SWEDEN("SE"), SWITZERLAND("CH"),
-  TARGET("TARGET"), TARGET2_SECURITIES("TARGET_2_SECURITIES"), TURKEY("TR"),
+  TARGET("TARGET"), TARGET2_SECURITIES("TARGET2_SECURITIES"), TURKEY("TR"),
   UKRAINE("UA"), UNITED_ARAB_EMIRATES("AE"), UNITED_KINGDOM(Locale.UK.getCountry()), UNITED_STATES(Locale.US.getCountry()), URUGUAY("UY"),
   VENEZUELA("VE");
 

…olidays/Holidays_target_2_securities.xml …holidays/Holidays_target2_securities.xmljollyday-core/src/main/resources/holidays/Holidays_target_2_securities.xml renamed to jollyday-core/src/main/resources/holidays/Holidays_target2_securities.xml jollyday-core/src/main/resources/holidays/Holidays_target_2_securities.xml renamed to jollyday-core/src/main/resources/holidays/Holidays_target2_securities.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Configuration hierarchy="target" description="TARGET2-Securities (T2S)"
+<Configuration hierarchy="target2-securities" description="TARGET2-Securities (T2S)"
                xmlns="https://focus_shift.de/jollyday/schema/holiday"
                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">

jollyday-core/src/test/java/de/focus_shift/jollyday/core/HolidayCalendarTest.java

@@ -11,7 +11,7 @@
 
 class HolidayCalendarTest {
 
-  private static final List<String> noneIso3166Countries = List.of("DJ_STOXX", "LME", "NYSE", "NYSE_EURONEXT", "TARGET", "TARGET_2_SECURITIES", "XK");
+  private static final List<String> noneIso3166Countries = List.of("DJ_STOXX", "LME", "NYSE", "NYSE_EURONEXT", "TARGET", "TARGET2_SECURITIES", "XK");
 
   @Test
   void ensureThatAllCountryAreISO3166Conform() {

jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/SubdivisionsTest.java

@@ -17,7 +17,7 @@
 
 class SubdivisionsTest {
 
-  private static final List<String> noneIso3166Countries = List.of("DJ_STOXX", "LME", "NYSE", "NYSE_EURONEXT", "TARGET", "TARGET_2_SECURITIES", "XK", "FR", "MC");
+  private static final List<String> noneIso3166Countries = List.of("DJ_STOXX", "LME", "NYSE", "NYSE_EURONEXT", "TARGET", "TARGET2_SECURITIES", "XK", "FR", "MC");
   private static final List<String> okSubdivisions = List.of("FI-01", "ES-RI", "IN-DH", "IN-OD", "IN-UK", "IN-CG", "IN-LA", "IN-TS", "SM-03", "SM-04", "SM-05", "SM-06", "SM-08");
 
   @Test