From f6900c24078a83215864246d0b9f9e7acbe0b357 Mon Sep 17 00:00:00 2001
From: Mark Struchkov <upagge@icloud.com>
Date: Thu, 24 Jan 2019 21:37:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D0=B7=20=D0=BE=D1=82?=
 =?UTF-8?q?=20Lombok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                | 10 +---------
 .../java/org/sadtech/autoresponder/Autoresponder.java  |  5 +++--
 .../autoresponder/service/impl/PersonServiceImpl.java  |  6 ++++--
 .../autoresponder/service/impl/UnitServiceImpl.java    |  5 +++--
 .../org/sadtech/autoresponder/AutoresponderTest.java   |  7 ++-----
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc3c0a5..01ab545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.sadtech.autoresponder</groupId>
-    <artifactId>core</artifactId>
+    <artifactId>autoresponder</artifactId>
     <version>1.1.2-SNAPHOT</version>
     <build>
         <plugins>
@@ -22,20 +22,12 @@
     </build>
 
     <properties>
-        <lombok.ver>1.18.4</lombok.ver>
         <log4j>1.2.17</log4j>
         <junit.ver>4.12</junit.ver>
         <mocito.ver>2.23.4</mocito.ver>
     </properties>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
-        </dependency>
-
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
diff --git a/src/main/java/org/sadtech/autoresponder/Autoresponder.java b/src/main/java/org/sadtech/autoresponder/Autoresponder.java
index 8c6e5e3..4c2ea9f 100644
--- a/src/main/java/org/sadtech/autoresponder/Autoresponder.java
+++ b/src/main/java/org/sadtech/autoresponder/Autoresponder.java
@@ -1,6 +1,6 @@
 package org.sadtech.autoresponder;
 
-import lombok.extern.log4j.Log4j;
+import org.apache.log4j.Logger;
 import org.sadtech.autoresponder.entity.Person;
 import org.sadtech.autoresponder.entity.Unit;
 import org.sadtech.autoresponder.entity.compare.UnitPriorityComparator;
@@ -13,9 +13,10 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-@Log4j
 public class Autoresponder {
 
+    public static final Logger log = Logger.getLogger(Autoresponder.class);
+
     private UnitService unitService;
     private PersonService personService;
 
diff --git a/src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java b/src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java
index f958c01..4162ec7 100644
--- a/src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java
+++ b/src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java
@@ -1,13 +1,15 @@
 package org.sadtech.autoresponder.service.impl;
 
-import lombok.extern.log4j.Log4j;
 import org.sadtech.autoresponder.entity.Person;
 import org.sadtech.autoresponder.repository.PersonRepository;
 import org.sadtech.autoresponder.service.PersonService;
 
-@Log4j
+import org.apache.log4j.Logger;
+
 public class PersonServiceImpl implements PersonService {
 
+    private static final Logger log = Logger.getLogger(PersonServiceImpl.class);
+
     private PersonRepository personRepository;
 
     public PersonServiceImpl(PersonRepository personRepository) {
diff --git a/src/main/java/org/sadtech/autoresponder/service/impl/UnitServiceImpl.java b/src/main/java/org/sadtech/autoresponder/service/impl/UnitServiceImpl.java
index 0248564..c4155f5 100644
--- a/src/main/java/org/sadtech/autoresponder/service/impl/UnitServiceImpl.java
+++ b/src/main/java/org/sadtech/autoresponder/service/impl/UnitServiceImpl.java
@@ -1,6 +1,6 @@
 package org.sadtech.autoresponder.service.impl;
 
-import lombok.extern.log4j.Log4j;
+import org.apache.log4j.Logger;
 import org.sadtech.autoresponder.entity.Unit;
 import org.sadtech.autoresponder.repository.UnitRepository;
 import org.sadtech.autoresponder.service.UnitService;
@@ -8,9 +8,10 @@ import org.sadtech.autoresponder.service.UnitService;
 import java.util.ArrayList;
 import java.util.List;
 
-@Log4j
 public class UnitServiceImpl implements UnitService {
 
+    private static final Logger log = Logger.getLogger(UnitServiceImpl.class);
+
     private List<UnitRepository> unitRepositories;
 
     public UnitServiceImpl() {
diff --git a/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java b/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java
index ca9944e..c9f95b6 100644
--- a/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java
+++ b/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java
@@ -38,7 +38,6 @@ public class AutoresponderTest {
         words2.add("тест");
         words2.add("привет");
 
-        unit.setLevel(true);
         unit.setPriority(50);
         unit.setKeyWords(words);
         unit.setAnswer("Здравствуйте, вы написали в нашу компанию!");
@@ -123,7 +122,7 @@ public class AutoresponderTest {
         }
 
         @Override
-        public void addUnits(Collection<TextUnit> units) {
+        public void addUnits(List<TextUnit> units) {
             textUnits.addAll(units);
         }
 
@@ -131,9 +130,7 @@ public class AutoresponderTest {
         public List<TextUnit> menuUnits() {
             List<TextUnit> units = new ArrayList<>();
             for (TextUnit textUnit : textUnits) {
-                if (textUnit.getLevel()) {
-                    units.add(textUnit);
-                }
+                units.add(textUnit);
             }
             return units;
         }