diff --git a/pom.xml b/pom.xml index fc3c0a5..01ab545 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.sadtech.autoresponder - core + autoresponder 1.1.2-SNAPHOT @@ -22,20 +22,12 @@ - 1.18.4 1.2.17 4.12 2.23.4 - - - org.projectlombok - lombok - 1.18.4 - - log4j log4j 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 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 units) { + public void addUnits(List units) { textUnits.addAll(units); } @@ -131,9 +130,7 @@ public class AutoresponderTest { public List menuUnits() { List units = new ArrayList<>(); for (TextUnit textUnit : textUnits) { - if (textUnit.getLevel()) { - units.add(textUnit); - } + units.add(textUnit); } return units; }