diff --git a/src/main/java/dev/struchkov/haiti/filter/jooq/CriteriaJooqFilter.java b/src/main/java/dev/struchkov/haiti/filter/jooq/CriteriaJooqFilter.java index 0bbda3b..a3b579e 100644 --- a/src/main/java/dev/struchkov/haiti/filter/jooq/CriteriaJooqFilter.java +++ b/src/main/java/dev/struchkov/haiti/filter/jooq/CriteriaJooqFilter.java @@ -3,6 +3,8 @@ package dev.struchkov.haiti.filter.jooq; import dev.struchkov.haiti.filter.jooq.exception.FilterJooqHaitiException; import dev.struchkov.haiti.filter.jooq.page.PageableOffset; import dev.struchkov.haiti.filter.jooq.page.PageableSeek; +import dev.struchkov.haiti.filter.jooq.sort.SortContainer; +import dev.struchkov.haiti.filter.jooq.sort.SortType; import dev.struchkov.haiti.utils.Assert; import org.jooq.Condition; import org.jooq.DSLContext; diff --git a/src/main/java/dev/struchkov/haiti/filter/jooq/SortType.java b/src/main/java/dev/struchkov/haiti/filter/jooq/SortType.java deleted file mode 100644 index 88cda08..0000000 --- a/src/main/java/dev/struchkov/haiti/filter/jooq/SortType.java +++ /dev/null @@ -1,7 +0,0 @@ -package dev.struchkov.haiti.filter.jooq; - -public enum SortType { - - ASC, DESC - -} diff --git a/src/main/java/dev/struchkov/haiti/filter/jooq/JoinTable.java b/src/main/java/dev/struchkov/haiti/filter/jooq/join/JoinTable.java similarity index 96% rename from src/main/java/dev/struchkov/haiti/filter/jooq/JoinTable.java rename to src/main/java/dev/struchkov/haiti/filter/jooq/join/JoinTable.java index ed466ff..2955511 100644 --- a/src/main/java/dev/struchkov/haiti/filter/jooq/JoinTable.java +++ b/src/main/java/dev/struchkov/haiti/filter/jooq/join/JoinTable.java @@ -1,4 +1,4 @@ -package dev.struchkov.haiti.filter.jooq; +package dev.struchkov.haiti.filter.jooq.join; import dev.struchkov.haiti.utils.Assert; diff --git a/src/main/java/dev/struchkov/haiti/filter/jooq/JoinTypeOperation.java b/src/main/java/dev/struchkov/haiti/filter/jooq/join/JoinTypeOperation.java similarity index 78% rename from src/main/java/dev/struchkov/haiti/filter/jooq/JoinTypeOperation.java rename to src/main/java/dev/struchkov/haiti/filter/jooq/join/JoinTypeOperation.java index 0b8dfc3..ac689ab 100644 --- a/src/main/java/dev/struchkov/haiti/filter/jooq/JoinTypeOperation.java +++ b/src/main/java/dev/struchkov/haiti/filter/jooq/join/JoinTypeOperation.java @@ -1,4 +1,4 @@ -package dev.struchkov.haiti.filter.jooq; +package dev.struchkov.haiti.filter.jooq.join; /** * Разрешенные типы операции JOIN. diff --git a/src/main/java/dev/struchkov/haiti/filter/jooq/SortContainer.java b/src/main/java/dev/struchkov/haiti/filter/jooq/sort/SortContainer.java similarity index 95% rename from src/main/java/dev/struchkov/haiti/filter/jooq/SortContainer.java rename to src/main/java/dev/struchkov/haiti/filter/jooq/sort/SortContainer.java index c8b020d..6bd1b7f 100644 --- a/src/main/java/dev/struchkov/haiti/filter/jooq/SortContainer.java +++ b/src/main/java/dev/struchkov/haiti/filter/jooq/sort/SortContainer.java @@ -1,4 +1,4 @@ -package dev.struchkov.haiti.filter.jooq; +package dev.struchkov.haiti.filter.jooq.sort; import dev.struchkov.haiti.utils.Assert; diff --git a/src/main/java/dev/struchkov/haiti/filter/jooq/sort/SortType.java b/src/main/java/dev/struchkov/haiti/filter/jooq/sort/SortType.java new file mode 100644 index 0000000..367e0da --- /dev/null +++ b/src/main/java/dev/struchkov/haiti/filter/jooq/sort/SortType.java @@ -0,0 +1,7 @@ +package dev.struchkov.haiti.filter.jooq.sort; + +public enum SortType { + + ASC, DESC + +}