Godfather-Bots/autoresponder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'release-1.4.0' into develop

Browse Source 
release-1.4.0
This commit is contained in:
Mark Struchkov 2019-02-23 12:55:19 +03:00
commit e05cae974f
7 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>org.sadtech.autoresponder</groupId> <groupId>org.sadtech.autoresponder</groupId>
<artifactId>autoresponder</artifactId> <artifactId>autoresponder</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.4.0-RELEASE</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<build> <build>
<plugins> <plugins>

2
src/main/java/org/sadtech/autoresponder/Autoresponder.java
View File

@ -1,9 +1,9 @@
package org.sadtech.autoresponder; package org.sadtech.autoresponder;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.sadtech.autoresponder.compare.UnitPriorityComparator;
import org.sadtech.autoresponder.entity.Person; import org.sadtech.autoresponder.entity.Person;
import org.sadtech.autoresponder.entity.Unit; import org.sadtech.autoresponder.entity.Unit;
import org.sadtech.autoresponder.entity.compare.UnitPriorityComparator;
import org.sadtech.autoresponder.service.PersonService; import org.sadtech.autoresponder.service.PersonService;
import org.sadtech.autoresponder.submodule.parser.Parser; import org.sadtech.autoresponder.submodule.parser.Parser;

2
src/main/java/org/sadtech/autoresponder/entity/compare/UnitPriorityComparator.java → src/main/java/org/sadtech/autoresponder/compare/UnitPriorityComparator.java
View File

@ -1,4 +1,4 @@
package org.sadtech.autoresponder.entity.compare; package org.sadtech.autoresponder.compare;
import org.sadtech.autoresponder.entity.Unit; import org.sadtech.autoresponder.entity.Unit;

4
src/main/java/org/sadtech/autoresponder/entity/Unit.java
View File

@ -1,6 +1,8 @@
package org.sadtech.autoresponder.entity; package org.sadtech.autoresponder.entity;
import java.util.*; import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public abstract class Unit { public abstract class Unit {

6
src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java → src/main/java/org/sadtech/autoresponder/repository/PersonRepositoryMap.java
View File

@ -1,9 +1,9 @@
package org.sadtech.autoresponder.repository.impl; package org.sadtech.autoresponder.repository;
import org.sadtech.autoresponder.entity.Person; import org.sadtech.autoresponder.entity.Person;
import org.sadtech.autoresponder.repository.PersonRepository;
import java.util.*; import java.util.HashMap;
import java.util.Map;
public class PersonRepositoryMap implements PersonRepository { public class PersonRepositoryMap implements PersonRepository {

10
src/main/java/org/sadtech/autoresponder/service/impl/PersonServiceImpl.java → src/main/java/org/sadtech/autoresponder/service/PersonServiceImpl.java
View File

@ -1,11 +1,9 @@
package org.sadtech.autoresponder.service.impl; package org.sadtech.autoresponder.service;
import org.sadtech.autoresponder.entity.Person;
import org.sadtech.autoresponder.repository.PersonRepository;
import org.sadtech.autoresponder.repository.impl.PersonRepositoryMap;
import org.sadtech.autoresponder.service.PersonService;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.sadtech.autoresponder.entity.Person;
import org.sadtech.autoresponder.repository.PersonRepository;
import org.sadtech.autoresponder.repository.PersonRepositoryMap;
public class PersonServiceImpl implements PersonService { public class PersonServiceImpl implements PersonService {

13
src/main/java/org/sadtech/autoresponder/service/UnitService.java
View File

@ -1,13 +0,0 @@
//package org.sadtech.autoresponder.service;
//
//import org.sadtech.autoresponder.entity.Unit;
//
//import java.util.Set;
//
//public interface UnitService {
//
// Set<Unit> menuUnit();
//
// void addUnit(Unit unit);
//
//}