diff --git a/.classpath b/.classpath index a25dc2c..1c125a8 100644 --- a/.classpath +++ b/.classpath @@ -1,42 +1,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.settings/com.vaadin.integration.eclipse.prefs b/.settings/com.vaadin.integration.eclipse.prefs index 2bf7134..ea671d4 100644 --- a/.settings/com.vaadin.integration.eclipse.prefs +++ b/.settings/com.vaadin.integration.eclipse.prefs @@ -1,4 +1,4 @@ -com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.6.4","8.8.3"] +com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.6.4","8.8.6"] com.vaadin.integration.eclipse.previousCompileAction=both com.vaadin.integration.eclipse.useLatestNightly=false com.vaadin.integration.eclipse.widgetsetDirty=true diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 1ae503a..5d2cc4e 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,8 @@ - + + + + @@ -11,7 +14,7 @@ - + @@ -22,20 +25,17 @@ - - - + + - - @@ -43,11 +43,11 @@ + + - - @@ -59,11 +59,15 @@ - - + + + - + + + + @@ -75,7 +79,10 @@ - + + + + @@ -87,7 +94,10 @@ - + + + + @@ -99,7 +109,10 @@ - + + + + diff --git a/src/main/java/Main.java b/src/main/java/Main.java deleted file mode 100644 index 8d301e9..0000000 --- a/src/main/java/Main.java +++ /dev/null @@ -1,21 +0,0 @@ -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; - -import com.mysql.cj.jdbc.MysqlDataSource; - -public class Main { - - public static void main(String[] args) throws SQLException { - MysqlDataSource dataSource = new MysqlDataSource(); - dataSource.setUrl( - "jdbc:mysql://localhost:3306/clubhelper?useSSL=FALSE&useUnicode=yes&characterEncoding=utf8&serverTimezone=UTC"); - dataSource.setUser("root"); - dataSource.setPassword("07!73"); - try (Connection conn = dataSource.getConnection()) { - DatabaseMetaData meta = conn.getMetaData(); - System.out.println(meta); - } - } - -} diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/EventBusiness.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/EventBusiness.java index a5fbecb..e4ad929 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/EventBusiness.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/EventBusiness.java @@ -87,6 +87,7 @@ public class EventBusiness { public void storeAltersgruppe(Altersgruppe edited) { altersgruppeDao.save(edited); clubEventDao.save(current); + log.info("Stored {}", edited); } public EventMeldung createMeldung() { diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/PersonBusiness.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/PersonBusiness.java new file mode 100644 index 0000000..39b5490 --- /dev/null +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/PersonBusiness.java @@ -0,0 +1,60 @@ +package de.kreth.vaadin.clubhelper.vaadinclubhelper.business; + +import java.util.Collection; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Adress; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Contact; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Relation; + +@Component +public class PersonBusiness { + + private final Logger log = LoggerFactory.getLogger(getClass()); + + @Autowired + private PersonDao dao; + + public void save(Person edited) { + dao.save(edited); + log.info("Saved {}", edited); + } + + public void delete(Contact c) { + dao.delete(c); + log.info("Deleted {}", c); + } + + public Collection findRelationsFor(Person person) { + log.info("Loading relations of {}", person); + return dao.findRelationsFor(person); + } + + public void delete(Adress a) { + dao.delete(a); + log.info("Deleted {}", a); + } + + public List listAll() { + log.info("Loading all Persons"); + return dao.listAll(); + } + + public void delete(Person c) { + dao.delete(c); + log.info("Deleted {}", c); + } + + public Person findLoginUser(String username, String password) { + log.info("Identifiing Login for user {}", username); + return dao.findLoginUser(username, password); + } + +} diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDao.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDao.java index 7a0929a..234256b 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDao.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDao.java @@ -28,4 +28,5 @@ public interface PersonDao extends IDao { void delete(Person p); void delete(Adress a); + } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDaoImpl.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDaoImpl.java index a689947..bb0e730 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDaoImpl.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/PersonDaoImpl.java @@ -133,4 +133,5 @@ public class PersonDaoImpl extends AbstractDaoImpl implements PersonDao Person person = a.getPerson(); person.getAdresses().remove(a); } + } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java index ea17f3f..5aeb7a2 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java @@ -30,17 +30,24 @@ public abstract class AbstractDataGrid extends VerticalLayout { private static final long serialVersionUID = -3404971410481135696L; private final Grid grid; + private final List source; + private final ListDataProvider dataProvider; + private boolean hasChanges; + private Column deleteButtonColumn; + private Consumer deleteConsumer; + private final List> successConsumers; private final HorizontalLayout buttonLayout; + private final Button addButton; - public AbstractDataGrid() { + protected AbstractDataGrid() { this.grid = new Grid<>(); this.source = new ArrayList<>(); successConsumers = new ArrayList<>(); @@ -110,7 +117,8 @@ public abstract class AbstractDataGrid extends VerticalLayout { this.deleteConsumer = deleteConsumer; if (deleteConsumer != null) { deleteButtonColumn.setHidden(false); - } else { + } + else { deleteButtonColumn.setHidden(true); } } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/ContactGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/ContactGrid.java index bd5c61d..fa75e8b 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/ContactGrid.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/ContactGrid.java @@ -24,6 +24,7 @@ public class ContactGrid extends AbstractDataGrid { * */ private static final long serialVersionUID = -2573761302198992085L; + private static final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); @Override @@ -40,17 +41,21 @@ public class ContactGrid extends AbstractDataGrid { protected ValidationResult validate(Contact obj, ValueContext context) { if (obj.getType().equalsIgnoreCase("email")) { return new EmailValidator("Emailformat nicht gültig!").apply(obj.getValue(), context); - } else if (obj.getType().equalsIgnoreCase("Telefon") || obj.getType().equalsIgnoreCase("Mobile")) { + } + else if (obj.getType().equalsIgnoreCase("Telefon") || obj.getType().equalsIgnoreCase("Mobile")) { try { PhoneNumber phone = phoneUtil.parse(obj.getValue(), "DE"); + if (phoneUtil.isValidNumber(phone)) { obj.setValue(phoneUtil.format(phone, com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)); return ValidationResult.ok(); - } else { - return ValidationResult.error("Fehler beim Validieren von Telefonnummer: " + obj.getValue()); } - } catch (NumberParseException e) { + else { + return ValidationResult.error("Ungültige Telefonnummer: " + obj.getValue()); + } + } + catch (NumberParseException e) { return ValidationResult.error("Fehler beim Validieren von Telefonnummer: " + obj.getValue()); } } @@ -74,4 +79,4 @@ public class ContactGrid extends AbstractDataGrid { return new Contact(); } -} \ No newline at end of file +} diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/EventDetails.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/EventDetails.java index dddb32d..7b8af18 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/EventDetails.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/EventDetails.java @@ -13,9 +13,9 @@ import com.vaadin.ui.Window; import de.kreth.googleconnectors.calendar.CalendarAdapter; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.meldung.EventMeldung; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PflichtenDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.navigation.ClubhelperNavigation.ClubNavigator; @@ -25,17 +25,25 @@ public class EventDetails extends GridLayout implements View { private static final long serialVersionUID = 8290150079638390995L; private final EventBusiness eventBusiness; - private final PersonDao personDao; + + private final PersonBusiness personDao; + private final GroupDao groupDao; + private final PflichtenDao pflichtenDao; private ClubEvent currentEvent; + private SingleEventView eventView; + private PersonGrid personGrid; + private EventAltersgruppen eventAltersgruppen; + private CalendarAdapter calendarAdapter; - public EventDetails(PersonDao personDao, GroupDao groupDao, EventBusiness eventBusiness, PflichtenDao pflichtenDao, + public EventDetails(PersonBusiness personDao, GroupDao groupDao, EventBusiness eventBusiness, + PflichtenDao pflichtenDao, CalendarAdapter calendarAdapter) { super(3, 5); this.eventBusiness = eventBusiness; @@ -81,7 +89,8 @@ public class EventDetails extends GridLayout implements View { addComponent(personGrid, 2, 0); addComponent(buttonLayout, 0, 4, 2, 4); setSizeFull(); - } else { + } + else { eventAltersgruppen.updateData(); } eventView.setEvent(currentEvent); diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java index f23d2a8..61eb169 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java @@ -1,12 +1,18 @@ package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components; import java.util.List; +import java.util.Set; import java.util.function.Consumer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.vaadin.teemu.switchui.Switch; import com.vaadin.data.Binder; +import com.vaadin.data.Binder.BindingBuilder; import com.vaadin.data.BinderValidationStatus; +import com.vaadin.data.HasValue.ValueChangeEvent; +import com.vaadin.data.HasValue.ValueChangeListener; import com.vaadin.data.ValidationResult; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; @@ -18,7 +24,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Gender; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; @@ -34,10 +40,12 @@ public class PersonEditDetails extends HorizontalLayout { private final DateField birthday; - private final PersonDao dao; + private final PersonBusiness dao; private final Binder binder; + private final Binder> binderGroups; + private Consumer personChangeHandler; private Button okButton; @@ -48,11 +56,11 @@ public class PersonEditDetails extends HorizontalLayout { private AdressComponent adressLayout; - public PersonEditDetails(List groups, PersonDao dao) { + public PersonEditDetails(List groups, PersonBusiness dao) { this(groups, dao, true); } - public PersonEditDetails(List groups, PersonDao dao, boolean showCloseButton) { + public PersonEditDetails(List groups, PersonBusiness dao, boolean showCloseButton) { this.dao = dao; @@ -122,6 +130,7 @@ public class PersonEditDetails extends HorizontalLayout { VerticalLayout layout = new VerticalLayout(textPrename, textSureName, birthday, genderBox, textStartPass, close, okButton); + binderGroups = new Binder>(); Component groupLayout = createGroupPanel(groups); contactLayout = new ContactGrid(); contactLayout.setDeleteConsumer(c -> { @@ -175,18 +184,46 @@ public class PersonEditDetails extends HorizontalLayout { for (GroupDef g : groups) { Switch sw = new Switch(g.getName()); + sw.setId("Group_" + g.getName()); sw.setData(g); layout.addComponent(sw); - binder.forField(sw).bind(p -> p.getGroups().contains(g), (bean, fieldvalue) -> { + BindingBuilder, Boolean> forField = binderGroups.forField(sw); + forField.bind(p -> p.contains(g), (bean, fieldvalue) -> { if (fieldvalue) { - bean.getGroups().add(g); + bean.add(g); } else { - bean.getGroups().remove(g); + bean.remove(g); } }); } + binder.addValueChangeListener(new ValueChangeListener() { + + transient Logger log = LoggerFactory.getLogger(PersonEditDetails.this.getClass()); + + @Override + public void valueChange(ValueChangeEvent event) { + Component comp = event.getComponent(); + Object oldGroups = event.getOldValue(); + Object newGroups = event.getValue(); + log.warn("Changed value in {}, old size={}, new size={}, hasChanges={}", comp.getId(), oldGroups, + newGroups, binder.hasChanges()); + } + }); + binderGroups.addValueChangeListener(new ValueChangeListener() { + + transient Logger log = LoggerFactory.getLogger(PersonEditDetails.this.getClass()); + + @Override + public void valueChange(ValueChangeEvent event) { + Component comp = event.getComponent(); + Object oldGroups = event.getOldValue(); + Object newGroups = event.getValue(); + log.warn("Changed value in {}, old size={}, new size={}, hasChanges={}", comp.getId(), oldGroups, + newGroups, binderGroups.hasChanges()); + } + }); return layout; } @@ -197,6 +234,12 @@ public class PersonEditDetails extends HorizontalLayout { public void setBean(Person person) { closeWithoutSave(); binder.setBean(person); + if (person != null) { + binderGroups.setBean(person.getGroups()); + } + else { + binderGroups.setBean(null); + } contactLayout.setPerson(person); relationshipLayout.setPerson(person); adressLayout.setPerson(person); @@ -212,7 +255,7 @@ public class PersonEditDetails extends HorizontalLayout { } } - void closeWithoutSave() { + public void closeWithoutSave() { if (hasChanges()) { final Person current = binder.getBean(); @@ -234,6 +277,7 @@ public class PersonEditDetails extends HorizontalLayout { public boolean hasChanges() { return binder.getBean() != null && (binder.hasChanges() + || binderGroups.hasChanges() || contactLayout.hasChanges() || relationshipLayout.hasChanges() || adressLayout.hasChanges()); diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilter.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilter.java index af6db40..2a226a4 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilter.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilter.java @@ -11,7 +11,7 @@ import com.vaadin.data.provider.DataChangeEvent; import com.vaadin.data.provider.DataProviderListener; import com.vaadin.server.SerializablePredicate; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.events.DataUpdatedEvent; @@ -20,16 +20,22 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.events.DefaultDataUpdateHa public class PersonFilter implements SerializablePredicate, DataProviderListener { private static final long serialVersionUID = -8481035921020651601L; + private Set selectedPersons = null; + private Set selectedGroups = null; + private final List publishedList; - private final PersonDao personDao; + + private final PersonBusiness personDao; + private final DefaultDataUpdateHandler updateHandler; + private String nameFilter; - public PersonFilter(PersonDao personDao) { - this.personDao = personDao; - publishedList = new ArrayList<>(personDao.listAll()); + public PersonFilter(PersonBusiness personDao2) { + this.personDao = personDao2; + publishedList = new ArrayList<>(personDao2.listAll()); this.updateHandler = new DefaultDataUpdateHandler(); } @@ -102,7 +108,8 @@ public class PersonFilter implements SerializablePredicate, DataProvider public void setNameFilter(String value) { if (value != null) { this.nameFilter = value.toLowerCase(); - } else { + } + else { this.nameFilter = value; } } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java index d563af7..dbacd57 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java @@ -31,8 +31,8 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.components.grid.GridMultiSelect; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Gender; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef; @@ -42,29 +42,40 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpass; public class PersonGrid extends VerticalLayout { private static final long serialVersionUID = -8148097982839343673L; + private final transient Logger log = LoggerFactory.getLogger(getClass()); private final transient DateTimeFormatter birthFormat = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM); + private final ListDataProvider dataProvider; private final Grid grid; + private final CheckBox checkIncluded; + private final ComboBox comboGroups; + private final TextField textFilter; - private final PersonDao personDao; + private final PersonBusiness personDao; private List allGroups; + private PersonFilter filter; + private ClubEvent currentEvent; + private Column startpassColumn; + private Layout filters; + private SelectionMode currentSelectionMode; + private Column genderColumn; private Column deleteButtonColumn; - public PersonGrid(GroupDao groupDao, PersonDao personDao) { + public PersonGrid(GroupDao groupDao, PersonBusiness personDao) { setId("main.person"); setCaption("Teilnehmer"); @@ -101,6 +112,7 @@ public class PersonGrid extends VerticalLayout { grid.setDataProvider(dataProvider); grid.setId("person.grid"); grid.setSizeFull(); + grid.setSelectionMode(SelectionMode.SINGLE); grid.addColumn(Person::getPrename).setCaption("Vorname"); grid.addColumn(Person::getSurname).setCaption("Nachname"); @@ -111,7 +123,8 @@ public class PersonGrid extends VerticalLayout { Startpass startpass = p.getStartpass(); if (startpass != null) { return startpass.getStartpassNr(); - } else { + } + else { return null; } }).setCaption("Startpass Nr."); @@ -124,7 +137,8 @@ public class PersonGrid extends VerticalLayout { if (gender == null) { icon = VaadinIcons.QUESTION; - } else { + } + else { switch (gender) { case FEMALE: icon = VaadinIcons.FEMALE; @@ -161,7 +175,8 @@ public class PersonGrid extends VerticalLayout { if (gender == null) { icon = VaadinIcons.QUESTION; - } else { + } + else { switch (gender) { case FEMALE: icon = VaadinIcons.FEMALE; @@ -228,7 +243,8 @@ public class PersonGrid extends VerticalLayout { if (value != null && value.length() >= 2) { filter.setNameFilter(value); dataProvider.refreshAll(); - } else { + } + else { filter.setNameFilter(null); dataProvider.refreshAll(); } @@ -249,7 +265,8 @@ public class PersonGrid extends VerticalLayout { private void updateSelectedOnlyFilter(Boolean selectedOnly) { if (selectedOnly != null && selectedOnly.equals(Boolean.TRUE)) { filter.setSelectedPersons(grid.getSelectedItems()); - } else { + } + else { filter.setSelectedPersons(null); } dataProvider.refreshAll(); @@ -269,7 +286,8 @@ public class PersonGrid extends VerticalLayout { asMultiSelect.deselectAll(); if (items == null || items.length == 0) { log.debug("No Persons selected."); - } else { + } + else { log.debug("Selecting Persons: {}", Arrays.asList(items)); asMultiSelect.selectItems(items); } @@ -312,10 +330,12 @@ public class PersonGrid extends VerticalLayout { if (currentSelectionMode == SelectionMode.MULTI) { if (ev != null) { updateSelection(ev); - } else { + } + else { selectItems(new Person[0]); } - } else if (ev != null) { + } + else if (ev != null) { Collection items = dataProvider.getItems(); items.clear(); items.addAll(ev.getPersons()); @@ -327,7 +347,8 @@ public class PersonGrid extends VerticalLayout { Set persons = ev.getPersons(); if (persons != null) { selectItems(persons.toArray(new Person[0])); - } else { + } + else { selectItems(new Person[0]); } } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/RelationComponent.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/RelationComponent.java index b2b4137..ba3395b 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/RelationComponent.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/RelationComponent.java @@ -6,16 +6,17 @@ import com.vaadin.data.Binder; import com.vaadin.data.ValidationResult; import com.vaadin.data.ValueContext; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Relation; public class RelationComponent extends AbstractDataGrid { private static final long serialVersionUID = 7813969695936351799L; - private PersonDao dao; - public RelationComponent(PersonDao dao) { + private PersonBusiness dao; + + public RelationComponent(PersonBusiness dao) { this.dao = dao; setEditorEnabled(false); } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/ClubhelperNavigation.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/ClubhelperNavigation.java index deee4e6..3ea373a 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/ClubhelperNavigation.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/ClubhelperNavigation.java @@ -17,8 +17,8 @@ import com.vaadin.ui.UI; import de.kreth.googleconnectors.calendar.CalendarAdapter; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PflichtenDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.EventDetails; @@ -30,9 +30,6 @@ public class ClubhelperNavigation implements ApplicationContextAware { private ApplicationContext context; - @Autowired - PersonDao personDao; - @Autowired GroupDao groupDao; @@ -50,6 +47,9 @@ public class ClubhelperNavigation implements ApplicationContextAware { private ClubNavigator navi; + @Autowired + PersonBusiness personBusiness; + public void configure(UI mainUI) { navi = new ClubNavigator().init(mainUI); @@ -63,10 +63,10 @@ public class ClubhelperNavigation implements ApplicationContextAware { navi.addView("", mainView); navi.addView(ClubhelperViews.MainView.name(), mainView); - navi.addView(ClubhelperViews.LoginUI.name(), new LoginUI(personDao, securityGroupVerifier)); + navi.addView(ClubhelperViews.LoginUI.name(), new LoginUI(personBusiness, securityGroupVerifier)); navi.addView(ClubhelperViews.PersonEditView.name(), factory.createPersonEdit()); navi.addView(ClubhelperViews.EventDetails.name(), - new EventDetails(personDao, groupDao, eventBusiness, pflichtenDao, calendarAdapter)); + new EventDetails(personBusiness, groupDao, eventBusiness, pflichtenDao, calendarAdapter)); page.addBrowserWindowResizeListener(ev -> { int width = ev.getWidth(); @@ -90,15 +90,15 @@ public class ClubhelperNavigation implements ApplicationContextAware { public MainView createMain() { if (page.getBrowserWindowWidth() < 1000) { - return new MainViewMobile(context, personDao, groupDao, eventBusiness, securityGroupVerifier); + return new MainViewMobile(context, personBusiness, groupDao, eventBusiness, securityGroupVerifier); } else { - return new MainViewDesktop(context, personDao, groupDao, eventBusiness, securityGroupVerifier); + return new MainViewDesktop(context, personBusiness, groupDao, eventBusiness, securityGroupVerifier); } } public PersonEditView createPersonEdit() { - return new PersonEditView(groupDao, personDao, (page.getBrowserWindowWidth() >= 1000)); + return new PersonEditView(groupDao, personBusiness, (page.getBrowserWindowWidth() >= 1000)); } } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUI.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUI.java index 26897d7..98750ae 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUI.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUI.java @@ -11,7 +11,7 @@ import com.vaadin.ui.LoginForm; import com.vaadin.ui.Notification; import com.vaadin.ui.VerticalLayout; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; @@ -25,7 +25,7 @@ public class LoginUI extends VerticalLayout implements View { private String parameters; - public LoginUI(PersonDao personDao, SecurityVerifier securityGroupVerifier) { + public LoginUI(PersonBusiness personBusiness, SecurityVerifier securityGroupVerifier) { LoginForm lf = new LoginForm(); lf.addLoginListener(e -> { @@ -34,7 +34,7 @@ public class LoginUI extends VerticalLayout implements View { String password = e.getLoginParameter("password"); try { - Person loggedin = personDao.findLoginUser(username, password); + Person loggedin = personBusiness.findLoginUser(username, password); securityGroupVerifier.setLoggedinPerson(loggedin); navigator.navigateTo(ClubhelperViews.MainView.name() + '/' + parameters); } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainView.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainView.java index 8cf0694..e23393b 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainView.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainView.java @@ -13,8 +13,8 @@ import com.vaadin.ui.VerticalLayout; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ClubhelperException; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; @@ -29,8 +29,6 @@ public abstract class MainView extends VerticalLayout implements View { protected final Logger LOGGER = LoggerFactory.getLogger(getClass()); - private final PersonDao personDao; - private final GroupDao groupDao; protected final EventBusiness eventBusiness; @@ -43,9 +41,11 @@ public abstract class MainView extends VerticalLayout implements View { protected ClubNavigator navigator; - public MainView(PersonDao personDao, GroupDao groupDao, EventBusiness eventBusiness, + private final PersonBusiness personBusiness; + + public MainView(GroupDao groupDao, EventBusiness eventBusiness, PersonBusiness personBusiness, SecurityVerifier securityGroupVerifier) { - this.personDao = personDao; + this.personBusiness = personBusiness; this.groupDao = groupDao; this.eventBusiness = eventBusiness; this.securityVerifier = securityGroupVerifier; @@ -79,7 +79,7 @@ public abstract class MainView extends VerticalLayout implements View { eventView.setId(eventView.getClass().getName()); eventView.setVisible(false); - personGrid = new PersonGrid(groupDao, personDao); + personGrid = new PersonGrid(groupDao, personBusiness); personGrid.setCaption("Personen"); personGrid.setSelectionMode(SelectionMode.MULTI); personGrid.onPersonSelect(ev -> personSelectionChange(ev)); diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java index 96b9aca..cf5e171 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java @@ -14,8 +14,8 @@ import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent; @@ -40,10 +40,10 @@ public class MainViewDesktop extends MainView { private ApplicationContext context; - public MainViewDesktop(ApplicationContext context, PersonDao personDao, GroupDao groupDao, + public MainViewDesktop(ApplicationContext context, PersonBusiness personDao, GroupDao groupDao, EventBusiness eventBusiness, SecurityVerifier securityGroupVerifier) { - super(personDao, groupDao, eventBusiness, securityGroupVerifier); + super(groupDao, eventBusiness, personDao, securityGroupVerifier); this.context = context; } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobile.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobile.java index 2cda47c..bc07002 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobile.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobile.java @@ -24,8 +24,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Window; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent.ClubEventProvider; @@ -42,10 +42,10 @@ public class MainViewMobile extends MainView { private ApplicationContext context; - public MainViewMobile(ApplicationContext context, PersonDao personDao, GroupDao groupDao, + public MainViewMobile(ApplicationContext context, PersonBusiness personDao, GroupDao groupDao, EventBusiness eventBusiness, SecurityVerifier securityGroupVerifier) { - super(personDao, groupDao, eventBusiness, securityGroupVerifier); + super(groupDao, eventBusiness, personDao, securityGroupVerifier); this.context = context; } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/PersonEditView.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/PersonEditView.java index afdf557..4bfd540 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/PersonEditView.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/PersonEditView.java @@ -8,12 +8,15 @@ import com.vaadin.event.selection.SelectionEvent; import com.vaadin.navigator.Navigator; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; +import com.vaadin.shared.ui.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonEditDetails; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonGrid; @@ -23,11 +26,12 @@ public class PersonEditView extends VerticalLayout implements View { private static final long serialVersionUID = 1770993670570422036L; private PersonGrid personGrid; + private PersonEditDetails personDetails; private Navigator navigator; - public PersonEditView(GroupDao groupDao, PersonDao personDao, boolean horizontalLayout) { + public PersonEditView(GroupDao groupDao, PersonBusiness personDao, boolean horizontalLayout) { setMargin(true); personGrid = new PersonGrid(groupDao, personDao); @@ -42,7 +46,8 @@ public class PersonEditView extends VerticalLayout implements View { if (horizontalLayout) { addComponent(createHorizontalLayout()); - } else { + } + else { addComponent(createVerticalLayout()); } Button addPerson = new Button("Hinzufügen"); @@ -81,8 +86,36 @@ public class PersonEditView extends VerticalLayout implements View { } void selectedPerson(SelectionEvent p) { - Optional firstSelectedItem = p.getFirstSelectedItem(); - personDetails.setBean(firstSelectedItem.orElse(null)); + if (personDetails.hasChanges()) { + VerticalLayout content = new VerticalLayout(); + Window dlg = new Window("Änderungen verwerfen?", content); + dlg.setClosable(false); + dlg.setModal(true); + + Label message = new Label( + "Die Personendaten wurden geändert.
Sollen diese Änderungen verworfen werden?", + ContentMode.HTML); + content.addComponent(message); + HorizontalLayout buttons = new HorizontalLayout(); + Button ok = new Button("Ja", ev -> { + dlg.setVisible(false); + PersonEditView.this.getUI().removeWindow(dlg); + Optional firstSelectedItem = p.getFirstSelectedItem(); + personDetails.setBean(firstSelectedItem.orElse(null)); + }); + Button cancel = new Button("Nein", ev -> { + dlg.setVisible(false); + PersonEditView.this.getUI().removeWindow(dlg); + }); + buttons.addComponents(ok, cancel); + + content.addComponent(buttons); + getUI().addWindow(dlg); + } + else { + Optional firstSelectedItem = p.getFirstSelectedItem(); + personDetails.setBean(firstSelectedItem.orElse(null)); + } } @Override diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index a9160f7..6056ebc 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -4,9 +4,15 @@ - - - + + + %d{yyyy-MM-dd HH:mm:ss} %-5p %logger %m%n + + + + + + diff --git a/src/test/java/de/kreth/vaadin/clubhelper/AbstractHibernateConfiguration.java b/src/test/java/de/kreth/vaadin/clubhelper/AbstractHibernateConfiguration.java index a1c66f3..a0ae9cf 100644 --- a/src/test/java/de/kreth/vaadin/clubhelper/AbstractHibernateConfiguration.java +++ b/src/test/java/de/kreth/vaadin/clubhelper/AbstractHibernateConfiguration.java @@ -1,5 +1,6 @@ package de.kreth.vaadin.clubhelper; +import java.io.InputStream; import java.util.HashSet; import java.util.Set; @@ -28,7 +29,8 @@ public abstract class AbstractHibernateConfiguration implements HibernateConfigu configuration.addAnnotatedClass(entityClass); } - configuration.addInputStream(getClass().getResourceAsStream("/schema/ClubEvent.hbm.xml")); + InputStream resourceAsStream = getClass().getResourceAsStream("/schema/ClubEvent.hbm.xml"); + configuration.addInputStream(resourceAsStream); configuration.setProperty("hibernate.hbm2ddl.auto", "update"); configuration.setProperty("spring.jpa.hibernate.ddl-auto", "update"); diff --git a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilterTest.java b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilterTest.java index ea09dd8..be3ba6e 100644 --- a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilterTest.java +++ b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonFilterTest.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.TestDatabaseHelper; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; @@ -43,7 +43,7 @@ class PersonFilterTest { TestDatabaseHelper testDatabaseHelper; @Mock - private PersonDao dao; + private PersonBusiness dao; static List setupData() { diff --git a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUITest.java b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUITest.java index 8d467d9..18b5ce7 100644 --- a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUITest.java +++ b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/LoginUITest.java @@ -18,7 +18,7 @@ import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.ui.Component; import com.vaadin.ui.LoginForm; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; @RunWith(SpringRunner.class) @@ -26,7 +26,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; public class LoginUITest { @Autowired - PersonDao personDao; + PersonBusiness personDao; @Autowired SecurityVerifier securityGroupVerifier; diff --git a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktopSmokeTest.java b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktopSmokeTest.java index cbd6c77..8d83b20 100644 --- a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktopSmokeTest.java +++ b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktopSmokeTest.java @@ -24,8 +24,8 @@ import com.vaadin.ui.HasComponents; import com.vaadin.ui.TextField; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEventBuilder; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; @@ -41,7 +41,7 @@ public class MainViewDesktopSmokeTest { ApplicationContext context; @Autowired - PersonDao personDao; + PersonBusiness personDao; @Autowired SecurityVerifier securityGroupVerifier; diff --git a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java index 7726ff1..cd31aaa 100644 --- a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java +++ b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java @@ -27,8 +27,8 @@ import com.vaadin.ui.Component; import com.vaadin.ui.HasComponents; import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.PersonBusiness; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEventBuilder; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef; @@ -50,7 +50,7 @@ public class MainViewMobileSmokeTest { ApplicationContext context; @Autowired - PersonDao personDao; + PersonBusiness personDao; SecurityVerifier securityGroupVerifier;