diff --git a/pom.xml b/pom.xml index 26b594b..bd99519 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - consultant-core + org.sadtech.autoresponder + core + 0.1-SNAPSHOT diff --git a/src/main/java/org/sadtech/consultant/MessageSender.java b/src/main/java/org/sadtech/autoresponder/MessageSender.java similarity index 70% rename from src/main/java/org/sadtech/consultant/MessageSender.java rename to src/main/java/org/sadtech/autoresponder/MessageSender.java index 75ba12e..ad72975 100644 --- a/src/main/java/org/sadtech/consultant/MessageSender.java +++ b/src/main/java/org/sadtech/autoresponder/MessageSender.java @@ -1,4 +1,4 @@ -package org.sadtech.consultant; +package org.sadtech.autoresponder; public interface MessageSender { diff --git a/src/main/java/org/sadtech/consultant/database/entity/Mail.java b/src/main/java/org/sadtech/autoresponder/database/entity/Mail.java similarity index 86% rename from src/main/java/org/sadtech/consultant/database/entity/Mail.java rename to src/main/java/org/sadtech/autoresponder/database/entity/Mail.java index 5ba4490..266d64b 100644 --- a/src/main/java/org/sadtech/consultant/database/entity/Mail.java +++ b/src/main/java/org/sadtech/autoresponder/database/entity/Mail.java @@ -1,4 +1,4 @@ -package org.sadtech.consultant.database.entity; +package org.sadtech.autoresponder.database.entity; import lombok.Data; diff --git a/src/main/java/org/sadtech/consultant/database/entity/NextUnit.java b/src/main/java/org/sadtech/autoresponder/database/entity/NextUnit.java similarity index 69% rename from src/main/java/org/sadtech/consultant/database/entity/NextUnit.java rename to src/main/java/org/sadtech/autoresponder/database/entity/NextUnit.java index 5e896fe..82b8ff4 100644 --- a/src/main/java/org/sadtech/consultant/database/entity/NextUnit.java +++ b/src/main/java/org/sadtech/autoresponder/database/entity/NextUnit.java @@ -1,10 +1,9 @@ -package org.sadtech.consultant.database.entity; +package org.sadtech.autoresponder.database.entity; import lombok.Data; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Table; @Entity @Data diff --git a/src/main/java/org/sadtech/consultant/database/entity/Person.java b/src/main/java/org/sadtech/autoresponder/database/entity/Person.java similarity index 92% rename from src/main/java/org/sadtech/consultant/database/entity/Person.java rename to src/main/java/org/sadtech/autoresponder/database/entity/Person.java index 847e228..bfe26a6 100644 --- a/src/main/java/org/sadtech/consultant/database/entity/Person.java +++ b/src/main/java/org/sadtech/autoresponder/database/entity/Person.java @@ -1,4 +1,4 @@ -package org.sadtech.consultant.database.entity; +package org.sadtech.autoresponder.database.entity; import lombok.Data; diff --git a/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java b/src/main/java/org/sadtech/autoresponder/database/entity/SaveUnit.java similarity index 82% rename from src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java rename to src/main/java/org/sadtech/autoresponder/database/entity/SaveUnit.java index d198992..8aebffd 100644 --- a/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java +++ b/src/main/java/org/sadtech/autoresponder/database/entity/SaveUnit.java @@ -1,4 +1,4 @@ -package org.sadtech.consultant.database.entity; +package org.sadtech.autoresponder.database.entity; import lombok.Data; diff --git a/src/main/java/org/sadtech/consultant/database/entity/Unit.java b/src/main/java/org/sadtech/autoresponder/database/entity/Unit.java similarity index 80% rename from src/main/java/org/sadtech/consultant/database/entity/Unit.java rename to src/main/java/org/sadtech/autoresponder/database/entity/Unit.java index a267686..e26b54e 100644 --- a/src/main/java/org/sadtech/consultant/database/entity/Unit.java +++ b/src/main/java/org/sadtech/autoresponder/database/entity/Unit.java @@ -1,4 +1,4 @@ -package org.sadtech.consultant.database.entity; +package org.sadtech.autoresponder.database.entity; import lombok.Data; diff --git a/src/main/java/org/sadtech/consultant/database/repository/MailRepository.java b/src/main/java/org/sadtech/autoresponder/database/repository/MailRepository.java similarity index 78% rename from src/main/java/org/sadtech/consultant/database/repository/MailRepository.java rename to src/main/java/org/sadtech/autoresponder/database/repository/MailRepository.java index 8e5541c..ebb2354 100644 --- a/src/main/java/org/sadtech/consultant/database/repository/MailRepository.java +++ b/src/main/java/org/sadtech/autoresponder/database/repository/MailRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.consultant.database.repository; +package org.sadtech.autoresponder.database.repository; -import org.sadtech.consultant.database.entity.Mail; +import org.sadtech.autoresponder.database.entity.Mail; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/org/sadtech/consultant/database/repository/NextUnitRepository.java b/src/main/java/org/sadtech/autoresponder/database/repository/NextUnitRepository.java similarity index 55% rename from src/main/java/org/sadtech/consultant/database/repository/NextUnitRepository.java rename to src/main/java/org/sadtech/autoresponder/database/repository/NextUnitRepository.java index 3f3f71f..4241f6e 100644 --- a/src/main/java/org/sadtech/consultant/database/repository/NextUnitRepository.java +++ b/src/main/java/org/sadtech/autoresponder/database/repository/NextUnitRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.consultant.database.repository; +package org.sadtech.autoresponder.database.repository; -import org.sadtech.consultant.database.entity.NextUnit; +import org.sadtech.autoresponder.database.entity.NextUnit; import org.springframework.data.jpa.repository.JpaRepository; public interface NextUnitRepository extends JpaRepository { diff --git a/src/main/java/org/sadtech/consultant/database/repository/PersonRepository.java b/src/main/java/org/sadtech/autoresponder/database/repository/PersonRepository.java similarity index 80% rename from src/main/java/org/sadtech/consultant/database/repository/PersonRepository.java rename to src/main/java/org/sadtech/autoresponder/database/repository/PersonRepository.java index a00fa83..c810301 100644 --- a/src/main/java/org/sadtech/consultant/database/repository/PersonRepository.java +++ b/src/main/java/org/sadtech/autoresponder/database/repository/PersonRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.consultant.database.repository; +package org.sadtech.autoresponder.database.repository; -import org.sadtech.consultant.database.entity.Person; +import org.sadtech.autoresponder.database.entity.Person; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/org/sadtech/consultant/database/repository/SaveUnitRepositoriy.java b/src/main/java/org/sadtech/autoresponder/database/repository/SaveUnitRepositoriy.java similarity index 55% rename from src/main/java/org/sadtech/consultant/database/repository/SaveUnitRepositoriy.java rename to src/main/java/org/sadtech/autoresponder/database/repository/SaveUnitRepositoriy.java index 7ff8077..29b9f61 100644 --- a/src/main/java/org/sadtech/consultant/database/repository/SaveUnitRepositoriy.java +++ b/src/main/java/org/sadtech/autoresponder/database/repository/SaveUnitRepositoriy.java @@ -1,6 +1,6 @@ -package org.sadtech.consultant.database.repository; +package org.sadtech.autoresponder.database.repository; -import org.sadtech.consultant.database.entity.SaveUnit; +import org.sadtech.autoresponder.database.entity.SaveUnit; import org.springframework.data.jpa.repository.JpaRepository; public interface SaveUnitRepositoriy extends JpaRepository { diff --git a/src/main/java/org/sadtech/consultant/database/repository/UnitRepositoriy.java b/src/main/java/org/sadtech/autoresponder/database/repository/UnitRepositoriy.java similarity index 55% rename from src/main/java/org/sadtech/consultant/database/repository/UnitRepositoriy.java rename to src/main/java/org/sadtech/autoresponder/database/repository/UnitRepositoriy.java index 51e7cca..183a913 100644 --- a/src/main/java/org/sadtech/consultant/database/repository/UnitRepositoriy.java +++ b/src/main/java/org/sadtech/autoresponder/database/repository/UnitRepositoriy.java @@ -1,6 +1,6 @@ -package org.sadtech.consultant.database.repository; +package org.sadtech.autoresponder.database.repository; -import org.sadtech.consultant.database.entity.Unit; +import org.sadtech.autoresponder.database.entity.Unit; import org.springframework.data.jpa.repository.JpaRepository; public interface UnitRepositoriy extends JpaRepository { diff --git a/src/main/java/org/sadtech/consultant/database/service/MailService.java b/src/main/java/org/sadtech/autoresponder/database/service/MailService.java similarity index 56% rename from src/main/java/org/sadtech/consultant/database/service/MailService.java rename to src/main/java/org/sadtech/autoresponder/database/service/MailService.java index 1ca820b..c5481e1 100644 --- a/src/main/java/org/sadtech/consultant/database/service/MailService.java +++ b/src/main/java/org/sadtech/autoresponder/database/service/MailService.java @@ -1,6 +1,6 @@ -package org.sadtech.consultant.database.service; +package org.sadtech.autoresponder.database.service; -import org.sadtech.consultant.database.entity.Mail; +import org.sadtech.autoresponder.database.entity.Mail; import java.util.List; diff --git a/src/main/java/org/sadtech/autoresponder/database/service/NextUnitService.java b/src/main/java/org/sadtech/autoresponder/database/service/NextUnitService.java new file mode 100644 index 0000000..48ed22f --- /dev/null +++ b/src/main/java/org/sadtech/autoresponder/database/service/NextUnitService.java @@ -0,0 +1,4 @@ +package org.sadtech.autoresponder.database.service; + +public interface NextUnitService { +} diff --git a/src/main/java/org/sadtech/consultant/database/service/PersonService.java b/src/main/java/org/sadtech/autoresponder/database/service/PersonService.java similarity index 72% rename from src/main/java/org/sadtech/consultant/database/service/PersonService.java rename to src/main/java/org/sadtech/autoresponder/database/service/PersonService.java index 0872760..d044d62 100644 --- a/src/main/java/org/sadtech/consultant/database/service/PersonService.java +++ b/src/main/java/org/sadtech/autoresponder/database/service/PersonService.java @@ -1,6 +1,6 @@ -package org.sadtech.consultant.database.service; +package org.sadtech.autoresponder.database.service; -import org.sadtech.consultant.database.entity.Person; +import org.sadtech.autoresponder.database.entity.Person; import java.util.Map; diff --git a/src/main/java/org/sadtech/autoresponder/database/service/SaveUnitService.java b/src/main/java/org/sadtech/autoresponder/database/service/SaveUnitService.java new file mode 100644 index 0000000..23b0273 --- /dev/null +++ b/src/main/java/org/sadtech/autoresponder/database/service/SaveUnitService.java @@ -0,0 +1,4 @@ +package org.sadtech.autoresponder.database.service; + +public interface SaveUnitService { +} diff --git a/src/main/java/org/sadtech/autoresponder/database/service/UnitService.java b/src/main/java/org/sadtech/autoresponder/database/service/UnitService.java new file mode 100644 index 0000000..7fb8e88 --- /dev/null +++ b/src/main/java/org/sadtech/autoresponder/database/service/UnitService.java @@ -0,0 +1,11 @@ +package org.sadtech.autoresponder.database.service; + +import org.sadtech.autoresponder.database.entity.Unit; + +public interface UnitService { + + void addUnit(Unit unit); + + void removeUnit(Long id); + +} diff --git a/src/main/java/org/sadtech/consultant/database/service/impl/MailServiceImpl.java b/src/main/java/org/sadtech/autoresponder/database/service/impl/MailServiceImpl.java similarity index 66% rename from src/main/java/org/sadtech/consultant/database/service/impl/MailServiceImpl.java rename to src/main/java/org/sadtech/autoresponder/database/service/impl/MailServiceImpl.java index 6432031..3bfada3 100644 --- a/src/main/java/org/sadtech/consultant/database/service/impl/MailServiceImpl.java +++ b/src/main/java/org/sadtech/autoresponder/database/service/impl/MailServiceImpl.java @@ -1,8 +1,8 @@ -package org.sadtech.consultant.database.service.impl; +package org.sadtech.autoresponder.database.service.impl; -import org.sadtech.consultant.database.entity.Mail; -import org.sadtech.consultant.database.repository.MailRepository; -import org.sadtech.consultant.database.service.MailService; +import org.sadtech.autoresponder.database.entity.Mail; +import org.sadtech.autoresponder.database.repository.MailRepository; +import org.sadtech.autoresponder.database.service.MailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/sadtech/consultant/database/service/impl/NextUnitServiceImpl.java b/src/main/java/org/sadtech/autoresponder/database/service/impl/NextUnitServiceImpl.java similarity index 55% rename from src/main/java/org/sadtech/consultant/database/service/impl/NextUnitServiceImpl.java rename to src/main/java/org/sadtech/autoresponder/database/service/impl/NextUnitServiceImpl.java index 1e93a0f..6f52c91 100644 --- a/src/main/java/org/sadtech/consultant/database/service/impl/NextUnitServiceImpl.java +++ b/src/main/java/org/sadtech/autoresponder/database/service/impl/NextUnitServiceImpl.java @@ -1,7 +1,7 @@ -package org.sadtech.consultant.database.service.impl; +package org.sadtech.autoresponder.database.service.impl; -import org.sadtech.consultant.database.repository.NextUnitRepository; -import org.sadtech.consultant.database.service.NextUnitService; +import org.sadtech.autoresponder.database.repository.NextUnitRepository; +import org.sadtech.autoresponder.database.service.NextUnitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/sadtech/consultant/database/service/impl/PersonServiceImpl.java b/src/main/java/org/sadtech/autoresponder/database/service/impl/PersonServiceImpl.java similarity index 77% rename from src/main/java/org/sadtech/consultant/database/service/impl/PersonServiceImpl.java rename to src/main/java/org/sadtech/autoresponder/database/service/impl/PersonServiceImpl.java index 936d0d8..7be8a66 100644 --- a/src/main/java/org/sadtech/consultant/database/service/impl/PersonServiceImpl.java +++ b/src/main/java/org/sadtech/autoresponder/database/service/impl/PersonServiceImpl.java @@ -1,8 +1,8 @@ -package org.sadtech.consultant.database.service.impl; +package org.sadtech.autoresponder.database.service.impl; -import org.sadtech.consultant.database.repository.PersonRepository; -import org.sadtech.consultant.database.entity.Person; -import org.sadtech.consultant.database.service.PersonService; +import org.sadtech.autoresponder.database.repository.PersonRepository; +import org.sadtech.autoresponder.database.entity.Person; +import org.sadtech.autoresponder.database.service.PersonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/sadtech/consultant/database/service/impl/SaveUnitServiceImpl.java b/src/main/java/org/sadtech/autoresponder/database/service/impl/SaveUnitServiceImpl.java similarity index 55% rename from src/main/java/org/sadtech/consultant/database/service/impl/SaveUnitServiceImpl.java rename to src/main/java/org/sadtech/autoresponder/database/service/impl/SaveUnitServiceImpl.java index 2524815..603a89c 100644 --- a/src/main/java/org/sadtech/consultant/database/service/impl/SaveUnitServiceImpl.java +++ b/src/main/java/org/sadtech/autoresponder/database/service/impl/SaveUnitServiceImpl.java @@ -1,7 +1,7 @@ -package org.sadtech.consultant.database.service.impl; +package org.sadtech.autoresponder.database.service.impl; -import org.sadtech.consultant.database.repository.SaveUnitRepositoriy; -import org.sadtech.consultant.database.service.SaveUnitService; +import org.sadtech.autoresponder.database.repository.SaveUnitRepositoriy; +import org.sadtech.autoresponder.database.service.SaveUnitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/sadtech/consultant/database/service/impl/UnitServiceImpl.java b/src/main/java/org/sadtech/autoresponder/database/service/impl/UnitServiceImpl.java similarity index 59% rename from src/main/java/org/sadtech/consultant/database/service/impl/UnitServiceImpl.java rename to src/main/java/org/sadtech/autoresponder/database/service/impl/UnitServiceImpl.java index eeec2d8..2cdddf2 100644 --- a/src/main/java/org/sadtech/consultant/database/service/impl/UnitServiceImpl.java +++ b/src/main/java/org/sadtech/autoresponder/database/service/impl/UnitServiceImpl.java @@ -1,8 +1,8 @@ -package org.sadtech.consultant.database.service.impl; +package org.sadtech.autoresponder.database.service.impl; -import org.sadtech.consultant.database.repository.UnitRepositoriy; -import org.sadtech.consultant.database.entity.Unit; -import org.sadtech.consultant.database.service.UnitService; +import org.sadtech.autoresponder.database.repository.UnitRepositoriy; +import org.sadtech.autoresponder.database.entity.Unit; +import org.sadtech.autoresponder.database.service.UnitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/sadtech/consultant/processing/MessageHandler.java b/src/main/java/org/sadtech/autoresponder/processing/MessageHandler.java similarity index 88% rename from src/main/java/org/sadtech/consultant/processing/MessageHandler.java rename to src/main/java/org/sadtech/autoresponder/processing/MessageHandler.java index d513930..ae1fab8 100644 --- a/src/main/java/org/sadtech/consultant/processing/MessageHandler.java +++ b/src/main/java/org/sadtech/autoresponder/processing/MessageHandler.java @@ -1,9 +1,9 @@ -package org.sadtech.consultant.processing; +package org.sadtech.autoresponder.processing; import lombok.extern.log4j.Log4j; -import org.sadtech.consultant.database.entity.Mail; -import org.sadtech.consultant.MessageSender; -import org.sadtech.consultant.database.entity.Person; +import org.sadtech.autoresponder.database.entity.Mail; +import org.sadtech.autoresponder.MessageSender; +import org.sadtech.autoresponder.database.entity.Person; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/sadtech/consultant/processing/MessageLogicService.java b/src/main/java/org/sadtech/autoresponder/processing/MessageLogicService.java similarity index 74% rename from src/main/java/org/sadtech/consultant/processing/MessageLogicService.java rename to src/main/java/org/sadtech/autoresponder/processing/MessageLogicService.java index 3eb2be4..6301456 100644 --- a/src/main/java/org/sadtech/consultant/processing/MessageLogicService.java +++ b/src/main/java/org/sadtech/autoresponder/processing/MessageLogicService.java @@ -1,7 +1,7 @@ -package org.sadtech.consultant.processing; +package org.sadtech.autoresponder.processing; -import org.sadtech.consultant.database.entity.Mail; -import org.sadtech.consultant.database.service.MailService; +import org.sadtech.autoresponder.database.entity.Mail; +import org.sadtech.autoresponder.database.service.MailService; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/sadtech/consultant/processing/PersonLogicService.java b/src/main/java/org/sadtech/autoresponder/processing/PersonLogicService.java similarity index 90% rename from src/main/java/org/sadtech/consultant/processing/PersonLogicService.java rename to src/main/java/org/sadtech/autoresponder/processing/PersonLogicService.java index 4da66f7..211dda8 100644 --- a/src/main/java/org/sadtech/consultant/processing/PersonLogicService.java +++ b/src/main/java/org/sadtech/autoresponder/processing/PersonLogicService.java @@ -1,8 +1,8 @@ -package org.sadtech.consultant.processing; +package org.sadtech.autoresponder.processing; import lombok.extern.log4j.Log4j; -import org.sadtech.consultant.database.entity.Person; -import org.sadtech.consultant.database.service.PersonService; +import org.sadtech.autoresponder.database.entity.Person; +import org.sadtech.autoresponder.database.service.PersonService; import org.springframework.stereotype.Component; @Log4j diff --git a/src/main/java/org/sadtech/consultant/database/service/NextUnitService.java b/src/main/java/org/sadtech/consultant/database/service/NextUnitService.java deleted file mode 100644 index 0106520..0000000 --- a/src/main/java/org/sadtech/consultant/database/service/NextUnitService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.sadtech.consultant.database.service; - -public interface NextUnitService { -} diff --git a/src/main/java/org/sadtech/consultant/database/service/SaveUnitService.java b/src/main/java/org/sadtech/consultant/database/service/SaveUnitService.java deleted file mode 100644 index 74250ae..0000000 --- a/src/main/java/org/sadtech/consultant/database/service/SaveUnitService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.sadtech.consultant.database.service; - -public interface SaveUnitService { -} diff --git a/src/main/java/org/sadtech/consultant/database/service/UnitService.java b/src/main/java/org/sadtech/consultant/database/service/UnitService.java deleted file mode 100644 index eafedba..0000000 --- a/src/main/java/org/sadtech/consultant/database/service/UnitService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.sadtech.consultant.database.service; - -import org.sadtech.consultant.database.entity.Unit; - -public interface UnitService { - - void addUnit(Unit unit); - - void removeUnit(Long id); - -}