Move With enum into MovingCondition

focus-shift · Dec 23, 2024 · dbb43ad · dbb43ad
1 parent 7415d24
commit dbb43ad
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 13 deletions.
diff --git a/...ay-core/src/main/java/de/focus_shift/jollyday/core/parser/functions/MoveDateRelative.java b/...ay-core/src/main/java/de/focus_shift/jollyday/core/parser/functions/MoveDateRelative.java
@@ -6,7 +6,7 @@
 import java.time.LocalDate;
 import java.util.function.Function;
 
-import static de.focus_shift.jollyday.core.spi.With.NEXT;
+import static de.focus_shift.jollyday.core.spi.Movable.MovingCondition.With.NEXT;
 import static java.time.temporal.TemporalAdjusters.nextOrSame;
 import static java.time.temporal.TemporalAdjusters.previousOrSame;
 

diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/spi/Movable.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/spi/Movable.java
@@ -29,6 +29,11 @@ public interface Movable {
    */
   interface MovingCondition {
 
+    enum With {
+      NEXT,
+      PREVIOUS
+    }
+
     /**
      * Represents the day of the week as trigger to move the holiday if the holiday would
      * occur oh this weekday.
@@ -50,6 +55,5 @@ interface MovingCondition {
      * @return the weekday the holiday will be moved to
      */
     DayOfWeek substitute();
-
   }
 }
diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/spi/With.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/spi/With.java
diff --git a/...ore/src/test/java/de/focus_shift/jollyday/core/parser/functions/MoveDateRelativeTest.java b/...ore/src/test/java/de/focus_shift/jollyday/core/parser/functions/MoveDateRelativeTest.java
@@ -1,7 +1,6 @@
 package de.focus_shift.jollyday.core.parser.functions;
 
 import de.focus_shift.jollyday.core.spi.Movable;
-import de.focus_shift.jollyday.core.spi.With;
 import org.junit.jupiter.api.Test;
 
 import java.time.DayOfWeek;

diff --git a/...core/src/test/java/de/focus_shift/jollyday/core/parser/impl/IslamicHolidayParserTest.java b/...core/src/test/java/de/focus_shift/jollyday/core/parser/impl/IslamicHolidayParserTest.java
@@ -4,7 +4,6 @@
 import de.focus_shift.jollyday.core.spi.Holidays;
 import de.focus_shift.jollyday.core.spi.IslamicHoliday;
 import de.focus_shift.jollyday.core.spi.Movable;
-import de.focus_shift.jollyday.core.spi.With;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;

diff --git a/...rc/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidMovingConditionTest.java b/...rc/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidMovingConditionTest.java
@@ -1,7 +1,6 @@
 package de.focus_shift.jollyday.core.parser.predicates;
 
 import de.focus_shift.jollyday.core.spi.Movable;
-import de.focus_shift.jollyday.core.spi.With;
 import org.junit.jupiter.api.Test;
 
 import java.time.DayOfWeek;

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
@@ -1,7 +1,6 @@
 package de.focus_shift.jollyday.jackson;
 
 import de.focus_shift.jollyday.core.spi.Movable;
-import de.focus_shift.jollyday.core.spi.With;
 
 import java.time.DayOfWeek;
 

diff --git a/jollyday-jaxb/src/main/java/de/focus_shift/jollyday/jaxb/JaxbMovingCondition.java b/jollyday-jaxb/src/main/java/de/focus_shift/jollyday/jaxb/JaxbMovingCondition.java
@@ -1,7 +1,6 @@
 package de.focus_shift.jollyday.jaxb;
 
 import de.focus_shift.jollyday.core.spi.Movable;
-import de.focus_shift.jollyday.core.spi.With;
 
 import java.time.DayOfWeek;