Merge tag 'release-1.0' into develop

release-1.0
This commit is contained in:
Mark Struchkov 2019-01-14 15:36:33 +03:00
commit cc8f6c2b1d
6 changed files with 10 additions and 10 deletions

View File

@ -6,7 +6,7 @@
<groupId>org.sadtech.autoresponder</groupId> <groupId>org.sadtech.autoresponder</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>0.1-SNAPSHOT</version> <version>1.0</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@ -5,7 +5,7 @@ import org.sadtech.autoresponder.repository.PersonRepository;
import java.util.*; import java.util.*;
public class PersonRepositoryImpl implements PersonRepository { public class PersonRepositoryMap implements PersonRepository {
private Map<Integer, Person> people = new HashMap<>(); private Map<Integer, Person> people = new HashMap<>();

View File

@ -5,7 +5,7 @@ import org.sadtech.autoresponder.repository.UnitRepository;
import java.util.*; import java.util.*;
public class UnitRepositoryImpl implements UnitRepository { public class UnitRepositoryMap implements UnitRepository {
private Map<Integer, Unit> units = new HashMap<>(); private Map<Integer, Unit> units = new HashMap<>();

View File

@ -5,7 +5,9 @@ import org.sadtech.autoresponder.entity.Person;
public interface PersonService { public interface PersonService {
Person getPersonById(Integer integer); Person getPersonById(Integer integer);
void addPerson(Person person); void addPerson(Person person);
boolean checkPerson(Integer idPerson); boolean checkPerson(Integer idPerson);
} }

View File

@ -3,6 +3,7 @@ package org.sadtech.autoresponder.service;
import org.sadtech.autoresponder.entity.Unit; import org.sadtech.autoresponder.entity.Unit;
public interface UnitService { public interface UnitService {
Unit nextUnit(Unit unit, String message); Unit nextUnit(Unit unit, String message);
Unit getUnitById(Integer idUnit); Unit getUnitById(Integer idUnit);

View File

@ -2,20 +2,17 @@ package org.sadtech.autoresponder;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
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.repository.impl.PersonRepositoryImpl; import org.sadtech.autoresponder.repository.impl.PersonRepositoryMap;
import org.sadtech.autoresponder.repository.impl.UnitRepositoryImpl; import org.sadtech.autoresponder.repository.impl.UnitRepositoryMap;
import org.sadtech.autoresponder.service.impl.PersonServiceImpl; import org.sadtech.autoresponder.service.impl.PersonServiceImpl;
import org.sadtech.autoresponder.service.impl.UnitServiceImpl; import org.sadtech.autoresponder.service.impl.UnitServiceImpl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import static org.junit.Assert.*;
public class AutoresponderTest { public class AutoresponderTest {
private Person person = new Person(); private Person person = new Person();
@ -23,8 +20,8 @@ public class AutoresponderTest {
private Unit unit2 = new Unit(); private Unit unit2 = new Unit();
private Unit unit3 = new Unit(); private Unit unit3 = new Unit();
private ArrayList<Unit> units = new ArrayList<>(); private ArrayList<Unit> units = new ArrayList<>();
private UnitRepositoryImpl unitRepository = new UnitRepositoryImpl(); private UnitRepositoryMap unitRepository = new UnitRepositoryMap();
private PersonRepositoryImpl personRepository = new PersonRepositoryImpl(); private PersonRepositoryMap personRepository = new PersonRepositoryMap();
private UnitServiceImpl unitService = new UnitServiceImpl(unitRepository); private UnitServiceImpl unitService = new UnitServiceImpl(unitRepository);
private PersonServiceImpl personService = new PersonServiceImpl(personRepository); private PersonServiceImpl personService = new PersonServiceImpl(personRepository);