From 9fc7ba95fecec4aef7680e1ff9038bce34cdbe92 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <git@upagge.ru>
Date: Tue, 15 Feb 2022 10:56:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../struchkov/haiti/filter/jooq/CriteriaJooqFilter.java    | 2 ++
 .../java/dev/struchkov/haiti/filter/jooq/SortType.java     | 7 -------
 .../struchkov/haiti/filter/jooq/{ => join}/JoinTable.java  | 2 +-
 .../haiti/filter/jooq/{ => join}/JoinTypeOperation.java    | 2 +-
 .../haiti/filter/jooq/{ => sort}/SortContainer.java        | 2 +-
 .../dev/struchkov/haiti/filter/jooq/sort/SortType.java     | 7 +++++++
 6 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 src/main/java/dev/struchkov/haiti/filter/jooq/SortType.java
 rename src/main/java/dev/struchkov/haiti/filter/jooq/{ => join}/JoinTable.java (96%)
 rename src/main/java/dev/struchkov/haiti/filter/jooq/{ => join}/JoinTypeOperation.java (78%)
 rename src/main/java/dev/struchkov/haiti/filter/jooq/{ => sort}/SortContainer.java (95%)
 create mode 100644 src/main/java/dev/struchkov/haiti/filter/jooq/sort/SortType.java

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
+
+}