From 03a009567f81b82e513da12a57cb9e8189e54267 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 26 Sep 2026 22:13:10 +0300
Subject: [PATCH 01/27] Apply some tweaks

---
 .../com/DesktopApplicationClientJava/Program.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index deea9b6..ed4f695 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -7,6 +7,9 @@
 import javafx.stage.Stage;
 
 public class Program extends Application {
+    final static double windowWidthPx = 500.0;
+    final static double windowHeightPx = 500.0;
+
     public static void main(String[] args) {
         launch(args);
     }
@@ -14,16 +17,17 @@ public static void main(String[] args) {
     @Override
     public void start(Stage stage) {
         Text text = new Text("Hello JAVAFX!");
-        text.setLayoutX(80);
-        text.setLayoutY(80);
+        text.setLayoutX(windowWidthPx / 2);
+        text.setLayoutY(windowHeightPx / 2);
 
         Group group = new Group(text);
         Scene scene = new Scene(group);
 
         stage.setScene(scene);
         stage.setTitle("JavaFX Application");
-        stage.setWidth(300);
-        stage.setHeight(250);
+        stage.setWidth(windowWidthPx);
+        stage.setHeight(windowHeightPx);
+        stage.centerOnScreen();
 
         stage.show();
     }

From 2707587c5f5a1e8c35ba44ba4b6516014f7768d6 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 26 Sep 2026 22:17:32 +0300
Subject: [PATCH 02/27] Add a button

---
 .../com/DesktopApplicationClientJava/Program.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index ed4f695..a81b286 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -3,12 +3,14 @@
 import javafx.application.Application;
 import javafx.scene.Group;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.layout.FlowPane;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 
 public class Program extends Application {
-    final static double windowWidthPx = 500.0;
-    final static double windowHeightPx = 500.0;
+    final static double windowWidthPx = 200.0;
+    final static double windowHeightPx = 100.0;
 
     public static void main(String[] args) {
         launch(args);
@@ -20,8 +22,11 @@ public void start(Stage stage) {
         text.setLayoutX(windowWidthPx / 2);
         text.setLayoutY(windowHeightPx / 2);
 
-        Group group = new Group(text);
-        Scene scene = new Scene(group);
+        Button button = new Button("Button");
+        Group group = new Group(button);
+
+        FlowPane root = new FlowPane(text, group);
+        Scene scene = new Scene(root);
 
         stage.setScene(scene);
         stage.setTitle("JavaFX Application");

From 9b8ff69189184f51d3c778fd7223f9f282ec1b80 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 26 Sep 2026 22:26:44 +0300
Subject: [PATCH 03/27] Add an event handler

---
 .../java/com/DesktopApplicationClientJava/Program.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index a81b286..1c7a37f 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -11,6 +11,7 @@
 public class Program extends Application {
     final static double windowWidthPx = 200.0;
     final static double windowHeightPx = 100.0;
+    int times = 0;
 
     public static void main(String[] args) {
         launch(args);
@@ -22,7 +23,12 @@ public void start(Stage stage) {
         text.setLayoutX(windowWidthPx / 2);
         text.setLayoutY(windowHeightPx / 2);
 
-        Button button = new Button("Button");
+        Button button = new Button("You haven't clicked me!");
+        button.setOnAction(e -> {
+                times++;
+                button.setText("You've clicked " + times + " times");
+        });
+
         Group group = new Group(button);
 
         FlowPane root = new FlowPane(text, group);
@@ -36,4 +42,4 @@ public void start(Stage stage) {
 
         stage.show();
     }
-}
\ No newline at end of file
+}

From c19bb369ec93a7e43d8605ccad6e79752ce24b37 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 26 Sep 2026 22:47:41 +0300
Subject: [PATCH 04/27] Setup fxml

---
 pom.xml                                       |  5 ++++
 .../DesktopApplicationClientJava/Main.fxml    |  8 ++++++
 .../DesktopApplicationClientJava/Program.java | 25 +++++--------------
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Main.fxml

diff --git a/pom.xml b/pom.xml
index 002b18a..5d59321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,11 @@
             <artifactId>javafx-controls</artifactId>
             <version>11</version>
         </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>27</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/src/main/java/com/DesktopApplicationClientJava/Main.fxml b/src/main/java/com/DesktopApplicationClientJava/Main.fxml
new file mode 100644
index 0000000..93ac1c6
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Main.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.scene.Group?>
+<?import javafx.scene.control.Button?>
+<Group xmlns:fx="http://javafx.com/fxml/1">
+    <Button xmlns:fx="http://javafx.com/fxml/1" text="Hello FXML" />
+</Group>
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index 1c7a37f..5cecb9b 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -1,37 +1,24 @@
 package com.DesktopApplicationClientJava;
 
+import java.io.IOException;
+
 import javafx.application.Application;
-import javafx.scene.Group;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.layout.FlowPane;
-import javafx.scene.text.Text;
 import javafx.stage.Stage;
 
 public class Program extends Application {
     final static double windowWidthPx = 200.0;
     final static double windowHeightPx = 100.0;
-    int times = 0;
 
     public static void main(String[] args) {
         launch(args);
     }
 
     @Override
-    public void start(Stage stage) {
-        Text text = new Text("Hello JAVAFX!");
-        text.setLayoutX(windowWidthPx / 2);
-        text.setLayoutY(windowHeightPx / 2);
-
-        Button button = new Button("You haven't clicked me!");
-        button.setOnAction(e -> {
-                times++;
-                button.setText("You've clicked " + times + " times");
-        });
-
-        Group group = new Group(button);
-
-        FlowPane root = new FlowPane(text, group);
+    public void start(Stage stage) throws IOException {
+        Parent root = FXMLLoader.load(getClass().getResource("Main.fxml"));
         Scene scene = new Scene(root);
 
         stage.setScene(scene);

From 619a0ac0bfc4ffb9c9328a13f49075f8d55d659e Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 26 Sep 2026 22:57:13 +0300
Subject: [PATCH 05/27] Migrate an event handler to fxml

---
 .../com/DesktopApplicationClientJava/Main.fxml |  4 ++--
 .../MainController.java                        | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/MainController.java

diff --git a/src/main/java/com/DesktopApplicationClientJava/Main.fxml b/src/main/java/com/DesktopApplicationClientJava/Main.fxml
index 93ac1c6..b473b15 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Main.fxml
+++ b/src/main/java/com/DesktopApplicationClientJava/Main.fxml
@@ -3,6 +3,6 @@
 <?import java.lang.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.control.Button?>
-<Group xmlns:fx="http://javafx.com/fxml/1">
-    <Button xmlns:fx="http://javafx.com/fxml/1" text="Hello FXML" />
+<Group xmlns:fx="http://javafx.com/fxml/1" fx:id="root" fx:controller="com.DesktopApplicationClientJava.MainController" >
+    <Button text="Hello FXML" onAction="#click" fx:id="button" />
 </Group>
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/MainController.java b/src/main/java/com/DesktopApplicationClientJava/MainController.java
new file mode 100644
index 0000000..9849fae
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/MainController.java
@@ -0,0 +1,18 @@
+package com.DesktopApplicationClientJava;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+
+public class MainController {
+    private int times = 0;
+
+    @FXML
+    private Button button;
+
+    @FXML
+    private void click(ActionEvent event) {
+        times++;
+        button.setText("You've clicked " + times + " times!");
+    }
+}

From 4565aa21b08dc38ac0430922be5bf59a676fb45d Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sun, 27 Sep 2026 00:18:10 +0300
Subject: [PATCH 06/27] Setup a login formf

---
 .../DesktopApplicationClientJava/Main.fxml    |  8 --
 .../MainController.java                       | 18 ----
 .../DesktopApplicationClientJava/Program.java |  7 +-
 .../controllers/FieldError.java               | 30 +++++++
 .../controllers/LoginFormController.java      | 87 +++++++++++++++++++
 .../fxml/LoginForm.fxml                       | 33 +++++++
 .../DesktopApplicationClientJava/styles.css   | 42 +++++++++
 7 files changed, 196 insertions(+), 29 deletions(-)
 delete mode 100644 src/main/java/com/DesktopApplicationClientJava/Main.fxml
 delete mode 100644 src/main/java/com/DesktopApplicationClientJava/MainController.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/FieldError.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/fxml/LoginForm.fxml
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/styles.css

diff --git a/src/main/java/com/DesktopApplicationClientJava/Main.fxml b/src/main/java/com/DesktopApplicationClientJava/Main.fxml
deleted file mode 100644
index b473b15..0000000
--- a/src/main/java/com/DesktopApplicationClientJava/Main.fxml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<Group xmlns:fx="http://javafx.com/fxml/1" fx:id="root" fx:controller="com.DesktopApplicationClientJava.MainController" >
-    <Button text="Hello FXML" onAction="#click" fx:id="button" />
-</Group>
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/MainController.java b/src/main/java/com/DesktopApplicationClientJava/MainController.java
deleted file mode 100644
index 9849fae..0000000
--- a/src/main/java/com/DesktopApplicationClientJava/MainController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.DesktopApplicationClientJava;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-
-public class MainController {
-    private int times = 0;
-
-    @FXML
-    private Button button;
-
-    @FXML
-    private void click(ActionEvent event) {
-        times++;
-        button.setText("You've clicked " + times + " times!");
-    }
-}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index 5cecb9b..3e068bf 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -9,8 +9,8 @@
 import javafx.stage.Stage;
 
 public class Program extends Application {
-    final static double windowWidthPx = 200.0;
-    final static double windowHeightPx = 100.0;
+    final static double windowWidthPx = 400.0;
+    final static double windowHeightPx = 300.0;
 
     public static void main(String[] args) {
         launch(args);
@@ -18,8 +18,9 @@ public static void main(String[] args) {
 
     @Override
     public void start(Stage stage) throws IOException {
-        Parent root = FXMLLoader.load(getClass().getResource("Main.fxml"));
+        Parent root = FXMLLoader.load(getClass().getResource("fxml/LoginForm.fxml"));
         Scene scene = new Scene(root);
+        scene.getStylesheets().add(getClass().getResource("styles.css").toExternalForm());
 
         stage.setScene(scene);
         stage.setTitle("JavaFX Application");
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/FieldError.java b/src/main/java/com/DesktopApplicationClientJava/controllers/FieldError.java
new file mode 100644
index 0000000..d5f2013
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/FieldError.java
@@ -0,0 +1,30 @@
+package com.DesktopApplicationClientJava.controllers;
+
+import javafx.scene.control.Label;
+
+class FieldError {
+    private final Label label;
+
+    FieldError(Label label) {
+        this.label = label;
+    }
+
+    void show(String message) {
+        if (label == null)
+            return;
+        label.setText(message);
+        label.setVisible(true);
+        label.setManaged(true);
+    }
+
+    void hide() {
+        if (label == null)
+            return;
+        label.setVisible(false);
+        label.setManaged(false);
+    }
+
+    boolean isShowing() {
+        return label.isVisible();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
new file mode 100644
index 0000000..0d8642f
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
@@ -0,0 +1,87 @@
+package com.DesktopApplicationClientJava.controllers;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+public class LoginFormController {
+    private static final int MIN_PASSWORD_LENGTH = 8;
+
+    @FXML
+    private TextField emailField;
+    @FXML
+    private Label emailErrorLabel;
+    private FieldError emailError;
+
+    @FXML
+    private PasswordField passwordField;
+    @FXML
+    private Label passwordErrorLabel;
+    private FieldError passwordError;
+
+    @FXML
+    private Button submitButton;
+
+    @FXML
+    private void initialize() {
+        emailError = new FieldError(emailErrorLabel);
+        passwordError = new FieldError(passwordErrorLabel);
+
+        emailField.textProperty().addListener((o, a, b) -> emailError.hide());
+        passwordField.textProperty().addListener((o, a, b) -> passwordError.hide());
+    }
+
+    @FXML
+    private void onSubmit(ActionEvent event) {
+        if (!isValid()) {
+            return;
+        }
+    }
+
+    private boolean isValid() {
+        return isEmailValid() & isPasswordValid();
+    }
+
+    private boolean isEmailValid() {
+        String email = emailField.getText();
+
+        if (email.isBlank()) {
+            emailError.show("Это поле обязательно для заполнения");
+            return false;
+        }
+        if (email.length() < 5) {
+            emailError.show("Почта не может быть короче 5 символов");
+            return false;
+        }
+        if (email.length() > 100) {
+            emailError.show("Почта не должна быть длиннее 100 символов");
+            return false;
+        }
+        if (!email.contains("@")) {
+            emailError.show("Неверный формат почты");
+            return false;
+        }
+
+        emailError.hide();
+        return true;
+    }
+
+    private boolean isPasswordValid() {
+        String pw = passwordField.getText();
+
+        if (pw.isBlank()) {
+            passwordError.show("Это поле обязательно для заполнения");
+            return false;
+        }
+        if (pw.length() < MIN_PASSWORD_LENGTH) {
+            passwordError.show("Пароль не может быть короче " + MIN_PASSWORD_LENGTH + " символов");
+            return false;
+        }
+
+        passwordError.hide();
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/fxml/LoginForm.fxml b/src/main/java/com/DesktopApplicationClientJava/fxml/LoginForm.fxml
new file mode 100644
index 0000000..42b99bf
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/fxml/LoginForm.fxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.geometry.Insets?>
+
+<VBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root" fx:controller="com.DesktopApplicationClientJava.controllers.LoginFormController">
+    <VBox spacing="5">
+        <padding>
+            <Insets top="10" right="10" bottom="10" left="10"/>
+        </padding>
+
+        <Label text="Госхрон" styleClass="h1"/>
+
+        <HBox spacing="5">
+            <Label text="Почта" labelFor="$emailField"/>
+            <TextField promptText="youremail@example.com" fx:id="emailField"/>
+        </HBox>
+        <Label fx:id="emailErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+
+        <HBox spacing="5">
+            <Label text="Пароль" labelFor="$passwordField"/>
+            <PasswordField fx:id="passwordField"/>
+        </HBox>
+        <Label fx:id="passwordErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+
+        <Button text="Войти" fx:id="submitButton" onAction="#onSubmit"/>
+    </VBox>
+</VBox>
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/styles.css b/src/main/java/com/DesktopApplicationClientJava/styles.css
new file mode 100644
index 0000000..7283338
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/styles.css
@@ -0,0 +1,42 @@
+.i {
+    -fx-font-style: italic;
+}
+
+.b {
+    -fx-font-weight: bold;
+}
+
+.h1 {
+    -fx-font-size: 32px;
+    -fx-font-weight: bold;
+}
+
+.h2 {
+    -fx-font-size: 24px;
+    -fx-font-weight: bold;
+}
+
+.h3 {
+    -fx-font-size: 19px;
+    -fx-font-weight: bold;
+}
+
+.h4 {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+}
+
+.h5 {
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+}
+
+.h6 {
+    -fx-font-size: 11px;
+    -fx-font-weight: bold;
+}
+
+.error-label {
+    -fx-text-fill: red;
+    -fx-font-size: 11px;
+}
\ No newline at end of file

From b2ea3cc05312f3e945eb298a655845bb999e7494 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sun, 27 Sep 2026 00:51:20 +0300
Subject: [PATCH 07/27] Setup scenicview

---
 scenicView.properties | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 scenicView.properties

diff --git a/scenicView.properties b/scenicView.properties
new file mode 100644
index 0000000..8309a28
--- /dev/null
+++ b/scenicView.properties
@@ -0,0 +1,19 @@
+#ScenicView properties
+#Sun Sep 27 00:49:41 MSK 2026
+autoRefreshStyleSheets=false
+automaticScenegraphStructureRefreshing=true
+collapseContainerControls=false
+collapseControls=true
+ignoreMouseTransparentNodes=true
+registerShortcuts=true
+showBaseline=false
+showBounds=true
+showCSSProperties=false
+showDefaultProperties=true
+showFilteredNodesInTree=true
+showInvisibleNodes=false
+showNodesIdInTree=false
+showSearchBar=true
+splitPaneDividerPosition=0.308125
+stageHeight=800.0
+stageWidth=800.0

From 7928d2936cac97c6b51709d28c4ec5a5c857f774 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sun, 27 Sep 2026 13:20:23 +0300
Subject: [PATCH 08/27] Tons of validators

---
 .gitignore                                    | 64 +++++++++++++-
 pom.xml                                       | 63 ++++++++++++-
 .../ControllerWiring.java                     | 20 +++++
 .../{controllers => }/FieldError.java         | 12 +--
 .../DesktopApplicationClientJava/Program.java | 18 +++-
 .../DesktopApplicationClientJava/User.java    | 17 ++++
 .../controllers/LoginFormController.java      | 88 +++++++++++--------
 .../controllers/SearchController.java         |  6 ++
 .../controllers/utils/Controller.java         | 19 ++++
 .../navigation/Navigator.java                 | 43 +++++++++
 .../navigation/NavigatorAware.java            |  5 ++
 .../session/Session.java                      | 22 +++++
 .../session/SessionAware.java                 |  5 ++
 .../validation/EmailValidator.java            | 22 +++++
 .../validation/FirstNameValidator.java        | 17 ++++
 .../validation/LastNameValidator.java         | 13 +++
 .../validation/PasswordValidator.java         | 17 ++++
 .../validation/utils/AbstractValidator.java   |  5 ++
 .../validation/utils/ErrorMessages.java       | 13 +++
 .../validation/utils/Validator.java           |  6 ++
 .../validation/utils/ValidatorHelpers.java    | 25 ++++++
 .../fxml/LoginForm.fxml                       | 16 +++-
 src/main/resources/fxml/Search.fxml           |  8 ++
 .../styles.css                                |  0
 .../java/validation/LoginValidatorTest.java   | 60 +++++++++++++
 25 files changed, 532 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/ControllerWiring.java
 rename src/main/java/com/DesktopApplicationClientJava/{controllers => }/FieldError.java (67%)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/User.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/session/Session.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java
 rename src/main/{java/com/DesktopApplicationClientJava => resources}/fxml/LoginForm.fxml (63%)
 create mode 100644 src/main/resources/fxml/Search.fxml
 rename src/main/{java/com/DesktopApplicationClientJava => resources}/styles.css (100%)
 create mode 100644 src/test/java/validation/LoginValidatorTest.java

diff --git a/.gitignore b/.gitignore
index 04d477a..ec64367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,66 @@ buildNumber.properties
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
-.vscode
\ No newline at end of file
+.vscode
+
+tools/scenicview/
+
+# General
+.DS_Store
+.localized
+__MACOSX/
+.AppleDouble
+.LSOverride
+Icon[
+]
+
+# Resource forks
+._*
+
+# Files and directories that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+.com.apple.timemachine.supported
+.PKInstallSandboxManager
+.PKInstallSandboxManager-SystemSoftware
+.hotfiles.btree
+.vol
+.file
+.disk_label*
+lost+found
+.HFS+ Private Directory Data[
+]
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Mac OS 6 to 9
+Desktop DB
+Desktop DF
+TheFindByContentFolder
+TheVolumeSettingsFolder
+.FBCIndex
+.FBCSemaphoreFile
+.FBCLockFolder
+
+# Quota system
+.quota.group
+.quota.user
+.quota.ops.group
+.quota.ops.user
+
+# TimeMachine
+Backups.backupdb
+.MobileBackups
+.MobileBackups.trash
+MobileBackups.trash
+tmbootpicker.efi
diff --git a/pom.xml b/pom.xml
index 5d59321..5628236 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,7 @@
 
     <name>DesktopApplicationClientJava</name>
     <description>DesktopApplicationClientJava</description>
-    <url>
-        https://github.com/vladcheck/DesktopApplicationClientJava
-    </url>
+    <url>https://github.com/vladcheck/DesktopApplicationClientJava</url>
 
     <properties>
         <encoding>UTF-8</encoding>
@@ -25,10 +23,40 @@
     <repositories></repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.testfx</groupId>
+            <artifactId>openjfx-monocle</artifactId>
+            <version>21.0.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testfx</groupId>
+            <artifactId>testfx-junit5</artifactId>
+            <version>4.0.18</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testfx</groupId>
+            <artifactId>testfx-core</artifactId>
+            <version>4.0.18</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>11</version>
+            <version>27</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
@@ -45,11 +73,38 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.5.4</version>
+                <configuration>
+                    <argLine>
+                        -Dtestfx.headless=true
+                        -Dtestfx.robot=glass
+                        -Dglass.platform=Monocle
+                        -Dmonocle.platform=Headless
+                        -Dprism.order=sw
+                        -Dprism.text=t2k
+                        -Djava.awt.headless=true
+                        --enable-native-access=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.14.1</version>
                 <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.48</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <compilerArgs>
+                        <arg>-proc:full</arg>
+                    </compilerArgs>
                     <release>25</release>
                 </configuration>
             </plugin>
diff --git a/src/main/java/com/DesktopApplicationClientJava/ControllerWiring.java b/src/main/java/com/DesktopApplicationClientJava/ControllerWiring.java
new file mode 100644
index 0000000..bcdf847
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/ControllerWiring.java
@@ -0,0 +1,20 @@
+package com.DesktopApplicationClientJava;
+
+import com.DesktopApplicationClientJava.navigation.Navigator;
+import com.DesktopApplicationClientJava.navigation.NavigatorAware;
+import com.DesktopApplicationClientJava.session.Session;
+import com.DesktopApplicationClientJava.session.SessionAware;
+
+import javafx.stage.Stage;
+
+public final class ControllerWiring {
+    private ControllerWiring() {
+    }
+
+    public static void wire(Object controller, Stage stage, Session session) {
+        if (controller instanceof SessionAware sa)
+            sa.setSession(session);
+        if (controller instanceof NavigatorAware na)
+            na.setNavigator(new Navigator(stage, session));
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/FieldError.java b/src/main/java/com/DesktopApplicationClientJava/FieldError.java
similarity index 67%
rename from src/main/java/com/DesktopApplicationClientJava/controllers/FieldError.java
rename to src/main/java/com/DesktopApplicationClientJava/FieldError.java
index d5f2013..cc9f362 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/FieldError.java
+++ b/src/main/java/com/DesktopApplicationClientJava/FieldError.java
@@ -1,15 +1,15 @@
-package com.DesktopApplicationClientJava.controllers;
+package com.DesktopApplicationClientJava;
 
 import javafx.scene.control.Label;
 
-class FieldError {
+public class FieldError {
     private final Label label;
 
-    FieldError(Label label) {
+    public FieldError(Label label) {
         this.label = label;
     }
 
-    void show(String message) {
+    public void show(String message) {
         if (label == null)
             return;
         label.setText(message);
@@ -17,14 +17,14 @@ void show(String message) {
         label.setManaged(true);
     }
 
-    void hide() {
+    public void hide() {
         if (label == null)
             return;
         label.setVisible(false);
         label.setManaged(false);
     }
 
-    boolean isShowing() {
+    public boolean isShowing() {
         return label.isVisible();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index 3e068bf..d682e65 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -2,6 +2,8 @@
 
 import java.io.IOException;
 
+import com.DesktopApplicationClientJava.session.Session;
+
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -9,8 +11,9 @@
 import javafx.stage.Stage;
 
 public class Program extends Application {
-    final static double windowWidthPx = 400.0;
-    final static double windowHeightPx = 300.0;
+    private final Session session = new Session();
+    private final static double windowWidthPx = 400.0;
+    private final static double windowHeightPx = 300.0;
 
     public static void main(String[] args) {
         launch(args);
@@ -18,9 +21,12 @@ public static void main(String[] args) {
 
     @Override
     public void start(Stage stage) throws IOException {
-        Parent root = FXMLLoader.load(getClass().getResource("fxml/LoginForm.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/LoginForm.fxml"));
+        Parent root = loader.load();
         Scene scene = new Scene(root);
-        scene.getStylesheets().add(getClass().getResource("styles.css").toExternalForm());
+        loadStyleSheet(scene, "/styles.css");
+
+        ControllerWiring.wire(loader.getController(), stage, session);
 
         stage.setScene(scene);
         stage.setTitle("JavaFX Application");
@@ -30,4 +36,8 @@ public void start(Stage stage) throws IOException {
 
         stage.show();
     }
+
+    private void loadStyleSheet(Scene scene, String path) {
+        scene.getStylesheets().add(getClass().getResource(path).toExternalForm());
+    }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/User.java b/src/main/java/com/DesktopApplicationClientJava/User.java
new file mode 100644
index 0000000..5fe9d38
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/User.java
@@ -0,0 +1,17 @@
+package com.DesktopApplicationClientJava;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * User
+ */
+@AllArgsConstructor
+@Getter
+@Setter
+public class User {
+    private String firstName;
+    private String lastName;
+    private String email;
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
index 0d8642f..de93a09 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
@@ -1,5 +1,14 @@
 package com.DesktopApplicationClientJava.controllers;
 
+import com.DesktopApplicationClientJava.FieldError;
+import com.DesktopApplicationClientJava.User;
+import com.DesktopApplicationClientJava.controllers.utils.Controller;
+import com.DesktopApplicationClientJava.validation.EmailValidator;
+import com.DesktopApplicationClientJava.validation.FirstNameValidator;
+import com.DesktopApplicationClientJava.validation.LastNameValidator;
+import com.DesktopApplicationClientJava.validation.PasswordValidator;
+import com.DesktopApplicationClientJava.validation.utils.Validator;
+
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -7,8 +16,18 @@
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
 
-public class LoginFormController {
-    private static final int MIN_PASSWORD_LENGTH = 8;
+public class LoginFormController extends Controller {
+    @FXML
+    private TextField firstNameField;
+    @FXML
+    private Label firstNameErrorLabel;
+    private FieldError firstNameError;
+
+    @FXML
+    private TextField lastNameField;
+    @FXML
+    private Label lastNameErrorLabel;
+    private FieldError lastNameError;
 
     @FXML
     private TextField emailField;
@@ -27,6 +46,8 @@ public class LoginFormController {
 
     @FXML
     private void initialize() {
+        firstNameError = new FieldError(firstNameErrorLabel);
+        lastNameError = new FieldError(lastNameErrorLabel);
         emailError = new FieldError(emailErrorLabel);
         passwordError = new FieldError(passwordErrorLabel);
 
@@ -36,52 +57,49 @@ private void initialize() {
 
     @FXML
     private void onSubmit(ActionEvent event) {
-        if (!isValid()) {
+        if (!isValid())
             return;
-        }
+
+        User user = authenticate(firstNameField.getText(), lastNameField.getText(), emailField.getText());
+        if (user == null)
+            return;
+
+        session.setCurrentUser(user);
+        navigator.goTo("/fxml/Search.fxml");
     }
 
     private boolean isValid() {
-        return isEmailValid() & isPasswordValid();
+        return isFirstNameValid() & isLastNameValid() & isEmailValid() & isPasswordValid();
     }
 
-    private boolean isEmailValid() {
-        String email = emailField.getText();
+    private boolean isFirstNameValid() {
+        return isFieldValid(firstNameField, new FirstNameValidator(), firstNameError);
+    }
 
-        if (email.isBlank()) {
-            emailError.show("Это поле обязательно для заполнения");
-            return false;
-        }
-        if (email.length() < 5) {
-            emailError.show("Почта не может быть короче 5 символов");
-            return false;
-        }
-        if (email.length() > 100) {
-            emailError.show("Почта не должна быть длиннее 100 символов");
-            return false;
-        }
-        if (!email.contains("@")) {
-            emailError.show("Неверный формат почты");
-            return false;
-        }
+    private boolean isLastNameValid() {
+        return isFieldValid(lastNameField, new LastNameValidator(), lastNameError);
+    }
 
-        emailError.hide();
-        return true;
+    private boolean isEmailValid() {
+        return isFieldValid(emailField, new EmailValidator(), emailError);
     }
 
     private boolean isPasswordValid() {
-        String pw = passwordField.getText();
+        return isFieldValid(passwordField, new PasswordValidator(), passwordError);
+    }
 
-        if (pw.isBlank()) {
-            passwordError.show("Это поле обязательно для заполнения");
-            return false;
-        }
-        if (pw.length() < MIN_PASSWORD_LENGTH) {
-            passwordError.show("Пароль не может быть короче " + MIN_PASSWORD_LENGTH + " символов");
-            return false;
+    private boolean isFieldValid(TextField field, Validator validator, FieldError errorLabel) {
+        String input = field.getText();
+        var error = validator.isValid(input);
+        if (error == null) {
+            errorLabel.hide();
+            return true;
         }
+        errorLabel.show(error);
+        return false;
+    }
 
-        passwordError.hide();
-        return true;
+    private User authenticate(String firstName, String lastName, String email) {
+        return new User(firstName, lastName, email);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java
new file mode 100644
index 0000000..5e5ddea
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java
@@ -0,0 +1,6 @@
+package com.DesktopApplicationClientJava.controllers;
+
+import com.DesktopApplicationClientJava.controllers.utils.Controller;
+
+public class SearchController extends Controller {
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java b/src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java
new file mode 100644
index 0000000..753b17f
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java
@@ -0,0 +1,19 @@
+package com.DesktopApplicationClientJava.controllers.utils;
+
+import com.DesktopApplicationClientJava.navigation.Navigator;
+import com.DesktopApplicationClientJava.navigation.NavigatorAware;
+import com.DesktopApplicationClientJava.session.Session;
+import com.DesktopApplicationClientJava.session.SessionAware;
+
+public abstract class Controller implements SessionAware, NavigatorAware {
+    protected Session session;
+    protected Navigator navigator;
+
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+    public void setNavigator(Navigator navigator) {
+        this.navigator = navigator;
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java b/src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java
new file mode 100644
index 0000000..52ad783
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java
@@ -0,0 +1,43 @@
+package com.DesktopApplicationClientJava.navigation;
+
+import java.io.IOException;
+
+import com.DesktopApplicationClientJava.session.Session;
+import com.DesktopApplicationClientJava.session.SessionAware;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.stage.Stage;
+import lombok.AllArgsConstructor;
+
+/**
+ * Navigator
+ */
+@AllArgsConstructor
+public class Navigator {
+    private final Stage stage;
+    private final Session session;
+
+    public void goTo(String fxmlFile) {
+        var url = Navigator.class.getResource(fxmlFile);
+        if (url == null) {
+            throw new IllegalArgumentException("FXML not found on classpath: " + fxmlFile);
+        }
+
+        FXMLLoader loader = new FXMLLoader(url);
+        try {
+            Parent root = loader.load();
+            var controller = loader.getController();
+            if (controller instanceof SessionAware sa) {
+                sa.setSession(session);
+            }
+            if (controller instanceof NavigatorAware na) {
+                na.setNavigator(this);
+            }
+            stage.getScene().setRoot(root);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to load FXML: " + fxmlFile, e);
+        }
+
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java b/src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java
new file mode 100644
index 0000000..c2f36e5
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java
@@ -0,0 +1,5 @@
+package com.DesktopApplicationClientJava.navigation;
+
+public interface NavigatorAware {
+    void setNavigator(Navigator navigator);
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/session/Session.java b/src/main/java/com/DesktopApplicationClientJava/session/Session.java
new file mode 100644
index 0000000..e49b08f
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/session/Session.java
@@ -0,0 +1,22 @@
+package com.DesktopApplicationClientJava.session;
+
+import com.DesktopApplicationClientJava.User;
+
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+public class Session {
+    private User currentUser;
+
+    public User getCurrentUser() {
+        return currentUser;
+    }
+
+    public void setCurrentUser(User user) {
+        this.currentUser = user;
+    }
+
+    public boolean isLoggedIn() {
+        return currentUser != null;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java b/src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java
new file mode 100644
index 0000000..3c2fabd
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java
@@ -0,0 +1,5 @@
+package com.DesktopApplicationClientJava.session;
+
+public interface SessionAware {
+    void setSession(Session session);
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
new file mode 100644
index 0000000..679832b
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
@@ -0,0 +1,22 @@
+package com.DesktopApplicationClientJava.validation;
+
+import com.DesktopApplicationClientJava.validation.utils.AbstractValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
+
+public class EmailValidator extends AbstractValidator {
+    public static final int MIN_EMAIL_LENGTH = 5;
+    public static final int MAX_EMAIL_LENGTH = 100;
+
+    public String isValid(String input) {
+        if (ValidatorHelpers.isEmpty(input))
+            return ErrorMessages.Required;
+        if (ValidatorHelpers.isShorterThan(input, MIN_EMAIL_LENGTH))
+            return ErrorMessages.MinLength("Почта", MIN_EMAIL_LENGTH);
+        if (ValidatorHelpers.isLongerThan(input, MAX_EMAIL_LENGTH))
+            return ErrorMessages.MaxLength("Почта", MAX_EMAIL_LENGTH);
+        if (!ValidatorHelpers.includes(input, "@"))
+            return "Неверный формат почты";
+        return null;
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
new file mode 100644
index 0000000..2c006f0
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
@@ -0,0 +1,17 @@
+package com.DesktopApplicationClientJava.validation;
+
+import com.DesktopApplicationClientJava.validation.utils.AbstractValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
+
+public class FirstNameValidator extends AbstractValidator {
+    private static final int MIN_LENGTH = 2;
+
+    public String isValid(String input) {
+        if (ValidatorHelpers.isEmpty(input))
+            return ErrorMessages.Required;
+        if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
+            return ErrorMessages.MinLength("Имя", MIN_LENGTH);
+        return null;
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
new file mode 100644
index 0000000..16937f9
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
@@ -0,0 +1,13 @@
+package com.DesktopApplicationClientJava.validation;
+
+import com.DesktopApplicationClientJava.validation.utils.AbstractValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
+
+public class LastNameValidator extends AbstractValidator {
+    public String isValid(String input) {
+        if (ValidatorHelpers.isEmpty(input))
+            return ErrorMessages.Required;
+        return null;
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
new file mode 100644
index 0000000..2da054a
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
@@ -0,0 +1,17 @@
+package com.DesktopApplicationClientJava.validation;
+
+import com.DesktopApplicationClientJava.validation.utils.AbstractValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
+
+public class PasswordValidator extends AbstractValidator {
+    private static final int MIN_LENGTH = 8;
+
+    public String isValid(String input) {
+        if (ValidatorHelpers.isEmpty(input))
+            return ErrorMessages.Required;
+        if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
+            return ErrorMessages.MinLength("Пароль", MIN_LENGTH);
+        return null;
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java
new file mode 100644
index 0000000..f6b3d2e
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java
@@ -0,0 +1,5 @@
+package com.DesktopApplicationClientJava.validation.utils;
+
+public abstract class AbstractValidator implements Validator {
+    public abstract String isValid(String input);
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
new file mode 100644
index 0000000..c4d198f
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
@@ -0,0 +1,13 @@
+package com.DesktopApplicationClientJava.validation.utils;
+
+public class ErrorMessages {
+    public final static String Required = "Это поле обязательно для заполнения";
+
+    public static final String MinLength(String fieldName, int minLength) {
+        return fieldName + " не может быть короче, чем " + minLength + " символов";
+    }
+
+    public static final String MaxLength(String fieldName, int maxLength) {
+        return fieldName + " не может быть длиннее, чем " + maxLength + " символов";
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java
new file mode 100644
index 0000000..6446901
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java
@@ -0,0 +1,6 @@
+package com.DesktopApplicationClientJava.validation.utils;
+
+@FunctionalInterface
+public interface Validator {
+    String isValid(String input);
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java
new file mode 100644
index 0000000..779dd42
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java
@@ -0,0 +1,25 @@
+package com.DesktopApplicationClientJava.validation.utils;
+
+public class ValidatorHelpers {
+    public static boolean isEmpty(String input) {
+        return input == null || input.isBlank();
+    }
+
+    public static boolean isShorterThan(String input, int min) {
+        return input.length() < min;
+    }
+
+    public static boolean isLongerThan(String input, int max) {
+        return input.length() > max;
+    }
+
+    /**
+     * @param input input string
+     * @param sub   substring
+     * @return <code>true</code> if <code>input</code> includes a substring
+     *         <code>sub</code>, <code>false</code> otherwise
+     */
+    public static boolean includes(String input, String sub) {
+        return input.contains(sub);
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/fxml/LoginForm.fxml b/src/main/resources/fxml/LoginForm.fxml
similarity index 63%
rename from src/main/java/com/DesktopApplicationClientJava/fxml/LoginForm.fxml
rename to src/main/resources/fxml/LoginForm.fxml
index 42b99bf..2dce85d 100644
--- a/src/main/java/com/DesktopApplicationClientJava/fxml/LoginForm.fxml
+++ b/src/main/resources/fxml/LoginForm.fxml
@@ -16,13 +16,25 @@
 
         <Label text="Госхрон" styleClass="h1"/>
 
-        <HBox spacing="5">
+         <HBox spacing="5" alignment="CENTER">
+            <Label text="Имя" labelFor="$firstNameField"/>
+            <TextField promptText="Антон" fx:id="firstNameField"/>
+        </HBox>
+        <Label fx:id="firstNameErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+
+         <HBox spacing="5" alignment="CENTER">
+            <Label text="Фамилия" labelFor="$lastNameField"/>
+            <TextField promptText="Антонов" fx:id="lastNameField"/>
+        </HBox>
+        <Label fx:id="lastNameErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+
+        <HBox spacing="5" alignment="CENTER">
             <Label text="Почта" labelFor="$emailField"/>
             <TextField promptText="youremail@example.com" fx:id="emailField"/>
         </HBox>
         <Label fx:id="emailErrorLabel" styleClass="error-label" managed="false" visible="false"/>
 
-        <HBox spacing="5">
+        <HBox spacing="5" alignment="CENTER">
             <Label text="Пароль" labelFor="$passwordField"/>
             <PasswordField fx:id="passwordField"/>
         </HBox>
diff --git a/src/main/resources/fxml/Search.fxml b/src/main/resources/fxml/Search.fxml
new file mode 100644
index 0000000..ba613f7
--- /dev/null
+++ b/src/main/resources/fxml/Search.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root" fx:controller="com.DesktopApplicationClientJava.controllers.SearchController">
+    <Label text="Welcome!" fx:id="welcomeLabel" styleClass="h1"/>
+</VBox>
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/styles.css b/src/main/resources/styles.css
similarity index 100%
rename from src/main/java/com/DesktopApplicationClientJava/styles.css
rename to src/main/resources/styles.css
diff --git a/src/test/java/validation/LoginValidatorTest.java b/src/test/java/validation/LoginValidatorTest.java
new file mode 100644
index 0000000..7bb0cae
--- /dev/null
+++ b/src/test/java/validation/LoginValidatorTest.java
@@ -0,0 +1,60 @@
+package validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+import com.DesktopApplicationClientJava.validation.EmailValidator;
+import com.DesktopApplicationClientJava.validation.PasswordValidator;
+
+class LoginValidatorTest {
+    private static final PasswordValidator passwordValidator = new PasswordValidator();
+    private static final EmailValidator emailValidator = new EmailValidator();
+
+    @Test
+    void emptyEmailIsRejected() {
+        assertEquals("Это поле обязательно для заполнения", emailValidator.isValid(""));
+    }
+
+    @Test
+    void blankEmailIsRejected() {
+        assertEquals("Это поле обязательно для заполнения", emailValidator.isValid("   "));
+    }
+
+    @Test
+    void shortEmailIsRejected() {
+        assertEquals("Почта не может быть короче 5 символов", emailValidator.isValid("a@b"));
+    }
+
+    @Test
+    void longEmailIsRejected() {
+        String e = "a".repeat(95) + "@x.com";
+        assertEquals("Почта не должна быть длиннее 100 символов", emailValidator.isValid(e));
+    }
+
+    @Test
+    void emailWithoutAtIsRejected() {
+        assertEquals("Неверный формат почты", emailValidator.isValid("nope.com"));
+    }
+
+    @Test
+    void validEmailIsAccepted() {
+        assertNull(emailValidator.isValid("test@example.com"));
+    }
+
+    @Test
+    void emptyPasswordIsRejected() {
+        assertEquals("Это поле обязательно для заполнения", passwordValidator.isValid(""));
+    }
+
+    @Test
+    void shortPasswordIsRejected() {
+        assertEquals("Пароль не может быть короче 8 символов", passwordValidator.isValid("short"));
+    }
+
+    @Test
+    void exactlyEightCharPasswordIsAccepted() {
+        assertNull(passwordValidator.isValid("12345678"));
+    }
+}
\ No newline at end of file

From 4ad72dd34aebcde0f208d228ebba008f403fa5d0 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sun, 27 Sep 2026 13:35:34 +0300
Subject: [PATCH 09/27] Little reorganization and deduplication

---
 .../DesktopApplicationClientJava/Program.java |  1 +
 .../controllers/LoginFormController.java      |  4 +-
 .../{ => entities}/User.java                  |  2 +-
 .../session/Session.java                      |  2 +-
 .../{ => utils}/ControllerWiring.java         |  2 +-
 .../{ => utils}/FieldError.java               |  2 +-
 .../validation/EmailValidator.java            |  7 ++-
 .../validation/FirstNameValidator.java        |  3 +-
 .../validation/LastNameValidator.java         |  5 ++
 .../validation/PasswordValidator.java         |  8 ++-
 .../validation/utils/ErrorMessages.java       |  1 +
 .../java/validation/EmailValidatorTest.java   | 46 ++++++++++++++
 .../validation/FirstNameValidatorTest.java    | 24 ++++++++
 .../validation/LastNameValidatorTest.java     | 24 ++++++++
 .../java/validation/LoginValidatorTest.java   | 60 -------------------
 .../validation/PasswordValidatorTest.java     | 30 ++++++++++
 16 files changed, 149 insertions(+), 72 deletions(-)
 rename src/main/java/com/DesktopApplicationClientJava/{ => entities}/User.java (82%)
 rename src/main/java/com/DesktopApplicationClientJava/{ => utils}/ControllerWiring.java (93%)
 rename src/main/java/com/DesktopApplicationClientJava/{ => utils}/FieldError.java (92%)
 create mode 100644 src/test/java/validation/EmailValidatorTest.java
 create mode 100644 src/test/java/validation/FirstNameValidatorTest.java
 create mode 100644 src/test/java/validation/LastNameValidatorTest.java
 delete mode 100644 src/test/java/validation/LoginValidatorTest.java
 create mode 100644 src/test/java/validation/PasswordValidatorTest.java

diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index d682e65..eceba3a 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 import com.DesktopApplicationClientJava.session.Session;
+import com.DesktopApplicationClientJava.utils.ControllerWiring;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
index de93a09..7e6d9d0 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
@@ -1,8 +1,8 @@
 package com.DesktopApplicationClientJava.controllers;
 
-import com.DesktopApplicationClientJava.FieldError;
-import com.DesktopApplicationClientJava.User;
 import com.DesktopApplicationClientJava.controllers.utils.Controller;
+import com.DesktopApplicationClientJava.entities.User;
+import com.DesktopApplicationClientJava.utils.FieldError;
 import com.DesktopApplicationClientJava.validation.EmailValidator;
 import com.DesktopApplicationClientJava.validation.FirstNameValidator;
 import com.DesktopApplicationClientJava.validation.LastNameValidator;
diff --git a/src/main/java/com/DesktopApplicationClientJava/User.java b/src/main/java/com/DesktopApplicationClientJava/entities/User.java
similarity index 82%
rename from src/main/java/com/DesktopApplicationClientJava/User.java
rename to src/main/java/com/DesktopApplicationClientJava/entities/User.java
index 5fe9d38..9b49645 100644
--- a/src/main/java/com/DesktopApplicationClientJava/User.java
+++ b/src/main/java/com/DesktopApplicationClientJava/entities/User.java
@@ -1,4 +1,4 @@
-package com.DesktopApplicationClientJava;
+package com.DesktopApplicationClientJava.entities;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/com/DesktopApplicationClientJava/session/Session.java b/src/main/java/com/DesktopApplicationClientJava/session/Session.java
index e49b08f..d45186f 100644
--- a/src/main/java/com/DesktopApplicationClientJava/session/Session.java
+++ b/src/main/java/com/DesktopApplicationClientJava/session/Session.java
@@ -1,6 +1,6 @@
 package com.DesktopApplicationClientJava.session;
 
-import com.DesktopApplicationClientJava.User;
+import com.DesktopApplicationClientJava.entities.User;
 
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/java/com/DesktopApplicationClientJava/ControllerWiring.java b/src/main/java/com/DesktopApplicationClientJava/utils/ControllerWiring.java
similarity index 93%
rename from src/main/java/com/DesktopApplicationClientJava/ControllerWiring.java
rename to src/main/java/com/DesktopApplicationClientJava/utils/ControllerWiring.java
index bcdf847..972c9a3 100644
--- a/src/main/java/com/DesktopApplicationClientJava/ControllerWiring.java
+++ b/src/main/java/com/DesktopApplicationClientJava/utils/ControllerWiring.java
@@ -1,4 +1,4 @@
-package com.DesktopApplicationClientJava;
+package com.DesktopApplicationClientJava.utils;
 
 import com.DesktopApplicationClientJava.navigation.Navigator;
 import com.DesktopApplicationClientJava.navigation.NavigatorAware;
diff --git a/src/main/java/com/DesktopApplicationClientJava/FieldError.java b/src/main/java/com/DesktopApplicationClientJava/utils/FieldError.java
similarity index 92%
rename from src/main/java/com/DesktopApplicationClientJava/FieldError.java
rename to src/main/java/com/DesktopApplicationClientJava/utils/FieldError.java
index cc9f362..88d3a61 100644
--- a/src/main/java/com/DesktopApplicationClientJava/FieldError.java
+++ b/src/main/java/com/DesktopApplicationClientJava/utils/FieldError.java
@@ -1,4 +1,4 @@
-package com.DesktopApplicationClientJava;
+package com.DesktopApplicationClientJava.utils;
 
 import javafx.scene.control.Label;
 
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
index 679832b..0ab51df 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
@@ -5,6 +5,7 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class EmailValidator extends AbstractValidator {
+    public static final String FIELD_NAME = "Почта";
     public static final int MIN_EMAIL_LENGTH = 5;
     public static final int MAX_EMAIL_LENGTH = 100;
 
@@ -12,11 +13,11 @@ public String isValid(String input) {
         if (ValidatorHelpers.isEmpty(input))
             return ErrorMessages.Required;
         if (ValidatorHelpers.isShorterThan(input, MIN_EMAIL_LENGTH))
-            return ErrorMessages.MinLength("Почта", MIN_EMAIL_LENGTH);
+            return ErrorMessages.MinLength(FIELD_NAME, MIN_EMAIL_LENGTH);
         if (ValidatorHelpers.isLongerThan(input, MAX_EMAIL_LENGTH))
-            return ErrorMessages.MaxLength("Почта", MAX_EMAIL_LENGTH);
+            return ErrorMessages.MaxLength(FIELD_NAME, MAX_EMAIL_LENGTH);
         if (!ValidatorHelpers.includes(input, "@"))
-            return "Неверный формат почты";
+            return ErrorMessages.IncorrectFormat;
         return null;
     }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
index 2c006f0..711eeda 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
@@ -5,13 +5,14 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class FirstNameValidator extends AbstractValidator {
+    public static final String FIELD_NAME = "Имя";
     private static final int MIN_LENGTH = 2;
 
     public String isValid(String input) {
         if (ValidatorHelpers.isEmpty(input))
             return ErrorMessages.Required;
         if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
-            return ErrorMessages.MinLength("Имя", MIN_LENGTH);
+            return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
         return null;
     }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
index 16937f9..01b463e 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
@@ -5,9 +5,14 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class LastNameValidator extends AbstractValidator {
+    public static final String FIELD_NAME = "Фамилия";
+    public static final int MIN_LENGTH = 2;
+
     public String isValid(String input) {
         if (ValidatorHelpers.isEmpty(input))
             return ErrorMessages.Required;
+        if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
+            return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
         return null;
     }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
index 2da054a..ccdb539 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
@@ -5,13 +5,17 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class PasswordValidator extends AbstractValidator {
-    private static final int MIN_LENGTH = 8;
+    public static final String FIELD_NAME = "Пароль";
+    public static final int MIN_LENGTH = 8;
+    public static final int MAX_LENGTH = 64;
 
     public String isValid(String input) {
         if (ValidatorHelpers.isEmpty(input))
             return ErrorMessages.Required;
         if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
-            return ErrorMessages.MinLength("Пароль", MIN_LENGTH);
+            return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
+        if (ValidatorHelpers.isLongerThan(input, MAX_LENGTH))
+            return ErrorMessages.MaxLength(FIELD_NAME, MAX_LENGTH);
         return null;
     }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
index c4d198f..08a91d2 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
@@ -2,6 +2,7 @@
 
 public class ErrorMessages {
     public final static String Required = "Это поле обязательно для заполнения";
+    public final static String IncorrectFormat = "Неверный формат";
 
     public static final String MinLength(String fieldName, int minLength) {
         return fieldName + " не может быть короче, чем " + minLength + " символов";
diff --git a/src/test/java/validation/EmailValidatorTest.java b/src/test/java/validation/EmailValidatorTest.java
new file mode 100644
index 0000000..9193453
--- /dev/null
+++ b/src/test/java/validation/EmailValidatorTest.java
@@ -0,0 +1,46 @@
+package validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+import com.DesktopApplicationClientJava.validation.EmailValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+
+public class EmailValidatorTest {
+    private static final String FIELD_NAME = EmailValidator.FIELD_NAME;
+    private static final EmailValidator emailValidator = new EmailValidator();
+
+    @Test
+    void emptyEmailIsRejected() {
+        assertEquals(ErrorMessages.Required, emailValidator.isValid(""));
+    }
+
+    @Test
+    void blankEmailIsRejected() {
+        assertEquals(ErrorMessages.Required, emailValidator.isValid("   "));
+    }
+
+    @Test
+    void shortEmailIsRejected() {
+        assertEquals(ErrorMessages.MinLength(FIELD_NAME, EmailValidator.MIN_EMAIL_LENGTH),
+                emailValidator.isValid("a@b"));
+    }
+
+    @Test
+    void longEmailIsRejected() {
+        String e = "a".repeat(95) + "@x.com";
+        assertEquals(ErrorMessages.MaxLength(FIELD_NAME, EmailValidator.MAX_EMAIL_LENGTH), emailValidator.isValid(e));
+    }
+
+    @Test
+    void emailWithoutAtIsRejected() {
+        assertEquals(ErrorMessages.IncorrectFormat, emailValidator.isValid("nope.com"));
+    }
+
+    @Test
+    void validEmailIsAccepted() {
+        assertNull(emailValidator.isValid("test@example.com"));
+    }
+}
diff --git a/src/test/java/validation/FirstNameValidatorTest.java b/src/test/java/validation/FirstNameValidatorTest.java
new file mode 100644
index 0000000..d95c63a
--- /dev/null
+++ b/src/test/java/validation/FirstNameValidatorTest.java
@@ -0,0 +1,24 @@
+package validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+import com.DesktopApplicationClientJava.validation.FirstNameValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+
+public class FirstNameValidatorTest {
+    private static final String FIELD_NAME = FirstNameValidator.FIELD_NAME;
+    private static final FirstNameValidator firstNameValidator = new FirstNameValidator();
+
+    @Test
+    void emptyFirstNameIsRejected() {
+        assertEquals(ErrorMessages.Required, firstNameValidator.isValid(""));
+    }
+
+    @Test
+    void validFirstNameIsAccepted() {
+        assertNull(firstNameValidator.isValid("Антон"));
+    }
+}
diff --git a/src/test/java/validation/LastNameValidatorTest.java b/src/test/java/validation/LastNameValidatorTest.java
new file mode 100644
index 0000000..8bf365a
--- /dev/null
+++ b/src/test/java/validation/LastNameValidatorTest.java
@@ -0,0 +1,24 @@
+package validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+import com.DesktopApplicationClientJava.validation.LastNameValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+
+public class LastNameValidatorTest {
+    private static final String FIELD_NAME = LastNameValidator.FIELD_NAME;
+    private static final LastNameValidator lastNameValidator = new LastNameValidator();
+
+    @Test
+    void emptyLastNameIsRejected() {
+        assertEquals(ErrorMessages.Required, lastNameValidator.isValid(""));
+    }
+
+    @Test
+    void validLastNameIsAccepted() {
+        assertNull(lastNameValidator.isValid("Антонов"));
+    }
+}
diff --git a/src/test/java/validation/LoginValidatorTest.java b/src/test/java/validation/LoginValidatorTest.java
deleted file mode 100644
index 7bb0cae..0000000
--- a/src/test/java/validation/LoginValidatorTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package validation;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import org.junit.jupiter.api.Test;
-
-import com.DesktopApplicationClientJava.validation.EmailValidator;
-import com.DesktopApplicationClientJava.validation.PasswordValidator;
-
-class LoginValidatorTest {
-    private static final PasswordValidator passwordValidator = new PasswordValidator();
-    private static final EmailValidator emailValidator = new EmailValidator();
-
-    @Test
-    void emptyEmailIsRejected() {
-        assertEquals("Это поле обязательно для заполнения", emailValidator.isValid(""));
-    }
-
-    @Test
-    void blankEmailIsRejected() {
-        assertEquals("Это поле обязательно для заполнения", emailValidator.isValid("   "));
-    }
-
-    @Test
-    void shortEmailIsRejected() {
-        assertEquals("Почта не может быть короче 5 символов", emailValidator.isValid("a@b"));
-    }
-
-    @Test
-    void longEmailIsRejected() {
-        String e = "a".repeat(95) + "@x.com";
-        assertEquals("Почта не должна быть длиннее 100 символов", emailValidator.isValid(e));
-    }
-
-    @Test
-    void emailWithoutAtIsRejected() {
-        assertEquals("Неверный формат почты", emailValidator.isValid("nope.com"));
-    }
-
-    @Test
-    void validEmailIsAccepted() {
-        assertNull(emailValidator.isValid("test@example.com"));
-    }
-
-    @Test
-    void emptyPasswordIsRejected() {
-        assertEquals("Это поле обязательно для заполнения", passwordValidator.isValid(""));
-    }
-
-    @Test
-    void shortPasswordIsRejected() {
-        assertEquals("Пароль не может быть короче 8 символов", passwordValidator.isValid("short"));
-    }
-
-    @Test
-    void exactlyEightCharPasswordIsAccepted() {
-        assertNull(passwordValidator.isValid("12345678"));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/validation/PasswordValidatorTest.java b/src/test/java/validation/PasswordValidatorTest.java
new file mode 100644
index 0000000..9c3eb36
--- /dev/null
+++ b/src/test/java/validation/PasswordValidatorTest.java
@@ -0,0 +1,30 @@
+package validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+import com.DesktopApplicationClientJava.validation.PasswordValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+
+public class PasswordValidatorTest {
+    private static final String FIELD_NAME = PasswordValidator.FIELD_NAME;
+    private static final PasswordValidator passwordValidator = new PasswordValidator();
+
+    @Test
+    void emptyPasswordIsRejected() {
+        assertEquals(ErrorMessages.Required, passwordValidator.isValid(""));
+    }
+
+    @Test
+    void shortPasswordIsRejected() {
+        assertEquals(ErrorMessages.MinLength(FIELD_NAME, PasswordValidator.MIN_LENGTH),
+                passwordValidator.isValid("short"));
+    }
+
+    @Test
+    void exactlyEightCharPasswordIsAccepted() {
+        assertNull(passwordValidator.isValid("12345678"));
+    }
+}

From 77d93caf1f1733d26b088fd9dc05c96391160536 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sun, 27 Sep 2026 13:42:00 +0300
Subject: [PATCH 10/27] Add third name field

---
 .../DesktopApplicationClientJava/Program.java |  2 +-
 .../controllers/LoginFormController.java      | 14 ++++++++++-
 .../validation/ThirdNameValidator.java        | 17 +++++++++++++
 src/main/resources/fxml/LoginForm.fxml        |  6 +++++
 .../validation/ThirdNameValidatorTest.java    | 24 +++++++++++++++++++
 5 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java
 create mode 100644 src/test/java/validation/ThirdNameValidatorTest.java

diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index eceba3a..88c6315 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -14,7 +14,7 @@
 public class Program extends Application {
     private final Session session = new Session();
     private final static double windowWidthPx = 400.0;
-    private final static double windowHeightPx = 300.0;
+    private final static double windowHeightPx = 400.0;
 
     public static void main(String[] args) {
         launch(args);
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
index 7e6d9d0..5178d58 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
@@ -7,6 +7,7 @@
 import com.DesktopApplicationClientJava.validation.FirstNameValidator;
 import com.DesktopApplicationClientJava.validation.LastNameValidator;
 import com.DesktopApplicationClientJava.validation.PasswordValidator;
+import com.DesktopApplicationClientJava.validation.ThirdNameValidator;
 import com.DesktopApplicationClientJava.validation.utils.Validator;
 
 import javafx.event.ActionEvent;
@@ -29,6 +30,12 @@ public class LoginFormController extends Controller {
     private Label lastNameErrorLabel;
     private FieldError lastNameError;
 
+    @FXML
+    private TextField thirdNameField;
+    @FXML
+    private Label thirdNameErrorLabel;
+    private FieldError thirdNameError;
+
     @FXML
     private TextField emailField;
     @FXML
@@ -48,6 +55,7 @@ public class LoginFormController extends Controller {
     private void initialize() {
         firstNameError = new FieldError(firstNameErrorLabel);
         lastNameError = new FieldError(lastNameErrorLabel);
+        thirdNameError = new FieldError(thirdNameErrorLabel);
         emailError = new FieldError(emailErrorLabel);
         passwordError = new FieldError(passwordErrorLabel);
 
@@ -69,7 +77,7 @@ private void onSubmit(ActionEvent event) {
     }
 
     private boolean isValid() {
-        return isFirstNameValid() & isLastNameValid() & isEmailValid() & isPasswordValid();
+        return isFirstNameValid() & isLastNameValid() & isThirdNameValid() & isEmailValid() & isPasswordValid();
     }
 
     private boolean isFirstNameValid() {
@@ -80,6 +88,10 @@ private boolean isLastNameValid() {
         return isFieldValid(lastNameField, new LastNameValidator(), lastNameError);
     }
 
+    private boolean isThirdNameValid() {
+        return isFieldValid(thirdNameField, new ThirdNameValidator(), thirdNameError);
+    }
+
     private boolean isEmailValid() {
         return isFieldValid(emailField, new EmailValidator(), emailError);
     }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java
new file mode 100644
index 0000000..87f7470
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java
@@ -0,0 +1,17 @@
+package com.DesktopApplicationClientJava.validation;
+
+import com.DesktopApplicationClientJava.validation.utils.AbstractValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
+
+public class ThirdNameValidator extends AbstractValidator {
+    public static final String FIELD_NAME = "Отчество";
+
+    @Override
+    public String isValid(String input) {
+        if (ValidatorHelpers.isEmpty(input))
+            return ErrorMessages.Required;
+        return null;
+    }
+
+}
diff --git a/src/main/resources/fxml/LoginForm.fxml b/src/main/resources/fxml/LoginForm.fxml
index 2dce85d..3f85c14 100644
--- a/src/main/resources/fxml/LoginForm.fxml
+++ b/src/main/resources/fxml/LoginForm.fxml
@@ -28,6 +28,12 @@
         </HBox>
         <Label fx:id="lastNameErrorLabel" styleClass="error-label" managed="false" visible="false"/>
 
+          <HBox spacing="5" alignment="CENTER">
+            <Label text="Отчество" labelFor="$thirdNameField"/>
+            <TextField promptText="Антонович" fx:id="thirdNameField"/>
+        </HBox>
+        <Label fx:id="thirdNameErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+
         <HBox spacing="5" alignment="CENTER">
             <Label text="Почта" labelFor="$emailField"/>
             <TextField promptText="youremail@example.com" fx:id="emailField"/>
diff --git a/src/test/java/validation/ThirdNameValidatorTest.java b/src/test/java/validation/ThirdNameValidatorTest.java
new file mode 100644
index 0000000..46c0e8b
--- /dev/null
+++ b/src/test/java/validation/ThirdNameValidatorTest.java
@@ -0,0 +1,24 @@
+package validation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+import com.DesktopApplicationClientJava.validation.ThirdNameValidator;
+import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+
+public class ThirdNameValidatorTest {
+    private static final String FIELD_NAME = ThirdNameValidator.FIELD_NAME;
+    private static final ThirdNameValidator thirdNameValidator = new ThirdNameValidator();
+
+    @Test
+    void emptyThirdNameIsRejected() {
+        assertEquals(ErrorMessages.Required, thirdNameValidator.isValid(""));
+    }
+
+    @Test
+    void validThirdNameIsAccepted() {
+        assertNull(thirdNameValidator.isValid("Антон"));
+    }
+}

From bb5aca3897a52dd625f380cc950509de367bb88d Mon Sep 17 00:00:00 2001
From: Timur Gauzhaev <gaujaev.to@vbtec.ru>
Date: Sat, 3 Oct 2026 11:18:45 +0300
Subject: [PATCH 11/27] =?UTF-8?q?Fix:=20=D0=92=D1=8B=D0=BD=D0=B5=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B8=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20main=20=D0=B2?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81,=20=D0=B8=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?=
 =?UTF-8?q?=D1=83=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                              | 10 +++++++++
 .idea/compiler.xml                            | 22 +++++++++++++++++++
 .idea/encodings.xml                           |  7 ++++++
 .idea/jarRepositories.xml                     | 20 +++++++++++++++++
 .idea/misc.xml                                | 12 ++++++++++
 .idea/vcs.xml                                 |  6 +++++
 .../DesktopApplicationClientJava/Main.java    |  9 ++++++++
 .../DesktopApplicationClientJava/Program.java |  3 ---
 8 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Main.java

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..da17098
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,10 @@
+# Игнорируемые файлы по умолчанию
+/shelf/
+/workspace.xml
+# HTTP-клиент на основе редактора
+/httpRequests/
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..9960e2c
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Annotation profile for DesktopApplicationClientJava" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.48/lombok-1.18.48.jar" />
+        </processorPath>
+        <module name="DesktopApplicationClientJava" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="DesktopApplicationClientJava" options="-proc:full" />
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..aa00ffa
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..ad7d837
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="26" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Main.java b/src/main/java/com/DesktopApplicationClientJava/Main.java
new file mode 100644
index 0000000..3a23dda
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Main.java
@@ -0,0 +1,9 @@
+package com.DesktopApplicationClientJava;
+
+import javafx.application.Application;
+
+public class Main {
+    public static void main(String[] args) {
+        Application.launch(Program.class, args);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index 88c6315..3209714 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -16,9 +16,6 @@ public class Program extends Application {
     private final static double windowWidthPx = 400.0;
     private final static double windowHeightPx = 400.0;
 
-    public static void main(String[] args) {
-        launch(args);
-    }
 
     @Override
     public void start(Stage stage) throws IOException {

From 52ffdfc88942d07f8788ebc7e952286cf51a98ca Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 11:23:15 +0300
Subject: [PATCH 12/27] fix: add .idea to .gitignore

---
 .gitignore                |  1 +
 .idea/.gitignore          | 10 ----------
 .idea/compiler.xml        | 22 ----------------------
 .idea/encodings.xml       |  7 -------
 .idea/jarRepositories.xml | 20 --------------------
 .idea/misc.xml            | 12 ------------
 .idea/vcs.xml             |  6 ------
 7 files changed, 1 insertion(+), 77 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index ec64367..16714c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ buildNumber.properties
 .classpath
 
 .vscode
+.idea
 
 tools/scenicview/
 
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index da17098..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Игнорируемые файлы по умолчанию
-/shelf/
-/workspace.xml
-# HTTP-клиент на основе редактора
-/httpRequests/
-# Ignored default folder with query files
-/queries/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 9960e2c..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Annotation profile for DesktopApplicationClientJava" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="false">
-          <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.48/lombok-1.18.48.jar" />
-        </processorPath>
-        <module name="DesktopApplicationClientJava" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="DesktopApplicationClientJava" options="-proc:full" />
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index aa00ffa..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 712ab9d..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index ad7d837..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="26" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From 829ea07a3d2f75be8b638ee03f49298924d9af90 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 11:51:34 +0300
Subject: [PATCH 13/27] docs: guide to pull

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index accc46e..c6f75b3 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
-# DesktopApplicationClientJava
\ No newline at end of file
+# DesktopApplicationClientJava
+
+```bash
+git pull --rebase
+```
\ No newline at end of file

From 80e9c09ca01dccdf61e812735dc527ba64607bb5 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 11:52:02 +0300
Subject: [PATCH 14/27] chore: format fxml

---
 src/main/resources/fxml/LoginForm.fxml | 45 +++++++++++++-------------
 src/main/resources/fxml/Search.fxml    |  5 +--
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/fxml/LoginForm.fxml b/src/main/resources/fxml/LoginForm.fxml
index 3f85c14..34fbb3c 100644
--- a/src/main/resources/fxml/LoginForm.fxml
+++ b/src/main/resources/fxml/LoginForm.fxml
@@ -8,44 +8,45 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.geometry.Insets?>
 
-<VBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root" fx:controller="com.DesktopApplicationClientJava.controllers.LoginFormController">
+<VBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root"
+    fx:controller="com.DesktopApplicationClientJava.controllers.LoginFormController">
     <VBox spacing="5">
         <padding>
-            <Insets top="10" right="10" bottom="10" left="10"/>
+            <Insets top="10" right="10" bottom="10" left="10" />
         </padding>
 
-        <Label text="Госхрон" styleClass="h1"/>
+        <Label text="Госхрон" styleClass="h1" />
 
-         <HBox spacing="5" alignment="CENTER">
-            <Label text="Имя" labelFor="$firstNameField"/>
-            <TextField promptText="Антон" fx:id="firstNameField"/>
+        <HBox spacing="5" alignment="CENTER">
+            <Label text="Имя" labelFor="$firstNameField" />
+            <TextField promptText="Антон" fx:id="firstNameField" />
         </HBox>
-        <Label fx:id="firstNameErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+        <Label fx:id="firstNameErrorLabel" styleClass="error-label" managed="false" visible="false" />
 
-         <HBox spacing="5" alignment="CENTER">
-            <Label text="Фамилия" labelFor="$lastNameField"/>
-            <TextField promptText="Антонов" fx:id="lastNameField"/>
+        <HBox spacing="5" alignment="CENTER">
+            <Label text="Фамилия" labelFor="$lastNameField" />
+            <TextField promptText="Антонов" fx:id="lastNameField" />
         </HBox>
-        <Label fx:id="lastNameErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+        <Label fx:id="lastNameErrorLabel" styleClass="error-label" managed="false" visible="false" />
 
-          <HBox spacing="5" alignment="CENTER">
-            <Label text="Отчество" labelFor="$thirdNameField"/>
-            <TextField promptText="Антонович" fx:id="thirdNameField"/>
+        <HBox spacing="5" alignment="CENTER">
+            <Label text="Отчество" labelFor="$thirdNameField" />
+            <TextField promptText="Антонович" fx:id="thirdNameField" />
         </HBox>
-        <Label fx:id="thirdNameErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+        <Label fx:id="thirdNameErrorLabel" styleClass="error-label" managed="false" visible="false" />
 
         <HBox spacing="5" alignment="CENTER">
-            <Label text="Почта" labelFor="$emailField"/>
-            <TextField promptText="youremail@example.com" fx:id="emailField"/>
+            <Label text="Почта" labelFor="$emailField" />
+            <TextField promptText="youremail@example.com" fx:id="emailField" />
         </HBox>
-        <Label fx:id="emailErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+        <Label fx:id="emailErrorLabel" styleClass="error-label" managed="false" visible="false" />
 
         <HBox spacing="5" alignment="CENTER">
-            <Label text="Пароль" labelFor="$passwordField"/>
-            <PasswordField fx:id="passwordField"/>
+            <Label text="Пароль" labelFor="$passwordField" />
+            <PasswordField fx:id="passwordField" />
         </HBox>
-        <Label fx:id="passwordErrorLabel" styleClass="error-label" managed="false" visible="false"/>
+        <Label fx:id="passwordErrorLabel" styleClass="error-label" managed="false" visible="false" />
 
-        <Button text="Войти" fx:id="submitButton" onAction="#onSubmit"/>
+        <Button text="Войти" fx:id="submitButton" onAction="#onSubmit" />
     </VBox>
 </VBox>
\ No newline at end of file
diff --git a/src/main/resources/fxml/Search.fxml b/src/main/resources/fxml/Search.fxml
index ba613f7..b6b8878 100644
--- a/src/main/resources/fxml/Search.fxml
+++ b/src/main/resources/fxml/Search.fxml
@@ -3,6 +3,7 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root" fx:controller="com.DesktopApplicationClientJava.controllers.SearchController">
-    <Label text="Welcome!" fx:id="welcomeLabel" styleClass="h1"/>
+<VBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root"
+    fx:controller="com.DesktopApplicationClientJava.controllers.SearchController">
+    <Label text="Welcome!" fx:id="welcomeLabel" styleClass="h1" />
 </VBox>
\ No newline at end of file

From 337ec5e3d98f55ec9d0732882ddcacafac64f28b Mon Sep 17 00:00:00 2001
From: Daniil <kazancevdanila2015@yandex.ru>
Date: Sat, 3 Oct 2026 12:00:52 +0300
Subject: [PATCH 15/27] chore: add validation, forms and bootstrap env

---
 pom.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5628236..943f93c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,34 @@
             <version>1.18.48</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.dlsc.formsfx</groupId>
+            <artifactId>formsfx-core</artifactId>
+            <version>11.6.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.synedra</groupId>
+            <artifactId>validatorfx</artifactId>
+            <version>0.6.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kordamp.bootstrapfx</groupId>
+            <artifactId>bootstrapfx-core</artifactId>
+            <version>0.4.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

From 9d881b95b50af99d0fc583bca21de3e55e9512c2 Mon Sep 17 00:00:00 2001
From: Timur Gauzhaev <gaujaev.to@vbtec.ru>
Date: Sat, 3 Oct 2026 12:02:25 +0300
Subject: [PATCH 16/27] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B8=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B2=D0=B0=D0=BB=D0=B5=D0=BD=20=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=83=D0=BB=D1=8C=20Api=20=D1=81=20Dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  12 +
 .../Api/ApiClient.java                        | 535 ++++++++++++++++++
 .../Api/ApiConfig.java                        |   4 +
 .../Api/ApiException.java                     |  20 +
 .../Api/Dto/error/ErrorResponse.java          |   4 +
 .../Dto/request/Admin/RegisterRequest.java    |  10 +
 .../Dto/request/Admin/UpdateUserRequest.java  |  11 +
 .../Dto/request/Admin/UserFilterRequest.java  |  15 +
 .../Api/Dto/request/Auth/LoginRequest.java    |   4 +
 .../Dto/request/Auth/RefreshTokenRequest.java |   4 +
 .../Resource/CreateResourceRequest.java       |   6 +
 .../Resource/ResourceFilterRequest.java       |  10 +
 .../Resource/UpdateResourceRequest.java       |   6 +
 .../Api/Dto/response/FileDto.java             |  10 +
 .../Dto/response/Jwt/JwtTokenResponse.java    |   8 +
 .../Api/Dto/response/ResourceDto.java         |  14 +
 .../Api/Dto/response/StoredFile.java          |  17 +
 .../Api/Dto/response/UserDto.java             |  17 +
 .../entities/Role.java                        |   7 +
 .../services/AuthService.java                 |  11 +
 .../services/FileService.java                 |   4 +
 .../services/ResourceService.java             |   4 +
 .../services/UsersService.java                |   4 +
 23 files changed, 737 insertions(+)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/entities/Role.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/services/FileService.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/services/UsersService.java

diff --git a/pom.xml b/pom.xml
index 943f93c..760ac41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,18 @@
     <repositories></repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.17.0</version>
+        </dependency>
+
+        <!-- 2. Модуль Jackson для поддержки дат (LocalDateTime) -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.17.0</version>
+        </dependency>
         <dependency>
             <groupId>org.testfx</groupId>
             <artifactId>openjfx-monocle</artifactId>
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
new file mode 100644
index 0000000..814c6d1
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
@@ -0,0 +1,535 @@
+package com.DesktopApplicationClientJava.Api;
+
+import com.DesktopApplicationClientJava.Api.ApiException;
+import com.DesktopApplicationClientJava.Api.Dto.request.Admin.RegisterRequest;
+import com.DesktopApplicationClientJava.Api.Dto.request.Admin.UpdateUserRequest;
+import com.DesktopApplicationClientJava.Api.Dto.request.Admin.UserFilterRequest;
+import com.DesktopApplicationClientJava.Api.Dto.request.Auth.LoginRequest;
+import com.DesktopApplicationClientJava.Api.Dto.request.Auth.RefreshTokenRequest;
+import com.DesktopApplicationClientJava.Api.Dto.request.Resource.CreateResourceRequest;
+import com.DesktopApplicationClientJava.Api.Dto.request.Resource.ResourceFilterRequest;
+import com.DesktopApplicationClientJava.Api.Dto.request.Resource.UpdateResourceRequest;
+import com.DesktopApplicationClientJava.Api.Dto.response.FileDto;
+import com.DesktopApplicationClientJava.Api.Dto.response.Jwt.JwtTokenResponse;
+import com.DesktopApplicationClientJava.Api.Dto.response.ResourceDto;
+import com.DesktopApplicationClientJava.Api.Dto.response.UserDto;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import dto.Error.ErrorResponse;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+
+public class ApiClient {
+    private final HttpClient httpClient;
+    private final ObjectMapper objectMapper;
+    private final String baseUrl;
+
+    private String accessToken;
+    private String refreshToken;
+
+    public ApiClient(String baseUrl) {
+        this.baseUrl = baseUrl;
+        this.httpClient = HttpClient.newHttpClient();
+        this.objectMapper = new ObjectMapper();
+        this.objectMapper.registerModule(new JavaTimeModule());
+    }
+
+    // Вход в систему
+    public JwtTokenResponse login(LoginRequest request) throws IOException, InterruptedException {
+        String jsonBody = objectMapper.writeValueAsString(request);
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/auth/login"))
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        JwtTokenResponse tokenResponse = parseResponse(response, JwtTokenResponse.class);
+        this.accessToken = tokenResponse.accessToken();
+        this.refreshToken = tokenResponse.refreshToken();
+        return tokenResponse;
+    }
+
+    public JwtTokenResponse refresh() throws IOException, InterruptedException {
+        refreshInternal();
+        return new JwtTokenResponse(accessToken, refreshToken);
+    }
+
+    private void refreshInternal() throws IOException, InterruptedException {
+        if (refreshToken == null) {
+            throw new ApiException(new ErrorResponse("Ошибка: нет refresh токена", 401));
+        }
+
+        String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/auth/refresh"))
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+
+        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        if (response.statusCode() >= 400) {
+            throw new ApiException(new ErrorResponse(
+                    "Refresh failed: " + response.body(), response.statusCode()));
+        }
+
+        JwtTokenResponse tokens = objectMapper.readValue(response.body(), JwtTokenResponse.class);
+        this.accessToken = tokens.accessToken();
+        this.refreshToken = tokens.refreshToken();
+    }
+
+    // Выход из системы
+    public void logout() throws IOException, InterruptedException {
+        if (accessToken == null) {
+            return;
+        }
+        String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/auth/logout"))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        this.accessToken = null;
+        this.refreshToken = null;
+    }
+
+    // Получение информации пользователя о себе
+    public UserDto getMe() throws IOException, InterruptedException {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/user/me"))
+                .header("Authorization", "Bearer " + accessToken)
+                .GET()
+                .build();
+
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, UserDto.class);
+    }
+
+    // Работа с Ресурсом(Документом)
+    public ResourceDto createResource(CreateResourceRequest request) throws IOException, InterruptedException {
+        String jsonBody = objectMapper.writeValueAsString(request);
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/resource"))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, ResourceDto.class);
+    }
+
+    // Поиск ресурса по Id
+    public ResourceDto findResourceById(UUID id) throws IOException, InterruptedException {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/resource/" + id))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .GET()
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, ResourceDto.class);
+    }
+
+    // Поиск ресурса по параметрам
+    public List<ResourceDto> findResourcesByFilters(ResourceFilterRequest filter,
+                                                    Long offset,
+                                                    Long count,
+                                                    String sortBy,
+                                                    String sortDir) throws IOException, InterruptedException {
+        List<String> params= new ArrayList<>();
+        if (filter != null) {
+            if (filter.title() != null && !filter.title().isBlank())
+                params.add("title=" + encode(filter.title()));
+            if (filter.description() != null && !filter.description().isBlank())
+                params.add("description=" + encode(filter.description()));
+            // createdAt/updatedAt пока не отправляем — при необходимости добавим формат
+        }
+        if (offset != null) params.add("offset=" + offset);
+        if (count  != null) params.add("count="  + count);
+        if (sortBy  != null)  params.add("sortBy="  + sortBy);
+        if (sortDir != null) params.add("sortDir=" + sortDir);
+        String url = baseUrl + "/api/v1/resource"
+                + (params.isEmpty() ? "" : "?" + String.join("&", params));
+
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(url))
+                .header("Authorization", "Bearer " + accessToken)
+                .GET()
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+
+        ResourceDto[] arr = objectMapper.readValue(response.body(), ResourceDto[].class);
+        return Arrays.asList(arr);
+    }
+
+    // Обновление ресурса
+    public ResourceDto updateResource(UUID uuid, UpdateResourceRequest request) throws IOException, InterruptedException {
+        String jsonBody = objectMapper.writeValueAsString(request);
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, ResourceDto.class);
+    }
+
+    // Удаление ресурса
+    public void deleteResource(UUID uuid) throws IOException, InterruptedException {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .DELETE()
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+    }
+    // Создание пользователя
+    public UserDto createUser(RegisterRequest request) throws IOException, InterruptedException {
+        String jsonBody = objectMapper.writeValueAsString(request);
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/admin"))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, UserDto.class);
+    }
+
+    // Поиск пользователя по ID
+    public UserDto getUserById(UUID uuid) throws IOException, InterruptedException {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .GET()
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, UserDto.class);
+    }
+
+    // Поиск пользователя по параметрам
+    public List<UserDto> getUsersByFilters(UserFilterRequest filter,
+                                           Long offset,
+                                           Long count,
+                                           String sortBy,
+                                           String sortDir
+    ) throws IOException, InterruptedException {
+        List<String> params = new ArrayList<>();
+        if (filter != null) {
+            if (filter.email() != null && !filter.email().isBlank())
+                params.add("email=" + encode(filter.email()));
+            if (filter.firstName() != null && !filter.firstName().isBlank())
+                params.add("firstName=" + encode(filter.firstName()));
+            if (filter.lastName() != null && !filter.lastName().isBlank())
+                params.add("lastName=" + encode(filter.lastName()));
+            if (filter.role() != null)
+                params.add("role=" + encode(filter.role().name()));
+            if (filter.enabled() != null)
+                params.add("enabled=" + filter.enabled());
+
+        }
+
+        if (offset != null) params.add("offset=" + offset);
+        if (count != null) params.add("count=" + count);
+        if (sortBy != null) params.add("sortBy=" + encode(sortBy));
+        if (sortDir != null) params.add("sortDir=" + encode(sortDir));
+
+        String url = baseUrl + "/api/v1/admin"
+                + (params.isEmpty() ? "" : "?" + String.join("&", params));
+
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(url))
+                .header("Authorization", "Bearer " + accessToken)
+                .GET()
+                .build();
+
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        UserDto[] users = objectMapper.readValue(response.body(), UserDto[].class);
+        return Arrays.asList(users);
+    }
+
+    // Обновление пользователя
+    public UserDto updateUser(UUID uuid, UpdateUserRequest request) throws IOException, InterruptedException {
+        String jsonBody = objectMapper.writeValueAsString(request);
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, UserDto.class);
+    }
+
+    // Удаление пользователя
+    public void deleteUser(UUID uuid) throws IOException, InterruptedException {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+                .header("Content-Type", "application/json")
+                .header("Authorization", "Bearer " + accessToken)
+                .DELETE()
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+    }
+
+
+    public FileDto uploadFile(UUID resourceUuid, Path filePath) throws IOException, InterruptedException {
+        String boundary = "----JavaPksBoundary" + System.currentTimeMillis();
+        byte[] fileBytes = Files.readAllBytes(filePath);
+        String filename = filePath.getFileName().toString();
+        String contentType = Optional
+                .ofNullable(Files.probeContentType(filePath))
+                .orElse("application/octet-stream");
+
+        ByteArrayOutputStream body = new ByteArrayOutputStream();
+
+        body.write(("--" + boundary + "\r\n").getBytes(StandardCharsets.UTF_8));
+        body.write(("Content-Disposition: form-data; name=\"file\"; filename=\""
+                + filename + "\"\r\n").getBytes(StandardCharsets.UTF_8));
+        body.write(("Content-Type: " + contentType + "\r\n\r\n")
+                .getBytes(StandardCharsets.UTF_8));
+        body.write(fileBytes);
+        body.write(("\r\n--" + boundary + "--\r\n").getBytes(StandardCharsets.UTF_8));
+
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid + "/file"))
+                .header("Content-Type", "multipart/form-data; boundary=" + boundary)
+                .header("Authorization", "Bearer " + accessToken)
+                .POST(HttpRequest.BodyPublishers.ofByteArray(body.toByteArray()))
+                .build();
+
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+        return parseResponse(response, FileDto.class);
+    }
+
+    public Path downloadFile(UUID resourceUuid, UUID fileUuid, Path destinationDir)
+            throws IOException, InterruptedException {
+
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
+                        + "/file/" + fileUuid))
+                .header("Authorization", "Bearer " + accessToken)
+                .GET()
+                .build();
+
+        HttpResponse<InputStream> response = executeWithRetry(
+                httpRequest, HttpResponse.BodyHandlers.ofInputStream());
+
+        if (response.statusCode() >= 400) {
+            String body = new String(response.body().readAllBytes(), StandardCharsets.UTF_8);
+            response.body().close();
+            try {
+                ErrorResponse error = objectMapper.readValue(body, ErrorResponse.class);
+                throw new ApiException(error);
+            } catch (ApiException e) {
+                throw e;
+            } catch (Exception parseFail) {
+                throw new ApiException(new ErrorResponse(
+                        "Ошибка сервера: " + body, response.statusCode()));
+            }
+        }
+
+        String filename = parseFilename(
+                response.headers().firstValue("Content-Disposition").orElse(null));
+        if (filename == null || filename.isBlank()) {
+            filename = fileUuid.toString();
+        }
+
+        Files.createDirectories(destinationDir);
+        Path target = destinationDir.resolve(filename);
+
+        try (InputStream in = response.body()) {
+            Files.copy(in, target, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+        }
+        return target;
+    }
+
+    public void deleteFile(UUID resourceUuid, UUID fileUuid)
+            throws IOException, InterruptedException {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
+                        + "/file/" + fileUuid))
+                .header("Authorization", "Bearer " + accessToken)
+                .DELETE()
+                .build();
+        HttpResponse<String> response = send(httpRequest);
+        checkError(response);
+    }
+
+    private static String parseFilename(String cd) {
+        if (cd == null) return null;
+
+        int starIdx = cd.indexOf("filename*=");
+        if (starIdx >= 0) {
+            String val = cd.substring(starIdx + "filename*=".length()).trim();
+            int semi = val.indexOf(';');
+            if (semi >= 0) val = val.substring(0, semi).trim();
+            int encIdx = val.indexOf("''");
+            if (encIdx >= 0) {
+                String encoded = val.substring(encIdx + 2);
+                return URLDecoder.decode(encoded, StandardCharsets.UTF_8);
+            }
+        }
+
+        int idx = cd.indexOf("filename=");
+        if (idx >= 0) {
+            String val = cd.substring(idx + "filename=".length()).trim();
+            if (val.startsWith("\"")) {
+                int end = val.indexOf('"', 1);
+                if (end > 0) return val.substring(1, end);
+            } else {
+                int semi = val.indexOf(';');
+                if (semi >= 0) val = val.substring(0, semi);
+                return val.trim();
+            }
+        }
+        return null;
+    }
+
+    // Выгрузка данных (пользователей, документов и их файлов)
+    public byte[] exportUsers() throws IOException, InterruptedException {
+        return downloadBinary("/api/v1/admin/users/export");
+    }
+
+    public byte[] exportResources() throws IOException, InterruptedException {
+        return downloadBinary("/api/v1/admin/resource/export");
+    }
+
+    public byte[] exportResourceFiles(UUID resourceId) throws IOException, InterruptedException {
+        return downloadBinary("/api/v1/admin/resource/" + resourceId + "/files/export");
+    }
+
+
+    private byte[] downloadBinary(String path) throws IOException, InterruptedException {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + path))
+                .header("Authorization", "Bearer " + accessToken)
+                .GET()
+                .build();
+
+        HttpResponse<byte[]> response = executeWithRetry(
+                httpRequest, HttpResponse.BodyHandlers.ofByteArray());
+
+        if (response.statusCode() >= 400) {
+            String body = new String(response.body(), StandardCharsets.UTF_8);
+            try {
+                ErrorResponse error = objectMapper.readValue(body, ErrorResponse.class);
+                throw new ApiException(error);
+            } catch (ApiException e) {
+                throw e;
+            } catch (Exception parseFail) {
+                throw new ApiException(new ErrorResponse(
+                        "Ошибка сервера: " + body, response.statusCode()));
+            }
+        }
+        return response.body();
+    }
+
+
+    private HttpResponse<String> send(HttpRequest request) throws IOException, InterruptedException {
+        return executeWithRetry(request, HttpResponse.BodyHandlers.ofString());
+    }
+
+    // Проверка ошибок сервера
+    private void checkError(HttpResponse<String> response) {
+        if (response.statusCode() < 400) return;
+        try {
+            ErrorResponse error = objectMapper.readValue(response.body(), ErrorResponse.class);
+            throw new ApiException(error);
+        } catch (ApiException e) {
+            throw e;
+        } catch (Exception parseFail) {
+            throw new ApiException(new ErrorResponse("Ошибка сервера: " + response.body(), response.statusCode()));
+        }
+    }
+
+    //Парсер ответа
+    private <T> T parseResponse(HttpResponse<String> response, Class<T> clazz) throws IOException {
+        if (response.body() == null || response.body().isBlank()) {
+            return null;
+        }
+        return objectMapper.readValue(response.body(), clazz);
+    }
+
+    private <T> HttpResponse<T> executeWithRetry(HttpRequest request,
+                                                 HttpResponse.BodyHandler<T> handler)
+            throws IOException, InterruptedException {
+
+        HttpResponse<T> response = httpClient.send(request, handler);
+
+        if (response.statusCode() != 401) return response;
+
+        if (request.uri().getPath().startsWith("/api/v1/auth/")) return response;
+
+        if (refreshToken == null) return response;
+
+        try {
+            refreshInternal();
+        } catch (Exception e) {
+            // refresh не удался — отдаём оригинальный 401, вызывающий код разберётся
+            return response;
+        }
+
+        // повторяем исходный запрос с новым access-токеном
+        HttpRequest retried = HttpRequest.newBuilder(
+                        request,
+                        (name, value) -> !name.equalsIgnoreCase("Authorization"))
+                .header("Authorization", "Bearer " + accessToken)
+                .build();
+
+
+        return httpClient.send(retried, handler);
+    }
+
+    private static String encode(String value) {
+        return URLEncoder.encode(value, StandardCharsets.UTF_8);
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+    public ObjectMapper getObjectMapper() {
+        return objectMapper;
+    }
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
new file mode 100644
index 0000000..099c4a5
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
@@ -0,0 +1,4 @@
+package com.DesktopApplicationClientJava.Api;
+
+public class ApiConfig {
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
new file mode 100644
index 0000000..3175964
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
@@ -0,0 +1,20 @@
+package com.DesktopApplicationClientJava.Api;
+
+import dto.Error.ErrorResponse;
+
+public class ApiException extends RuntimeException {
+    private final ErrorResponse errorResponse;
+
+    public ApiException(ErrorResponse errorResponse) {
+        super(errorResponse.message());
+        this.errorResponse = errorResponse;
+    }
+
+    public ErrorResponse getErrorResponse() {
+        return errorResponse;
+    }
+
+    public int getStatus() {
+        return errorResponse.status();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
new file mode 100644
index 0000000..58fc4f0
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
@@ -0,0 +1,4 @@
+package com.DesktopApplicationClientJava.Api.Dto.error;
+
+public class ErrorResponse {
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java
new file mode 100644
index 0000000..e5bbecf
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java
@@ -0,0 +1,10 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Admin;
+import com.DesktopApplicationClientJava.entities.Role;
+
+public record RegisterRequest(
+        String email,
+        String password,
+        Role role,       // "USER", "MODER" или "ADMIN"
+        String firstname,
+        String lastname
+) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java
new file mode 100644
index 0000000..f6f9362
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java
@@ -0,0 +1,11 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Admin;
+
+import com.DesktopApplicationClientJava.entities.Role;
+
+public record UpdateUserRequest(
+        String email,
+        Boolean enabled,
+        Role role,
+        String firstname,
+        String lastname
+) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java
new file mode 100644
index 0000000..6fa92cc
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java
@@ -0,0 +1,15 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Admin;
+
+import com.DesktopApplicationClientJava.entities.Role;
+
+import java.time.LocalDateTime;
+
+public record UserFilterRequest(
+        String email,
+        Role role,
+        String firstName,
+        String lastName,
+        Boolean enabled,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt) {
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java
new file mode 100644
index 0000000..379b485
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java
@@ -0,0 +1,4 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Auth;
+
+public record LoginRequest(String email, String password) {
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java
new file mode 100644
index 0000000..d6638b2
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java
@@ -0,0 +1,4 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Auth;
+
+public record RefreshTokenRequest(String refreshToken) {
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java
new file mode 100644
index 0000000..46a816d
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java
@@ -0,0 +1,6 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Resource;
+
+public record CreateResourceRequest(
+        String title,
+        String description
+) {}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java
new file mode 100644
index 0000000..05ff9c1
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java
@@ -0,0 +1,10 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Resource;
+
+import java.time.LocalDateTime;
+
+public record ResourceFilterRequest(
+        String title,
+        String description,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt
+) {}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java
new file mode 100644
index 0000000..6fc171f
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java
@@ -0,0 +1,6 @@
+package com.DesktopApplicationClientJava.Api.Dto.request.Resource;
+
+public record UpdateResourceRequest(
+        String title,
+        String description
+) {}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java
new file mode 100644
index 0000000..0e208c7
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java
@@ -0,0 +1,10 @@
+package com.DesktopApplicationClientJava.Api.Dto.response;
+
+import java.util.UUID;
+
+public record FileDto(
+        UUID uuid,
+        String name,
+        String contentType,
+        Long size
+) {}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java
new file mode 100644
index 0000000..8e29abd
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java
@@ -0,0 +1,8 @@
+package com.DesktopApplicationClientJava.Api.Dto.response.Jwt;
+
+public record JwtTokenResponse(
+        String accessToken,
+        String refreshToken
+) {
+}
+
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java
new file mode 100644
index 0000000..6258659
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java
@@ -0,0 +1,14 @@
+package com.DesktopApplicationClientJava.Api.Dto.response;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public record ResourceDto(
+        UUID uuid,
+        String title,
+        String description,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt,
+        List<FileDto> files
+) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java
new file mode 100644
index 0000000..cad3f55
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java
@@ -0,0 +1,17 @@
+package com.DesktopApplicationClientJava.Api.Dto.response;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public record StoredFile(
+        InputStream content,
+        String contentType,
+        long size) implements AutoCloseable {
+
+    @Override
+    public void close() throws IOException {
+        if (content != null) {
+            content.close();
+        }
+    }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java
new file mode 100644
index 0000000..a06ec43
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java
@@ -0,0 +1,17 @@
+package com.DesktopApplicationClientJava.Api.Dto.response;
+
+import com.DesktopApplicationClientJava.entities.Role;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record UserDto(
+        UUID uuid,
+        String email,
+        Role role,
+        String firstName,
+        String lastName,
+        Boolean enabled,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt) {
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/entities/Role.java b/src/main/java/com/DesktopApplicationClientJava/entities/Role.java
new file mode 100644
index 0000000..bea3448
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/entities/Role.java
@@ -0,0 +1,7 @@
+package com.DesktopApplicationClientJava.entities;
+
+public enum Role {
+    USER,
+    MODER,
+    ADMIN
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java b/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
new file mode 100644
index 0000000..697da9d
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
@@ -0,0 +1,11 @@
+package dto.Error;
+
+public record ErrorResponse(
+        String message,
+        int status,
+        long timestamp
+) {
+    public ErrorResponse(String message, int status) {
+        this(message, status, System.currentTimeMillis());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/FileService.java b/src/main/java/com/DesktopApplicationClientJava/services/FileService.java
new file mode 100644
index 0000000..655050f
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/services/FileService.java
@@ -0,0 +1,4 @@
+package com.DesktopApplicationClientJava.services;
+
+public class FileService {
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java b/src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java
new file mode 100644
index 0000000..1b3a9cb
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java
@@ -0,0 +1,4 @@
+package com.DesktopApplicationClientJava.services;
+
+public class ResourceService {
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/UsersService.java b/src/main/java/com/DesktopApplicationClientJava/services/UsersService.java
new file mode 100644
index 0000000..8c3d28f
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/services/UsersService.java
@@ -0,0 +1,4 @@
+package com.DesktopApplicationClientJava.services;
+
+public class UsersService {
+}

From 072904820052917bf03356b32ec3bed5e6490506 Mon Sep 17 00:00:00 2001
From: Timur Gauzhaev <gaujaev.to@vbtec.ru>
Date: Sat, 3 Oct 2026 12:05:08 +0300
Subject: [PATCH 17/27] =?UTF-8?q?Fix:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D1=85=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/DesktopApplicationClientJava/Api/ApiClient.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
index 814c6d1..8f25f4f 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
@@ -1,6 +1,5 @@
 package com.DesktopApplicationClientJava.Api;
 
-import com.DesktopApplicationClientJava.Api.ApiException;
 import com.DesktopApplicationClientJava.Api.Dto.request.Admin.RegisterRequest;
 import com.DesktopApplicationClientJava.Api.Dto.request.Admin.UpdateUserRequest;
 import com.DesktopApplicationClientJava.Api.Dto.request.Admin.UserFilterRequest;

From ff1b3461400a92dbf479baff8102e3bb91ad1e54 Mon Sep 17 00:00:00 2001
From: Timur Gauzhaev <gaujaev.to@vbtec.ru>
Date: Sat, 3 Oct 2026 12:11:30 +0300
Subject: [PATCH 18/27] =?UTF-8?q?Fix:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20Respon?=
 =?UTF-8?q?se?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesktopApplicationClientJava/Api/ApiConfig.java  |  1 +
 .../Api/Dto/error/ErrorResponse.java                 |  9 ++++++++-
 .../services/AuthService.java                        | 12 +++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
index 099c4a5..a0a5e54 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
@@ -1,4 +1,5 @@
 package com.DesktopApplicationClientJava.Api;
 
 public class ApiConfig {
+
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
index 58fc4f0..fa2b16b 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
@@ -1,4 +1,11 @@
 package com.DesktopApplicationClientJava.Api.Dto.error;
 
-public class ErrorResponse {
+public record ErrorResponse(
+        String message,
+        int status,
+        long timestamp
+) {
+    public ErrorResponse(String message, int status) {
+        this(message, status, System.currentTimeMillis());
+    }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java b/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
index 697da9d..51e83c9 100644
--- a/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
+++ b/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
@@ -1,11 +1,5 @@
-package dto.Error;
+package com.DesktopApplicationClientJava.services;
+
+public class AuthService {
 
-public record ErrorResponse(
-        String message,
-        int status,
-        long timestamp
-) {
-    public ErrorResponse(String message, int status) {
-        this(message, status, System.currentTimeMillis());
-    }
 }
\ No newline at end of file

From e983720dd5de50db483a67afdc20d79905b98dc9 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 14:44:55 +0300
Subject: [PATCH 19/27] fix: wrong import of ErrorRespnse

---
 .../Api/ApiClient.java                        | 1018 +++++++++--------
 .../Api/ApiException.java                     |   24 +-
 2 files changed, 529 insertions(+), 513 deletions(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
index 8f25f4f..b05f8e6 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
@@ -1,5 +1,6 @@
 package com.DesktopApplicationClientJava.Api;
 
+import com.DesktopApplicationClientJava.Api.Dto.error.ErrorResponse;
 import com.DesktopApplicationClientJava.Api.Dto.request.Admin.RegisterRequest;
 import com.DesktopApplicationClientJava.Api.Dto.request.Admin.UpdateUserRequest;
 import com.DesktopApplicationClientJava.Api.Dto.request.Admin.UserFilterRequest;
@@ -14,7 +15,6 @@
 import com.DesktopApplicationClientJava.Api.Dto.response.UserDto;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import dto.Error.ErrorResponse;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -31,504 +31,520 @@
 import java.util.*;
 
 public class ApiClient {
-    private final HttpClient httpClient;
-    private final ObjectMapper objectMapper;
-    private final String baseUrl;
-
-    private String accessToken;
-    private String refreshToken;
-
-    public ApiClient(String baseUrl) {
-        this.baseUrl = baseUrl;
-        this.httpClient = HttpClient.newHttpClient();
-        this.objectMapper = new ObjectMapper();
-        this.objectMapper.registerModule(new JavaTimeModule());
-    }
-
-    // Вход в систему
-    public JwtTokenResponse login(LoginRequest request) throws IOException, InterruptedException {
-        String jsonBody = objectMapper.writeValueAsString(request);
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/auth/login"))
-                .header("Content-Type", "application/json")
-                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        JwtTokenResponse tokenResponse = parseResponse(response, JwtTokenResponse.class);
-        this.accessToken = tokenResponse.accessToken();
-        this.refreshToken = tokenResponse.refreshToken();
-        return tokenResponse;
-    }
-
-    public JwtTokenResponse refresh() throws IOException, InterruptedException {
-        refreshInternal();
-        return new JwtTokenResponse(accessToken, refreshToken);
-    }
-
-    private void refreshInternal() throws IOException, InterruptedException {
-        if (refreshToken == null) {
-            throw new ApiException(new ErrorResponse("Ошибка: нет refresh токена", 401));
-        }
-
-        String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/auth/refresh"))
-                .header("Content-Type", "application/json")
-                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-        if (response.statusCode() >= 400) {
-            throw new ApiException(new ErrorResponse(
-                    "Refresh failed: " + response.body(), response.statusCode()));
-        }
-
-        JwtTokenResponse tokens = objectMapper.readValue(response.body(), JwtTokenResponse.class);
-        this.accessToken = tokens.accessToken();
-        this.refreshToken = tokens.refreshToken();
-    }
-
-    // Выход из системы
-    public void logout() throws IOException, InterruptedException {
-        if (accessToken == null) {
-            return;
-        }
-        String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/auth/logout"))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        this.accessToken = null;
-        this.refreshToken = null;
-    }
-
-    // Получение информации пользователя о себе
-    public UserDto getMe() throws IOException, InterruptedException {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/user/me"))
-                .header("Authorization", "Bearer " + accessToken)
-                .GET()
-                .build();
-
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, UserDto.class);
-    }
-
-    // Работа с Ресурсом(Документом)
-    public ResourceDto createResource(CreateResourceRequest request) throws IOException, InterruptedException {
-        String jsonBody = objectMapper.writeValueAsString(request);
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/resource"))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, ResourceDto.class);
-    }
-
-    // Поиск ресурса по Id
-    public ResourceDto findResourceById(UUID id) throws IOException, InterruptedException {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/resource/" + id))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .GET()
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, ResourceDto.class);
-    }
-
-    // Поиск ресурса по параметрам
-    public List<ResourceDto> findResourcesByFilters(ResourceFilterRequest filter,
-                                                    Long offset,
-                                                    Long count,
-                                                    String sortBy,
-                                                    String sortDir) throws IOException, InterruptedException {
-        List<String> params= new ArrayList<>();
-        if (filter != null) {
-            if (filter.title() != null && !filter.title().isBlank())
-                params.add("title=" + encode(filter.title()));
-            if (filter.description() != null && !filter.description().isBlank())
-                params.add("description=" + encode(filter.description()));
-            // createdAt/updatedAt пока не отправляем — при необходимости добавим формат
-        }
-        if (offset != null) params.add("offset=" + offset);
-        if (count  != null) params.add("count="  + count);
-        if (sortBy  != null)  params.add("sortBy="  + sortBy);
-        if (sortDir != null) params.add("sortDir=" + sortDir);
-        String url = baseUrl + "/api/v1/resource"
-                + (params.isEmpty() ? "" : "?" + String.join("&", params));
-
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(url))
-                .header("Authorization", "Bearer " + accessToken)
-                .GET()
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-
-        ResourceDto[] arr = objectMapper.readValue(response.body(), ResourceDto[].class);
-        return Arrays.asList(arr);
-    }
-
-    // Обновление ресурса
-    public ResourceDto updateResource(UUID uuid, UpdateResourceRequest request) throws IOException, InterruptedException {
-        String jsonBody = objectMapper.writeValueAsString(request);
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, ResourceDto.class);
-    }
-
-    // Удаление ресурса
-    public void deleteResource(UUID uuid) throws IOException, InterruptedException {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .DELETE()
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-    }
-    // Создание пользователя
-    public UserDto createUser(RegisterRequest request) throws IOException, InterruptedException {
-        String jsonBody = objectMapper.writeValueAsString(request);
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/admin"))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, UserDto.class);
-    }
-
-    // Поиск пользователя по ID
-    public UserDto getUserById(UUID uuid) throws IOException, InterruptedException {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .GET()
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, UserDto.class);
-    }
-
-    // Поиск пользователя по параметрам
-    public List<UserDto> getUsersByFilters(UserFilterRequest filter,
-                                           Long offset,
-                                           Long count,
-                                           String sortBy,
-                                           String sortDir
-    ) throws IOException, InterruptedException {
-        List<String> params = new ArrayList<>();
-        if (filter != null) {
-            if (filter.email() != null && !filter.email().isBlank())
-                params.add("email=" + encode(filter.email()));
-            if (filter.firstName() != null && !filter.firstName().isBlank())
-                params.add("firstName=" + encode(filter.firstName()));
-            if (filter.lastName() != null && !filter.lastName().isBlank())
-                params.add("lastName=" + encode(filter.lastName()));
-            if (filter.role() != null)
-                params.add("role=" + encode(filter.role().name()));
-            if (filter.enabled() != null)
-                params.add("enabled=" + filter.enabled());
-
-        }
-
-        if (offset != null) params.add("offset=" + offset);
-        if (count != null) params.add("count=" + count);
-        if (sortBy != null) params.add("sortBy=" + encode(sortBy));
-        if (sortDir != null) params.add("sortDir=" + encode(sortDir));
-
-        String url = baseUrl + "/api/v1/admin"
-                + (params.isEmpty() ? "" : "?" + String.join("&", params));
-
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(url))
-                .header("Authorization", "Bearer " + accessToken)
-                .GET()
-                .build();
-
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        UserDto[] users = objectMapper.readValue(response.body(), UserDto[].class);
-        return Arrays.asList(users);
-    }
-
-    // Обновление пользователя
-    public UserDto updateUser(UUID uuid, UpdateUserRequest request) throws IOException, InterruptedException {
-        String jsonBody = objectMapper.writeValueAsString(request);
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, UserDto.class);
-    }
-
-    // Удаление пользователя
-    public void deleteUser(UUID uuid) throws IOException, InterruptedException {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
-                .header("Content-Type", "application/json")
-                .header("Authorization", "Bearer " + accessToken)
-                .DELETE()
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-    }
-
-
-    public FileDto uploadFile(UUID resourceUuid, Path filePath) throws IOException, InterruptedException {
-        String boundary = "----JavaPksBoundary" + System.currentTimeMillis();
-        byte[] fileBytes = Files.readAllBytes(filePath);
-        String filename = filePath.getFileName().toString();
-        String contentType = Optional
-                .ofNullable(Files.probeContentType(filePath))
-                .orElse("application/octet-stream");
-
-        ByteArrayOutputStream body = new ByteArrayOutputStream();
-
-        body.write(("--" + boundary + "\r\n").getBytes(StandardCharsets.UTF_8));
-        body.write(("Content-Disposition: form-data; name=\"file\"; filename=\""
-                + filename + "\"\r\n").getBytes(StandardCharsets.UTF_8));
-        body.write(("Content-Type: " + contentType + "\r\n\r\n")
-                .getBytes(StandardCharsets.UTF_8));
-        body.write(fileBytes);
-        body.write(("\r\n--" + boundary + "--\r\n").getBytes(StandardCharsets.UTF_8));
-
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid + "/file"))
-                .header("Content-Type", "multipart/form-data; boundary=" + boundary)
-                .header("Authorization", "Bearer " + accessToken)
-                .POST(HttpRequest.BodyPublishers.ofByteArray(body.toByteArray()))
-                .build();
-
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-        return parseResponse(response, FileDto.class);
-    }
-
-    public Path downloadFile(UUID resourceUuid, UUID fileUuid, Path destinationDir)
-            throws IOException, InterruptedException {
-
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
-                        + "/file/" + fileUuid))
-                .header("Authorization", "Bearer " + accessToken)
-                .GET()
-                .build();
-
-        HttpResponse<InputStream> response = executeWithRetry(
-                httpRequest, HttpResponse.BodyHandlers.ofInputStream());
-
-        if (response.statusCode() >= 400) {
-            String body = new String(response.body().readAllBytes(), StandardCharsets.UTF_8);
-            response.body().close();
-            try {
-                ErrorResponse error = objectMapper.readValue(body, ErrorResponse.class);
-                throw new ApiException(error);
-            } catch (ApiException e) {
-                throw e;
-            } catch (Exception parseFail) {
-                throw new ApiException(new ErrorResponse(
-                        "Ошибка сервера: " + body, response.statusCode()));
-            }
-        }
-
-        String filename = parseFilename(
-                response.headers().firstValue("Content-Disposition").orElse(null));
-        if (filename == null || filename.isBlank()) {
-            filename = fileUuid.toString();
-        }
-
-        Files.createDirectories(destinationDir);
-        Path target = destinationDir.resolve(filename);
-
-        try (InputStream in = response.body()) {
-            Files.copy(in, target, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-        }
-        return target;
-    }
-
-    public void deleteFile(UUID resourceUuid, UUID fileUuid)
-            throws IOException, InterruptedException {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
-                        + "/file/" + fileUuid))
-                .header("Authorization", "Bearer " + accessToken)
-                .DELETE()
-                .build();
-        HttpResponse<String> response = send(httpRequest);
-        checkError(response);
-    }
-
-    private static String parseFilename(String cd) {
-        if (cd == null) return null;
-
-        int starIdx = cd.indexOf("filename*=");
-        if (starIdx >= 0) {
-            String val = cd.substring(starIdx + "filename*=".length()).trim();
-            int semi = val.indexOf(';');
-            if (semi >= 0) val = val.substring(0, semi).trim();
-            int encIdx = val.indexOf("''");
-            if (encIdx >= 0) {
-                String encoded = val.substring(encIdx + 2);
-                return URLDecoder.decode(encoded, StandardCharsets.UTF_8);
-            }
-        }
-
-        int idx = cd.indexOf("filename=");
-        if (idx >= 0) {
-            String val = cd.substring(idx + "filename=".length()).trim();
-            if (val.startsWith("\"")) {
-                int end = val.indexOf('"', 1);
-                if (end > 0) return val.substring(1, end);
-            } else {
-                int semi = val.indexOf(';');
-                if (semi >= 0) val = val.substring(0, semi);
-                return val.trim();
-            }
-        }
-        return null;
-    }
-
-    // Выгрузка данных (пользователей, документов и их файлов)
-    public byte[] exportUsers() throws IOException, InterruptedException {
-        return downloadBinary("/api/v1/admin/users/export");
-    }
-
-    public byte[] exportResources() throws IOException, InterruptedException {
-        return downloadBinary("/api/v1/admin/resource/export");
-    }
-
-    public byte[] exportResourceFiles(UUID resourceId) throws IOException, InterruptedException {
-        return downloadBinary("/api/v1/admin/resource/" + resourceId + "/files/export");
-    }
-
-
-    private byte[] downloadBinary(String path) throws IOException, InterruptedException {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + path))
-                .header("Authorization", "Bearer " + accessToken)
-                .GET()
-                .build();
-
-        HttpResponse<byte[]> response = executeWithRetry(
-                httpRequest, HttpResponse.BodyHandlers.ofByteArray());
-
-        if (response.statusCode() >= 400) {
-            String body = new String(response.body(), StandardCharsets.UTF_8);
-            try {
-                ErrorResponse error = objectMapper.readValue(body, ErrorResponse.class);
-                throw new ApiException(error);
-            } catch (ApiException e) {
-                throw e;
-            } catch (Exception parseFail) {
-                throw new ApiException(new ErrorResponse(
-                        "Ошибка сервера: " + body, response.statusCode()));
-            }
-        }
-        return response.body();
-    }
-
-
-    private HttpResponse<String> send(HttpRequest request) throws IOException, InterruptedException {
-        return executeWithRetry(request, HttpResponse.BodyHandlers.ofString());
-    }
-
-    // Проверка ошибок сервера
-    private void checkError(HttpResponse<String> response) {
-        if (response.statusCode() < 400) return;
-        try {
-            ErrorResponse error = objectMapper.readValue(response.body(), ErrorResponse.class);
-            throw new ApiException(error);
-        } catch (ApiException e) {
-            throw e;
-        } catch (Exception parseFail) {
-            throw new ApiException(new ErrorResponse("Ошибка сервера: " + response.body(), response.statusCode()));
-        }
-    }
-
-    //Парсер ответа
-    private <T> T parseResponse(HttpResponse<String> response, Class<T> clazz) throws IOException {
-        if (response.body() == null || response.body().isBlank()) {
-            return null;
-        }
-        return objectMapper.readValue(response.body(), clazz);
-    }
-
-    private <T> HttpResponse<T> executeWithRetry(HttpRequest request,
-                                                 HttpResponse.BodyHandler<T> handler)
-            throws IOException, InterruptedException {
-
-        HttpResponse<T> response = httpClient.send(request, handler);
-
-        if (response.statusCode() != 401) return response;
-
-        if (request.uri().getPath().startsWith("/api/v1/auth/")) return response;
-
-        if (refreshToken == null) return response;
-
-        try {
-            refreshInternal();
-        } catch (Exception e) {
-            // refresh не удался — отдаём оригинальный 401, вызывающий код разберётся
-            return response;
-        }
-
-        // повторяем исходный запрос с новым access-токеном
-        HttpRequest retried = HttpRequest.newBuilder(
-                        request,
-                        (name, value) -> !name.equalsIgnoreCase("Authorization"))
-                .header("Authorization", "Bearer " + accessToken)
-                .build();
-
-
-        return httpClient.send(retried, handler);
-    }
-
-    private static String encode(String value) {
-        return URLEncoder.encode(value, StandardCharsets.UTF_8);
-    }
-
-    public String getAccessToken() {
-        return accessToken;
-    }
-    public String getRefreshToken() {
-        return refreshToken;
-    }
-    public HttpClient getHttpClient() {
-        return httpClient;
-    }
-    public ObjectMapper getObjectMapper() {
-        return objectMapper;
-    }
-    public String getBaseUrl() {
-        return baseUrl;
-    }
+  private final HttpClient httpClient;
+  private final ObjectMapper objectMapper;
+  private final String baseUrl;
+
+  private String accessToken;
+  private String refreshToken;
+
+  public ApiClient(String baseUrl) {
+    this.baseUrl = baseUrl;
+    this.httpClient = HttpClient.newHttpClient();
+    this.objectMapper = new ObjectMapper();
+    this.objectMapper.registerModule(new JavaTimeModule());
+  }
+
+  // Вход в систему
+  public JwtTokenResponse login(LoginRequest request) throws IOException, InterruptedException {
+    String jsonBody = objectMapper.writeValueAsString(request);
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/auth/login"))
+        .header("Content-Type", "application/json")
+        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    JwtTokenResponse tokenResponse = parseResponse(response, JwtTokenResponse.class);
+    this.accessToken = tokenResponse.accessToken();
+    this.refreshToken = tokenResponse.refreshToken();
+    return tokenResponse;
+  }
+
+  public JwtTokenResponse refresh() throws IOException, InterruptedException {
+    refreshInternal();
+    return new JwtTokenResponse(accessToken, refreshToken);
+  }
+
+  private void refreshInternal() throws IOException, InterruptedException {
+    if (refreshToken == null) {
+      throw new ApiException(new ErrorResponse("Ошибка: нет refresh токена", 401));
+    }
+
+    String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
+    HttpRequest request = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/auth/refresh"))
+        .header("Content-Type", "application/json")
+        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+        .build();
+
+    HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+    if (response.statusCode() >= 400) {
+      throw new ApiException(new ErrorResponse(
+          "Refresh failed: " + response.body(), response.statusCode()));
+    }
+
+    JwtTokenResponse tokens = objectMapper.readValue(response.body(), JwtTokenResponse.class);
+    this.accessToken = tokens.accessToken();
+    this.refreshToken = tokens.refreshToken();
+  }
+
+  // Выход из системы
+  public void logout() throws IOException, InterruptedException {
+    if (accessToken == null) {
+      return;
+    }
+    String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/auth/logout"))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    this.accessToken = null;
+    this.refreshToken = null;
+  }
+
+  // Получение информации пользователя о себе
+  public UserDto getMe() throws IOException, InterruptedException {
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/user/me"))
+        .header("Authorization", "Bearer " + accessToken)
+        .GET()
+        .build();
+
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, UserDto.class);
+  }
+
+  // Работа с Ресурсом(Документом)
+  public ResourceDto createResource(CreateResourceRequest request) throws IOException, InterruptedException {
+    String jsonBody = objectMapper.writeValueAsString(request);
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/resource"))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, ResourceDto.class);
+  }
+
+  // Поиск ресурса по Id
+  public ResourceDto findResourceById(UUID id) throws IOException, InterruptedException {
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/resource/" + id))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .GET()
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, ResourceDto.class);
+  }
+
+  // Поиск ресурса по параметрам
+  public List<ResourceDto> findResourcesByFilters(ResourceFilterRequest filter,
+      Long offset,
+      Long count,
+      String sortBy,
+      String sortDir) throws IOException, InterruptedException {
+    List<String> params = new ArrayList<>();
+    if (filter != null) {
+      if (filter.title() != null && !filter.title().isBlank())
+        params.add("title=" + encode(filter.title()));
+      if (filter.description() != null && !filter.description().isBlank())
+        params.add("description=" + encode(filter.description()));
+      // createdAt/updatedAt пока не отправляем — при необходимости добавим формат
+    }
+    if (offset != null)
+      params.add("offset=" + offset);
+    if (count != null)
+      params.add("count=" + count);
+    if (sortBy != null)
+      params.add("sortBy=" + sortBy);
+    if (sortDir != null)
+      params.add("sortDir=" + sortDir);
+    String url = baseUrl + "/api/v1/resource"
+        + (params.isEmpty() ? "" : "?" + String.join("&", params));
+
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(url))
+        .header("Authorization", "Bearer " + accessToken)
+        .GET()
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+
+    ResourceDto[] arr = objectMapper.readValue(response.body(), ResourceDto[].class);
+    return Arrays.asList(arr);
+  }
+
+  // Обновление ресурса
+  public ResourceDto updateResource(UUID uuid, UpdateResourceRequest request) throws IOException, InterruptedException {
+    String jsonBody = objectMapper.writeValueAsString(request);
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
+        .build();
+
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, ResourceDto.class);
+  }
+
+  // Удаление ресурса
+  public void deleteResource(UUID uuid) throws IOException, InterruptedException {
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .DELETE()
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+  }
+
+  // Создание пользователя
+  public UserDto createUser(RegisterRequest request) throws IOException, InterruptedException {
+    String jsonBody = objectMapper.writeValueAsString(request);
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/admin"))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, UserDto.class);
+  }
+
+  // Поиск пользователя по ID
+  public UserDto getUserById(UUID uuid) throws IOException, InterruptedException {
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .GET()
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, UserDto.class);
+  }
+
+  // Поиск пользователя по параметрам
+  public List<UserDto> getUsersByFilters(UserFilterRequest filter,
+      Long offset,
+      Long count,
+      String sortBy,
+      String sortDir) throws IOException, InterruptedException {
+    List<String> params = new ArrayList<>();
+    if (filter != null) {
+      if (filter.email() != null && !filter.email().isBlank())
+        params.add("email=" + encode(filter.email()));
+      if (filter.firstName() != null && !filter.firstName().isBlank())
+        params.add("firstName=" + encode(filter.firstName()));
+      if (filter.lastName() != null && !filter.lastName().isBlank())
+        params.add("lastName=" + encode(filter.lastName()));
+      if (filter.role() != null)
+        params.add("role=" + encode(filter.role().name()));
+      if (filter.enabled() != null)
+        params.add("enabled=" + filter.enabled());
+
+    }
+
+    if (offset != null)
+      params.add("offset=" + offset);
+    if (count != null)
+      params.add("count=" + count);
+    if (sortBy != null)
+      params.add("sortBy=" + encode(sortBy));
+    if (sortDir != null)
+      params.add("sortDir=" + encode(sortDir));
+
+    String url = baseUrl + "/api/v1/admin"
+        + (params.isEmpty() ? "" : "?" + String.join("&", params));
+
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(url))
+        .header("Authorization", "Bearer " + accessToken)
+        .GET()
+        .build();
+
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    UserDto[] users = objectMapper.readValue(response.body(), UserDto[].class);
+    return Arrays.asList(users);
+  }
+
+  // Обновление пользователя
+  public UserDto updateUser(UUID uuid, UpdateUserRequest request) throws IOException, InterruptedException {
+    String jsonBody = objectMapper.writeValueAsString(request);
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, UserDto.class);
+  }
+
+  // Удаление пользователя
+  public void deleteUser(UUID uuid) throws IOException, InterruptedException {
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+        .header("Content-Type", "application/json")
+        .header("Authorization", "Bearer " + accessToken)
+        .DELETE()
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+  }
+
+  public FileDto uploadFile(UUID resourceUuid, Path filePath) throws IOException, InterruptedException {
+    String boundary = "----JavaPksBoundary" + System.currentTimeMillis();
+    byte[] fileBytes = Files.readAllBytes(filePath);
+    String filename = filePath.getFileName().toString();
+    String contentType = Optional
+        .ofNullable(Files.probeContentType(filePath))
+        .orElse("application/octet-stream");
+
+    ByteArrayOutputStream body = new ByteArrayOutputStream();
+
+    body.write(("--" + boundary + "\r\n").getBytes(StandardCharsets.UTF_8));
+    body.write(("Content-Disposition: form-data; name=\"file\"; filename=\""
+        + filename + "\"\r\n").getBytes(StandardCharsets.UTF_8));
+    body.write(("Content-Type: " + contentType + "\r\n\r\n")
+        .getBytes(StandardCharsets.UTF_8));
+    body.write(fileBytes);
+    body.write(("\r\n--" + boundary + "--\r\n").getBytes(StandardCharsets.UTF_8));
+
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid + "/file"))
+        .header("Content-Type", "multipart/form-data; boundary=" + boundary)
+        .header("Authorization", "Bearer " + accessToken)
+        .POST(HttpRequest.BodyPublishers.ofByteArray(body.toByteArray()))
+        .build();
+
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+    return parseResponse(response, FileDto.class);
+  }
+
+  public Path downloadFile(UUID resourceUuid, UUID fileUuid, Path destinationDir)
+      throws IOException, InterruptedException {
+
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
+            + "/file/" + fileUuid))
+        .header("Authorization", "Bearer " + accessToken)
+        .GET()
+        .build();
+
+    HttpResponse<InputStream> response = executeWithRetry(
+        httpRequest, HttpResponse.BodyHandlers.ofInputStream());
+
+    if (response.statusCode() >= 400) {
+      String body = new String(response.body().readAllBytes(), StandardCharsets.UTF_8);
+      response.body().close();
+      try {
+        ErrorResponse error = objectMapper.readValue(body, ErrorResponse.class);
+        throw new ApiException(error);
+      } catch (ApiException e) {
+        throw e;
+      } catch (Exception parseFail) {
+        throw new ApiException(new ErrorResponse(
+            "Ошибка сервера: " + body, response.statusCode()));
+      }
+    }
+
+    String filename = parseFilename(
+        response.headers().firstValue("Content-Disposition").orElse(null));
+    if (filename == null || filename.isBlank()) {
+      filename = fileUuid.toString();
+    }
+
+    Files.createDirectories(destinationDir);
+    Path target = destinationDir.resolve(filename);
+
+    try (InputStream in = response.body()) {
+      Files.copy(in, target, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+    }
+    return target;
+  }
+
+  public void deleteFile(UUID resourceUuid, UUID fileUuid)
+      throws IOException, InterruptedException {
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
+            + "/file/" + fileUuid))
+        .header("Authorization", "Bearer " + accessToken)
+        .DELETE()
+        .build();
+    HttpResponse<String> response = send(httpRequest);
+    checkError(response);
+  }
+
+  private static String parseFilename(String cd) {
+    if (cd == null)
+      return null;
+
+    int starIdx = cd.indexOf("filename*=");
+    if (starIdx >= 0) {
+      String val = cd.substring(starIdx + "filename*=".length()).trim();
+      int semi = val.indexOf(';');
+      if (semi >= 0)
+        val = val.substring(0, semi).trim();
+      int encIdx = val.indexOf("''");
+      if (encIdx >= 0) {
+        String encoded = val.substring(encIdx + 2);
+        return URLDecoder.decode(encoded, StandardCharsets.UTF_8);
+      }
+    }
+
+    int idx = cd.indexOf("filename=");
+    if (idx >= 0) {
+      String val = cd.substring(idx + "filename=".length()).trim();
+      if (val.startsWith("\"")) {
+        int end = val.indexOf('"', 1);
+        if (end > 0)
+          return val.substring(1, end);
+      } else {
+        int semi = val.indexOf(';');
+        if (semi >= 0)
+          val = val.substring(0, semi);
+        return val.trim();
+      }
+    }
+    return null;
+  }
+
+  // Выгрузка данных (пользователей, документов и их файлов)
+  public byte[] exportUsers() throws IOException, InterruptedException {
+    return downloadBinary("/api/v1/admin/users/export");
+  }
+
+  public byte[] exportResources() throws IOException, InterruptedException {
+    return downloadBinary("/api/v1/admin/resource/export");
+  }
+
+  public byte[] exportResourceFiles(UUID resourceId) throws IOException, InterruptedException {
+    return downloadBinary("/api/v1/admin/resource/" + resourceId + "/files/export");
+  }
+
+  private byte[] downloadBinary(String path) throws IOException, InterruptedException {
+    HttpRequest httpRequest = HttpRequest.newBuilder()
+        .uri(URI.create(baseUrl + path))
+        .header("Authorization", "Bearer " + accessToken)
+        .GET()
+        .build();
+
+    HttpResponse<byte[]> response = executeWithRetry(
+        httpRequest, HttpResponse.BodyHandlers.ofByteArray());
+
+    if (response.statusCode() >= 400) {
+      String body = new String(response.body(), StandardCharsets.UTF_8);
+      try {
+        ErrorResponse error = objectMapper.readValue(body, ErrorResponse.class);
+        throw new ApiException(error);
+      } catch (ApiException e) {
+        throw e;
+      } catch (Exception parseFail) {
+        throw new ApiException(new ErrorResponse(
+            "Ошибка сервера: " + body, response.statusCode()));
+      }
+    }
+    return response.body();
+  }
+
+  private HttpResponse<String> send(HttpRequest request) throws IOException, InterruptedException {
+    return executeWithRetry(request, HttpResponse.BodyHandlers.ofString());
+  }
+
+  // Проверка ошибок сервера
+  private void checkError(HttpResponse<String> response) {
+    if (response.statusCode() < 400)
+      return;
+    try {
+      ErrorResponse error = objectMapper.readValue(response.body(), ErrorResponse.class);
+      throw new ApiException(error);
+    } catch (ApiException e) {
+      throw e;
+    } catch (Exception parseFail) {
+      throw new ApiException(new ErrorResponse("Ошибка сервера: " + response.body(), response.statusCode()));
+    }
+  }
+
+  // Парсер ответа
+  private <T> T parseResponse(HttpResponse<String> response, Class<T> clazz) throws IOException {
+    if (response.body() == null || response.body().isBlank()) {
+      return null;
+    }
+    return objectMapper.readValue(response.body(), clazz);
+  }
+
+  private <T> HttpResponse<T> executeWithRetry(HttpRequest request,
+      HttpResponse.BodyHandler<T> handler)
+      throws IOException, InterruptedException {
+
+    HttpResponse<T> response = httpClient.send(request, handler);
+
+    if (response.statusCode() != 401)
+      return response;
+
+    if (request.uri().getPath().startsWith("/api/v1/auth/"))
+      return response;
+
+    if (refreshToken == null)
+      return response;
+
+    try {
+      refreshInternal();
+    } catch (Exception e) {
+      // refresh не удался — отдаём оригинальный 401, вызывающий код разберётся
+      return response;
+    }
+
+    // повторяем исходный запрос с новым access-токеном
+    HttpRequest retried = HttpRequest.newBuilder(
+        request,
+        (name, value) -> !name.equalsIgnoreCase("Authorization"))
+        .header("Authorization", "Bearer " + accessToken)
+        .build();
+
+    return httpClient.send(retried, handler);
+  }
+
+  private static String encode(String value) {
+    return URLEncoder.encode(value, StandardCharsets.UTF_8);
+  }
+
+  public String getAccessToken() {
+    return accessToken;
+  }
+
+  public String getRefreshToken() {
+    return refreshToken;
+  }
+
+  public HttpClient getHttpClient() {
+    return httpClient;
+  }
+
+  public ObjectMapper getObjectMapper() {
+    return objectMapper;
+  }
+
+  public String getBaseUrl() {
+    return baseUrl;
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
index 3175964..e882852 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
@@ -1,20 +1,20 @@
 package com.DesktopApplicationClientJava.Api;
 
-import dto.Error.ErrorResponse;
+import com.DesktopApplicationClientJava.Api.Dto.error.ErrorResponse;
 
 public class ApiException extends RuntimeException {
-    private final ErrorResponse errorResponse;
+  private final ErrorResponse errorResponse;
 
-    public ApiException(ErrorResponse errorResponse) {
-        super(errorResponse.message());
-        this.errorResponse = errorResponse;
-    }
+  public ApiException(ErrorResponse errorResponse) {
+    super(errorResponse.message());
+    this.errorResponse = errorResponse;
+  }
 
-    public ErrorResponse getErrorResponse() {
-        return errorResponse;
-    }
+  public ErrorResponse getErrorResponse() {
+    return errorResponse;
+  }
 
-    public int getStatus() {
-        return errorResponse.status();
-    }
+  public int getStatus() {
+    return errorResponse.status();
+  }
 }
\ No newline at end of file

From ed1f4804968baad98a46b5b35729925ff56efc36 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 14:50:02 +0300
Subject: [PATCH 20/27] fix: failing dependency resolution in CI

---
 .github/workflows/maven.yml | 23 +++++++++--------------
 pom.xml                     |  9 +++++++++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8a04a22..01dfd10 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,11 +1,3 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 name: Java CI with Maven
 
 on:
@@ -14,22 +6,25 @@ on:
   pull_request:
     branches: [ "main" ]
 
+permissions:
+  contents: write
+
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 25
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: '25'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
-
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+      uses: advanced-security/maven-dependency-submission-action@v5
+      continue-on-error: true
+      with:
+        directory: .
+        maven-args: "-DmergeClassifiers=true"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 760ac41..d631725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,15 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.11.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 60b3b5189053ef5d89201371dc615e760c9db867 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 15:04:51 +0300
Subject: [PATCH 21/27] chore: configure format job

---
 .github/workflows/maven.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 01dfd10..812288f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,4 +27,17 @@ jobs:
       continue-on-error: true
       with:
         directory: .
-        maven-args: "-DmergeClassifiers=true"
\ No newline at end of file
+        maven-args: "-DmergeClassifiers=true"
+
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+          cache: maven
+      - name: Check formatting
+        run: mvn -B spotless:check --file pom.xml
\ No newline at end of file

From 1128f5412e4f6abd46f9f511b130fe6983cd0b6a Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 15:06:10 +0300
Subject: [PATCH 22/27] chore: add spotless

---
 pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pom.xml b/pom.xml
index d631725..3be8170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,30 @@
                     <mainClass>com.DesktopApplicationClientJava.Program</mainClass>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
+                <configuration>
+                    <java>
+                        <googleJavaFormat>
+                            <version>1.22.0</version>
+                        </googleJavaFormat>
+                        <removeUnusedImports />
+                        <trimTrailingWhitespace />
+                        <endWithNewline />
+                    </java>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>spotless-check</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file

From 1ae7c623b00560a33912bdc86b81f59f8e824954 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 15:08:26 +0300
Subject: [PATCH 23/27] chore: fix format

---
 pom.xml                                       |   4 +-
 .../Api/ApiClient.java                        | 365 +++++++++---------
 .../Api/ApiConfig.java                        |   4 +-
 .../Api/ApiException.java                     |   2 +-
 .../Api/Dto/error/ErrorResponse.java          |  12 +-
 .../Dto/request/Admin/RegisterRequest.java    |  12 +-
 .../Dto/request/Admin/UpdateUserRequest.java  |   7 +-
 .../Dto/request/Admin/UserFilterRequest.java  |  16 +-
 .../Api/Dto/request/Auth/LoginRequest.java    |   3 +-
 .../Dto/request/Auth/RefreshTokenRequest.java |   3 +-
 .../Resource/CreateResourceRequest.java       |   5 +-
 .../Resource/ResourceFilterRequest.java       |   6 +-
 .../Resource/UpdateResourceRequest.java       |   5 +-
 .../Api/Dto/response/FileDto.java             |   7 +-
 .../Dto/response/Jwt/JwtTokenResponse.java    |   7 +-
 .../Api/Dto/response/ResourceDto.java         |  13 +-
 .../Api/Dto/response/StoredFile.java          |  16 +-
 .../Api/Dto/response/UserDto.java             |  18 +-
 .../DesktopApplicationClientJava/Main.java    |   8 +-
 .../DesktopApplicationClientJava/Program.java |  55 ++-
 .../controllers/LoginFormController.java      | 185 +++++----
 .../controllers/SearchController.java         |   3 +-
 .../controllers/utils/Controller.java         |  16 +-
 .../entities/Role.java                        |   8 +-
 .../entities/User.java                        |  10 +-
 .../navigation/Navigator.java                 |  51 ++-
 .../navigation/NavigatorAware.java            |   4 +-
 .../services/AuthService.java                 |   4 +-
 .../services/FileService.java                 |   3 +-
 .../services/ResourceService.java             |   3 +-
 .../services/UsersService.java                |   3 +-
 .../session/Session.java                      |  23 +-
 .../session/SessionAware.java                 |   2 +-
 .../utils/ControllerWiring.java               |  14 +-
 .../utils/FieldError.java                     |  40 +-
 .../validation/EmailValidator.java            |  26 +-
 .../validation/FirstNameValidator.java        |  17 +-
 .../validation/LastNameValidator.java         |  17 +-
 .../validation/PasswordValidator.java         |  23 +-
 .../validation/ThirdNameValidator.java        |  14 +-
 .../validation/utils/AbstractValidator.java   |   2 +-
 .../validation/utils/ErrorMessages.java       |  16 +-
 .../validation/utils/Validator.java           |   2 +-
 .../validation/utils/ValidatorHelpers.java    |  36 +-
 .../java/validation/EmailValidatorTest.java   |  74 ++--
 .../validation/FirstNameValidatorTest.java    |  23 +-
 .../validation/LastNameValidatorTest.java     |  23 +-
 .../validation/PasswordValidatorTest.java     |  34 +-
 .../validation/ThirdNameValidatorTest.java    |  23 +-
 49 files changed, 590 insertions(+), 677 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3be8170..b224d9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,11 +168,11 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
+                <version>3.4.0</version>
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.22.0</version>
+                            <version>1.35.0</version>
                         </googleJavaFormat>
                         <removeUnusedImports />
                         <trimTrailingWhitespace />
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
index b05f8e6..66afc37 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiClient.java
@@ -15,7 +15,6 @@
 import com.DesktopApplicationClientJava.Api.Dto.response.UserDto;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,11 +47,12 @@ public ApiClient(String baseUrl) {
   // Вход в систему
   public JwtTokenResponse login(LoginRequest request) throws IOException, InterruptedException {
     String jsonBody = objectMapper.writeValueAsString(request);
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/auth/login"))
-        .header("Content-Type", "application/json")
-        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/auth/login"))
+            .header("Content-Type", "application/json")
+            .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
     JwtTokenResponse tokenResponse = parseResponse(response, JwtTokenResponse.class);
@@ -72,17 +72,18 @@ private void refreshInternal() throws IOException, InterruptedException {
     }
 
     String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
-    HttpRequest request = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/auth/refresh"))
-        .header("Content-Type", "application/json")
-        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-        .build();
+    HttpRequest request =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/auth/refresh"))
+            .header("Content-Type", "application/json")
+            .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+            .build();
 
     HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
 
     if (response.statusCode() >= 400) {
-      throw new ApiException(new ErrorResponse(
-          "Refresh failed: " + response.body(), response.statusCode()));
+      throw new ApiException(
+          new ErrorResponse("Refresh failed: " + response.body(), response.statusCode()));
     }
 
     JwtTokenResponse tokens = objectMapper.readValue(response.body(), JwtTokenResponse.class);
@@ -96,12 +97,13 @@ public void logout() throws IOException, InterruptedException {
       return;
     }
     String jsonBody = objectMapper.writeValueAsString(new RefreshTokenRequest(refreshToken));
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/auth/logout"))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/auth/logout"))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
     this.accessToken = null;
@@ -110,11 +112,12 @@ public void logout() throws IOException, InterruptedException {
 
   // Получение информации пользователя о себе
   public UserDto getMe() throws IOException, InterruptedException {
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/user/me"))
-        .header("Authorization", "Bearer " + accessToken)
-        .GET()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/user/me"))
+            .header("Authorization", "Bearer " + accessToken)
+            .GET()
+            .build();
 
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
@@ -122,14 +125,16 @@ public UserDto getMe() throws IOException, InterruptedException {
   }
 
   // Работа с Ресурсом(Документом)
-  public ResourceDto createResource(CreateResourceRequest request) throws IOException, InterruptedException {
+  public ResourceDto createResource(CreateResourceRequest request)
+      throws IOException, InterruptedException {
     String jsonBody = objectMapper.writeValueAsString(request);
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/resource"))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/resource"))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
     return parseResponse(response, ResourceDto.class);
@@ -137,23 +142,22 @@ public ResourceDto createResource(CreateResourceRequest request) throws IOExcept
 
   // Поиск ресурса по Id
   public ResourceDto findResourceById(UUID id) throws IOException, InterruptedException {
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/resource/" + id))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .GET()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/resource/" + id))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .GET()
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
     return parseResponse(response, ResourceDto.class);
   }
 
   // Поиск ресурса по параметрам
-  public List<ResourceDto> findResourcesByFilters(ResourceFilterRequest filter,
-      Long offset,
-      Long count,
-      String sortBy,
-      String sortDir) throws IOException, InterruptedException {
+  public List<ResourceDto> findResourcesByFilters(
+      ResourceFilterRequest filter, Long offset, Long count, String sortBy, String sortDir)
+      throws IOException, InterruptedException {
     List<String> params = new ArrayList<>();
     if (filter != null) {
       if (filter.title() != null && !filter.title().isBlank())
@@ -162,22 +166,19 @@ public List<ResourceDto> findResourcesByFilters(ResourceFilterRequest filter,
         params.add("description=" + encode(filter.description()));
       // createdAt/updatedAt пока не отправляем — при необходимости добавим формат
     }
-    if (offset != null)
-      params.add("offset=" + offset);
-    if (count != null)
-      params.add("count=" + count);
-    if (sortBy != null)
-      params.add("sortBy=" + sortBy);
-    if (sortDir != null)
-      params.add("sortDir=" + sortDir);
-    String url = baseUrl + "/api/v1/resource"
-        + (params.isEmpty() ? "" : "?" + String.join("&", params));
-
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(url))
-        .header("Authorization", "Bearer " + accessToken)
-        .GET()
-        .build();
+    if (offset != null) params.add("offset=" + offset);
+    if (count != null) params.add("count=" + count);
+    if (sortBy != null) params.add("sortBy=" + sortBy);
+    if (sortDir != null) params.add("sortDir=" + sortDir);
+    String url =
+        baseUrl + "/api/v1/resource" + (params.isEmpty() ? "" : "?" + String.join("&", params));
+
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(url))
+            .header("Authorization", "Bearer " + accessToken)
+            .GET()
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
 
@@ -186,14 +187,16 @@ public List<ResourceDto> findResourcesByFilters(ResourceFilterRequest filter,
   }
 
   // Обновление ресурса
-  public ResourceDto updateResource(UUID uuid, UpdateResourceRequest request) throws IOException, InterruptedException {
+  public ResourceDto updateResource(UUID uuid, UpdateResourceRequest request)
+      throws IOException, InterruptedException {
     String jsonBody = objectMapper.writeValueAsString(request);
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
+            .build();
 
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
@@ -202,12 +205,13 @@ public ResourceDto updateResource(UUID uuid, UpdateResourceRequest request) thro
 
   // Удаление ресурса
   public void deleteResource(UUID uuid) throws IOException, InterruptedException {
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .DELETE()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/resource/" + uuid))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .DELETE()
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
   }
@@ -215,12 +219,13 @@ public void deleteResource(UUID uuid) throws IOException, InterruptedException {
   // Создание пользователя
   public UserDto createUser(RegisterRequest request) throws IOException, InterruptedException {
     String jsonBody = objectMapper.writeValueAsString(request);
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/admin"))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/admin"))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
     return parseResponse(response, UserDto.class);
@@ -228,23 +233,22 @@ public UserDto createUser(RegisterRequest request) throws IOException, Interrupt
 
   // Поиск пользователя по ID
   public UserDto getUserById(UUID uuid) throws IOException, InterruptedException {
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .GET()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .GET()
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
     return parseResponse(response, UserDto.class);
   }
 
   // Поиск пользователя по параметрам
-  public List<UserDto> getUsersByFilters(UserFilterRequest filter,
-      Long offset,
-      Long count,
-      String sortBy,
-      String sortDir) throws IOException, InterruptedException {
+  public List<UserDto> getUsersByFilters(
+      UserFilterRequest filter, Long offset, Long count, String sortBy, String sortDir)
+      throws IOException, InterruptedException {
     List<String> params = new ArrayList<>();
     if (filter != null) {
       if (filter.email() != null && !filter.email().isBlank())
@@ -253,30 +257,24 @@ public List<UserDto> getUsersByFilters(UserFilterRequest filter,
         params.add("firstName=" + encode(filter.firstName()));
       if (filter.lastName() != null && !filter.lastName().isBlank())
         params.add("lastName=" + encode(filter.lastName()));
-      if (filter.role() != null)
-        params.add("role=" + encode(filter.role().name()));
-      if (filter.enabled() != null)
-        params.add("enabled=" + filter.enabled());
-
+      if (filter.role() != null) params.add("role=" + encode(filter.role().name()));
+      if (filter.enabled() != null) params.add("enabled=" + filter.enabled());
     }
 
-    if (offset != null)
-      params.add("offset=" + offset);
-    if (count != null)
-      params.add("count=" + count);
-    if (sortBy != null)
-      params.add("sortBy=" + encode(sortBy));
-    if (sortDir != null)
-      params.add("sortDir=" + encode(sortDir));
+    if (offset != null) params.add("offset=" + offset);
+    if (count != null) params.add("count=" + count);
+    if (sortBy != null) params.add("sortBy=" + encode(sortBy));
+    if (sortDir != null) params.add("sortDir=" + encode(sortDir));
 
-    String url = baseUrl + "/api/v1/admin"
-        + (params.isEmpty() ? "" : "?" + String.join("&", params));
+    String url =
+        baseUrl + "/api/v1/admin" + (params.isEmpty() ? "" : "?" + String.join("&", params));
 
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(url))
-        .header("Authorization", "Bearer " + accessToken)
-        .GET()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(url))
+            .header("Authorization", "Bearer " + accessToken)
+            .GET()
+            .build();
 
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
@@ -285,14 +283,16 @@ public List<UserDto> getUsersByFilters(UserFilterRequest filter,
   }
 
   // Обновление пользователя
-  public UserDto updateUser(UUID uuid, UpdateUserRequest request) throws IOException, InterruptedException {
+  public UserDto updateUser(UUID uuid, UpdateUserRequest request)
+      throws IOException, InterruptedException {
     String jsonBody = objectMapper.writeValueAsString(request);
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .PUT(HttpRequest.BodyPublishers.ofString(jsonBody))
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
     return parseResponse(response, UserDto.class);
@@ -300,40 +300,42 @@ public UserDto updateUser(UUID uuid, UpdateUserRequest request) throws IOExcepti
 
   // Удаление пользователя
   public void deleteUser(UUID uuid) throws IOException, InterruptedException {
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
-        .header("Content-Type", "application/json")
-        .header("Authorization", "Bearer " + accessToken)
-        .DELETE()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/admin/" + uuid))
+            .header("Content-Type", "application/json")
+            .header("Authorization", "Bearer " + accessToken)
+            .DELETE()
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
   }
 
-  public FileDto uploadFile(UUID resourceUuid, Path filePath) throws IOException, InterruptedException {
+  public FileDto uploadFile(UUID resourceUuid, Path filePath)
+      throws IOException, InterruptedException {
     String boundary = "----JavaPksBoundary" + System.currentTimeMillis();
     byte[] fileBytes = Files.readAllBytes(filePath);
     String filename = filePath.getFileName().toString();
-    String contentType = Optional
-        .ofNullable(Files.probeContentType(filePath))
-        .orElse("application/octet-stream");
+    String contentType =
+        Optional.ofNullable(Files.probeContentType(filePath)).orElse("application/octet-stream");
 
     ByteArrayOutputStream body = new ByteArrayOutputStream();
 
     body.write(("--" + boundary + "\r\n").getBytes(StandardCharsets.UTF_8));
-    body.write(("Content-Disposition: form-data; name=\"file\"; filename=\""
-        + filename + "\"\r\n").getBytes(StandardCharsets.UTF_8));
-    body.write(("Content-Type: " + contentType + "\r\n\r\n")
-        .getBytes(StandardCharsets.UTF_8));
+    body.write(
+        ("Content-Disposition: form-data; name=\"file\"; filename=\"" + filename + "\"\r\n")
+            .getBytes(StandardCharsets.UTF_8));
+    body.write(("Content-Type: " + contentType + "\r\n\r\n").getBytes(StandardCharsets.UTF_8));
     body.write(fileBytes);
     body.write(("\r\n--" + boundary + "--\r\n").getBytes(StandardCharsets.UTF_8));
 
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid + "/file"))
-        .header("Content-Type", "multipart/form-data; boundary=" + boundary)
-        .header("Authorization", "Bearer " + accessToken)
-        .POST(HttpRequest.BodyPublishers.ofByteArray(body.toByteArray()))
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid + "/file"))
+            .header("Content-Type", "multipart/form-data; boundary=" + boundary)
+            .header("Authorization", "Bearer " + accessToken)
+            .POST(HttpRequest.BodyPublishers.ofByteArray(body.toByteArray()))
+            .build();
 
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
@@ -343,15 +345,15 @@ public FileDto uploadFile(UUID resourceUuid, Path filePath) throws IOException,
   public Path downloadFile(UUID resourceUuid, UUID fileUuid, Path destinationDir)
       throws IOException, InterruptedException {
 
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
-            + "/file/" + fileUuid))
-        .header("Authorization", "Bearer " + accessToken)
-        .GET()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid + "/file/" + fileUuid))
+            .header("Authorization", "Bearer " + accessToken)
+            .GET()
+            .build();
 
-    HttpResponse<InputStream> response = executeWithRetry(
-        httpRequest, HttpResponse.BodyHandlers.ofInputStream());
+    HttpResponse<InputStream> response =
+        executeWithRetry(httpRequest, HttpResponse.BodyHandlers.ofInputStream());
 
     if (response.statusCode() >= 400) {
       String body = new String(response.body().readAllBytes(), StandardCharsets.UTF_8);
@@ -362,13 +364,12 @@ public Path downloadFile(UUID resourceUuid, UUID fileUuid, Path destinationDir)
       } catch (ApiException e) {
         throw e;
       } catch (Exception parseFail) {
-        throw new ApiException(new ErrorResponse(
-            "Ошибка сервера: " + body, response.statusCode()));
+        throw new ApiException(new ErrorResponse("Ошибка сервера: " + body, response.statusCode()));
       }
     }
 
-    String filename = parseFilename(
-        response.headers().firstValue("Content-Disposition").orElse(null));
+    String filename =
+        parseFilename(response.headers().firstValue("Content-Disposition").orElse(null));
     if (filename == null || filename.isBlank()) {
       filename = fileUuid.toString();
     }
@@ -384,26 +385,24 @@ public Path downloadFile(UUID resourceUuid, UUID fileUuid, Path destinationDir)
 
   public void deleteFile(UUID resourceUuid, UUID fileUuid)
       throws IOException, InterruptedException {
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid
-            + "/file/" + fileUuid))
-        .header("Authorization", "Bearer " + accessToken)
-        .DELETE()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + "/api/v1/resource/" + resourceUuid + "/file/" + fileUuid))
+            .header("Authorization", "Bearer " + accessToken)
+            .DELETE()
+            .build();
     HttpResponse<String> response = send(httpRequest);
     checkError(response);
   }
 
   private static String parseFilename(String cd) {
-    if (cd == null)
-      return null;
+    if (cd == null) return null;
 
     int starIdx = cd.indexOf("filename*=");
     if (starIdx >= 0) {
       String val = cd.substring(starIdx + "filename*=".length()).trim();
       int semi = val.indexOf(';');
-      if (semi >= 0)
-        val = val.substring(0, semi).trim();
+      if (semi >= 0) val = val.substring(0, semi).trim();
       int encIdx = val.indexOf("''");
       if (encIdx >= 0) {
         String encoded = val.substring(encIdx + 2);
@@ -416,12 +415,10 @@ private static String parseFilename(String cd) {
       String val = cd.substring(idx + "filename=".length()).trim();
       if (val.startsWith("\"")) {
         int end = val.indexOf('"', 1);
-        if (end > 0)
-          return val.substring(1, end);
+        if (end > 0) return val.substring(1, end);
       } else {
         int semi = val.indexOf(';');
-        if (semi >= 0)
-          val = val.substring(0, semi);
+        if (semi >= 0) val = val.substring(0, semi);
         return val.trim();
       }
     }
@@ -442,14 +439,15 @@ public byte[] exportResourceFiles(UUID resourceId) throws IOException, Interrupt
   }
 
   private byte[] downloadBinary(String path) throws IOException, InterruptedException {
-    HttpRequest httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(baseUrl + path))
-        .header("Authorization", "Bearer " + accessToken)
-        .GET()
-        .build();
+    HttpRequest httpRequest =
+        HttpRequest.newBuilder()
+            .uri(URI.create(baseUrl + path))
+            .header("Authorization", "Bearer " + accessToken)
+            .GET()
+            .build();
 
-    HttpResponse<byte[]> response = executeWithRetry(
-        httpRequest, HttpResponse.BodyHandlers.ofByteArray());
+    HttpResponse<byte[]> response =
+        executeWithRetry(httpRequest, HttpResponse.BodyHandlers.ofByteArray());
 
     if (response.statusCode() >= 400) {
       String body = new String(response.body(), StandardCharsets.UTF_8);
@@ -459,8 +457,7 @@ private byte[] downloadBinary(String path) throws IOException, InterruptedExcept
       } catch (ApiException e) {
         throw e;
       } catch (Exception parseFail) {
-        throw new ApiException(new ErrorResponse(
-            "Ошибка сервера: " + body, response.statusCode()));
+        throw new ApiException(new ErrorResponse("Ошибка сервера: " + body, response.statusCode()));
       }
     }
     return response.body();
@@ -472,15 +469,15 @@ private HttpResponse<String> send(HttpRequest request) throws IOException, Inter
 
   // Проверка ошибок сервера
   private void checkError(HttpResponse<String> response) {
-    if (response.statusCode() < 400)
-      return;
+    if (response.statusCode() < 400) return;
     try {
       ErrorResponse error = objectMapper.readValue(response.body(), ErrorResponse.class);
       throw new ApiException(error);
     } catch (ApiException e) {
       throw e;
     } catch (Exception parseFail) {
-      throw new ApiException(new ErrorResponse("Ошибка сервера: " + response.body(), response.statusCode()));
+      throw new ApiException(
+          new ErrorResponse("Ошибка сервера: " + response.body(), response.statusCode()));
     }
   }
 
@@ -492,20 +489,17 @@ private <T> T parseResponse(HttpResponse<String> response, Class<T> clazz) throw
     return objectMapper.readValue(response.body(), clazz);
   }
 
-  private <T> HttpResponse<T> executeWithRetry(HttpRequest request,
-      HttpResponse.BodyHandler<T> handler)
+  private <T> HttpResponse<T> executeWithRetry(
+      HttpRequest request, HttpResponse.BodyHandler<T> handler)
       throws IOException, InterruptedException {
 
     HttpResponse<T> response = httpClient.send(request, handler);
 
-    if (response.statusCode() != 401)
-      return response;
+    if (response.statusCode() != 401) return response;
 
-    if (request.uri().getPath().startsWith("/api/v1/auth/"))
-      return response;
+    if (request.uri().getPath().startsWith("/api/v1/auth/")) return response;
 
-    if (refreshToken == null)
-      return response;
+    if (refreshToken == null) return response;
 
     try {
       refreshInternal();
@@ -515,11 +509,10 @@ private <T> HttpResponse<T> executeWithRetry(HttpRequest request,
     }
 
     // повторяем исходный запрос с новым access-токеном
-    HttpRequest retried = HttpRequest.newBuilder(
-        request,
-        (name, value) -> !name.equalsIgnoreCase("Authorization"))
-        .header("Authorization", "Bearer " + accessToken)
-        .build();
+    HttpRequest retried =
+        HttpRequest.newBuilder(request, (name, value) -> !name.equalsIgnoreCase("Authorization"))
+            .header("Authorization", "Bearer " + accessToken)
+            .build();
 
     return httpClient.send(retried, handler);
   }
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
index a0a5e54..e434338 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiConfig.java
@@ -1,5 +1,3 @@
 package com.DesktopApplicationClientJava.Api;
 
-public class ApiConfig {
-
-}
+public class ApiConfig {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java b/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
index e882852..06ba69f 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/ApiException.java
@@ -17,4 +17,4 @@ public ErrorResponse getErrorResponse() {
   public int getStatus() {
     return errorResponse.status();
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
index fa2b16b..9a563cb 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/error/ErrorResponse.java
@@ -1,11 +1,7 @@
 package com.DesktopApplicationClientJava.Api.Dto.error;
 
-public record ErrorResponse(
-        String message,
-        int status,
-        long timestamp
-) {
-    public ErrorResponse(String message, int status) {
-        this(message, status, System.currentTimeMillis());
-    }
+public record ErrorResponse(String message, int status, long timestamp) {
+  public ErrorResponse(String message, int status) {
+    this(message, status, System.currentTimeMillis());
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java
index e5bbecf..43d8021 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/RegisterRequest.java
@@ -1,10 +1,10 @@
 package com.DesktopApplicationClientJava.Api.Dto.request.Admin;
+
 import com.DesktopApplicationClientJava.entities.Role;
 
 public record RegisterRequest(
-        String email,
-        String password,
-        Role role,       // "USER", "MODER" или "ADMIN"
-        String firstname,
-        String lastname
-) {}
+    String email,
+    String password,
+    Role role, // "USER", "MODER" или "ADMIN"
+    String firstname,
+    String lastname) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java
index f6f9362..4ac2708 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UpdateUserRequest.java
@@ -3,9 +3,4 @@
 import com.DesktopApplicationClientJava.entities.Role;
 
 public record UpdateUserRequest(
-        String email,
-        Boolean enabled,
-        Role role,
-        String firstname,
-        String lastname
-) {}
+    String email, Boolean enabled, Role role, String firstname, String lastname) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java
index 6fa92cc..cb3af19 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Admin/UserFilterRequest.java
@@ -1,15 +1,13 @@
 package com.DesktopApplicationClientJava.Api.Dto.request.Admin;
 
 import com.DesktopApplicationClientJava.entities.Role;
-
 import java.time.LocalDateTime;
 
 public record UserFilterRequest(
-        String email,
-        Role role,
-        String firstName,
-        String lastName,
-        Boolean enabled,
-        LocalDateTime createdAt,
-        LocalDateTime updatedAt) {
-}
+    String email,
+    Role role,
+    String firstName,
+    String lastName,
+    Boolean enabled,
+    LocalDateTime createdAt,
+    LocalDateTime updatedAt) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java
index 379b485..95cddd9 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/LoginRequest.java
@@ -1,4 +1,3 @@
 package com.DesktopApplicationClientJava.Api.Dto.request.Auth;
 
-public record LoginRequest(String email, String password) {
-}
+public record LoginRequest(String email, String password) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java
index d6638b2..7543162 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Auth/RefreshTokenRequest.java
@@ -1,4 +1,3 @@
 package com.DesktopApplicationClientJava.Api.Dto.request.Auth;
 
-public record RefreshTokenRequest(String refreshToken) {
-}
\ No newline at end of file
+public record RefreshTokenRequest(String refreshToken) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java
index 46a816d..19672e1 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/CreateResourceRequest.java
@@ -1,6 +1,3 @@
 package com.DesktopApplicationClientJava.Api.Dto.request.Resource;
 
-public record CreateResourceRequest(
-        String title,
-        String description
-) {}
\ No newline at end of file
+public record CreateResourceRequest(String title, String description) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java
index 05ff9c1..3333123 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/ResourceFilterRequest.java
@@ -3,8 +3,4 @@
 import java.time.LocalDateTime;
 
 public record ResourceFilterRequest(
-        String title,
-        String description,
-        LocalDateTime createdAt,
-        LocalDateTime updatedAt
-) {}
\ No newline at end of file
+    String title, String description, LocalDateTime createdAt, LocalDateTime updatedAt) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java
index 6fc171f..ceffbc2 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/request/Resource/UpdateResourceRequest.java
@@ -1,6 +1,3 @@
 package com.DesktopApplicationClientJava.Api.Dto.request.Resource;
 
-public record UpdateResourceRequest(
-        String title,
-        String description
-) {}
\ No newline at end of file
+public record UpdateResourceRequest(String title, String description) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java
index 0e208c7..5facf5e 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/FileDto.java
@@ -2,9 +2,4 @@
 
 import java.util.UUID;
 
-public record FileDto(
-        UUID uuid,
-        String name,
-        String contentType,
-        Long size
-) {}
\ No newline at end of file
+public record FileDto(UUID uuid, String name, String contentType, Long size) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java
index 8e29abd..5e4b709 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/Jwt/JwtTokenResponse.java
@@ -1,8 +1,3 @@
 package com.DesktopApplicationClientJava.Api.Dto.response.Jwt;
 
-public record JwtTokenResponse(
-        String accessToken,
-        String refreshToken
-) {
-}
-
+public record JwtTokenResponse(String accessToken, String refreshToken) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java
index 6258659..cb4d46e 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/ResourceDto.java
@@ -5,10 +5,9 @@
 import java.util.UUID;
 
 public record ResourceDto(
-        UUID uuid,
-        String title,
-        String description,
-        LocalDateTime createdAt,
-        LocalDateTime updatedAt,
-        List<FileDto> files
-) {}
+    UUID uuid,
+    String title,
+    String description,
+    LocalDateTime createdAt,
+    LocalDateTime updatedAt,
+    List<FileDto> files) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java
index cad3f55..383680b 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/StoredFile.java
@@ -3,15 +3,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-public record StoredFile(
-        InputStream content,
-        String contentType,
-        long size) implements AutoCloseable {
+public record StoredFile(InputStream content, String contentType, long size)
+    implements AutoCloseable {
 
-    @Override
-    public void close() throws IOException {
-        if (content != null) {
-            content.close();
-        }
+  @Override
+  public void close() throws IOException {
+    if (content != null) {
+      content.close();
     }
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java
index a06ec43..ea2d3a9 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Api/Dto/response/UserDto.java
@@ -1,17 +1,15 @@
 package com.DesktopApplicationClientJava.Api.Dto.response;
 
 import com.DesktopApplicationClientJava.entities.Role;
-
 import java.time.LocalDateTime;
 import java.util.UUID;
 
 public record UserDto(
-        UUID uuid,
-        String email,
-        Role role,
-        String firstName,
-        String lastName,
-        Boolean enabled,
-        LocalDateTime createdAt,
-        LocalDateTime updatedAt) {
-}
\ No newline at end of file
+    UUID uuid,
+    String email,
+    Role role,
+    String firstName,
+    String lastName,
+    Boolean enabled,
+    LocalDateTime createdAt,
+    LocalDateTime updatedAt) {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Main.java b/src/main/java/com/DesktopApplicationClientJava/Main.java
index 3a23dda..249f023 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Main.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Main.java
@@ -3,7 +3,7 @@
 import javafx.application.Application;
 
 public class Main {
-    public static void main(String[] args) {
-        Application.launch(Program.class, args);
-    }
-}
\ No newline at end of file
+  public static void main(String[] args) {
+    Application.launch(Program.class, args);
+  }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/Program.java b/src/main/java/com/DesktopApplicationClientJava/Program.java
index 3209714..c5bbe90 100644
--- a/src/main/java/com/DesktopApplicationClientJava/Program.java
+++ b/src/main/java/com/DesktopApplicationClientJava/Program.java
@@ -1,10 +1,8 @@
 package com.DesktopApplicationClientJava;
 
-import java.io.IOException;
-
 import com.DesktopApplicationClientJava.session.Session;
 import com.DesktopApplicationClientJava.utils.ControllerWiring;
-
+import java.io.IOException;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -12,30 +10,29 @@
 import javafx.stage.Stage;
 
 public class Program extends Application {
-    private final Session session = new Session();
-    private final static double windowWidthPx = 400.0;
-    private final static double windowHeightPx = 400.0;
-
-
-    @Override
-    public void start(Stage stage) throws IOException {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/LoginForm.fxml"));
-        Parent root = loader.load();
-        Scene scene = new Scene(root);
-        loadStyleSheet(scene, "/styles.css");
-
-        ControllerWiring.wire(loader.getController(), stage, session);
-
-        stage.setScene(scene);
-        stage.setTitle("JavaFX Application");
-        stage.setWidth(windowWidthPx);
-        stage.setHeight(windowHeightPx);
-        stage.centerOnScreen();
-
-        stage.show();
-    }
-
-    private void loadStyleSheet(Scene scene, String path) {
-        scene.getStylesheets().add(getClass().getResource(path).toExternalForm());
-    }
+  private final Session session = new Session();
+  private static final double windowWidthPx = 400.0;
+  private static final double windowHeightPx = 400.0;
+
+  @Override
+  public void start(Stage stage) throws IOException {
+    FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/LoginForm.fxml"));
+    Parent root = loader.load();
+    Scene scene = new Scene(root);
+    loadStyleSheet(scene, "/styles.css");
+
+    ControllerWiring.wire(loader.getController(), stage, session);
+
+    stage.setScene(scene);
+    stage.setTitle("JavaFX Application");
+    stage.setWidth(windowWidthPx);
+    stage.setHeight(windowHeightPx);
+    stage.centerOnScreen();
+
+    stage.show();
+  }
+
+  private void loadStyleSheet(Scene scene, String path) {
+    scene.getStylesheets().add(getClass().getResource(path).toExternalForm());
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
index 5178d58..d8baf11 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/LoginFormController.java
@@ -9,7 +9,6 @@
 import com.DesktopApplicationClientJava.validation.PasswordValidator;
 import com.DesktopApplicationClientJava.validation.ThirdNameValidator;
 import com.DesktopApplicationClientJava.validation.utils.Validator;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -18,100 +17,92 @@
 import javafx.scene.control.TextField;
 
 public class LoginFormController extends Controller {
-    @FXML
-    private TextField firstNameField;
-    @FXML
-    private Label firstNameErrorLabel;
-    private FieldError firstNameError;
-
-    @FXML
-    private TextField lastNameField;
-    @FXML
-    private Label lastNameErrorLabel;
-    private FieldError lastNameError;
-
-    @FXML
-    private TextField thirdNameField;
-    @FXML
-    private Label thirdNameErrorLabel;
-    private FieldError thirdNameError;
-
-    @FXML
-    private TextField emailField;
-    @FXML
-    private Label emailErrorLabel;
-    private FieldError emailError;
-
-    @FXML
-    private PasswordField passwordField;
-    @FXML
-    private Label passwordErrorLabel;
-    private FieldError passwordError;
-
-    @FXML
-    private Button submitButton;
-
-    @FXML
-    private void initialize() {
-        firstNameError = new FieldError(firstNameErrorLabel);
-        lastNameError = new FieldError(lastNameErrorLabel);
-        thirdNameError = new FieldError(thirdNameErrorLabel);
-        emailError = new FieldError(emailErrorLabel);
-        passwordError = new FieldError(passwordErrorLabel);
-
-        emailField.textProperty().addListener((o, a, b) -> emailError.hide());
-        passwordField.textProperty().addListener((o, a, b) -> passwordError.hide());
-    }
-
-    @FXML
-    private void onSubmit(ActionEvent event) {
-        if (!isValid())
-            return;
-
-        User user = authenticate(firstNameField.getText(), lastNameField.getText(), emailField.getText());
-        if (user == null)
-            return;
-
-        session.setCurrentUser(user);
-        navigator.goTo("/fxml/Search.fxml");
-    }
-
-    private boolean isValid() {
-        return isFirstNameValid() & isLastNameValid() & isThirdNameValid() & isEmailValid() & isPasswordValid();
-    }
-
-    private boolean isFirstNameValid() {
-        return isFieldValid(firstNameField, new FirstNameValidator(), firstNameError);
-    }
-
-    private boolean isLastNameValid() {
-        return isFieldValid(lastNameField, new LastNameValidator(), lastNameError);
-    }
-
-    private boolean isThirdNameValid() {
-        return isFieldValid(thirdNameField, new ThirdNameValidator(), thirdNameError);
-    }
-
-    private boolean isEmailValid() {
-        return isFieldValid(emailField, new EmailValidator(), emailError);
-    }
-
-    private boolean isPasswordValid() {
-        return isFieldValid(passwordField, new PasswordValidator(), passwordError);
-    }
-
-    private boolean isFieldValid(TextField field, Validator validator, FieldError errorLabel) {
-        String input = field.getText();
-        var error = validator.isValid(input);
-        if (error == null) {
-            errorLabel.hide();
-            return true;
-        }
-        errorLabel.show(error);
-        return false;
-    }
-
-    private User authenticate(String firstName, String lastName, String email) {
-        return new User(firstName, lastName, email);
+  @FXML private TextField firstNameField;
+  @FXML private Label firstNameErrorLabel;
+  private FieldError firstNameError;
+
+  @FXML private TextField lastNameField;
+  @FXML private Label lastNameErrorLabel;
+  private FieldError lastNameError;
+
+  @FXML private TextField thirdNameField;
+  @FXML private Label thirdNameErrorLabel;
+  private FieldError thirdNameError;
+
+  @FXML private TextField emailField;
+  @FXML private Label emailErrorLabel;
+  private FieldError emailError;
+
+  @FXML private PasswordField passwordField;
+  @FXML private Label passwordErrorLabel;
+  private FieldError passwordError;
+
+  @FXML private Button submitButton;
+
+  @FXML
+  private void initialize() {
+    firstNameError = new FieldError(firstNameErrorLabel);
+    lastNameError = new FieldError(lastNameErrorLabel);
+    thirdNameError = new FieldError(thirdNameErrorLabel);
+    emailError = new FieldError(emailErrorLabel);
+    passwordError = new FieldError(passwordErrorLabel);
+
+    emailField.textProperty().addListener((o, a, b) -> emailError.hide());
+    passwordField.textProperty().addListener((o, a, b) -> passwordError.hide());
+  }
+
+  @FXML
+  private void onSubmit(ActionEvent event) {
+    if (!isValid()) return;
+
+    User user =
+        authenticate(firstNameField.getText(), lastNameField.getText(), emailField.getText());
+    if (user == null) return;
+
+    session.setCurrentUser(user);
+    navigator.goTo("/fxml/Search.fxml");
+  }
+
+  private boolean isValid() {
+    return isFirstNameValid()
+        & isLastNameValid()
+        & isThirdNameValid()
+        & isEmailValid()
+        & isPasswordValid();
+  }
+
+  private boolean isFirstNameValid() {
+    return isFieldValid(firstNameField, new FirstNameValidator(), firstNameError);
+  }
+
+  private boolean isLastNameValid() {
+    return isFieldValid(lastNameField, new LastNameValidator(), lastNameError);
+  }
+
+  private boolean isThirdNameValid() {
+    return isFieldValid(thirdNameField, new ThirdNameValidator(), thirdNameError);
+  }
+
+  private boolean isEmailValid() {
+    return isFieldValid(emailField, new EmailValidator(), emailError);
+  }
+
+  private boolean isPasswordValid() {
+    return isFieldValid(passwordField, new PasswordValidator(), passwordError);
+  }
+
+  private boolean isFieldValid(TextField field, Validator validator, FieldError errorLabel) {
+    String input = field.getText();
+    var error = validator.isValid(input);
+    if (error == null) {
+      errorLabel.hide();
+      return true;
     }
-}
\ No newline at end of file
+    errorLabel.show(error);
+    return false;
+  }
+
+  private User authenticate(String firstName, String lastName, String email) {
+    return new User(firstName, lastName, email);
+  }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java
index 5e5ddea..9112fdd 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/SearchController.java
@@ -2,5 +2,4 @@
 
 import com.DesktopApplicationClientJava.controllers.utils.Controller;
 
-public class SearchController extends Controller {
-}
+public class SearchController extends Controller {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java b/src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java
index 753b17f..34b2bc4 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/utils/Controller.java
@@ -6,14 +6,14 @@
 import com.DesktopApplicationClientJava.session.SessionAware;
 
 public abstract class Controller implements SessionAware, NavigatorAware {
-    protected Session session;
-    protected Navigator navigator;
+  protected Session session;
+  protected Navigator navigator;
 
-    public void setSession(Session session) {
-        this.session = session;
-    }
+  public void setSession(Session session) {
+    this.session = session;
+  }
 
-    public void setNavigator(Navigator navigator) {
-        this.navigator = navigator;
-    }
+  public void setNavigator(Navigator navigator) {
+    this.navigator = navigator;
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/entities/Role.java b/src/main/java/com/DesktopApplicationClientJava/entities/Role.java
index bea3448..992a4ed 100644
--- a/src/main/java/com/DesktopApplicationClientJava/entities/Role.java
+++ b/src/main/java/com/DesktopApplicationClientJava/entities/Role.java
@@ -1,7 +1,7 @@
 package com.DesktopApplicationClientJava.entities;
 
 public enum Role {
-    USER,
-    MODER,
-    ADMIN
-}
\ No newline at end of file
+  USER,
+  MODER,
+  ADMIN
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/entities/User.java b/src/main/java/com/DesktopApplicationClientJava/entities/User.java
index 9b49645..dfc6d99 100644
--- a/src/main/java/com/DesktopApplicationClientJava/entities/User.java
+++ b/src/main/java/com/DesktopApplicationClientJava/entities/User.java
@@ -4,14 +4,12 @@
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * User
- */
+/** User */
 @AllArgsConstructor
 @Getter
 @Setter
 public class User {
-    private String firstName;
-    private String lastName;
-    private String email;
+  private String firstName;
+  private String lastName;
+  private String email;
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java b/src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java
index 52ad783..3f84fc7 100644
--- a/src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/navigation/Navigator.java
@@ -1,43 +1,38 @@
 package com.DesktopApplicationClientJava.navigation;
 
-import java.io.IOException;
-
 import com.DesktopApplicationClientJava.session.Session;
 import com.DesktopApplicationClientJava.session.SessionAware;
-
+import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.stage.Stage;
 import lombok.AllArgsConstructor;
 
-/**
- * Navigator
- */
+/** Navigator */
 @AllArgsConstructor
 public class Navigator {
-    private final Stage stage;
-    private final Session session;
-
-    public void goTo(String fxmlFile) {
-        var url = Navigator.class.getResource(fxmlFile);
-        if (url == null) {
-            throw new IllegalArgumentException("FXML not found on classpath: " + fxmlFile);
-        }
+  private final Stage stage;
+  private final Session session;
 
-        FXMLLoader loader = new FXMLLoader(url);
-        try {
-            Parent root = loader.load();
-            var controller = loader.getController();
-            if (controller instanceof SessionAware sa) {
-                sa.setSession(session);
-            }
-            if (controller instanceof NavigatorAware na) {
-                na.setNavigator(this);
-            }
-            stage.getScene().setRoot(root);
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to load FXML: " + fxmlFile, e);
-        }
+  public void goTo(String fxmlFile) {
+    var url = Navigator.class.getResource(fxmlFile);
+    if (url == null) {
+      throw new IllegalArgumentException("FXML not found on classpath: " + fxmlFile);
+    }
 
+    FXMLLoader loader = new FXMLLoader(url);
+    try {
+      Parent root = loader.load();
+      var controller = loader.getController();
+      if (controller instanceof SessionAware sa) {
+        sa.setSession(session);
+      }
+      if (controller instanceof NavigatorAware na) {
+        na.setNavigator(this);
+      }
+      stage.getScene().setRoot(root);
+    } catch (IOException e) {
+      throw new RuntimeException("Failed to load FXML: " + fxmlFile, e);
     }
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java b/src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java
index c2f36e5..f4a4bc8 100644
--- a/src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java
+++ b/src/main/java/com/DesktopApplicationClientJava/navigation/NavigatorAware.java
@@ -1,5 +1,5 @@
 package com.DesktopApplicationClientJava.navigation;
 
 public interface NavigatorAware {
-    void setNavigator(Navigator navigator);
-}
\ No newline at end of file
+  void setNavigator(Navigator navigator);
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java b/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
index 51e83c9..40667ff 100644
--- a/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
+++ b/src/main/java/com/DesktopApplicationClientJava/services/AuthService.java
@@ -1,5 +1,3 @@
 package com.DesktopApplicationClientJava.services;
 
-public class AuthService {
-
-}
\ No newline at end of file
+public class AuthService {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/FileService.java b/src/main/java/com/DesktopApplicationClientJava/services/FileService.java
index 655050f..6f616cf 100644
--- a/src/main/java/com/DesktopApplicationClientJava/services/FileService.java
+++ b/src/main/java/com/DesktopApplicationClientJava/services/FileService.java
@@ -1,4 +1,3 @@
 package com.DesktopApplicationClientJava.services;
 
-public class FileService {
-}
+public class FileService {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java b/src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java
index 1b3a9cb..cabf91c 100644
--- a/src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java
+++ b/src/main/java/com/DesktopApplicationClientJava/services/ResourceService.java
@@ -1,4 +1,3 @@
 package com.DesktopApplicationClientJava.services;
 
-public class ResourceService {
-}
+public class ResourceService {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/services/UsersService.java b/src/main/java/com/DesktopApplicationClientJava/services/UsersService.java
index 8c3d28f..018573e 100644
--- a/src/main/java/com/DesktopApplicationClientJava/services/UsersService.java
+++ b/src/main/java/com/DesktopApplicationClientJava/services/UsersService.java
@@ -1,4 +1,3 @@
 package com.DesktopApplicationClientJava.services;
 
-public class UsersService {
-}
+public class UsersService {}
diff --git a/src/main/java/com/DesktopApplicationClientJava/session/Session.java b/src/main/java/com/DesktopApplicationClientJava/session/Session.java
index d45186f..352b636 100644
--- a/src/main/java/com/DesktopApplicationClientJava/session/Session.java
+++ b/src/main/java/com/DesktopApplicationClientJava/session/Session.java
@@ -1,22 +1,21 @@
 package com.DesktopApplicationClientJava.session;
 
 import com.DesktopApplicationClientJava.entities.User;
-
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
 public class Session {
-    private User currentUser;
+  private User currentUser;
 
-    public User getCurrentUser() {
-        return currentUser;
-    }
+  public User getCurrentUser() {
+    return currentUser;
+  }
 
-    public void setCurrentUser(User user) {
-        this.currentUser = user;
-    }
+  public void setCurrentUser(User user) {
+    this.currentUser = user;
+  }
 
-    public boolean isLoggedIn() {
-        return currentUser != null;
-    }
-}
\ No newline at end of file
+  public boolean isLoggedIn() {
+    return currentUser != null;
+  }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java b/src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java
index 3c2fabd..83a8e4f 100644
--- a/src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java
+++ b/src/main/java/com/DesktopApplicationClientJava/session/SessionAware.java
@@ -1,5 +1,5 @@
 package com.DesktopApplicationClientJava.session;
 
 public interface SessionAware {
-    void setSession(Session session);
+  void setSession(Session session);
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/utils/ControllerWiring.java b/src/main/java/com/DesktopApplicationClientJava/utils/ControllerWiring.java
index 972c9a3..f986f72 100644
--- a/src/main/java/com/DesktopApplicationClientJava/utils/ControllerWiring.java
+++ b/src/main/java/com/DesktopApplicationClientJava/utils/ControllerWiring.java
@@ -4,17 +4,13 @@
 import com.DesktopApplicationClientJava.navigation.NavigatorAware;
 import com.DesktopApplicationClientJava.session.Session;
 import com.DesktopApplicationClientJava.session.SessionAware;
-
 import javafx.stage.Stage;
 
 public final class ControllerWiring {
-    private ControllerWiring() {
-    }
+  private ControllerWiring() {}
 
-    public static void wire(Object controller, Stage stage, Session session) {
-        if (controller instanceof SessionAware sa)
-            sa.setSession(session);
-        if (controller instanceof NavigatorAware na)
-            na.setNavigator(new Navigator(stage, session));
-    }
+  public static void wire(Object controller, Stage stage, Session session) {
+    if (controller instanceof SessionAware sa) sa.setSession(session);
+    if (controller instanceof NavigatorAware na) na.setNavigator(new Navigator(stage, session));
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/utils/FieldError.java b/src/main/java/com/DesktopApplicationClientJava/utils/FieldError.java
index 88d3a61..cafa2bf 100644
--- a/src/main/java/com/DesktopApplicationClientJava/utils/FieldError.java
+++ b/src/main/java/com/DesktopApplicationClientJava/utils/FieldError.java
@@ -3,28 +3,26 @@
 import javafx.scene.control.Label;
 
 public class FieldError {
-    private final Label label;
+  private final Label label;
 
-    public FieldError(Label label) {
-        this.label = label;
-    }
+  public FieldError(Label label) {
+    this.label = label;
+  }
 
-    public void show(String message) {
-        if (label == null)
-            return;
-        label.setText(message);
-        label.setVisible(true);
-        label.setManaged(true);
-    }
+  public void show(String message) {
+    if (label == null) return;
+    label.setText(message);
+    label.setVisible(true);
+    label.setManaged(true);
+  }
 
-    public void hide() {
-        if (label == null)
-            return;
-        label.setVisible(false);
-        label.setManaged(false);
-    }
+  public void hide() {
+    if (label == null) return;
+    label.setVisible(false);
+    label.setManaged(false);
+  }
 
-    public boolean isShowing() {
-        return label.isVisible();
-    }
-}
\ No newline at end of file
+  public boolean isShowing() {
+    return label.isVisible();
+  }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
index 0ab51df..75e0d99 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/EmailValidator.java
@@ -5,19 +5,17 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class EmailValidator extends AbstractValidator {
-    public static final String FIELD_NAME = "Почта";
-    public static final int MIN_EMAIL_LENGTH = 5;
-    public static final int MAX_EMAIL_LENGTH = 100;
+  public static final String FIELD_NAME = "Почта";
+  public static final int MIN_EMAIL_LENGTH = 5;
+  public static final int MAX_EMAIL_LENGTH = 100;
 
-    public String isValid(String input) {
-        if (ValidatorHelpers.isEmpty(input))
-            return ErrorMessages.Required;
-        if (ValidatorHelpers.isShorterThan(input, MIN_EMAIL_LENGTH))
-            return ErrorMessages.MinLength(FIELD_NAME, MIN_EMAIL_LENGTH);
-        if (ValidatorHelpers.isLongerThan(input, MAX_EMAIL_LENGTH))
-            return ErrorMessages.MaxLength(FIELD_NAME, MAX_EMAIL_LENGTH);
-        if (!ValidatorHelpers.includes(input, "@"))
-            return ErrorMessages.IncorrectFormat;
-        return null;
-    }
+  public String isValid(String input) {
+    if (ValidatorHelpers.isEmpty(input)) return ErrorMessages.Required;
+    if (ValidatorHelpers.isShorterThan(input, MIN_EMAIL_LENGTH))
+      return ErrorMessages.MinLength(FIELD_NAME, MIN_EMAIL_LENGTH);
+    if (ValidatorHelpers.isLongerThan(input, MAX_EMAIL_LENGTH))
+      return ErrorMessages.MaxLength(FIELD_NAME, MAX_EMAIL_LENGTH);
+    if (!ValidatorHelpers.includes(input, "@")) return ErrorMessages.IncorrectFormat;
+    return null;
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
index 711eeda..5f9516f 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/FirstNameValidator.java
@@ -5,14 +5,13 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class FirstNameValidator extends AbstractValidator {
-    public static final String FIELD_NAME = "Имя";
-    private static final int MIN_LENGTH = 2;
+  public static final String FIELD_NAME = "Имя";
+  private static final int MIN_LENGTH = 2;
 
-    public String isValid(String input) {
-        if (ValidatorHelpers.isEmpty(input))
-            return ErrorMessages.Required;
-        if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
-            return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
-        return null;
-    }
+  public String isValid(String input) {
+    if (ValidatorHelpers.isEmpty(input)) return ErrorMessages.Required;
+    if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
+      return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
+    return null;
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
index 01b463e..933e658 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/LastNameValidator.java
@@ -5,14 +5,13 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class LastNameValidator extends AbstractValidator {
-    public static final String FIELD_NAME = "Фамилия";
-    public static final int MIN_LENGTH = 2;
+  public static final String FIELD_NAME = "Фамилия";
+  public static final int MIN_LENGTH = 2;
 
-    public String isValid(String input) {
-        if (ValidatorHelpers.isEmpty(input))
-            return ErrorMessages.Required;
-        if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
-            return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
-        return null;
-    }
+  public String isValid(String input) {
+    if (ValidatorHelpers.isEmpty(input)) return ErrorMessages.Required;
+    if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
+      return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
+    return null;
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
index ccdb539..a9e2c97 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/PasswordValidator.java
@@ -5,17 +5,16 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class PasswordValidator extends AbstractValidator {
-    public static final String FIELD_NAME = "Пароль";
-    public static final int MIN_LENGTH = 8;
-    public static final int MAX_LENGTH = 64;
+  public static final String FIELD_NAME = "Пароль";
+  public static final int MIN_LENGTH = 8;
+  public static final int MAX_LENGTH = 64;
 
-    public String isValid(String input) {
-        if (ValidatorHelpers.isEmpty(input))
-            return ErrorMessages.Required;
-        if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
-            return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
-        if (ValidatorHelpers.isLongerThan(input, MAX_LENGTH))
-            return ErrorMessages.MaxLength(FIELD_NAME, MAX_LENGTH);
-        return null;
-    }
+  public String isValid(String input) {
+    if (ValidatorHelpers.isEmpty(input)) return ErrorMessages.Required;
+    if (ValidatorHelpers.isShorterThan(input, MIN_LENGTH))
+      return ErrorMessages.MinLength(FIELD_NAME, MIN_LENGTH);
+    if (ValidatorHelpers.isLongerThan(input, MAX_LENGTH))
+      return ErrorMessages.MaxLength(FIELD_NAME, MAX_LENGTH);
+    return null;
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java
index 87f7470..fd3aa2f 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/ThirdNameValidator.java
@@ -5,13 +5,11 @@
 import com.DesktopApplicationClientJava.validation.utils.ValidatorHelpers;
 
 public class ThirdNameValidator extends AbstractValidator {
-    public static final String FIELD_NAME = "Отчество";
-
-    @Override
-    public String isValid(String input) {
-        if (ValidatorHelpers.isEmpty(input))
-            return ErrorMessages.Required;
-        return null;
-    }
+  public static final String FIELD_NAME = "Отчество";
 
+  @Override
+  public String isValid(String input) {
+    if (ValidatorHelpers.isEmpty(input)) return ErrorMessages.Required;
+    return null;
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java
index f6b3d2e..3a921e8 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/AbstractValidator.java
@@ -1,5 +1,5 @@
 package com.DesktopApplicationClientJava.validation.utils;
 
 public abstract class AbstractValidator implements Validator {
-    public abstract String isValid(String input);
+  public abstract String isValid(String input);
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
index 08a91d2..51a3b71 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ErrorMessages.java
@@ -1,14 +1,14 @@
 package com.DesktopApplicationClientJava.validation.utils;
 
 public class ErrorMessages {
-    public final static String Required = "Это поле обязательно для заполнения";
-    public final static String IncorrectFormat = "Неверный формат";
+  public static final String Required = "Это поле обязательно для заполнения";
+  public static final String IncorrectFormat = "Неверный формат";
 
-    public static final String MinLength(String fieldName, int minLength) {
-        return fieldName + " не может быть короче, чем " + minLength + " символов";
-    }
+  public static final String MinLength(String fieldName, int minLength) {
+    return fieldName + " не может быть короче, чем " + minLength + " символов";
+  }
 
-    public static final String MaxLength(String fieldName, int maxLength) {
-        return fieldName + " не может быть длиннее, чем " + maxLength + " символов";
-    }
+  public static final String MaxLength(String fieldName, int maxLength) {
+    return fieldName + " не может быть длиннее, чем " + maxLength + " символов";
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java
index 6446901..081eef7 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/Validator.java
@@ -2,5 +2,5 @@
 
 @FunctionalInterface
 public interface Validator {
-    String isValid(String input);
+  String isValid(String input);
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java
index 779dd42..6db826b 100644
--- a/src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java
+++ b/src/main/java/com/DesktopApplicationClientJava/validation/utils/ValidatorHelpers.java
@@ -1,25 +1,25 @@
 package com.DesktopApplicationClientJava.validation.utils;
 
 public class ValidatorHelpers {
-    public static boolean isEmpty(String input) {
-        return input == null || input.isBlank();
-    }
+  public static boolean isEmpty(String input) {
+    return input == null || input.isBlank();
+  }
 
-    public static boolean isShorterThan(String input, int min) {
-        return input.length() < min;
-    }
+  public static boolean isShorterThan(String input, int min) {
+    return input.length() < min;
+  }
 
-    public static boolean isLongerThan(String input, int max) {
-        return input.length() > max;
-    }
+  public static boolean isLongerThan(String input, int max) {
+    return input.length() > max;
+  }
 
-    /**
-     * @param input input string
-     * @param sub   substring
-     * @return <code>true</code> if <code>input</code> includes a substring
-     *         <code>sub</code>, <code>false</code> otherwise
-     */
-    public static boolean includes(String input, String sub) {
-        return input.contains(sub);
-    }
+  /**
+   * @param input input string
+   * @param sub substring
+   * @return <code>true</code> if <code>input</code> includes a substring <code>sub</code>, <code>
+   *     false</code> otherwise
+   */
+  public static boolean includes(String input, String sub) {
+    return input.contains(sub);
+  }
 }
diff --git a/src/test/java/validation/EmailValidatorTest.java b/src/test/java/validation/EmailValidatorTest.java
index 9193453..54f5480 100644
--- a/src/test/java/validation/EmailValidatorTest.java
+++ b/src/test/java/validation/EmailValidatorTest.java
@@ -3,44 +3,46 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.jupiter.api.Test;
-
 import com.DesktopApplicationClientJava.validation.EmailValidator;
 import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import org.junit.jupiter.api.Test;
 
 public class EmailValidatorTest {
-    private static final String FIELD_NAME = EmailValidator.FIELD_NAME;
-    private static final EmailValidator emailValidator = new EmailValidator();
-
-    @Test
-    void emptyEmailIsRejected() {
-        assertEquals(ErrorMessages.Required, emailValidator.isValid(""));
-    }
-
-    @Test
-    void blankEmailIsRejected() {
-        assertEquals(ErrorMessages.Required, emailValidator.isValid("   "));
-    }
-
-    @Test
-    void shortEmailIsRejected() {
-        assertEquals(ErrorMessages.MinLength(FIELD_NAME, EmailValidator.MIN_EMAIL_LENGTH),
-                emailValidator.isValid("a@b"));
-    }
-
-    @Test
-    void longEmailIsRejected() {
-        String e = "a".repeat(95) + "@x.com";
-        assertEquals(ErrorMessages.MaxLength(FIELD_NAME, EmailValidator.MAX_EMAIL_LENGTH), emailValidator.isValid(e));
-    }
-
-    @Test
-    void emailWithoutAtIsRejected() {
-        assertEquals(ErrorMessages.IncorrectFormat, emailValidator.isValid("nope.com"));
-    }
-
-    @Test
-    void validEmailIsAccepted() {
-        assertNull(emailValidator.isValid("test@example.com"));
-    }
+  private static final String FIELD_NAME = EmailValidator.FIELD_NAME;
+  private static final EmailValidator emailValidator = new EmailValidator();
+
+  @Test
+  void emptyEmailIsRejected() {
+    assertEquals(ErrorMessages.Required, emailValidator.isValid(""));
+  }
+
+  @Test
+  void blankEmailIsRejected() {
+    assertEquals(ErrorMessages.Required, emailValidator.isValid("   "));
+  }
+
+  @Test
+  void shortEmailIsRejected() {
+    assertEquals(
+        ErrorMessages.MinLength(FIELD_NAME, EmailValidator.MIN_EMAIL_LENGTH),
+        emailValidator.isValid("a@b"));
+  }
+
+  @Test
+  void longEmailIsRejected() {
+    String e = "a".repeat(95) + "@x.com";
+    assertEquals(
+        ErrorMessages.MaxLength(FIELD_NAME, EmailValidator.MAX_EMAIL_LENGTH),
+        emailValidator.isValid(e));
+  }
+
+  @Test
+  void emailWithoutAtIsRejected() {
+    assertEquals(ErrorMessages.IncorrectFormat, emailValidator.isValid("nope.com"));
+  }
+
+  @Test
+  void validEmailIsAccepted() {
+    assertNull(emailValidator.isValid("test@example.com"));
+  }
 }
diff --git a/src/test/java/validation/FirstNameValidatorTest.java b/src/test/java/validation/FirstNameValidatorTest.java
index d95c63a..1ef2a3a 100644
--- a/src/test/java/validation/FirstNameValidatorTest.java
+++ b/src/test/java/validation/FirstNameValidatorTest.java
@@ -3,22 +3,21 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.jupiter.api.Test;
-
 import com.DesktopApplicationClientJava.validation.FirstNameValidator;
 import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import org.junit.jupiter.api.Test;
 
 public class FirstNameValidatorTest {
-    private static final String FIELD_NAME = FirstNameValidator.FIELD_NAME;
-    private static final FirstNameValidator firstNameValidator = new FirstNameValidator();
+  private static final String FIELD_NAME = FirstNameValidator.FIELD_NAME;
+  private static final FirstNameValidator firstNameValidator = new FirstNameValidator();
 
-    @Test
-    void emptyFirstNameIsRejected() {
-        assertEquals(ErrorMessages.Required, firstNameValidator.isValid(""));
-    }
+  @Test
+  void emptyFirstNameIsRejected() {
+    assertEquals(ErrorMessages.Required, firstNameValidator.isValid(""));
+  }
 
-    @Test
-    void validFirstNameIsAccepted() {
-        assertNull(firstNameValidator.isValid("Антон"));
-    }
+  @Test
+  void validFirstNameIsAccepted() {
+    assertNull(firstNameValidator.isValid("Антон"));
+  }
 }
diff --git a/src/test/java/validation/LastNameValidatorTest.java b/src/test/java/validation/LastNameValidatorTest.java
index 8bf365a..aeec56e 100644
--- a/src/test/java/validation/LastNameValidatorTest.java
+++ b/src/test/java/validation/LastNameValidatorTest.java
@@ -3,22 +3,21 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.jupiter.api.Test;
-
 import com.DesktopApplicationClientJava.validation.LastNameValidator;
 import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import org.junit.jupiter.api.Test;
 
 public class LastNameValidatorTest {
-    private static final String FIELD_NAME = LastNameValidator.FIELD_NAME;
-    private static final LastNameValidator lastNameValidator = new LastNameValidator();
+  private static final String FIELD_NAME = LastNameValidator.FIELD_NAME;
+  private static final LastNameValidator lastNameValidator = new LastNameValidator();
 
-    @Test
-    void emptyLastNameIsRejected() {
-        assertEquals(ErrorMessages.Required, lastNameValidator.isValid(""));
-    }
+  @Test
+  void emptyLastNameIsRejected() {
+    assertEquals(ErrorMessages.Required, lastNameValidator.isValid(""));
+  }
 
-    @Test
-    void validLastNameIsAccepted() {
-        assertNull(lastNameValidator.isValid("Антонов"));
-    }
+  @Test
+  void validLastNameIsAccepted() {
+    assertNull(lastNameValidator.isValid("Антонов"));
+  }
 }
diff --git a/src/test/java/validation/PasswordValidatorTest.java b/src/test/java/validation/PasswordValidatorTest.java
index 9c3eb36..8350694 100644
--- a/src/test/java/validation/PasswordValidatorTest.java
+++ b/src/test/java/validation/PasswordValidatorTest.java
@@ -3,28 +3,28 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.jupiter.api.Test;
-
 import com.DesktopApplicationClientJava.validation.PasswordValidator;
 import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import org.junit.jupiter.api.Test;
 
 public class PasswordValidatorTest {
-    private static final String FIELD_NAME = PasswordValidator.FIELD_NAME;
-    private static final PasswordValidator passwordValidator = new PasswordValidator();
+  private static final String FIELD_NAME = PasswordValidator.FIELD_NAME;
+  private static final PasswordValidator passwordValidator = new PasswordValidator();
 
-    @Test
-    void emptyPasswordIsRejected() {
-        assertEquals(ErrorMessages.Required, passwordValidator.isValid(""));
-    }
+  @Test
+  void emptyPasswordIsRejected() {
+    assertEquals(ErrorMessages.Required, passwordValidator.isValid(""));
+  }
 
-    @Test
-    void shortPasswordIsRejected() {
-        assertEquals(ErrorMessages.MinLength(FIELD_NAME, PasswordValidator.MIN_LENGTH),
-                passwordValidator.isValid("short"));
-    }
+  @Test
+  void shortPasswordIsRejected() {
+    assertEquals(
+        ErrorMessages.MinLength(FIELD_NAME, PasswordValidator.MIN_LENGTH),
+        passwordValidator.isValid("short"));
+  }
 
-    @Test
-    void exactlyEightCharPasswordIsAccepted() {
-        assertNull(passwordValidator.isValid("12345678"));
-    }
+  @Test
+  void exactlyEightCharPasswordIsAccepted() {
+    assertNull(passwordValidator.isValid("12345678"));
+  }
 }
diff --git a/src/test/java/validation/ThirdNameValidatorTest.java b/src/test/java/validation/ThirdNameValidatorTest.java
index 46c0e8b..0eb4f25 100644
--- a/src/test/java/validation/ThirdNameValidatorTest.java
+++ b/src/test/java/validation/ThirdNameValidatorTest.java
@@ -3,22 +3,21 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.jupiter.api.Test;
-
 import com.DesktopApplicationClientJava.validation.ThirdNameValidator;
 import com.DesktopApplicationClientJava.validation.utils.ErrorMessages;
+import org.junit.jupiter.api.Test;
 
 public class ThirdNameValidatorTest {
-    private static final String FIELD_NAME = ThirdNameValidator.FIELD_NAME;
-    private static final ThirdNameValidator thirdNameValidator = new ThirdNameValidator();
+  private static final String FIELD_NAME = ThirdNameValidator.FIELD_NAME;
+  private static final ThirdNameValidator thirdNameValidator = new ThirdNameValidator();
 
-    @Test
-    void emptyThirdNameIsRejected() {
-        assertEquals(ErrorMessages.Required, thirdNameValidator.isValid(""));
-    }
+  @Test
+  void emptyThirdNameIsRejected() {
+    assertEquals(ErrorMessages.Required, thirdNameValidator.isValid(""));
+  }
 
-    @Test
-    void validThirdNameIsAccepted() {
-        assertNull(thirdNameValidator.isValid("Антон"));
-    }
+  @Test
+  void validThirdNameIsAccepted() {
+    assertNull(thirdNameValidator.isValid("Антон"));
+  }
 }

From 8b6b3b2e4810fa62b39f273fcc3fb7a26672975a Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 15:11:00 +0300
Subject: [PATCH 24/27] chore: fix job permissions; make format depend on build

---
 .github/workflows/maven.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 812288f..5558a59 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -6,11 +6,11 @@ on:
   pull_request:
     branches: [ "main" ]
 
-permissions:
-  contents: write
 
 jobs:
   build:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -30,6 +30,7 @@ jobs:
         maven-args: "-DmergeClassifiers=true"
 
   format:
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

From d56ac20117e068a45fc02b34a3bf5225a5f34acb Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 15:12:24 +0300
Subject: [PATCH 25/27] chore: rename workflow

---
 .github/workflows/{maven.yml => workflow.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{maven.yml => workflow.yml} (97%)

diff --git a/.github/workflows/maven.yml b/.github/workflows/workflow.yml
similarity index 97%
rename from .github/workflows/maven.yml
rename to .github/workflows/workflow.yml
index 5558a59..1b16d80 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/workflow.yml
@@ -1,4 +1,4 @@
-name: Java CI with Maven
+name: PR pipeline
 
 on:
   push:

From 08bcfddbf0f1d126e97275a37c61ac31ae10f555 Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 15:16:06 +0300
Subject: [PATCH 26/27] chore: setup reusable setup-jdk action

---
 .github/actions/setup-jdk/action.yml | 12 ++++++++++++
 .github/workflows/workflow.yml       | 16 ++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 .github/actions/setup-jdk/action.yml

diff --git a/.github/actions/setup-jdk/action.yml b/.github/actions/setup-jdk/action.yml
new file mode 100644
index 0000000..e0e1978
--- /dev/null
+++ b/.github/actions/setup-jdk/action.yml
@@ -0,0 +1,12 @@
+name: 'Setup JDK 25'
+description: 'Sets up Java 25 with Temurin and Maven cache'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK 25
+      uses: actions/setup-java@v4
+      with:
+        java-version: '25'
+        distribution: 'temurin'
+        cache: maven
\ No newline at end of file
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 1b16d80..29edfe4 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -14,12 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 25
-      uses: actions/setup-java@v5
-      with:
-        java-version: '25'
-        distribution: 'temurin'
-        cache: maven
+    - name: Set up JDK
+      uses: ./.github/actions/setup-jdk
     - name: Build with Maven
       run: mvn -B package --file pom.xml
     - name: Update dependency graph
@@ -34,11 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 25
-        uses: actions/setup-java@v4
-        with:
-          java-version: '25'
-          distribution: 'temurin'
-          cache: maven
+      - name: Set up JDK
+        uses: ./.github/actions/setup-jdk
       - name: Check formatting
         run: mvn -B spotless:check --file pom.xml
\ No newline at end of file

From 1d133b7b33087c8069ce5ace6e1fe17202d8435e Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Sat, 3 Oct 2026 15:24:01 +0300
Subject: [PATCH 27/27] chore: update checkout and setup-java

---
 .github/actions/setup-jdk/action.yml | 2 +-
 .github/workflows/workflow.yml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/actions/setup-jdk/action.yml b/.github/actions/setup-jdk/action.yml
index e0e1978..209dfce 100644
--- a/.github/actions/setup-jdk/action.yml
+++ b/.github/actions/setup-jdk/action.yml
@@ -5,7 +5,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up JDK 25
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: '25'
         distribution: 'temurin'
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 29edfe4..f2b4b73 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up JDK
       uses: ./.github/actions/setup-jdk
     - name: Build with Maven
@@ -29,7 +29,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK
         uses: ./.github/actions/setup-jdk
       - name: Check formatting