diff --git a/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGenerator.java b/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGenerator.java index 49c0fa3a..9bdc15fe 100644 --- a/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGenerator.java +++ b/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGenerator.java @@ -56,8 +56,7 @@ void generateHolidaySource(HolidayCalendar cal, Writer writer) throws IOExceptio writer.write("import de.focus_shift.jollyday.pojo.*;\n\n"); writer.write("public class Holiday_" + calendarId + " {\n\n"); - - writer.write(" public static JavaConfiguration configuration;\n\n"); + writer.write(" public static PojoConfiguration configuration;\n\n"); StringBuilder sb = new StringBuilder(); sb.append(" static {\n"); sb.append(" configuration = "); @@ -95,8 +94,7 @@ void generateConfigurationSource(Writer writer) throws IOException { writeHeader(writer); - - writer.append(" static Map configurations = new HashMap<>();\n"); + writer.append(" static Map configurations = new HashMap<>();\n"); writer.append(" static {\n"); for (HolidayCalendar cal : HolidayCalendar.values()) { @@ -146,7 +144,7 @@ private void writeHeader(Writer writer) throws IOException { writer.write("import de.focus_shift.jollyday.core.spi.ConfigurationService;\n"); writer.write("import de.focus_shift.jollyday.pojo.holidays.*;\n\n"); - writer.write("public class JavaConfigurationService implements ConfigurationService {\n\n"); + writer.write("public class PojoConfigurationService implements ConfigurationService {\n\n"); } private void writeFooter(Writer writer) throws IOException { @@ -157,16 +155,17 @@ private void writeFooter(Writer writer) throws IOException { sb.append(" public Configuration getConfiguration(ManagerParameter parameter) {\n"); sb.append(" final String cacheKey = parameter.createCacheKey();\n"); sb.append("\n"); - sb.append(" JavaConfiguration configuration = configurations.get(cacheKey);\n"); + sb.append(" PojoConfiguration configuration = configurations.get(cacheKey);\n"); sb.append(" return configuration;\n"); sb.append(" }\n"); sb.append("}"); writer.write(sb.toString()); } - // public JavaConfiguration(JavaHolidays javaHolidays, List subConfigurations, String hierarchy, String description) + + // public PojoConfiguration(PojoHolidays javaHolidays, List subConfigurations, String hierarchy, String description) private String configuration(Configuration configuration) { - return constructor("JavaConfiguration", holidays(configuration.holidays()), configurations(configuration.subConfigurations()), string(configuration.hierarchy()), string(configuration.description())); + return constructor("PojoConfiguration", holidays(configuration.holidays()), configurations(configuration.subConfigurations()), string(configuration.hierarchy()), string(configuration.description())); } private String configurations(Stream configurations) { @@ -183,14 +182,14 @@ private String configurations(Stream configurations) { return result; } - // public JavaHolidays(List christianHoliday, List islamicHoliday, List ethiopianOrthodoxHoliday, List fixed, List fixedWeekday, List fixedWeekdayBetweenFixed, List fixedWeekdayRelativeToFixed, List relativeToFixed, List relativeToWeekdayInMonth, List relativeToEasterSunday) + // public PojoHolidays(List christianHoliday, List islamicHoliday, List ethiopianOrthodoxHoliday, List fixed, List fixedWeekday, List fixedWeekdayBetweenFixed, List fixedWeekdayRelativeToFixed, List relativeToFixed, List relativeToWeekdayInMonth, List relativeToEasterSunday) private String holidays(Holidays holidays) { if (holidays == null) { return "null"; } StringBuilder sb = new StringBuilder(); - sb.append(String.format("new JavaHolidays()\n")); + sb.append(String.format("new PojoHolidays()\n")); for (de.focus_shift.jollyday.core.spi.Fixed fixed : holidays.fixed()) { sb.append(String.format(" .addFixed(%s)\n", fixed(fixed))); } @@ -234,54 +233,54 @@ private String holidays(Holidays holidays) { return sb.toString(); } - // public JavaFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, MonthDay day) + // public PojoFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, MonthDay day) private String fixed(Fixed fixed) { - return constructor("JavaFixed", string(fixed.descriptionPropertiesKey()), enums(fixed.officiality()), year(fixed.validFrom()), year(fixed.validTo()), yearCycle(fixed.cycle()), movingConditions(fixed.conditions()), monthDay(fixed.day())); + return constructor("PojoFixed", string(fixed.descriptionPropertiesKey()), enums(fixed.officiality()), year(fixed.validFrom()), year(fixed.validTo()), yearCycle(fixed.cycle()), movingConditions(fixed.conditions()), monthDay(fixed.day())); } - //public JavaChristianHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, ChristianHolidayType type, Chronology chronology) + //public PojoChristianHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, ChristianHolidayType type, Chronology chronology) private String christianHoliday(ChristianHoliday christianHoliday) { - return constructor("JavaChristianHoliday", string(christianHoliday.descriptionPropertiesKey()), enums(christianHoliday.officiality()), year(christianHoliday.validFrom()), year(christianHoliday.validTo()), yearCycle(christianHoliday.cycle()), movingConditions(christianHoliday.conditions()), enums(christianHoliday.type()), chronology(christianHoliday.chronology())); + return constructor("PojoChristianHoliday", string(christianHoliday.descriptionPropertiesKey()), enums(christianHoliday.officiality()), year(christianHoliday.validFrom()), year(christianHoliday.validTo()), yearCycle(christianHoliday.cycle()), movingConditions(christianHoliday.conditions()), enums(christianHoliday.type()), chronology(christianHoliday.chronology())); } - // public JavaEthiopianOrthodoxHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, EthiopianOrthodoxHolidayType type) + // public PojoEthiopianOrthodoxHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, EthiopianOrthodoxHolidayType type) private String ethiopianOrthodoxHoliday(EthiopianOrthodoxHoliday hol) { - return constructor("JavaEthiopianOrthodoxHoliday", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), enums(hol.type())); + return constructor("PojoEthiopianOrthodoxHoliday", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), enums(hol.type())); } - // public JavaIslamicHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, IslamicHolidayType type) + // public PojoIslamicHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, IslamicHolidayType type) private String islamicHoliday(IslamicHoliday hol) { - return constructor("JavaIslamicHoliday", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), movingConditions(hol.conditions()), enums(hol.type())); + return constructor("PojoIslamicHoliday", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), movingConditions(hol.conditions()), enums(hol.type())); } - // public JavaFixedWeekdayBetweenFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed from, Fixed to, DayOfWeek weekday) + // public PojoFixedWeekdayBetweenFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed from, Fixed to, DayOfWeek weekday) private String fixedWeekdayBetweenFixed(FixedWeekdayBetweenFixed hol) { - return constructor("JavaFixedWeekdayBetweenFixed", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), fixed(hol.from()), fixed(hol.to()), dayOfWeek(hol.weekday())); + return constructor("PojoFixedWeekdayBetweenFixed", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), fixed(hol.from()), fixed(hol.to()), dayOfWeek(hol.weekday())); } - // public JavaFixedWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Month month, Occurrance which) + // public PojoFixedWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Month month, Occurrance which) private String fixedWeekdayInMonth(FixedWeekdayInMonth hol) { - return constructor("JavaFixedWeekdayInMonth", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), dayOfWeek(hol.weekday()), month(hol.month()), enums(hol.which())); + return constructor("PojoFixedWeekdayInMonth", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), dayOfWeek(hol.weekday()), month(hol.month()), enums(hol.which())); } - // public JavaFixedWeekdayRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Relation when, Fixed day, Occurrance which) + // public PojoFixedWeekdayRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Relation when, Fixed day, Occurrance which) private String fixedWeekdayRelativeToFixed(FixedWeekdayRelativeToFixed hol) { - return constructor("JavaFixedWeekdayRelativeToFixed", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), dayOfWeek(hol.weekday()), enums(hol.when()), fixed(hol.day()), enums(hol.which())); + return constructor("PojoFixedWeekdayRelativeToFixed", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), dayOfWeek(hol.weekday()), enums(hol.when()), fixed(hol.day()), enums(hol.which())); } - // public JavaRelativeToEasterSunday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Chronology chronology, Days days) + // public PojoRelativeToEasterSunday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Chronology chronology, Days days) private String relativeToEasterSunday(RelativeToEasterSunday hol) { - return constructor("JavaRelativeToEasterSunday", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), chronology(hol.chronology()), days(hol.days())); + return constructor("PojoRelativeToEasterSunday", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), chronology(hol.chronology()), days(hol.days())); } - // public JavaRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed date, DayOfWeek weekday, Relation when, Days days) { + // public PojoRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed date, DayOfWeek weekday, Relation when, Days days) { private String relativeToFixed(RelativeToFixed hol) { - return constructor("JavaRelativeToFixed", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), fixed(hol.date()), dayOfWeek(hol.weekday()), enums(hol.when()), days(hol.days())); + return constructor("PojoRelativeToFixed", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), fixed(hol.date()), dayOfWeek(hol.weekday()), enums(hol.when()), days(hol.days())); } - // public JavaRelativeToWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, FixedWeekdayInMonth weekdayInMonth, DayOfWeek weekday, Relation when) + // public PojoRelativeToWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, FixedWeekdayInMonth weekdayInMonth, DayOfWeek weekday, Relation when) private String relativeToWeekdayInMonth(RelativeToWeekdayInMonth hol) { - return constructor("JavaRelativeToWeekdayInMonth", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), fixedWeekdayInMonth(hol.weekdayInMonth()), dayOfWeek(hol.weekday()), enums(hol.when())); + return constructor("PojoRelativeToWeekdayInMonth", string(hol.descriptionPropertiesKey()), enums(hol.officiality()), year(hol.validFrom()), year(hol.validTo()), yearCycle(hol.cycle()), fixedWeekdayInMonth(hol.weekdayInMonth()), dayOfWeek(hol.weekday()), enums(hol.when())); } private String constructor(Object... arguments) { @@ -370,12 +369,12 @@ private String movingConditions(List movingConditions) { } } - // public JavaMovingCondition(DayOfWeek substitute, With with, DayOfWeek weekday) { + // public PojoMovingCondition(DayOfWeek substitute, With with, DayOfWeek weekday) { private String movingCondition(MovingCondition movingCondition) { if (movingCondition == null) { return "null"; } else { - return constructor("JavaMovingCondition", dayOfWeek(movingCondition.substitute()), enums(movingCondition.with()), dayOfWeek(movingCondition.weekday())); + return constructor("PojoMovingCondition", dayOfWeek(movingCondition.substitute()), enums(movingCondition.with()), dayOfWeek(movingCondition.weekday())); } } } diff --git a/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGeneratorMojo.java b/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGeneratorMojo.java index cf2da427..cc7f7b49 100644 --- a/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGeneratorMojo.java +++ b/jollyday-pojo-generator/src/main/java/de/focus_shift/jollyday/pojo/generator/PojoGeneratorMojo.java @@ -34,7 +34,7 @@ public void execute() throws MojoExecutionException { throw new MojoExecutionException("Target directory doesn't exist or cannot be generated: "+ genDir.getAbsolutePath()); } - final File configurationService = Paths.get(outputDirectory.getAbsolutePath(), "de/focus_shift/jollyday/pojo/JavaConfigurationService.java").toFile(); + final File configurationService = Paths.get(outputDirectory.getAbsolutePath(), "de/focus_shift/jollyday/pojo/PojoConfigurationService.java").toFile(); try (FileWriter fileWriter = new FileWriter(configurationService, false)) { PojoGenerator generator = new PojoGenerator(); diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaChristianHoliday.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoChristianHoliday.java similarity index 88% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaChristianHoliday.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoChristianHoliday.java index 0633b663..dd3e8f91 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaChristianHoliday.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoChristianHoliday.java @@ -10,12 +10,12 @@ import de.focus_shift.jollyday.core.spi.MovingCondition; import de.focus_shift.jollyday.core.spi.YearCycle; -public class JavaChristianHoliday extends DefaultMovingHoliday implements ChristianHoliday { +public class PojoChristianHoliday extends DefaultMovingHoliday implements ChristianHoliday { private ChristianHolidayType type; private Chronology chronology; - public JavaChristianHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, ChristianHolidayType type, Chronology chronology) { + public PojoChristianHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, ChristianHolidayType type, Chronology chronology) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle, conditions); this.type = type; this.chronology = chronology; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaConfiguration.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoConfiguration.java similarity index 82% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaConfiguration.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoConfiguration.java index 925335d2..835f4787 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaConfiguration.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoConfiguration.java @@ -6,18 +6,17 @@ import de.focus_shift.jollyday.core.spi.Configuration; import de.focus_shift.jollyday.core.spi.Holidays; +public class PojoConfiguration implements Configuration { -public class JavaConfiguration implements Configuration { - - private JavaHolidays javaHolidays; + private PojoHolidays javaHolidays; private List subConfigurations; private String hierarchy; private String description; - public JavaConfiguration() { + public PojoConfiguration() { } - public JavaConfiguration(JavaHolidays javaHolidays, List subConfigurations, String hierarchy, String description) { + public PojoConfiguration(PojoHolidays javaHolidays, List subConfigurations, String hierarchy, String description) { this.javaHolidays = javaHolidays; this.subConfigurations = subConfigurations; this.hierarchy = hierarchy; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaEthiopianOrthodoxHoliday.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoEthiopianOrthodoxHoliday.java similarity index 84% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaEthiopianOrthodoxHoliday.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoEthiopianOrthodoxHoliday.java index 5b2bf364..16ded351 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaEthiopianOrthodoxHoliday.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoEthiopianOrthodoxHoliday.java @@ -7,11 +7,11 @@ import de.focus_shift.jollyday.core.spi.EthiopianOrthodoxHolidayType; import de.focus_shift.jollyday.core.spi.YearCycle; -public class JavaEthiopianOrthodoxHoliday extends DefaultHoliday implements EthiopianOrthodoxHoliday { +public class PojoEthiopianOrthodoxHoliday extends DefaultHoliday implements EthiopianOrthodoxHoliday { private EthiopianOrthodoxHolidayType type; - public JavaEthiopianOrthodoxHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, EthiopianOrthodoxHolidayType type) { + public PojoEthiopianOrthodoxHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, EthiopianOrthodoxHolidayType type) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle); this.type = type; } diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixed.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixed.java similarity index 83% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixed.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixed.java index 4aee9d01..ee75ee11 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixed.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixed.java @@ -9,11 +9,11 @@ import de.focus_shift.jollyday.core.spi.MovingCondition; import de.focus_shift.jollyday.core.spi.YearCycle; -public class JavaFixed extends DefaultMovingHoliday implements Fixed { +public class PojoFixed extends DefaultMovingHoliday implements Fixed { private MonthDay day; - public JavaFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, MonthDay day) { + public PojoFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, MonthDay day) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle, conditions); this.day = day; } diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayBetweenFixed.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayBetweenFixed.java similarity index 87% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayBetweenFixed.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayBetweenFixed.java index 999ccbc4..2928f3dd 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayBetweenFixed.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayBetweenFixed.java @@ -8,14 +8,13 @@ import de.focus_shift.jollyday.core.spi.FixedWeekdayBetweenFixed; import de.focus_shift.jollyday.core.spi.YearCycle; - -public class JavaFixedWeekdayBetweenFixed extends DefaultHoliday implements FixedWeekdayBetweenFixed { +public class PojoFixedWeekdayBetweenFixed extends DefaultHoliday implements FixedWeekdayBetweenFixed { private Fixed from; private Fixed to; private DayOfWeek weekday; - public JavaFixedWeekdayBetweenFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed from, Fixed to, DayOfWeek weekday) { + public PojoFixedWeekdayBetweenFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed from, Fixed to, DayOfWeek weekday) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle); this.from = from; this.to = to; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayInMonth.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayInMonth.java similarity index 87% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayInMonth.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayInMonth.java index a37ea86d..4c382a57 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayInMonth.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayInMonth.java @@ -9,13 +9,13 @@ import de.focus_shift.jollyday.core.spi.Occurrance; import de.focus_shift.jollyday.core.spi.YearCycle; -public class JavaFixedWeekdayInMonth extends DefaultHoliday implements FixedWeekdayInMonth { +public class PojoFixedWeekdayInMonth extends DefaultHoliday implements FixedWeekdayInMonth { private DayOfWeek weekday; private Month month; private Occurrance which; - public JavaFixedWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Month month, Occurrance which) { + public PojoFixedWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Month month, Occurrance which) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle); this.weekday = weekday; this.month = month; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayRelativeToFixed.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayRelativeToFixed.java similarity index 89% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayRelativeToFixed.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayRelativeToFixed.java index dabcc2a1..2d6a3a0b 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaFixedWeekdayRelativeToFixed.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoFixedWeekdayRelativeToFixed.java @@ -10,15 +10,14 @@ import de.focus_shift.jollyday.core.spi.Relation; import de.focus_shift.jollyday.core.spi.YearCycle; - -public class JavaFixedWeekdayRelativeToFixed extends DefaultHoliday implements FixedWeekdayRelativeToFixed { +public class PojoFixedWeekdayRelativeToFixed extends DefaultHoliday implements FixedWeekdayRelativeToFixed { private DayOfWeek weekday; private Relation when; private Fixed day; private Occurrance which; - public JavaFixedWeekdayRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Relation when, Fixed day, Occurrance which) { + public PojoFixedWeekdayRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, DayOfWeek weekday, Relation when, Fixed day, Occurrance which) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle); this.weekday = weekday; this.when = when; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaHolidays.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoHolidays.java similarity index 84% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaHolidays.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoHolidays.java index 489c36dd..54580bd8 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaHolidays.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoHolidays.java @@ -14,7 +14,7 @@ import de.focus_shift.jollyday.core.spi.RelativeToFixed; import de.focus_shift.jollyday.core.spi.RelativeToWeekdayInMonth; -public class JavaHolidays implements de.focus_shift.jollyday.core.spi.Holidays { +public class PojoHolidays implements de.focus_shift.jollyday.core.spi.Holidays { protected List christianHoliday = new ArrayList<>(); protected List islamicHoliday = new ArrayList<>(); @@ -29,11 +29,11 @@ public class JavaHolidays implements de.focus_shift.jollyday.core.spi.Holidays { protected List relativeToWeekdayInMonth = new ArrayList<>(); protected List relativeToEasterSunday= new ArrayList<>(); - public JavaHolidays() { + public PojoHolidays() { } - public JavaHolidays(List christianHoliday, List islamicHoliday, List ethiopianOrthodoxHoliday, List fixed, List fixedWeekday, List fixedWeekdayBetweenFixed, List fixedWeekdayRelativeToFixed, List relativeToFixed, List relativeToWeekdayInMonth, List relativeToEasterSunday) { + public PojoHolidays(List christianHoliday, List islamicHoliday, List ethiopianOrthodoxHoliday, List fixed, List fixedWeekday, List fixedWeekdayBetweenFixed, List fixedWeekdayRelativeToFixed, List relativeToFixed, List relativeToWeekdayInMonth, List relativeToEasterSunday) { this.christianHoliday = christianHoliday; this.islamicHoliday = islamicHoliday; this.ethiopianOrthodoxHoliday = ethiopianOrthodoxHoliday; @@ -51,7 +51,7 @@ public List fixed() { return fixed; } - public JavaHolidays addFixed(Fixed value) { + public PojoHolidays addFixed(Fixed value) { this.fixed.add(value); return this; } @@ -61,7 +61,7 @@ public List relativeToFixed() { return relativeToFixed; } - public JavaHolidays addRelativeToFixed(RelativeToFixed value) { + public PojoHolidays addRelativeToFixed(RelativeToFixed value) { this.relativeToFixed.add(value); return this; } @@ -71,7 +71,7 @@ public List relativeToWeekdayInMonth() { return relativeToWeekdayInMonth; } - public JavaHolidays addRelativeToWeekdayInMonth(RelativeToWeekdayInMonth value) { + public PojoHolidays addRelativeToWeekdayInMonth(RelativeToWeekdayInMonth value) { this.relativeToWeekdayInMonth.add(value); return this; } @@ -81,7 +81,7 @@ public List fixedWeekdays() { return fixedWeekday; } - public JavaHolidays addFixedWeekday(FixedWeekdayInMonth value) { + public PojoHolidays addFixedWeekday(FixedWeekdayInMonth value) { this.fixedWeekday.add(value); return this; } @@ -91,7 +91,7 @@ public List christianHolidays() { return christianHoliday; } - public JavaHolidays addChristianHoliday(ChristianHoliday value) { + public PojoHolidays addChristianHoliday(ChristianHoliday value) { this.christianHoliday.add(value); return this; } @@ -101,7 +101,7 @@ public List islamicHolidays() { return islamicHoliday; } - public JavaHolidays addIslamicHoliday(IslamicHoliday value) { + public PojoHolidays addIslamicHoliday(IslamicHoliday value) { this.islamicHoliday.add(value); return this; } @@ -111,7 +111,7 @@ public List fixedWeekdayBetweenFixed() { return fixedWeekdayBetweenFixed; } - public JavaHolidays addFixedWeekdayBetweenFixed(FixedWeekdayBetweenFixed value) { + public PojoHolidays addFixedWeekdayBetweenFixed(FixedWeekdayBetweenFixed value) { this.fixedWeekdayBetweenFixed.add(value); return this; } @@ -121,7 +121,7 @@ public List fixedWeekdayRelativeToFixed() { return fixedWeekdayRelativeToFixed; } - public JavaHolidays addFixedWeekdayRelativeToFixed(FixedWeekdayRelativeToFixed value) { + public PojoHolidays addFixedWeekdayRelativeToFixed(FixedWeekdayRelativeToFixed value) { this.fixedWeekdayRelativeToFixed.add(value); return this; } @@ -131,7 +131,7 @@ public List ethiopianOrthodoxHolidays() { return ethiopianOrthodoxHoliday; } - public JavaHolidays addEthiopianOrthodoxHoliday(EthiopianOrthodoxHoliday value) { + public PojoHolidays addEthiopianOrthodoxHoliday(EthiopianOrthodoxHoliday value) { this.ethiopianOrthodoxHoliday.add(value); return this; } @@ -141,7 +141,7 @@ public List relativeToEasterSunday() { return relativeToEasterSunday; } - public JavaHolidays addRelativeToEasterSunday(RelativeToEasterSunday value) { + public PojoHolidays addRelativeToEasterSunday(RelativeToEasterSunday value) { this.relativeToEasterSunday.add(value); return this; } diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaIslamicHoliday.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoIslamicHoliday.java similarity index 85% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaIslamicHoliday.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoIslamicHoliday.java index b233465b..5409b237 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaIslamicHoliday.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoIslamicHoliday.java @@ -9,11 +9,11 @@ import de.focus_shift.jollyday.core.spi.MovingCondition; import de.focus_shift.jollyday.core.spi.YearCycle; -public class JavaIslamicHoliday extends DefaultMovingHoliday implements IslamicHoliday { +public class PojoIslamicHoliday extends DefaultMovingHoliday implements IslamicHoliday { private IslamicHolidayType type; - public JavaIslamicHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, IslamicHolidayType type) { + public PojoIslamicHoliday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, List conditions, IslamicHolidayType type) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle, conditions); this.type = type; } diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaMovingCondition.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoMovingCondition.java similarity index 81% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaMovingCondition.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoMovingCondition.java index 71fddae6..1e7d7fdd 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaMovingCondition.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoMovingCondition.java @@ -5,13 +5,13 @@ import de.focus_shift.jollyday.core.spi.MovingCondition; import de.focus_shift.jollyday.core.spi.With; -public class JavaMovingCondition implements MovingCondition { +public class PojoMovingCondition implements MovingCondition { private DayOfWeek substitute; private With with; private DayOfWeek weekday; - public JavaMovingCondition(DayOfWeek substitute, With with, DayOfWeek weekday) { + public PojoMovingCondition(DayOfWeek substitute, With with, DayOfWeek weekday) { this.substitute = substitute; this.with = with; this.weekday = weekday; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToEasterSunday.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToEasterSunday.java similarity index 85% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToEasterSunday.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToEasterSunday.java index e59e867c..0b12d249 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToEasterSunday.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToEasterSunday.java @@ -9,12 +9,12 @@ import de.focus_shift.jollyday.core.spi.RelativeToEasterSunday; import de.focus_shift.jollyday.core.spi.YearCycle; -public class JavaRelativeToEasterSunday extends DefaultHoliday implements RelativeToEasterSunday { +public class PojoRelativeToEasterSunday extends DefaultHoliday implements RelativeToEasterSunday { private Chronology chronology; private Days days; - public JavaRelativeToEasterSunday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Chronology chronology, Days days) { + public PojoRelativeToEasterSunday(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Chronology chronology, Days days) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle); this.chronology = chronology; this.days = days; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToFixed.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToFixed.java similarity index 88% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToFixed.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToFixed.java index d981844a..03b6ced7 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToFixed.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToFixed.java @@ -11,7 +11,7 @@ import de.focus_shift.jollyday.core.spi.RelativeToFixed; import de.focus_shift.jollyday.core.spi.YearCycle; -public class JavaRelativeToFixed extends DefaultHoliday implements RelativeToFixed { +public class PojoRelativeToFixed extends DefaultHoliday implements RelativeToFixed { private Fixed date; @@ -19,7 +19,7 @@ public class JavaRelativeToFixed extends DefaultHoliday implements RelativeToFix Relation when; Days days; - public JavaRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed date, DayOfWeek weekday, Relation when, Days days) { + public PojoRelativeToFixed(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, Fixed date, DayOfWeek weekday, Relation when, Days days) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle); this.date = date; this.weekday = weekday; diff --git a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToWeekdayInMonth.java b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToWeekdayInMonth.java similarity index 89% rename from jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToWeekdayInMonth.java rename to jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToWeekdayInMonth.java index e2afcee1..00cec2f0 100644 --- a/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/JavaRelativeToWeekdayInMonth.java +++ b/jollyday-pojo/src/main/java/de/focus_shift/jollyday/pojo/PojoRelativeToWeekdayInMonth.java @@ -9,14 +9,13 @@ import de.focus_shift.jollyday.core.spi.RelativeToWeekdayInMonth; import de.focus_shift.jollyday.core.spi.YearCycle; - -public class JavaRelativeToWeekdayInMonth extends DefaultHoliday implements RelativeToWeekdayInMonth { +public class PojoRelativeToWeekdayInMonth extends DefaultHoliday implements RelativeToWeekdayInMonth { private FixedWeekdayInMonth weekdayInMonth; private DayOfWeek weekday; private Relation when; - public JavaRelativeToWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, FixedWeekdayInMonth weekdayInMonth, DayOfWeek weekday, Relation when) { + public PojoRelativeToWeekdayInMonth(String descriptionPropertiesKey, HolidayType officiality, Year validFrom, Year validTo, YearCycle cycle, FixedWeekdayInMonth weekdayInMonth, DayOfWeek weekday, Relation when) { super(descriptionPropertiesKey, officiality, validFrom, validTo, cycle); this.weekdayInMonth = weekdayInMonth; this.weekday = weekday; diff --git a/jollyday-pojo/src/main/java/module-info.java b/jollyday-pojo/src/main/java/module-info.java index 8c087602..1aa4fc32 100644 --- a/jollyday-pojo/src/main/java/module-info.java +++ b/jollyday-pojo/src/main/java/module-info.java @@ -1,10 +1,10 @@ import de.focus_shift.jollyday.core.spi.ConfigurationService; -import de.focus_shift.jollyday.pojo.JavaConfigurationService; +import de.focus_shift.jollyday.pojo.PojoConfigurationService; module de.focus_shift.jollyday.pojo { provides ConfigurationService with - JavaConfigurationService; + PojoConfigurationService; requires org.slf4j; requires org.threeten.extra; diff --git a/jollyday-pojo/src/main/resources/META-INF/services/de.focus_shift.jollyday.core.spi.ConfigurationService b/jollyday-pojo/src/main/resources/META-INF/services/de.focus_shift.jollyday.core.spi.ConfigurationService index ac3ba156..a7a94289 100644 --- a/jollyday-pojo/src/main/resources/META-INF/services/de.focus_shift.jollyday.core.spi.ConfigurationService +++ b/jollyday-pojo/src/main/resources/META-INF/services/de.focus_shift.jollyday.core.spi.ConfigurationService @@ -1 +1 @@ -de.focus_shift.jollyday.pojo.JavaConfigurationService +de.focus_shift.jollyday.pojo.PojoConfigurationService diff --git a/jollyday-pojo/src/test/java/de/focus_shift/jollyday/pojo/test/JavaConfigurationTest.java b/jollyday-pojo/src/test/java/de/focus_shift/jollyday/pojo/test/PojoConfigurationServiceTest.java similarity index 81% rename from jollyday-pojo/src/test/java/de/focus_shift/jollyday/pojo/test/JavaConfigurationTest.java rename to jollyday-pojo/src/test/java/de/focus_shift/jollyday/pojo/test/PojoConfigurationServiceTest.java index 49d80e1c..3c218a18 100644 --- a/jollyday-pojo/src/test/java/de/focus_shift/jollyday/pojo/test/JavaConfigurationTest.java +++ b/jollyday-pojo/src/test/java/de/focus_shift/jollyday/pojo/test/PojoConfigurationServiceTest.java @@ -12,15 +12,15 @@ import de.focus_shift.jollyday.core.ManagerParameters; import de.focus_shift.jollyday.core.spi.Configuration; import de.focus_shift.jollyday.core.spi.YearCycle; -import de.focus_shift.jollyday.pojo.JavaConfigurationService; -import de.focus_shift.jollyday.pojo.JavaFixed; +import de.focus_shift.jollyday.pojo.PojoConfigurationService; +import de.focus_shift.jollyday.pojo.PojoFixed; -class JavaConfigurationTest { +class PojoConfigurationServiceTest { @Test - void enhanceJavaConfigurationService() { + void enhancePojoConfigurationServiceWithSpecialHoliday() { - JavaConfigurationService javaConfigurationService = new JavaConfigurationService(); + PojoConfigurationService javaConfigurationService = new PojoConfigurationService(); ManagerParameter parameter = ManagerParameters.create("de"); HolidayManager holidayManager = HolidayManager.getInstance(parameter); @@ -28,7 +28,7 @@ void enhanceJavaConfigurationService() { // add new holiday for 22.3 dynamically via code/api Configuration configuration = javaConfigurationService.getConfiguration(parameter); - JavaFixed stgandulfholiday = new JavaFixed("st.gandulf's day", HolidayType.UNOFFICIAL_HOLIDAY, null, null, YearCycle.EVERY_YEAR, null, MonthDay.of(3, 22)); + PojoFixed stgandulfholiday = new PojoFixed("St.Gandulf's Day", HolidayType.UNOFFICIAL_HOLIDAY, null, null, YearCycle.EVERY_YEAR, null, MonthDay.of(3, 22)); configuration.holidays().fixed().add(stgandulfholiday); HolidayManager.clearManagerCache(); // we have to clear the manager cache because otherwise the holidaymanager from above with old configuration would be reused.