diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonChristianHoliday.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonChristianHoliday.java index 733c2cb1f..616a28f4d 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonChristianHoliday.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonChristianHoliday.java @@ -15,19 +15,32 @@ import static java.util.stream.Collectors.toList; -public class JacksonChristianHoliday implements ChristianHoliday { +/** + * {@inheritDoc} + */ +class JacksonChristianHoliday implements ChristianHoliday { private final de.focus_shift.jollyday.jackson.mapping.ChristianHoliday christianHoliday; - public JacksonChristianHoliday(de.focus_shift.jollyday.jackson.mapping.ChristianHoliday christianHoliday) { + JacksonChristianHoliday(de.focus_shift.jollyday.jackson.mapping.ChristianHoliday christianHoliday) { this.christianHoliday = christianHoliday; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public ChristianHolidayType type() { return ChristianHolidayType.valueOf(christianHoliday.getType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Chronology chronology() { return christianHoliday.getChronology() == ChronologyType.JULIAN @@ -35,11 +48,21 @@ public Chronology chronology() { : IsoChronology.INSTANCE; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return christianHoliday.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return christianHoliday.getLocalizedType() == null @@ -47,6 +70,11 @@ public HolidayType officiality() { : HolidayType.valueOf(christianHoliday.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return christianHoliday.getValidFrom() == null @@ -54,6 +82,11 @@ public Year validFrom() { : Year.of(christianHoliday.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return christianHoliday.getValidTo() == null @@ -61,6 +94,11 @@ public Year validTo() { : Year.of(christianHoliday.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return christianHoliday.getEvery() == null @@ -68,6 +106,11 @@ public YearCycle cycle() { : YearCycle.valueOf(christianHoliday.getEvery().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List conditions() { return christianHoliday.getMovingCondition().stream() diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfiguration.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfiguration.java index 68d3d4eb0..f06c5586a 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfiguration.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfiguration.java @@ -5,7 +5,9 @@ import java.util.stream.Stream; - +/** + * {@inheritDoc} + */ public class JacksonConfiguration implements Configuration { private final de.focus_shift.jollyday.jackson.mapping.Configuration xmlConfiguration; @@ -14,21 +16,41 @@ public JacksonConfiguration(de.focus_shift.jollyday.jackson.mapping.Configuratio this.xmlConfiguration = xmlConfiguration; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Holidays holidays() { return new JacksonHolidays(xmlConfiguration.getHolidays()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Stream subConfigurations() { return xmlConfiguration.getSubConfigurations().stream().map(JacksonConfiguration::new); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String hierarchy() { return xmlConfiguration.getHierarchy(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String description() { return xmlConfiguration.getDescription(); diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfigurationService.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfigurationService.java index 1dc94140a..7e2625138 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfigurationService.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonConfigurationService.java @@ -7,11 +7,18 @@ import java.io.InputStream; import java.net.URL; - +/** + * {@inheritDoc} + */ public class JacksonConfigurationService implements ConfigurationService { private static final XMLUtil xmlUtil = new XMLUtil(); + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Configuration getConfiguration(ManagerParameter parameter) { final URL resourceUrl = parameter.createResourceUrl(); diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonEthiopianOrthodoxHoliday.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonEthiopianOrthodoxHoliday.java index b5536c755..d12bd5c3d 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonEthiopianOrthodoxHoliday.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonEthiopianOrthodoxHoliday.java @@ -7,19 +7,32 @@ import java.time.Year; -public class JacksonEthiopianOrthodoxHoliday implements EthiopianOrthodoxHoliday { +/** + * {@inheritDoc} + */ +class JacksonEthiopianOrthodoxHoliday implements EthiopianOrthodoxHoliday { private final de.focus_shift.jollyday.jackson.mapping.EthiopianOrthodoxHoliday ethiopianOrthodoxHoliday; - public JacksonEthiopianOrthodoxHoliday(de.focus_shift.jollyday.jackson.mapping.EthiopianOrthodoxHoliday ethiopianOrthodoxHoliday) { + JacksonEthiopianOrthodoxHoliday(de.focus_shift.jollyday.jackson.mapping.EthiopianOrthodoxHoliday ethiopianOrthodoxHoliday) { this.ethiopianOrthodoxHoliday = ethiopianOrthodoxHoliday; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return ethiopianOrthodoxHoliday.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return ethiopianOrthodoxHoliday.getLocalizedType() == null @@ -27,11 +40,21 @@ public HolidayType officiality() { : HolidayType.valueOf(ethiopianOrthodoxHoliday.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public EthiopianOrthodoxHolidayType type() { return EthiopianOrthodoxHolidayType.valueOf(ethiopianOrthodoxHoliday.getType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return ethiopianOrthodoxHoliday.getValidFrom() == null @@ -39,6 +62,11 @@ public Year validFrom() { : Year.of(ethiopianOrthodoxHoliday.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return ethiopianOrthodoxHoliday.getValidTo() == null @@ -46,6 +74,11 @@ public Year validTo() { : Year.of(ethiopianOrthodoxHoliday.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return ethiopianOrthodoxHoliday.getEvery() == null diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixed.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixed.java index a42012a68..292de1042 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixed.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixed.java @@ -11,27 +11,44 @@ import static java.util.stream.Collectors.toList; - -public class JacksonFixed implements Fixed { +/** + * {@inheritDoc} + */ +class JacksonFixed implements Fixed { private final XMLUtil xmlUtil = new XMLUtil(); private final de.focus_shift.jollyday.jackson.mapping.Fixed fixed; - public JacksonFixed(de.focus_shift.jollyday.jackson.mapping.Fixed fixed) { + JacksonFixed(de.focus_shift.jollyday.jackson.mapping.Fixed fixed) { this.fixed = fixed; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public MonthDay day() { return MonthDay.of(xmlUtil.getMonth(fixed.getMonth()), fixed.getDay()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return fixed.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return fixed.getLocalizedType() == null @@ -39,6 +56,11 @@ public HolidayType officiality() { : HolidayType.valueOf(fixed.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return fixed.getValidFrom() == null @@ -46,6 +68,11 @@ public Year validFrom() { : Year.of(fixed.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return fixed.getValidTo() == null @@ -53,6 +80,11 @@ public Year validTo() { : Year.of(fixed.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return fixed.getEvery() == null @@ -60,6 +92,11 @@ public YearCycle cycle() { : YearCycle.valueOf(fixed.getEvery().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List conditions() { return fixed.getMovingCondition().stream() diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayBetweenFixed.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayBetweenFixed.java index e4918a6ea..894384a7c 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayBetweenFixed.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayBetweenFixed.java @@ -8,35 +8,62 @@ import java.time.DayOfWeek; import java.time.Year; - -public class JacksonFixedWeekdayBetweenFixed implements FixedWeekdayBetweenFixed { +/** + * {@inheritDoc} + */ +class JacksonFixedWeekdayBetweenFixed implements FixedWeekdayBetweenFixed { private final de.focus_shift.jollyday.jackson.mapping.FixedWeekdayBetweenFixed fixedWeekdayBetweenFixed; - public JacksonFixedWeekdayBetweenFixed(de.focus_shift.jollyday.jackson.mapping.FixedWeekdayBetweenFixed fixedWeekdayInMonth) { + JacksonFixedWeekdayBetweenFixed(de.focus_shift.jollyday.jackson.mapping.FixedWeekdayBetweenFixed fixedWeekdayInMonth) { this.fixedWeekdayBetweenFixed = fixedWeekdayInMonth; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Fixed from() { return new JacksonFixed(fixedWeekdayBetweenFixed.getFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Fixed to() { return new JacksonFixed(fixedWeekdayBetweenFixed.getTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public DayOfWeek weekday() { return DayOfWeek.valueOf(fixedWeekdayBetweenFixed.getWeekday().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return fixedWeekdayBetweenFixed.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return fixedWeekdayBetweenFixed.getLocalizedType() == null @@ -44,6 +71,11 @@ public HolidayType officiality() { : HolidayType.valueOf(fixedWeekdayBetweenFixed.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return fixedWeekdayBetweenFixed.getValidFrom() == null @@ -51,6 +83,11 @@ public Year validFrom() { : Year.of(fixedWeekdayBetweenFixed.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return fixedWeekdayBetweenFixed.getValidTo() == null @@ -58,6 +95,11 @@ public Year validTo() { : Year.of(fixedWeekdayBetweenFixed.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return fixedWeekdayBetweenFixed.getEvery() == null diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayInMonth.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayInMonth.java index a853ff70b..2bfa15d4b 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayInMonth.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayInMonth.java @@ -9,34 +9,59 @@ import java.time.Month; import java.time.Year; -public class JacksonFixedWeekdayInMonth implements FixedWeekdayInMonth { +class JacksonFixedWeekdayInMonth implements FixedWeekdayInMonth { private final de.focus_shift.jollyday.jackson.mapping.FixedWeekdayInMonth fixedWeekdayInMonth; - public JacksonFixedWeekdayInMonth(de.focus_shift.jollyday.jackson.mapping.FixedWeekdayInMonth fixedWeekdayInMonth) { + JacksonFixedWeekdayInMonth(de.focus_shift.jollyday.jackson.mapping.FixedWeekdayInMonth fixedWeekdayInMonth) { this.fixedWeekdayInMonth = fixedWeekdayInMonth; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public DayOfWeek weekday() { return DayOfWeek.valueOf(fixedWeekdayInMonth.getWeekday().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Month month() { return Month.valueOf(fixedWeekdayInMonth.getMonth().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Occurrance which() { return Occurrance.valueOf(fixedWeekdayInMonth.getWhich().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return fixedWeekdayInMonth.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return fixedWeekdayInMonth.getLocalizedType() == null @@ -44,6 +69,11 @@ public HolidayType officiality() { : HolidayType.valueOf(fixedWeekdayInMonth.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return fixedWeekdayInMonth.getValidFrom() == null @@ -51,6 +81,11 @@ public Year validFrom() { : Year.of(fixedWeekdayInMonth.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return fixedWeekdayInMonth.getValidTo() == null @@ -58,6 +93,11 @@ public Year validTo() { : Year.of(fixedWeekdayInMonth.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return fixedWeekdayInMonth.getEvery() == null diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayRelativeToFixed.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayRelativeToFixed.java index f61d0a12e..97fb39859 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayRelativeToFixed.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonFixedWeekdayRelativeToFixed.java @@ -11,39 +11,69 @@ import java.time.Year; -public class JacksonFixedWeekdayRelativeToFixed implements FixedWeekdayRelativeToFixed { +class JacksonFixedWeekdayRelativeToFixed implements FixedWeekdayRelativeToFixed { private final de.focus_shift.jollyday.jackson.mapping.FixedWeekdayRelativeToFixed fixedWeekdayRelativeToFixed; - public JacksonFixedWeekdayRelativeToFixed(de.focus_shift.jollyday.jackson.mapping.FixedWeekdayRelativeToFixed fixedWeekdayRelativeToFixed) { + JacksonFixedWeekdayRelativeToFixed(de.focus_shift.jollyday.jackson.mapping.FixedWeekdayRelativeToFixed fixedWeekdayRelativeToFixed) { this.fixedWeekdayRelativeToFixed = fixedWeekdayRelativeToFixed; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public DayOfWeek weekday() { return DayOfWeek.valueOf(fixedWeekdayRelativeToFixed.getWeekday().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Relation when() { return Relation.valueOf(fixedWeekdayRelativeToFixed.getWhen().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Fixed day() { return new JacksonFixed(fixedWeekdayRelativeToFixed.getDay()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Occurrance which() { return Occurrance.valueOf(fixedWeekdayRelativeToFixed.getWhich().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return fixedWeekdayRelativeToFixed.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return fixedWeekdayRelativeToFixed.getLocalizedType() == null @@ -51,6 +81,11 @@ public HolidayType officiality() { : HolidayType.valueOf(fixedWeekdayRelativeToFixed.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return fixedWeekdayRelativeToFixed.getValidFrom() == null @@ -58,6 +93,11 @@ public Year validFrom() { : Year.of(fixedWeekdayRelativeToFixed.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return fixedWeekdayRelativeToFixed.getValidTo() == null @@ -65,6 +105,11 @@ public Year validTo() { : Year.of(fixedWeekdayRelativeToFixed.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return fixedWeekdayRelativeToFixed.getEvery() == null diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonHolidays.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonHolidays.java index 80c832e64..e3be2ee5b 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonHolidays.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonHolidays.java @@ -16,6 +16,9 @@ import static java.util.stream.Collectors.toList; +/** + * {@inheritDoc} + */ public class JacksonHolidays implements de.focus_shift.jollyday.core.spi.Holidays { private final Holidays holidays; @@ -24,51 +27,101 @@ public JacksonHolidays(Holidays holidays) { this.holidays = holidays; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List fixed() { return holidays.getFixed().stream().map(JacksonFixed::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List relativeToFixed() { return holidays.getRelativeToFixed().stream().map(JacksonRelativeToFixed::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List relativeToWeekdayInMonth() { return holidays.getRelativeToWeekdayInMonth().stream().map(JacksonRelativeToWeekdayInMonth::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List fixedWeekdays() { return holidays.getFixedWeekday().stream().map(JacksonFixedWeekdayInMonth::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List christianHolidays() { return holidays.getChristianHoliday().stream().map(JacksonChristianHoliday::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List islamicHolidays() { return holidays.getIslamicHoliday().stream().map(JacksonIslamicHoliday::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List fixedWeekdayBetweenFixed() { return holidays.getFixedWeekdayBetweenFixed().stream().map(JacksonFixedWeekdayBetweenFixed::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List fixedWeekdayRelativeToFixed() { return holidays.getFixedWeekdayRelativeToFixed().stream().map(JacksonFixedWeekdayRelativeToFixed::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List ethiopianOrthodoxHolidays() { return holidays.getEthiopianOrthodoxHoliday().stream().map(JacksonEthiopianOrthodoxHoliday::new).collect(toList()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List relativeToEasterSunday() { return holidays.getRelativeToEasterSunday().stream().map(JacksonRelativeToEasterSunday::new).collect(toList()); diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonIslamicHoliday.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonIslamicHoliday.java index 9e8c9de93..81fb3c924 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonIslamicHoliday.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonIslamicHoliday.java @@ -11,25 +11,42 @@ import static java.util.stream.Collectors.toList; - -public class JacksonIslamicHoliday implements IslamicHoliday { +/** + * {@inheritDoc} + */ +class JacksonIslamicHoliday implements IslamicHoliday { private final de.focus_shift.jollyday.jackson.mapping.IslamicHoliday islamicHoliday; - public JacksonIslamicHoliday(de.focus_shift.jollyday.jackson.mapping.IslamicHoliday christianHoliday) { + JacksonIslamicHoliday(de.focus_shift.jollyday.jackson.mapping.IslamicHoliday christianHoliday) { this.islamicHoliday = christianHoliday; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public IslamicHolidayType type() { return IslamicHolidayType.valueOf(islamicHoliday.getType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return islamicHoliday.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return islamicHoliday.getLocalizedType() == null @@ -37,6 +54,11 @@ public HolidayType officiality() { : HolidayType.valueOf(islamicHoliday.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return islamicHoliday.getValidFrom() == null @@ -44,6 +66,11 @@ public Year validFrom() { : Year.of(islamicHoliday.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return islamicHoliday.getValidTo() == null @@ -51,6 +78,11 @@ public Year validTo() { : Year.of(islamicHoliday.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return islamicHoliday.getEvery() == null @@ -58,6 +90,11 @@ public YearCycle cycle() { : YearCycle.valueOf(islamicHoliday.getEvery().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public List conditions() { return islamicHoliday.getMovingCondition().stream() diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonMovingCondition.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonMovingCondition.java index 21ec52b7a..a7b2620d7 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonMovingCondition.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonMovingCondition.java @@ -5,24 +5,42 @@ import java.time.DayOfWeek; -public class JacksonMovingCondition implements MovingCondition { +/** + * {@inheritDoc} + */ +class JacksonMovingCondition implements MovingCondition { private final de.focus_shift.jollyday.jackson.mapping.MovingCondition movingCondition; - public JacksonMovingCondition(de.focus_shift.jollyday.jackson.mapping.MovingCondition jacksonMovingCondition) { + JacksonMovingCondition(de.focus_shift.jollyday.jackson.mapping.MovingCondition jacksonMovingCondition) { this.movingCondition = jacksonMovingCondition; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public DayOfWeek substitute() { return DayOfWeek.valueOf(movingCondition.getSubstitute().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public With with() { return With.valueOf(movingCondition.getWith().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public DayOfWeek weekday() { return DayOfWeek.valueOf(movingCondition.getWeekday().name()); diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToEasterSunday.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToEasterSunday.java index 831f123cd..c8f9c8739 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToEasterSunday.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToEasterSunday.java @@ -11,19 +11,32 @@ import java.time.chrono.Chronology; import java.time.chrono.IsoChronology; -public class JacksonRelativeToEasterSunday implements RelativeToEasterSunday { +/** + * {@inheritDoc} + */ +class JacksonRelativeToEasterSunday implements RelativeToEasterSunday { private final de.focus_shift.jollyday.jackson.mapping.RelativeToEasterSunday relativeToEasterSunday; - public JacksonRelativeToEasterSunday(de.focus_shift.jollyday.jackson.mapping.RelativeToEasterSunday relativeToEasterSunday) { + JacksonRelativeToEasterSunday(de.focus_shift.jollyday.jackson.mapping.RelativeToEasterSunday relativeToEasterSunday) { this.relativeToEasterSunday = relativeToEasterSunday; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return relativeToEasterSunday.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return relativeToEasterSunday.getLocalizedType() == null @@ -31,6 +44,11 @@ public HolidayType officiality() { : HolidayType.valueOf(relativeToEasterSunday.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return relativeToEasterSunday.getValidFrom() == null @@ -38,6 +56,11 @@ public Year validFrom() { : Year.of(relativeToEasterSunday.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return relativeToEasterSunday.getValidTo() == null @@ -45,6 +68,11 @@ public Year validTo() { : Year.of(relativeToEasterSunday.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return relativeToEasterSunday.getEvery() == null @@ -52,11 +80,21 @@ public YearCycle cycle() { : YearCycle.valueOf(relativeToEasterSunday.getEvery().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Chronology chronology() { return relativeToEasterSunday.getChronology() == ChronologyType.JULIAN ? JulianChronology.INSTANCE : IsoChronology.INSTANCE; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Days days() { return Days.of(relativeToEasterSunday.getDays()); diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToFixed.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToFixed.java index 3778af542..a073c5a03 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToFixed.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToFixed.java @@ -10,19 +10,29 @@ import java.time.DayOfWeek; import java.time.Year; -public class JacksonRelativeToFixed implements RelativeToFixed { +class JacksonRelativeToFixed implements RelativeToFixed { private final de.focus_shift.jollyday.jackson.mapping.RelativeToFixed relativeToFixed; - public JacksonRelativeToFixed(de.focus_shift.jollyday.jackson.mapping.RelativeToFixed relativeToFixed) { + JacksonRelativeToFixed(de.focus_shift.jollyday.jackson.mapping.RelativeToFixed relativeToFixed) { this.relativeToFixed = relativeToFixed; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Fixed date() { return new JacksonFixed(relativeToFixed.getDate()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public DayOfWeek weekday() { return relativeToFixed.getWeekday() == null @@ -30,6 +40,11 @@ public DayOfWeek weekday() { : DayOfWeek.valueOf(relativeToFixed.getWeekday().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Relation when() { return relativeToFixed.getWhen() == null @@ -37,6 +52,11 @@ public Relation when() { : Relation.valueOf(relativeToFixed.getWhen().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Days days() { return relativeToFixed.getDays() == null @@ -44,11 +64,21 @@ public Days days() { : Days.of(relativeToFixed.getDays()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return relativeToFixed.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return relativeToFixed.getLocalizedType() == null @@ -56,6 +86,11 @@ public HolidayType officiality() { : HolidayType.valueOf(relativeToFixed.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return relativeToFixed.getValidFrom() == null @@ -63,6 +98,11 @@ public Year validFrom() { : Year.of(relativeToFixed.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return relativeToFixed.getValidTo() == null @@ -70,6 +110,11 @@ public Year validTo() { : Year.of(relativeToFixed.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return relativeToFixed.getEvery() == null diff --git a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToWeekdayInMonth.java b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToWeekdayInMonth.java index 55bade30d..d185eff59 100644 --- a/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToWeekdayInMonth.java +++ b/jollyday-jackson/src/main/java/de/focus_shift/jollyday/jackson/JacksonRelativeToWeekdayInMonth.java @@ -10,34 +10,62 @@ import java.time.Year; -public class JacksonRelativeToWeekdayInMonth implements RelativeToWeekdayInMonth { +/** + * {@inheritDoc} + */ +class JacksonRelativeToWeekdayInMonth implements RelativeToWeekdayInMonth { private final de.focus_shift.jollyday.jackson.mapping.RelativeToWeekdayInMonth relativeToWeekdayInMonth; - public JacksonRelativeToWeekdayInMonth(de.focus_shift.jollyday.jackson.mapping.RelativeToWeekdayInMonth relativeToWeekdayInMonth) { + JacksonRelativeToWeekdayInMonth(de.focus_shift.jollyday.jackson.mapping.RelativeToWeekdayInMonth relativeToWeekdayInMonth) { this.relativeToWeekdayInMonth = relativeToWeekdayInMonth; } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public FixedWeekdayInMonth weekdayInMonth() { return new JacksonFixedWeekdayInMonth(relativeToWeekdayInMonth.getFixedWeekday()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public DayOfWeek weekday() { return DayOfWeek.valueOf(relativeToWeekdayInMonth.getWeekday().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Relation when() { return Relation.valueOf(relativeToWeekdayInMonth.getWhen().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public String descriptionPropertiesKey() { return relativeToWeekdayInMonth.getDescriptionPropertiesKey(); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public HolidayType officiality() { return relativeToWeekdayInMonth.getLocalizedType() == null @@ -45,6 +73,11 @@ public HolidayType officiality() { : HolidayType.valueOf(relativeToWeekdayInMonth.getLocalizedType().name()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validFrom() { return relativeToWeekdayInMonth.getValidFrom() == null @@ -52,6 +85,11 @@ public Year validFrom() { : Year.of(relativeToWeekdayInMonth.getValidFrom()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public Year validTo() { return relativeToWeekdayInMonth.getValidTo() == null @@ -59,6 +97,11 @@ public Year validTo() { : Year.of(relativeToWeekdayInMonth.getValidTo()); } + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ @Override public YearCycle cycle() { return relativeToWeekdayInMonth.getEvery() == null