From 0d1a75266fd3aa1b63323ff18d5152e83a890046 Mon Sep 17 00:00:00 2001
From: Volha <kresiko@gmail.com>
Date: Tue, 9 Mar 2021 11:30:46 +0200
Subject: [PATCH 1/5] The task with threads is completed, but I don't know how
 to print "END once"

---
 .../src/main/java/race/Car.java               | 49 +++++++++++++++++
 .../src/main/java/race/Finish.java            | 36 +++++++++++++
 .../src/main/java/race/MainClass.java         | 30 +++++++++++
 .../src/main/java/race/Race.java              | 13 +++++
 .../src/main/java/race/RaceGoing.java         | 52 +++++++++++++++++++
 .../src/main/java/race/Road.java              | 19 +++++++
 .../src/main/java/race/Stage.java             | 10 ++++
 .../src/main/java/race/Tunnel.java            | 29 +++++++++++
 8 files changed, 238 insertions(+)
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Race.java
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Road.java
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Stage.java
 create mode 100644 org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Tunnel.java

diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java
new file mode 100644
index 0000000..8a30e37
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java
@@ -0,0 +1,49 @@
+package race;
+
+//import static race.MainClass.cbStartRace;
+
+import static race.RaceGoing.newBarrier;
+
+public class Car implements Runnable {
+    private static int CARS_COUNT;
+
+    static {
+        CARS_COUNT = 4;
+    }
+
+    private Race race;
+    private int speed;
+    private String name;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public int getSpeed() {
+        return speed;
+    }
+
+    public Car(int speed, int carNumber, Race race) {
+        this.race = race;
+        this.speed = speed;
+        this.name = "Участник #" + carNumber;
+    }
+
+    @Override
+    public void run() {
+        try {
+            System.out.println(this.name + " готовится");
+            Thread.sleep(500 + (int) (Math.random() * 800));
+            System.out.println(this.name + " готов");
+            newBarrier.await();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        for ( Stage stage : race.getStages() ) {
+            stage.go(this);
+        }
+    }
+}
+
+
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
new file mode 100644
index 0000000..2f37874
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
@@ -0,0 +1,36 @@
+package race;
+
+import java.util.concurrent.BrokenBarrierException;
+
+public class Finish extends Stage {
+    volatile boolean winnner = false;
+
+    public Finish() {
+        this.description = "Finish";
+    }
+
+    @Override
+    public void go(Car c) {
+        System.out.println(c.getName() + " начал этап: " + description);
+        System.out.println(c.getName() + " закончил этап: " + description);
+        if (!winnner) {
+            System.out.println(c.getName() + " WON");
+            winnner = true;
+        }
+        try {
+            RaceGoing.newFinishBarrier.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (BrokenBarrierException e) {
+            e.printStackTrace();
+        }
+      finally {
+            System.out.println("ВАЖНОЕ ОБЪЯВЛЕНИЕ >>> The race is finished!!!");
+
+        }
+    }
+}
+
+
+
+
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java
new file mode 100644
index 0000000..6de5a68
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java
@@ -0,0 +1,30 @@
+package race;
+//Организуем гонки:
+//        Все участники должны стартовать одновременно, несмотря на то, что на подготовку у каждого из них уходит разное время.
+//        В туннель не может заехать одновременно больше половины участников (условность).
+//        Попробуйте всё это синхронизировать.
+//        Только после того как все завершат гонку, нужно выдать объявление об окончании.
+//        Можете корректировать классы (в т.ч. конструктор машин) и добавлять объекты классов из пакета util.concurrent.
+
+import java.util.concurrent.BrokenBarrierException;
+
+public class MainClass {
+    public static void main(String[] args) throws InterruptedException {
+        // parent thread
+        RaceGoing raceGoing = new RaceGoing();
+
+        Thread t1 = new Thread(raceGoing);
+        t1.start();
+//        try {
+//            RaceGoing.newFinishBarrier.await();
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        } catch (BrokenBarrierException e) {
+//            e.printStackTrace();
+//        }
+//        System.out.println("FIN");
+//        t1.join();
+//        System.out.println("FINISH");
+        //  System.out.println("ВАЖНОЕ ОБЪЯВЛЕНИЕ >>> Гонка закончилась!!!");
+    }
+}
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Race.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Race.java
new file mode 100644
index 0000000..9ec35b7
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Race.java
@@ -0,0 +1,13 @@
+package race;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class Race {
+        private ArrayList<Stage> stages;
+        public ArrayList<Stage> getStages() { return stages; }
+        public Race(Stage... stages) {
+            this.stages = new ArrayList<>(Arrays.asList(stages));
+        }
+    }
+
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java
new file mode 100644
index 0000000..bb0142b
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java
@@ -0,0 +1,52 @@
+package race;
+
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.locks.Lock;
+
+public class RaceGoing implements Runnable {
+    public static final int CARS_COUNT = 4;
+    public static CyclicBarrier newBarrier = new CyclicBarrier(CARS_COUNT + 1);
+    public static CyclicBarrier newFinishBarrier = new CyclicBarrier(CARS_COUNT);
+    public static Lock lock;
+    public static Car[] cars;
+    public static Semaphore tunnelSemaphore = new Semaphore(CARS_COUNT / 2);
+
+    @Override
+    public void run() {
+        System.out.println("Number of parties required to trip the barrier = " +
+                newBarrier.getParties());
+
+        System.out.println("ВАЖНОЕ ОБЪЯВЛЕНИЕ >>> Подготовка!!!");
+        Race race = new Race(new Road(60), new Tunnel(80), new Road(40), new Finish());
+        cars = new Car[CARS_COUNT];
+        for ( int i = 0; i < cars.length; i++ ) {
+            cars[i] = new Car(20 + (int) (Math.random() * 10), i + 1, race);
+        }
+        for ( int i = 0; i < cars.length; i++ ) {
+            new Thread(cars[i]).start();
+        }
+
+        try {
+            RaceGoing.newBarrier.await();
+        } catch (InterruptedException | BrokenBarrierException e) {
+            e.printStackTrace();
+        }
+        System.out.println("Race begun");
+
+        // Resetting the newBarrier
+        newBarrier.reset();
+        System.out.println("Barrier reset successful");
+        //RaceGoing.newBarrier.await();
+//        try {
+//            newFinishBarrier.await();
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        } catch (BrokenBarrierException e) {
+//            e.printStackTrace();
+//        }
+
+    }
+}
+
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Road.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Road.java
new file mode 100644
index 0000000..15cad8b
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Road.java
@@ -0,0 +1,19 @@
+package race;
+
+public class Road extends Stage {
+    public Road(int length) {
+        this.length = length;
+        this.description = "Дорога " + length + " метров";
+    }
+
+    @Override
+    public void go(Car c) {
+        try {
+            System.out.println(c.getName() + " начал этап: " + description);
+            Thread.sleep(length / c.getSpeed() * 1000);
+            System.out.println(c.getName() + " закончил этап: " + description);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Stage.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Stage.java
new file mode 100644
index 0000000..1661a4e
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Stage.java
@@ -0,0 +1,10 @@
+package race;
+public abstract class Stage {
+    protected int length;
+    protected String description;
+    public String getDescription() {
+        return description;
+    }
+    public abstract void go(Car c);
+}
+
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Tunnel.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Tunnel.java
new file mode 100644
index 0000000..cc02ec0
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Tunnel.java
@@ -0,0 +1,29 @@
+package race;
+
+import static race.RaceGoing.tunnelSemaphore;
+
+public class Tunnel extends Stage {
+    public Tunnel(int tunnelLength) {
+        this.length = tunnelLength;
+        this.description = "Тоннель " + length + " метров";
+    }
+
+    @Override
+    public void go(Car c) {
+        try {
+            try {
+                System.out.println(c.getName() + " готовится к этапу(ждет): " + description);
+                tunnelSemaphore.acquire();
+                System.out.println(c.getName() + " начал этап: " + description);
+                Thread.sleep(length / c.getSpeed() * 1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            } finally {
+                System.out.println(c.getName() + " закончил этап: " + description);
+                tunnelSemaphore.release();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file

From 5f8f9cd1c84d7b027dc4559d405fef82a67d871c Mon Sep 17 00:00:00 2001
From: Volha <kresiko@gmail.com>
Date: Tue, 9 Mar 2021 21:47:48 +0200
Subject: [PATCH 2/5] The end is working, but sometimes there are twi
 winners...

---
 .../src/main/java/race/Car.java               |  9 ++++++++
 .../src/main/java/race/Finish.java            | 15 ++----------
 .../src/main/java/race/MainClass.java         | 11 ---------
 .../src/main/java/race/RaceGoing.java         | 23 ++++++++-----------
 4 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java
index 8a30e37..129a9a0 100644
--- a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Car.java
@@ -2,6 +2,8 @@
 
 //import static race.MainClass.cbStartRace;
 
+import java.util.concurrent.BrokenBarrierException;
+
 import static race.RaceGoing.newBarrier;
 
 public class Car implements Runnable {
@@ -43,6 +45,13 @@ public void run() {
         for ( Stage stage : race.getStages() ) {
             stage.go(this);
         }
+        try {
+            newBarrier.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (BrokenBarrierException e) {
+            e.printStackTrace();
+        }
     }
 }
 
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
index 2f37874..811bdee 100644
--- a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
@@ -14,20 +14,9 @@ public void go(Car c) {
         System.out.println(c.getName() + " начал этап: " + description);
         System.out.println(c.getName() + " закончил этап: " + description);
         if (!winnner) {
-            System.out.println(c.getName() + " WON");
             winnner = true;
-        }
-        try {
-            RaceGoing.newFinishBarrier.await();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (BrokenBarrierException e) {
-            e.printStackTrace();
-        }
-      finally {
-            System.out.println("ВАЖНОЕ ОБЪЯВЛЕНИЕ >>> The race is finished!!!");
-
-        }
+            System.out.println(c.getName() + " WON ");
+                    }
     }
 }
 
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java
index 6de5a68..18c15a0 100644
--- a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/MainClass.java
@@ -15,16 +15,5 @@ public static void main(String[] args) throws InterruptedException {
 
         Thread t1 = new Thread(raceGoing);
         t1.start();
-//        try {
-//            RaceGoing.newFinishBarrier.await();
-//        } catch (InterruptedException e) {
-//            e.printStackTrace();
-//        } catch (BrokenBarrierException e) {
-//            e.printStackTrace();
-//        }
-//        System.out.println("FIN");
-//        t1.join();
-//        System.out.println("FINISH");
-        //  System.out.println("ВАЖНОЕ ОБЪЯВЛЕНИЕ >>> Гонка закончилась!!!");
     }
 }
diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java
index bb0142b..81b9721 100644
--- a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/RaceGoing.java
@@ -29,24 +29,19 @@ public void run() {
         }
 
         try {
-            RaceGoing.newBarrier.await();
+            newBarrier.await();
         } catch (InterruptedException | BrokenBarrierException e) {
             e.printStackTrace();
         }
         System.out.println("Race begun");
-
-        // Resetting the newBarrier
-        newBarrier.reset();
-        System.out.println("Barrier reset successful");
-        //RaceGoing.newBarrier.await();
-//        try {
-//            newFinishBarrier.await();
-//        } catch (InterruptedException e) {
-//            e.printStackTrace();
-//        } catch (BrokenBarrierException e) {
-//            e.printStackTrace();
-//        }
-
+        try {
+            newBarrier.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (BrokenBarrierException e) {
+            e.printStackTrace();
+        }
+        System.out.println("The race is finished");
     }
 }
 

From ef238a903fa39f0a826bd30ee6afc95f9be8c00e Mon Sep 17 00:00:00 2001
From: Volha <kresiko@gmail.com>
Date: Wed, 10 Mar 2021 07:50:32 +0200
Subject: [PATCH 3/5] Threads II hw. Race

---
 .../threadracefromexample/src/main/java/race/Finish.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
index 811bdee..3295c99 100644
--- a/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
+++ b/org.volha.geekbrains.java.level3/threadracefromexample/src/main/java/race/Finish.java
@@ -1,9 +1,10 @@
 package race;
 
 import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class Finish extends Stage {
-    volatile boolean winnner = false;
+    AtomicBoolean winner = new AtomicBoolean(false);
 
     public Finish() {
         this.description = "Finish";
@@ -13,8 +14,8 @@ public Finish() {
     public void go(Car c) {
         System.out.println(c.getName() + " начал этап: " + description);
         System.out.println(c.getName() + " закончил этап: " + description);
-        if (!winnner) {
-            winnner = true;
+        if (!winner.get()) {
+            winner.set(true);
             System.out.println(c.getName() + " WON ");
                     }
     }

From 684610f03dd48d027759622a5739c4724dbc44cb Mon Sep 17 00:00:00 2001
From: Volha <kresiko@gmail.com>
Date: Wed, 10 Mar 2021 14:06:15 +0200
Subject: [PATCH 4/5] Java level 3 lesson2 hw - db

---
 .../src/main/java/client/Controller.java      |   2 +-
 .../client/src/main/java/client/Main.java     |   2 +-
 .../src/main/java/client/RegController.java   |   5 +-
 .../client/target/classes/css/style.css       |   3 +
 .../client/target/classes/reg.fxml            |  26 ++++
 .../client/target/classes/sample.fxml         |  34 +++++
 .../target/maven-archiver/pom.properties      |   5 +
 .../target/maven-archiver/pom.properties      |   5 +
 .../chat_geekchat_16012021/main.db            | Bin 20967424 -> 20967424 bytes
 .../src/main/java/server/AuthService.java     |   1 +
 .../src/main/java/server/ClientHandler.java   |   4 +-
 .../src/main/java/server/DBAuthService.java   | 134 ++----------------
 .../server/src/main/java/server/DBMain.java   | 111 ++++-----------
 .../server/src/main/java/server/Server.java   |  10 +-
 .../main/java/server/SimpleAuthService.java   |  10 +-
 .../target/maven-archiver/pom.properties      |   5 +
 16 files changed, 135 insertions(+), 222 deletions(-)
 create mode 100644 org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/css/style.css
 create mode 100644 org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/reg.fxml
 create mode 100644 org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/sample.fxml
 create mode 100644 org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/maven-archiver/pom.properties
 create mode 100644 org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/command/target/maven-archiver/pom.properties
 create mode 100644 org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/target/maven-archiver/pom.properties

diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Controller.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Controller.java
index cf9a065..75b31c0 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Controller.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Controller.java	
@@ -143,7 +143,7 @@ private void connect() {
                                 String[] tokens = str.split("\\s");
                                 Platform.runLater(() -> {
                                     clientList.getItems().clear();
-                                    for (int i = 1; i < tokens.length; i++) {
+                                    for ( int i = 1; i < tokens.length; i++ ) {
                                         clientList.getItems().add(tokens[i]);
                                     }
                                 });
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Main.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Main.java
index 2593306..15d3045 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Main.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/Main.java	
@@ -9,7 +9,7 @@
 public class Main extends Application {
 
     @Override
-    public void start(Stage primaryStage) throws Exception{
+    public void start(Stage primaryStage) throws Exception {
         Parent root = FXMLLoader.load(getClass().getResource("/sample.fxml"));
         primaryStage.setTitle("GeekChat");
         primaryStage.setScene(new Scene(root, 400, 350));
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/RegController.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/RegController.java
index 2cb0340..3a7b9a5 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/RegController.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/src/main/java/client/RegController.java	
@@ -24,10 +24,11 @@ public void tryToReg(ActionEvent actionEvent) {
         controller.tryToReg(login, password, nickname);
     }
 
-    public void regOk(){
+    public void regOk() {
         textArea.appendText("Регистрация прошла успешно\n");
     }
-    public void regNo(){
+
+    public void regNo() {
         textArea.appendText("Логин или никнейм уже заняты\n");
     }
 
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/css/style.css b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/css/style.css
new file mode 100644
index 0000000..88225fa
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/css/style.css	
@@ -0,0 +1,3 @@
+.root{
+    -fx-font-size: 16;
+}
\ No newline at end of file
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/reg.fxml b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/reg.fxml
new file mode 100644
index 0000000..5a786d7
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/reg.fxml	
@@ -0,0 +1,26 @@
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import java.net.URL?>
+<?import javafx.scene.control.PasswordField?>
+<VBox fx:controller="client.RegController"
+      xmlns:fx="http://javafx.com/fxml" alignment="center">
+
+    <stylesheets>
+        <URL value="@/css/style.css"/>
+    </stylesheets>
+
+
+    <TextField fx:id="loginField" promptText="login"/>
+    <PasswordField fx:id="passwordField" promptText="password"/>
+    <TextField fx:id="nicknameField" promptText="nickname"/>
+
+    <TextArea fx:id="textArea" VBox.vgrow="ALWAYS" editable="false"/>
+    <HBox>
+        <Button text="reg" minWidth="100" onAction="#tryToReg"/>
+        <Button text="cancel" minWidth="100"/>
+    </HBox>
+
+</VBox>
\ No newline at end of file
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/sample.fxml b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/sample.fxml
new file mode 100644
index 0000000..4922377
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/classes/sample.fxml	
@@ -0,0 +1,34 @@
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import java.net.URL?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.ListView?>
+<VBox fx:controller="client.Controller"
+      xmlns:fx="http://javafx.com/fxml" alignment="center">
+
+    <stylesheets>
+        <URL value="@/css/style.css"/>
+    </stylesheets>
+
+    <HBox fx:id="authPanel">
+        <TextField fx:id="loginField" HBox.hgrow="ALWAYS" promptText="login"/>
+        <PasswordField fx:id="passwordField" HBox.hgrow="ALWAYS" promptText="password" onAction="#tryToAuth"/>
+        <Button text="login" onAction="#tryToAuth" minWidth="100"/>
+        <Button text="reg" onAction="#registration" minWidth="80"/>
+    </HBox>
+
+    <HBox VBox.vgrow="ALWAYS">
+        <ListView fx:id="clientList" visible="false" managed="false" minWidth="100"
+        onMouseReleased="#clientListClicked"/>
+        <TextArea fx:id="textArea" HBox.hgrow="ALWAYS" editable="false"/>
+    </HBox>
+
+    <HBox fx:id="msgPanel" visible="false" managed="false">
+        <TextField fx:id="textField" HBox.hgrow="ALWAYS" promptText="input message" onAction="#sendMsg"/>
+        <Button text="send" onAction="#sendMsg"/>
+    </HBox>
+
+</VBox>
\ No newline at end of file
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/maven-archiver/pom.properties b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..506f44a
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/client/target/maven-archiver/pom.properties	
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Mar 02 11:51:14 EET 2021
+version=1.0-SNAPSHOT
+groupId=org.example
+artifactId=client
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/command/target/maven-archiver/pom.properties b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/command/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..d6b5c5e
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/command/target/maven-archiver/pom.properties	
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Mar 02 11:51:14 EET 2021
+version=1.0-SNAPSHOT
+groupId=org.example
+artifactId=command
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/main.db b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/main.db
index 77691d96feab69ebe9e154f72e9f3bc2e8b2e393..951e70240dc3049d9723fd01fb0fbc1d6bd6d480 100644
GIT binary patch
delta 8518
zcmeI%dvsHU9l-H>n<lwQn)^$dwrRlH@KTCA43%m{afM}2m4daX>|re?YDe0THnixJ
z7GZOOlSkCe_hUnR%cdKXJ#dQe2g9*Vr(?{==A3TMiB3iF`@7ZsH_!18Wge5}^S$@x
z(dOKq`@8qFgS+<n2C-&%c!FU>_8Nv!%knLj-nHZFV-t*tGwuxrpE2CQNrp5ACyB>?
z+TLhyT-#K$cCKB#7x%ztY7cn)%f?yWXf$e`TVGgVj~kPmnQV>EZEc?2)H*+YOmcp_
zX<pl$=9U?)$=S)4w)ni3=Huoi3!Ck>0ZAA;qEn}u%Vy_07G%=BxlCt1-J4&W>ddz1
z(_M?&Kk8vG->|7I8E<Qverz)SKi)gmACGsY;>|5><5|mOPw(uGw<S+<wib=*=<V&#
z_N4y%NO$L{3%fhI(#`|^IzC=QVW~a2q%KehNnJ^upT$Vu<i)+|o?dsIPq!rDY?aC?
z!{P`x3XRelW4XAd#$47o^!Ytrk3MD8x%C}^58lrM^@Z(H-w?Am81k|_DO+WuTp<_8
z+0r9t$jQ<o(`2HImSGZNM(nX)vtP7#+S~1|_9lBnaaw$)j*{YB{}lFsf548pjYuT2
z;KN&>+HHix;cTOR1)|PImvakLIU9NBW>vZk5#b4|!dc5?GFHS{OQlj)xwDo|r>(HF
z*3;8tg`BlSB4LTM*5BW6*#pjMUtgacbUw#fOA<qOyUf|{=uHjX?SQkL>rW5eEx+?l
zK8)pa)^fR=WjSlvY}WQVuO9lW)b<R$n-@8^a<|)vMxxWRh4r=V9#eK3vb#7Riu0kk
z2R`9FP&PB<@|muv>0AWF{G8Kck}+hDydkg3OY*$z<h=fbJSz9g-LhHkl-uM6xsJ2^
zC9+0V$_iO3OE}wSibv}w{G0j|&OXH-v9I<(V8HD%%~(uZU9F8qwN+Kx%1UiTg*Fn=
zmX~Y8VQna+717$ZHW<{Fm1zS3t>3Tp`Lvvssn@IZc(iV}dk%}zQr&R5v?V1jm(Mpe
z4rUp$T;7yd<T-gtw#k(;OLEdL3neWl%3U&7?vMv$y__Sra>>6%R?GQvad8|J$3bxq
zeB3=S!0FfPikMvd$2_jEnQg4rMORl;7x_HXK+G<tftVSlftV?#ftYEgftWo^12Gd!
z12OxV24eQv`pvk059*TZ_A*^^z0OP!GtW#AGsjF2Gi&KH`9MDJbzYLoc?#R+OlgQo
z@!;QA=Y-<V{e10#|F46;eM;O286Wv)z2Z6k<IeZu>p$mvK#y_D-gkdvD_m2X+Ef~H
zUuZ60m)o>1XYS}87I~L{?!Bjnx?X+2jZ&1HH@M4$E?p>v8y<LJ!3RGAC_@l71R;b`
zjtDAHi7G@<jTnYuIQByg_D3z^7=e)(h0z#;18^Y5q7LJ55XNHyCSno}Mgo&jk3%p8
z4LB5sp%I5;DvrRBn1-Y91vFtgX5foR;!Bu`S!l-5I0naJHd-(Tb8#G6aXi{E4=3P6
zoP_!KGQNVZ;%hh=?KlM;Sb$TJLK>&xbew@sd>spsK^MA_#UkX;gI?sZ7=7r+5}b*%
z@C}@ebFdTx7{oH1i{)5>Z{k}x58uZ5Scz4*0N=rdSdBGUi*+dAB3z71@LhZlm*O&9
zjw^5_uEN#02G`;`d>=o+dR&hUxB)lfCftl$a4T-Z?bwJP;zzgxcjCwR2{z%UxC@){
zGyELCz%Q`{cjH&M2lrwt?!*0f01x6JJd8*1C?3P(*oI$YJD$LAumiuv@9=v(iKp-f
zJdJ1YN9@F(unT|2vv>~A;|2T$f5nUV8(zZS@iJb)Kk!eyihtoX{2Q-hH{QUT_z&K~
z+js|i@GjoN-c=m?tDz~;xHP32x5lIKYAlUU<JSZ<WtyPI)`%vg32VwV5lw}rQd6ag
zYN|Cc%`nYy&3>91&HkENO<XfVGg323Gg>o7bAaYR%~(yHW}N0A&3MfO%|y*4&B2<4
lX0oPUbBJb&ra^P4<}gj8=5Wna%@LX-HPg&3Ob>HV-Ulda3`zh1

delta 10451
zcmeI2`FB+H6~JGZNdke)3j|0YWML<)lbKBN9;*RCF(Md21s4PXQ4x>?7gS!btxIWD
zn(j?oYxnh~n|8OYcCV#&)vmO5p)Iu5E-F>&=iY?jd;fs^#GJ$DhVwb!%z+PYxg6*|
za&lNVJWw;T+Vd(;dY)I$*BAMkI5az3Rqf4P_E@=p&?`>u^ZYQi&ws*y$WI+=t39+P
zRrpaTa0V7A<>ojrGEv&IKb0x#Sh=dLV|_#W^7TFUl&?)TmXuWWJn1)-X7_e(-P2jp
z6Z#!B{tI4JZEewkuxr!i9a}rQ_HNm_v#YbSvAF+i&&kx#L{fjAO%?mSo`1}L%75JN
z^Lq>T*%^3!6@JTuSD?u2>8;;h;#GK_|7_vz8obbjPc9VD0wd}x5~p5yb-k5kygZBj
zqn`hg|GfX4f80M>xC;wcN}<4D7AT#WOn61bGLkY9GKM4)-mw0=@vz6ec-()+f7(A>
zxElxaPonTw<}<lKS<m6sIsS%MxZeu*SfRk+7vO%|n0qAoV9k9+(TTomlitLlrMosa
zgkhL&$+i0@`nDU@ybyJbQQ0}DZANA4P+N^^@>3`JwxEXQKR(T&tDQqpIv1|PZFXEb
z7py>SGOD!|b(K*qGf*3i%8f%^X;gC=>I$Q>8&Q|5iUxk)xy%~eW#(8@8)}15=?rSU
ztD3{fs7s9sMx!n<s<jw(u~97>P|-T$wEkM7wEjg#Y5fkPwEl%gY5g^*eEnvrzuG;N
zjkNv+#%cXkMrr-?jnew<Mrr-?jMDlmjnew(4yZ`4x~$ee#~jo8D~!_m%UzYx`ez%Z
z^_Ll?^_Lo@_1lt>bM0re{#oXj)?Z?j)?aLt)?Z|l)?bLq*Uw1(1@57ya9xC(Z=BW-
zjnevoQCh#%D6QXOl-AD~rS+ThD&n4R()!uF6Q%VtMrr*fSEaRn+9<6*&nT@w*C?$&
z2NmU?JZY^z+Z@ySvy9UEGmX;vjYetx8K`{ywA7z|`cS~rjt5WFH_bS$Kh-F$KgB4m
zKiMd)KglSqKhY?y-{2_vYyEo1g`w83GfL~%x+>866O7XOHAZRu@kVL=ajN>Ce?b^%
z{c3Ye>sJ}2^~V~e^~V^c^+%%y>htkZztTO_st=w~k#Smoq)}SG!YHlp8>RJAMrr+W
zqqP1Aqav+8+&HaYW|Y<+=BgI0Kh!9#Uuu-rFEL8%7Y`_T{sm$GTQ_NrY5jyzT7QU9
zTEECBt?!}o^;@VPo6`EyjrS+L=+vt}2=%QS-{F2%PU^?E8zuGQ+l-R>@jj!ZetfG@
zQa`@MsLUFkfAP)6N&WaHqojVk*H!w~jk}DJ`f;aGQa|2fl+=%J%&Um{&2sI>yYo(z
z)Q@)=CH3Q-MoInn2BV~YyaSc5FK^xWdiPLPuKoBrQBnV96ogs1_G4!kLuq|y7ei@%
zXBR_heP<U#X?<rGLuq~4#ReX@D7o~b*xAN#THjg5P+H$v#)44ay0Np2p|t)+_wzGa
z-&w{urS+X<EQmsV>&E@tm@Z=+)B4UbhSK`ZGKSLn&N7D5`m&7W>&sg=c6PBK<gJSu
z*u^4QdvRLd*~L&=-`T}bTHo2lP+H&F#ZX$`*~L&=Uv{y4eSPW1tIb`hZ{65g#`sRH
z?<`|MsBhiaS;kOW-&w{`THjg5P+H$v#!!)7`=_=sZIRac&N9X^t?w*jD6Q`-V<@dJ
z%UHg?ymez|7YlgpO8xvU#`_Pa_1m00L8$eeU5ry&e~CGz^_^XeQ(E8I#ZX#bcCl0S
zxl*|HW0tYg&p%qrlgC-c_)e|wEMozVeLr@VF_hMKmNAUhca|}f)_0aMRIXi~f2X%G
zS_E3(S;kOW-&w{`THjg5P+DJ>u~YQ}dF#f`F2*lQ>pQzxgwy)6jOFvRYJF!H<CNBS
zb}^LJcXlz9)^~O>l-8GB?DWTLeO<<e4?O>Z)~2>QcR#$lXxr}b9{-V`@)iCe@)%!V
z?*F;`4;=s4-Q7ouU<f223B^zXr7#qRK^Y8(5l{{(@Sy@m!YHVO(J%(aLKRfQI2aE#
zFac_z4(g!+Cc-3`3{zk#OoQn#0~%o_%!1i42j;>&NJA53APdcqgBECo0794#3t%BE
zg2k`|&Vn{r3d`VZSPm=T95@$N!g<gR=ff(v09L~qxDYzvB3KLS;9|H0E`{~50WO2f
z;R?7CHo{e~2{yykum!flHn;}1!?kc7Tn{_o2G|L^U^m<dd!Q4#U@zPRH^VJ(E9`^Y
z;C8qJ_Co~SZ~*RvSHY{{HE<W)4fnvk@LD(suY=daeQ-ZK0EgfW&;xITH^H0XE$~)&
z8@wIf0ln}}co)1I9)$P6L-1aBAG{wv03U=8!H3}^@KN{}d>lRjG4#PF;ZyKw_zZj&
z9)?HYbMSfi0(=p^1Yd@)z@zY0_!@j29)ri>8}Lo|7JM7N1K)-3!S~?__yHV-AHtLH
zBlt1=1bzxXgP+4w@HG4aehI&VU&C+Uw{Qf02fv4B;1BRe_!ImYj>2EyukbfG2FKy=
z@DF$v{t3^)zu@2SANVgk4==!ra031ZFTu<33Y<L1y?;N*7$PGfBPpX;Mv0748AD|Z
zlTjvPxQr1p%4MWv_%bSFjFd4-Mx~6=GRDXlE2BzAwTy8x#>=RYF+oPHj5-<hG8$w|
zlrc%hWEoRrOqDTB#&j7oWHic{DPxw5*)rzHm@8wRjI@j<85tQ_8O<_sGFoJ`$_QkH
XGUm%zAY-A7MKTr_J<8LgsN4TPFi;<9

diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/AuthService.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/AuthService.java
index 82d8b65..5112e55 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/AuthService.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/AuthService.java	
@@ -2,5 +2,6 @@
 
 public interface AuthService {
     String getNicknameByLoginAndPassword(String login, String password);
+
     boolean registration(String login, String password, String nickname);
 }
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/ClientHandler.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/ClientHandler.java
index f32e621..11342ca 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/ClientHandler.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/ClientHandler.java	
@@ -25,7 +25,7 @@ public ClientHandler(Server server, Socket socket) {
 
             new Thread(() -> {
                 try {
-                    socket.setSoTimeout(5000);
+                    // socket.setSoTimeout(5000);
                     //цикл аутентификации
                     while (true) {
                         String str = in.readUTF();
@@ -91,7 +91,7 @@ public ClientHandler(Server server, Socket socket) {
                             server.broadcastMsg(this, str);
                         }
                     }
-                //SocketTimeoutException
+                    //SocketTimeoutException
                 } catch (SocketTimeoutException e) {
                     sendMsg(Command.END);
                 } catch (RuntimeException e) {
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBAuthService.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBAuthService.java
index ea46217..805d385 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBAuthService.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBAuthService.java	
@@ -1,49 +1,21 @@
 package server;
 
-import org.sqlite.core.DB;
-
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class DBAuthService implements AuthService {
-    private class UserData {
-        String login;
-        String password;
-        String nickname;
-
-        public UserData(String login, String password, String nickname) {
-            this.login = login;
-            this.password = password;
-            this.nickname = nickname;
+    static {
+        try {
+            DBMain.connect();
+            System.out.println("db connected");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (SQLException throwables) {
+            throwables.printStackTrace();
         }
     }
 
-  //  private List<SimpleAuthService.UserData> users;
-
-    public DBAuthService() {
-//        try {
-//            DBMain.connect();
-//        } catch (ClassNotFoundException e) {
-//            e.printStackTrace();
-//        } catch (SQLException throwables) {
-//            throwables.printStackTrace();
-//        }
-        //users = new ArrayList<>();
-  //      users.add(new SimpleAuthService.UserData("qwe", "qwe", "qwe"));
-        DBMain.addUser ("qwe", "qwe", "qwe");
-        DBMain.addUser ("asd", "asd", "asd");
-        DBMain.addUser ("zxc", "zxc", "zxc");
-//        users.add(new SimpleAuthService.UserData("asd", "asd", "asd"));
-//        users.add(new SimpleAuthService.UserData("zxc", "zxc", "zxc"));
-//        for (int i = 1; i < 10; i++) {
-//            users.add(new SimpleAuthService.UserData("user" + i, "pass" + i, "nick" + i));
-//        }
-    }
-
     @Override
     public String getNicknameByLoginAndPassword(String login, String password) {
-        System.out.println(DBMain.selectNicknameByLoginAndPassword(login, password));
         return DBMain.selectNicknameByLoginAndPassword(login, password);
     }
 
@@ -51,21 +23,20 @@ public String getNicknameByLoginAndPassword(String login, String password) {
     public boolean registration(String login, String password, String nickname) {
 
         try {
-            if ((DBMain.selectLogin(login))||(DBMain.selectNickName(nickname))){
-            //if(user.login.equals(login) || user.nickname.equals(nickname)){
-                    return false;
-                }
+            if ((DBMain.selectLogin(login)) || (DBMain.selectNickName(nickname))) {
+                return false;
+            }
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
         try {
-            DBMain.add(login, password, nickname);
+            DBMain.addUser(login, password, nickname);
+            System.out.println("User added to DB, login " + login + " password " + password + " nickname " + nickname);
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
         return true;
     }
-
 }
 
 
@@ -73,82 +44,3 @@ public boolean registration(String login, String password, String nickname) {
 
 
 
-
-
-
-
-//
-//
-//
-//
-//    public class SimpleAuthService implements AuthService {
-//        private class UserData {
-//            String login;
-//            String password;
-//            String nickname;
-//
-//            public UserData(String login, String password, String nickname) {
-//                this.login = login;
-//                this.password = password;
-//                this.nickname = nickname;
-//            }
-//        }
-//
-//        private List<server.SimpleAuthService.UserData> users;
-//
-//        public SimpleAuthService() {
-//            users = new ArrayList<>();
-//            users.add(new server.SimpleAuthService.UserData("qwe", "qwe", "qwe"));
-//            users.add(new server.SimpleAuthService.UserData("asd", "asd", "asd"));
-//            users.add(new server.SimpleAuthService.UserData("zxc", "zxc", "zxc"));
-//            for (int i = 1; i < 10; i++) {
-//                users.add(new server.SimpleAuthService.UserData("user" + i, "pass" + i, "nick" + i));
-//            }
-//        }
-//
-//        @Override
-//        public String getNicknameByLoginAndPassword(String login, String password) {
-//            for ( server.SimpleAuthService.UserData user : users) {
-//                if(user.login.equals(login) && user.password.equals(password)){
-//                    return user.nickname;
-//                }
-//            }
-//            return null;
-//        }
-//
-//        @Override
-//        public boolean registration(String login, String password, String nickname) {
-//            for ( server.SimpleAuthService.UserData user : users) {
-//                if(user.login.equals(login) || user.nickname.equals(nickname)){
-//                    return false;
-//                }
-//            }
-//            users.add(new server.SimpleAuthService.UserData(login, password, nickname));
-//            return true;
-//        }
-//    }
-
-    //////---------------------------
-//
-//import java.sql.SQLException;
-//
-//    public class DBAuthService implements AuthService{
-//
-//        @Override
-//        public String getNicknameByLoginAndPassword(String login, String password){
-//            System.out.println("Selected nick "+ DBCrud.selectNicknameByLoginAndPassword(login, password));
-//            return DBCrud.selectNicknameByLoginAndPassword(login, password);
-//        }
-//
-//        @Override
-//        public boolean registration(String login, String password, String nickname) {
-//            return false;
-//        }
-//    }
-
-
-
-
-
-
-
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBMain.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBMain.java
index 7e7b121..1129df9 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBMain.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/DBMain.java	
@@ -4,43 +4,14 @@
 
 public class DBMain {
 
-
     private static Connection connection;
     private static Statement stmt;
     private static PreparedStatement psInsert;
 
-   // public static void main(String[] args) {
-   {
-       try {
-           connect();
-//            clearTable();
-//            fillTable();
-           System.out.println("db connected");
-           //  clearTable();
-           //   prepareAllStatements();
-           //exRollback();
-
-       } catch (Exception e) {
-           e.printStackTrace();
-       } finally {
-           disconnect();
-       }
-   }
-  // }
-
-//        private static void exRollback() throws SQLException {
-//            stmt.executeUpdate("INSERT INTO students (name, score) VALUES ('Bob1', 85);");
-//            Savepoint sp1 = connection.setSavepoint();
-//            stmt.executeUpdate("INSERT INTO students (name, score) VALUES ('Bob2', 85);");
-//            connection.rollback(sp1);
-//            stmt.executeUpdate("INSERT INTO students (name, score) VALUES ('Bob3', 85);");
-//            connection.setAutoCommit(true);
-//        }
-
     private static void fillTableBatch() throws SQLException {
         long begin = System.currentTimeMillis();
         connection.setAutoCommit(false);
-        for (int i = 1; i <= 1000; i++) {
+        for ( int i = 1; i <= 1000; i++ ) {
             psInsert.setString(1, "Bob " + i);
             psInsert.setInt(2, i * 15 % 100);
 
@@ -56,7 +27,7 @@ private static void fillTable() throws SQLException {
         long begin = System.currentTimeMillis();
         connection.setAutoCommit(false);
         prepareAllStatements();
-        for (int i = 1; i <= 5; i++) {
+        for ( int i = 1; i <= 5; i++ ) {
             psInsert.setString(1, "Bob " + i);
             psInsert.setString(2, "123");
             psInsert.setString(3, "Bob " + i);
@@ -74,30 +45,6 @@ private static void prepareAllStatements() throws SQLException {
     private static void clearTable() throws SQLException {
         stmt.executeUpdate("DELETE FROM users;");
     }
-    //CRUD create read update delete
-//        private static void exSelect() throws SQLException {
-//            ResultSet rs = stmt.executeQuery("SELECT name, score FROM students WHERE score > 80;");
-//
-//            while (rs.next()) {
-//                System.out.println(rs.getString("name") + " " + rs.getInt("score"));
-//            }
-//
-//            rs.close();
-//        }
-//
-//        private static void clearTable() throws SQLException {
-//            stmt.executeUpdate("DELETE FROM students;");
-//        }
-//
-//        private static void exDelete() throws SQLException {
-//            stmt.executeUpdate("DELETE FROM students WHERE score <= 40;");
-//        }
-//
-//        private static void exUpdate() throws SQLException {
-//            stmt.executeUpdate("UPDATE students SET score = 100 WHERE score >=85;");
-////        UPDATE students SET score = 90 WHERE (score >=85) AND (name='Bob6');
-////        UPDATE students SET score = 90 WHERE (score >=85) OR (name='Bob6');
-//        }
 
     private static void exInsertMore() throws SQLException {
         stmt.executeUpdate("INSERT INTO students (name, score) VALUES ('Bob4', 75),('Bob5', 35),('Bob6', 95);");
@@ -126,21 +73,17 @@ private static void disconnect() {
         }
     }
 
-
     public static String selectNicknameByLoginAndPassword(String login, String password) {
-        String nick=null;
-        String query = String.format("SELECT nickname FROM users WHERE login = '%s' & password = '%s';", login, password);
+        String nick = null;
+        String query = String.format("SELECT * FROM users WHERE login = '%s' and password = '%s';", login, password);
         ResultSet rs = null;
-        try  {
+        try {
             rs = stmt.executeQuery(query);
-
             if (rs.next()) {
-                nick = rs.getString("nick");
-                System.out.println("Gotten nickname "+ nick);
+                nick = rs.getString("nickname");
             } else {
                 nick = null;
             }
-
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
@@ -152,45 +95,43 @@ public static String selectNicknameByLoginAndPassword(String login, String passw
         return nick;
     }
 
-    public static void addUser(String qwe, String qwe1, String qwe2) {
-
-    }
-
     public static boolean selectLogin(String login) throws SQLException {
-       ResultSet rs = stmt.executeQuery("SELECT FROM users WHERE login = " + login + ";");
-      //  SELECT nick FROM users WHERE login = '%s'& password = '%s');
-if (rs.next()) {
-    rs.close();
-                return  true;
-            }
-
+        String query = String.format("SELECT * FROM users WHERE login = '%s' ;", login);
+        System.out.println(query);
+        ResultSet rs = stmt.executeQuery(query);
+        System.out.println("result set" + rs);
+        if (rs.next()) {
             rs.close();
-return false;
+            System.out.println("true");
+            return true;
         }
+        rs.close();
+        System.out.println("false");
+        return false;
+    }
 
     public static boolean selectNickName(String nickname) throws SQLException {
-        ResultSet rs = stmt.executeQuery("SELECT FROM users WHERE nickname =  " + nickname + ";");
+        String query = String.format("SELECT * FROM users WHERE nickname = '%s' ;", nickname);
+        ResultSet rs = stmt.executeQuery(query);
         if (rs.next()) {
             rs.close();
-            return  true;
+            return true;
         }
-
         rs.close();
         return false;
     }
 
-    public static void add (String login, String password, String nickname) throws SQLException {
+    public static void addUser(String login, String password, String nickname) throws SQLException {
         connection.setAutoCommit(false);
         prepareAllStatements();
-           psInsert.setString(1, login);
-            psInsert.setString(2, password);
-            psInsert.setString(3, nickname);
-            psInsert.executeUpdate();
+        psInsert.setString(1, login);
+        psInsert.setString(2, password);
+        psInsert.setString(3, nickname);
+        psInsert.executeUpdate();
         connection.commit();
 
     }
-
-    }
+}
 
 
 
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/Server.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/Server.java
index a9f50fd..353ef6d 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/Server.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/Server.java	
@@ -42,14 +42,14 @@ public Server() {
 
     public void broadcastMsg(ClientHandler clientHandler, String msg) {
         String message = String.format("[ %s ]: %s", clientHandler.getNickname(), msg);
-        for (ClientHandler c : clients) {
+        for ( ClientHandler c : clients ) {
             c.sendMsg(message);
         }
     }
 
     public void privateMsg(ClientHandler sender, String receiver, String msg) {
         String message = String.format("[ %s ] to [ %s ]: %s", sender.getNickname(), receiver, msg);
-        for (ClientHandler c : clients) {
+        for ( ClientHandler c : clients ) {
             if (c.getNickname().equals(receiver)) {
                 c.sendMsg(message);
                 if (!c.equals(sender)) {
@@ -76,7 +76,7 @@ public AuthService getAuthService() {
     }
 
     public boolean isLoginAuthenticated(String login) {
-        for (ClientHandler c : clients) {
+        for ( ClientHandler c : clients ) {
             if (c.getLogin().equals(login)) {
                 return true;
             }
@@ -87,13 +87,13 @@ public boolean isLoginAuthenticated(String login) {
     public void broadcastClientList() {
         StringBuilder sb = new StringBuilder(Command.CLIENT_LIST);
 
-        for (ClientHandler c : clients) {
+        for ( ClientHandler c : clients ) {
             sb.append(" ").append(c.getNickname());
         }
 
         String msg = sb.toString();
 
-        for (ClientHandler c : clients) {
+        for ( ClientHandler c : clients ) {
             c.sendMsg(msg);
         }
     }
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/SimpleAuthService.java b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/SimpleAuthService.java
index 0c8767e..988f832 100644
--- a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/SimpleAuthService.java	
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/src/main/java/server/SimpleAuthService.java	
@@ -23,15 +23,15 @@ public SimpleAuthService() {
         users.add(new UserData("qwe", "qwe", "qwe"));
         users.add(new UserData("asd", "asd", "asd"));
         users.add(new UserData("zxc", "zxc", "zxc"));
-        for (int i = 1; i < 10; i++) {
+        for ( int i = 1; i < 10; i++ ) {
             users.add(new UserData("user" + i, "pass" + i, "nick" + i));
         }
     }
 
     @Override
     public String getNicknameByLoginAndPassword(String login, String password) {
-        for (UserData user : users) {
-            if(user.login.equals(login) && user.password.equals(password)){
+        for ( UserData user : users ) {
+            if (user.login.equals(login) && user.password.equals(password)) {
                 return user.nickname;
             }
         }
@@ -40,8 +40,8 @@ public String getNicknameByLoginAndPassword(String login, String password) {
 
     @Override
     public boolean registration(String login, String password, String nickname) {
-        for (UserData user : users) {
-            if(user.login.equals(login) || user.nickname.equals(nickname)){
+        for ( UserData user : users ) {
+            if (user.login.equals(login) || user.nickname.equals(nickname)) {
                 return false;
             }
         }
diff --git a/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/target/maven-archiver/pom.properties b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..f3d736e
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/org.volha.geekbrains.java.level3.dbase/chat_geekchat_16012021 (4)/chat_geekchat_16012021/server/target/maven-archiver/pom.properties	
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Mar 02 11:51:15 EET 2021
+version=1.0-SNAPSHOT
+groupId=org.example
+artifactId=server

From 36a3d8532e8ad1e9f31078393d2dab871d7d3102 Mon Sep 17 00:00:00 2001
From: Volha <kresiko@gmail.com>
Date: Wed, 10 Mar 2021 14:16:29 +0200
Subject: [PATCH 5/5] Lesson 7 hw - annotations

---
 .../java/lesson7hw_annotations/AfterSuit.java |   1 +
 .../AnnotationsMainApp.java                   |   6 +-
 .../lesson7hw_annotations/BeforeSuit.java     |   1 +
 .../MethodWithPriority.java                   |  31 +++++
 .../lesson7hw_annotations/RunAnnotations.java | 106 ++++++++++++++----
 .../main/java/lesson7hw_annotations/Test.java |   4 +-
 .../lesson7hw_annotations/TestExecutes.java   |  22 +++-
 .../TestThrowsException.java                  |   8 ++
 8 files changed, 152 insertions(+), 27 deletions(-)
 create mode 100644 org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/MethodWithPriority.java

diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AfterSuit.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AfterSuit.java
index 2578885..14d2aef 100644
--- a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AfterSuit.java
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AfterSuit.java
@@ -8,4 +8,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface AfterSuit {
+
 }
diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AnnotationsMainApp.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AnnotationsMainApp.java
index 1d8e101..b03b71e 100644
--- a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AnnotationsMainApp.java
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/AnnotationsMainApp.java
@@ -26,8 +26,10 @@ public class AnnotationsMainApp {
 
     public static void main(String[] args) {
         try {
-            RunAnnotations.run("lesson7hw_annotations.TestExecutes");
-        } catch (ClassNotFoundException e) {
+            RunAnnotations.run ("lesson7hw_annotations.TestExecutes");
+            RunAnnotations.run("lesson7hw_annotations.TestThrowsException");
+
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/BeforeSuit.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/BeforeSuit.java
index 53fc703..1e33c0a 100644
--- a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/BeforeSuit.java
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/BeforeSuit.java
@@ -8,4 +8,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface BeforeSuit {
+
 }
diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/MethodWithPriority.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/MethodWithPriority.java
new file mode 100644
index 0000000..74e62ef
--- /dev/null
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/MethodWithPriority.java
@@ -0,0 +1,31 @@
+package lesson7hw_annotations;
+
+import java.lang.reflect.Method;
+
+public class MethodWithPriority {
+           private int priority;
+        private Method method;
+
+    public MethodWithPriority(int priority, Method method) {
+        this.priority = priority;
+        this.method = method;
+    }
+
+    public int getPriority() {
+            return priority;
+        }
+
+        public void setPriority(int priority) {
+            this.priority = priority;
+        }
+
+        public Method getMethod() {
+            return method;
+        }
+
+        public void setMethod(Method method) {
+            this.method = method;
+        }
+
+    }
+
diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/RunAnnotations.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/RunAnnotations.java
index dadc315..209b95a 100644
--- a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/RunAnnotations.java
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/RunAnnotations.java
@@ -2,10 +2,13 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
 
 public class RunAnnotations {
 
-
     public static void run(String classToRunTestsName) throws ClassNotFoundException {
         Class ClassToRunTests = Class.forName(classToRunTestsName);
         int countBeforeSuit = 0;
@@ -13,19 +16,54 @@ public static void run(String classToRunTestsName) throws ClassNotFoundException
         Method methodBeforeSuit = null;
         Method methodAfterSuit = null;
         Method[] methods = ClassToRunTests.getDeclaredMethods();
+        ArrayList<MethodWithPriority> arrayOfMethods = new ArrayList<>();
         // ClassToRunTests.class.getDeclaredMethods();
 
         for ( Method o : methods ) {
             if (o.getAnnotation(BeforeSuit.class) != null) {
                 countBeforeSuit++;
+                if (countBeforeSuit > 1) {
+                    System.out.println("Too much the same");
+                    throw new RuntimeException();
+                }
                 methodBeforeSuit = o;
             }
-
             if (o.getAnnotation(AfterSuit.class) != null) {
                 countAfterSuit++;
+                if (countAfterSuit > 1) {
+                    System.out.println("Too much the same");
+                    throw new RuntimeException();
+                }
                 methodAfterSuit = o;
             }
+            if (o.getAnnotation(Test.class) != null) {
+                arrayOfMethods.add(new MethodWithPriority(o.getAnnotation(Test.class).priority(), o));
+            }
         }
+
+///good solution when priority is unique
+//            if (o.getAnnotation(Test.class) != null) {
+//                priorityMethod.put(o.getAnnotation(Test.class).priority(), o);
+//            }
+//        }
+//
+//
+//        for ( Map.Entry<Integer, Method> entry : priorityMethod.entrySet()) {
+//          // Integer key = entry.getKey();
+//            Method value = entry.getValue();
+//            try {
+//                value.invoke(ClassToRunTests);
+//            } catch (IllegalAccessException e) {
+//                e.printStackTrace();
+//            } catch (InvocationTargetException e) {
+//                e.printStackTrace();
+//            }
+//        }
+///good solution when priority is unique
+
+//            }
+//        }
+//
         if (countBeforeSuit == 1) {
             try {
                 methodBeforeSuit.invoke(ClassToRunTests);
@@ -35,24 +73,15 @@ public static void run(String classToRunTestsName) throws ClassNotFoundException
                 e.printStackTrace();
             }
         }
-
-        if (countBeforeSuit > 1 || countAfterSuit > 1) {
-            throw new RuntimeException();
-        }
-
-        for ( Method m : methods ) {
-            if (m.getAnnotation(Test.class) != null) {
-                System.out.println("Test must be executed");
-                try {
-                    m.invoke(ClassToRunTests);
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                }
+        arrayOfMethods.stream().sorted(Comparator.comparing(MethodWithPriority::getPriority)).forEach((t) -> {
+            try {
+                t.getMethod().invoke(ClassToRunTests);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
             }
-        }
-
+        });
         if (countAfterSuit == 1) {
             try {
                 methodAfterSuit.invoke(ClassToRunTests);
@@ -65,4 +94,43 @@ public static void run(String classToRunTestsName) throws ClassNotFoundException
     }
 }
 
+//
+//        for ( Method m : methods ) {
+//            if (m.getAnnotation(Test.class) != null) {
+//                System.out.println("Test must be executed");
+//                System.out.println ("priority is "+ m.getAnnotation(Test.class).priority());
+//              //  Field[] fields = ClassToRunTests.getDeclaredFields();
+//                try {
+//                    Field field = ClassToRunTests.getDeclaredField("priority");
+//                                        try {
+//                        System.out.println("priority = getint " + field.getInt(ClassToRunTests) +" get "+field.get(ClassToRunTests));
+//                    } catch (IllegalAccessException e) {
+//                        e.printStackTrace();
+//                    }
+//                } catch (NoSuchFieldException e) {
+//                    e.printStackTrace();
+//                }
+//System.out.println(m.getAnnotation(ClassToRunTests).priority());
+//                for (Field field : fields){
+//                    try {
+//
+//                        Field field = c1.getDeclaredField("color");
+////        field.setAccessible(true);
+//        System.out.println(field.get(cat));
+//        field.set(cat, "purple");
+//                        System.out.println("field name " + field.getName() + "field value: "+ ClassToRunTests.getField(field.getName()));
+//                    } catch (NoSuchFieldException e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//                try {
+//                    m.invoke(ClassToRunTests);
+//                } catch (IllegalAccessException e) {
+//                    e.printStackTrace();
+//                } catch (InvocationTargetException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+
 
diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/Test.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/Test.java
index ba02c47..39c1593 100644
--- a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/Test.java
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/Test.java
@@ -8,4 +8,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Test {
-}
+    int priority() default 4;
+
+    }
diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestExecutes.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestExecutes.java
index 9607088..5baba54 100644
--- a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestExecutes.java
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestExecutes.java
@@ -1,20 +1,32 @@
 package lesson7hw_annotations;
 
 public class TestExecutes {
+    static int priority;
 
     @BeforeSuit
     public static void testBeforeSuit() {
         System.out.println("@BeforeSuit executed");
     }
 
-    @Test
-    public void testMethodWith1Priority() {
-        System.out.println("Test  1 run");
+    @Test (  priority = 56)
+    public static void testMethodWith1Priority() {
+        System.out.println("Test  with priority 56 run");
+          }
+
+
+    @Test (  priority = 3)
+    public static void testMethodWith3Priority() {
+        System.out.println("Test  with priority 3 run");
+    }
+
+    @Test(  priority = 56)
+    public static void testMethodWith56Priority() {
+        System.out.println("Test  with priority 56 run");
     }
 
     @Test
-    public static void testMethodWith5Priority() {
-        System.out.println("Test  5 run");
+    public static void testMethodWithDefaultPriority() {
+        System.out.println("Test  with default priority run");
     }
 
     @AfterSuit
diff --git a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestThrowsException.java b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestThrowsException.java
index 17291d6..ad91ccc 100644
--- a/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestThrowsException.java
+++ b/org.volha.geekbrains.java.level3/src/main/java/lesson7hw_annotations/TestThrowsException.java
@@ -1,4 +1,12 @@
 package lesson7hw_annotations;
 
 public class TestThrowsException {
+    @BeforeSuit
+    public static void testBeforeSuit() {
+        System.out.println("@BeforeSuit executed");
+    }
+    @BeforeSuit
+    public static void testBeforeSuit2() {
+        System.out.println("@BeforeSuit executed");
+    }
 }