authorities) {
-
- UserData user = new UserData(username, password, authorities);
- user.setUserProfile(principal);
- return user;
- }
-
- /*
- * Leave empty on purpose. Not used in this version.
- */
- @Override
- protected UserProfile retrievePrincipal(String username) {
-
- return null;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/BaseUserDetailsService.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/BaseUserDetailsService.java
deleted file mode 100644
index b23fa597b..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/BaseUserDetailsService.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.common.impl.security;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import io.oasp.gastronomy.restaurant.general.common.api.UserProfile;
-import io.oasp.gastronomy.restaurant.general.common.api.Usermanagement;
-import io.oasp.gastronomy.restaurant.general.common.api.security.UserData;
-import io.oasp.module.security.common.api.accesscontrol.AccessControl;
-import io.oasp.module.security.common.api.accesscontrol.AccessControlProvider;
-import io.oasp.module.security.common.api.accesscontrol.PrincipalAccessControlProvider;
-import io.oasp.module.security.common.base.accesscontrol.AccessControlGrantedAuthority;
-
-/**
- * This class represents a customized implementation of the {@link UserDetailsService} interface.
- *
- * It should be used in custom subclasses of {@link WebSecurityConfigurerAdapter} in the following way:
- *
- * - Inject a fully configured instance of {@link BaseUserDetailsService} into the subclass of
- * {@link WebSecurityConfigurerAdapter}
- * - Override method {@code configure(HttpSecurity)} of {@link WebSecurityConfigurerAdapter}
- * - Add the {@link BaseUserDetailsService} to the {@code HttpSecurity} object.
- *
- * The following code snippet shows the above steps:
- *
- *
- * @Configuration
- * @EnableWebSecurity
- * public class MyWebSecurityConfig extends WebSecurityConfigurerAdapter {
- * // ...
- * @Inject
- * private UserDetailsService userDetailsService;
- * // ...
- * @Override
- * public void configure(HttpSecurity http) throws Exception {
- * http.userDetailsService(this.userDetailsService)... //add matchers and other stuff
- * }
- * }
- *
- *
- *
- * For another example, have a look at {@link BaseWebSecurityConfig}.
- */
-@Named
-public class BaseUserDetailsService implements UserDetailsService {
-
- /** Logger instance. */
- private static final Logger LOG = LoggerFactory.getLogger(BaseUserDetailsService.class);
-
- private Usermanagement usermanagement;
-
- private AuthenticationManagerBuilder amBuilder;
-
- private AccessControlProvider accessControlProvider;
-
- private PrincipalAccessControlProvider principalAccessControlProvider;
-
- @Override
- public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-
- UserProfile principal = retrievePrincipal(username);
- Set authorities = getAuthorities(principal);
- UserDetails user;
- try {
- // amBuilder uses the InMemoryUserDetailsManager, because it is configured in BaseWebSecurityConfig
- user = getAmBuilder().getDefaultUserDetailsService().loadUserByUsername(username);
- UserData userData = new UserData(user.getUsername(), user.getPassword(), authorities);
- userData.setUserProfile(principal);
- return userData;
- } catch (Exception e) {
- e.printStackTrace();
- UsernameNotFoundException exception = new UsernameNotFoundException("Authentication failed.", e);
- LOG.warn("Failed to get user {}.", username, exception);
- throw exception;
- }
- }
-
- /**
- * Returns the {@link GrantedAuthority}s of the user associated with the provided {@link UserProfile}.
- *
- * @param principal the {@link UserProfile} of the user
- * @return the associated {@link GrantedAuthority}s
- * @throws AuthenticationException if no principal is retrievable for the given {@code username}
- */
- protected Set getAuthorities(UserProfile principal) throws AuthenticationException {
-
- if (principal == null) {
- LOG.warn("Principal must not be null.");
- throw new IllegalArgumentException();
- }
- // determine granted authorities for spring-security...
- Set authorities = new HashSet<>();
- Collection accessControlIds = this.principalAccessControlProvider.getAccessControlIds(principal);
- Set accessControlSet = new HashSet<>();
- for (String id : accessControlIds) {
- boolean success = this.accessControlProvider.collectAccessControls(id, accessControlSet);
- if (!success) {
- LOG.warn("Undefined access control {}.", id);
- }
- }
- for (AccessControl accessControl : accessControlSet) {
- authorities.add(new AccessControlGrantedAuthority(accessControl));
- }
- return authorities;
- }
-
- /**
- * @param username The {@code username} for which the {@code UserProfile} will be queried.
- * @return An instance of type {@link UserProfile} obtained by querying the {@code username}.
- */
- protected UserProfile retrievePrincipal(String username) {
-
- try {
- return this.usermanagement.findUserProfileByLogin(username);
- } catch (RuntimeException e) {
- e.printStackTrace();
- UsernameNotFoundException exception = new UsernameNotFoundException("Authentication failed.", e);
- LOG.warn("Failed to get user {}.", username, exception);
- throw exception;
- }
- }
-
- /**
- * @return usermanagement
- */
- public Usermanagement getUsermanagement() {
-
- return this.usermanagement;
- }
-
- /**
- * @param usermanagement new value of {@link #getUsermanagement}.
- */
- @Inject
- public void setUsermanagement(Usermanagement usermanagement) {
-
- this.usermanagement = usermanagement;
- }
-
- /**
- * @return amBuilder
- */
- public AuthenticationManagerBuilder getAmBuilder() {
-
- return this.amBuilder;
- }
-
- /**
- * @param amBuilder new value of {@link #getAmBuilder}.
- */
- @Inject
- public void setAmBuilder(AuthenticationManagerBuilder amBuilder) {
-
- this.amBuilder = amBuilder;
- }
-
- /**
- * @return accessControlProvider
- */
- public AccessControlProvider getAccessControlProvider() {
-
- return this.accessControlProvider;
- }
-
- /**
- * @param accessControlProvider new value of {@link #getAccessControlProvider}.
- */
- @Inject
- public void setAccessControlProvider(AccessControlProvider accessControlProvider) {
-
- this.accessControlProvider = accessControlProvider;
- }
-
- /**
- * @return principalAccessControlProvider
- */
- public PrincipalAccessControlProvider getPrincipalAccessControlProvider() {
-
- return this.principalAccessControlProvider;
- }
-
- /**
- * @param principalAccessControlProvider new value of {@link #getPrincipalAccessControlProvider}.
- */
- @Inject
- public void setPrincipalAccessControlProvider(
- PrincipalAccessControlProvider principalAccessControlProvider) {
-
- this.principalAccessControlProvider = principalAccessControlProvider;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/CsrfRequestMatcher.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/CsrfRequestMatcher.java
deleted file mode 100644
index 9daa2dad9..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/CsrfRequestMatcher.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.common.impl.security;
-
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.security.web.util.matcher.RequestMatcher;
-
-/**
- * This is the implementation of {@link RequestMatcher}, which decides which {@link HttpServletRequest Requests} require
- * a correct CSRF token.
- *
- * @see Cross-site request forgery
- *
- */
-public class CsrfRequestMatcher implements RequestMatcher {
-
- private static final Pattern HTTP_METHOD_PATTERN = Pattern.compile("^GET$");
-
- private static final String[] PATH_PREFIXES_WITHOUT_CSRF_PROTECTION =
- { "/login", "/logout", "/services/rest/login", "/websocket" };
-
- @Override
- public boolean matches(HttpServletRequest request) {
-
- // GET requests are read-only and therefore do not need CSRF protection
- if (HTTP_METHOD_PATTERN.matcher(request.getMethod()).matches()) {
-
- return false;
- }
-
- // There are specific URLs which can not be protected from CSRF. For example, in case of the the login page,
- // the CSRF token can only be accessed after a successful authentication ("login").
- String requestPath = getRequestPath(request);
- for (String path : PATH_PREFIXES_WITHOUT_CSRF_PROTECTION) {
- if (requestPath.startsWith(path)) {
- return false;
- }
- }
-
- return true;
- }
-
- private String getRequestPath(HttpServletRequest request) {
-
- String url = request.getServletPath();
- String pathInfo = request.getPathInfo();
-
- if (pathInfo != null) {
- url += pathInfo;
- }
-
- return url;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/PrincipalAccessControlProviderImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/PrincipalAccessControlProviderImpl.java
deleted file mode 100644
index fd1da2226..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/common/impl/security/PrincipalAccessControlProviderImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.common.impl.security;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.inject.Named;
-
-import io.oasp.gastronomy.restaurant.general.common.api.UserProfile;
-import io.oasp.module.security.common.api.accesscontrol.PrincipalAccessControlProvider;
-
-/**
- * The implementation of {@link PrincipalAccessControlProvider} for this sample application.
- * ATTENTION:
- * In reality you would typically receive the user-profile from the central identity-management (via LDAP) and the roles
- * (and groups) from a central access manager (that might also implement the identify-management). This design was only
- * chosen to keep our sample application simple. Otherwise one would have to start a separate external server
- * application to make everything work what would be too complicated to get things running easily.
- *
- */
-@Named
-public class PrincipalAccessControlProviderImpl implements PrincipalAccessControlProvider {
-
- /**
- * The constructor.
- */
- public PrincipalAccessControlProviderImpl() {
-
- super();
- }
-
- @Override
- public Collection getAccessControlIds(UserProfile principal) {
-
- return Arrays.asList(principal.getRole().getName());
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/ApplicationPersistenceEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/ApplicationPersistenceEntity.java
deleted file mode 100644
index 45979e32f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/ApplicationPersistenceEntity.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.api;
-
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
-import javax.persistence.Version;
-
-import io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity;
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-
-/**
- * Abstract Entity for all Entities with an id and a version field.
- *
- */
-@MappedSuperclass
-public abstract class ApplicationPersistenceEntity implements ApplicationEntity, MutablePersistenceEntity {
-
- private static final long serialVersionUID = 1L;
-
- /** @see #getId() */
- private Long id;
-
- /** @see #getModificationCounter() */
- private int modificationCounter;
-
- /** @see #getRevision() */
- private Number revision;
-
- /**
- * The constructor.
- */
- public ApplicationPersistenceEntity() {
-
- super();
- }
-
- @Override
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- public Long getId() {
-
- return this.id;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setId(Long id) {
-
- this.id = id;
- }
-
- @Override
- @Version
- public int getModificationCounter() {
-
- return this.modificationCounter;
- }
-
- @Override
- public void setModificationCounter(int version) {
-
- this.modificationCounter = version;
- }
-
- @Override
- @Transient
- public Number getRevision() {
-
- return this.revision;
- }
-
- /**
- * @param revision the revision to set
- */
- @Override
- public void setRevision(Number revision) {
-
- this.revision = revision;
- }
-
- @Override
- public String toString() {
-
- StringBuilder buffer = new StringBuilder();
- toString(buffer);
- return buffer.toString();
- }
-
- /**
- * Method to extend {@link #toString()} logic.
- *
- * @param buffer is the {@link StringBuilder} where to {@link StringBuilder#append(Object) append} the string
- * representation.
- */
- protected void toString(StringBuilder buffer) {
-
- buffer.append(getClass().getSimpleName());
- if (this.id != null) {
- buffer.append("[id=");
- buffer.append(this.id);
- buffer.append("]");
- }
- }
-}
\ No newline at end of file
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/BinaryObjectEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/BinaryObjectEntity.java
deleted file mode 100644
index 33a70391f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/BinaryObjectEntity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.api;
-
-import java.sql.Blob;
-
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-
-import io.oasp.gastronomy.restaurant.general.common.api.BinaryObject;
-
-/**
- * {@link ApplicationPersistenceEntity Entity} for {@link BinaryObject}. Contains the actual {@link Blob}.
- *
- */
-@Entity
-@Table(name = "BinaryObject")
-public class BinaryObjectEntity extends ApplicationPersistenceEntity implements BinaryObject {
-
- private static final long serialVersionUID = 1L;
-
- private Blob data;
-
- private String mimeType;
-
- private long size;
-
- /**
- * The constructor.
- */
- public BinaryObjectEntity() {
-
- super();
- }
-
- @Override
- public void setMimeType(String mimeType) {
-
- this.mimeType = mimeType;
-
- }
-
- @Override
- public String getMimeType() {
-
- return this.mimeType;
- }
-
- /**
- * @return data
- */
-
- /**
- * Remove the following line completely (Type Annotation) in case of database other than PostGres and Uncomment the
- * annotation for @Lob
- */
- // @Type(type = "org.hibernate.type.BinaryType")
- @Lob
- public Blob getData() {
-
- return this.data;
- }
-
- /**
- * @param data the data to set
- */
- public void setData(Blob data) {
-
- this.data = data;
- }
-
- @Override
- public long getSize() {
-
- return this.size;
- }
-
- @Override
- public void setSize(long size) {
-
- this.size = size;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/ApplicationDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/ApplicationDao.java
deleted file mode 100644
index 0f735a81e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/ApplicationDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.api.dao;
-
-import io.oasp.module.jpa.dataaccess.api.Dao;
-import io.oasp.module.jpa.dataaccess.api.GenericRevisionedDao;
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-
-/**
- * Interface for all {@link GenericRevisionedDao DAOs} (Data Access Object) of this application.
- *
- *
- * @param is the type of the managed entity.
- */
-public interface ApplicationDao> extends Dao {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/ApplicationRevisionedDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/ApplicationRevisionedDao.java
deleted file mode 100644
index 1b7b35117..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/ApplicationRevisionedDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.api.dao;
-
-import io.oasp.module.jpa.dataaccess.api.GenericRevisionedDao;
-import io.oasp.module.jpa.dataaccess.api.RevisionedDao;
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-
-/**
- * Interface for all {@link GenericRevisionedDao DAOs} (Data Access Object) of this application.
- *
- *
- * @param is the type of the managed entity.
- */
-public interface ApplicationRevisionedDao> extends
- ApplicationDao, RevisionedDao {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/BinaryObjectDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/BinaryObjectDao.java
deleted file mode 100644
index fee2b77fe..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/api/dao/BinaryObjectDao.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.BinaryObjectEntity;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link BinaryObjectEntity} entity.
- *
- */
-public interface BinaryObjectDao extends ApplicationDao {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/DatabaseMigrator.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/DatabaseMigrator.java
deleted file mode 100644
index aec498866..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/DatabaseMigrator.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.base;
-
-import javax.sql.DataSource;
-
-import org.flywaydb.core.Flyway;
-
-/**
- * Type to migrate the database. Gets initialized before hibernate.
- *
- */
-public class DatabaseMigrator {
-
- /** Path of test data location. */
- private static final String testDataPath = "classpath:db/test-data";
-
- /** Path of master data location. */
- private static final String masterDataPath = "classpath:db/migration";
-
- /** Property is true if database migration is enabled. */
- private boolean enabled;
-
- /** The JDBC data source. */
- private DataSource dataSource;
-
- /** Property is true if test data should be included in migration. */
- private boolean testdata;
-
- /** Property is true if database should be cleaned before migration. */
- private boolean clean;
-
- /**
- * Migrate the database to the latest available migration.
- */
- public void migrate() {
-
- if (this.enabled) {
- final Flyway flyway = new Flyway();
- flyway.setDataSource(this.dataSource);
- if (this.testdata) {
- flyway.setLocations(masterDataPath, testDataPath);
- } else {
- flyway.setLocations(masterDataPath);
- }
- if (this.clean) {
- flyway.clean();
- }
- flyway.migrate();
- }
- }
-
- /**
- * Import test data.
- *
- * @param importTestDataPath path to directory with files with test data
- */
- public void importTestData(String importTestDataPath) {
-
- final Flyway flyway = new Flyway();
- flyway.setDataSource(this.dataSource);
- flyway.setLocations(importTestDataPath);
- flyway.setIgnoreMissingMigrations(true);
- flyway.migrate();
- }
-
- /**
- * @return enabled
- */
- public boolean isEnabled() {
-
- return this.enabled;
- }
-
- /**
- * @param enabled the enabled to set
- */
- public void setEnabled(boolean enabled) {
-
- this.enabled = enabled;
- }
-
- /**
- * @return datasource
- */
- public DataSource getDataSource() {
-
- return this.dataSource;
- }
-
- /**
- * @param datasource the datasource to set
- */
- public void setDataSource(DataSource datasource) {
-
- this.dataSource = datasource;
- }
-
- /**
- * @param testdata the testdata to set
- */
- public void setTestdata(boolean testdata) {
-
- this.testdata = testdata;
- }
-
- /**
- * @param clean the clean to set
- */
- public void setClean(boolean clean) {
-
- this.clean = clean;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/MoneyAttributeConverter.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/MoneyAttributeConverter.java
deleted file mode 100644
index e3ce5020a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/MoneyAttributeConverter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.base;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-
-import java.math.BigDecimal;
-
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-
-/**
- * This is the {@link AttributeConverter} to allow that JPA vendors can persist instances of {@link Money} if used in
- * {@link io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity entities}.
- *
- */
-@Converter(autoApply = true)
-public class MoneyAttributeConverter implements AttributeConverter {
-
- /**
- * The constructor.
- */
- public MoneyAttributeConverter() {
-
- super();
- }
-
- @Override
- public BigDecimal convertToDatabaseColumn(Money attribute) {
-
- if (attribute == null) {
- return null;
- }
- return attribute.getValue();
- }
-
- @Override
- public Money convertToEntityAttribute(BigDecimal dbData) {
-
- if (dbData == null) {
- return null;
- }
- return new Money(dbData);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/ApplicationDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/ApplicationDaoImpl.java
deleted file mode 100644
index 2fdd14198..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/ApplicationDaoImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.base.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-import io.oasp.module.jpa.dataaccess.base.AbstractRevisionedDao;
-
-import org.springframework.stereotype.Repository;
-
-/**
- * This is the abstract base implementation of {@link ApplicationDao}.
- *
- * @param is the {@link #getEntityClass() type} of the managed entity.
- *
- */
-@Repository
-public abstract class ApplicationDaoImpl> extends
- AbstractRevisionedDao implements ApplicationDao {
-
- /**
- * The constructor.
- */
- public ApplicationDaoImpl() {
-
- super();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/ApplicationMasterDataDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/ApplicationMasterDataDaoImpl.java
deleted file mode 100644
index 035e436d1..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/ApplicationMasterDataDaoImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.base.dao;
-
-import java.util.List;
-
-import io.oasp.module.jpa.dataaccess.api.MutablePersistenceEntity;
-import io.oasp.module.jpa.dataaccess.api.RevisionedMasterDataDao;
-
-/**
- * This is the abstract base implementation of {@link RevisionedMasterDataDao} based on {@link ApplicationDaoImpl}.
- *
- * @param is the {@link #getEntityClass() type} of the managed entity.
- *
- */
-public abstract class ApplicationMasterDataDaoImpl>
- extends ApplicationDaoImpl implements RevisionedMasterDataDao {
-
- /**
- * The constructor.
- */
- public ApplicationMasterDataDaoImpl() {
-
- super();
- }
-
- @Override
- public List findAll() {
-
- return super.findAll();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/BinaryObjectDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/BinaryObjectDaoImpl.java
deleted file mode 100644
index 62f62f4b9..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/dao/BinaryObjectDaoImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.dataaccess.base.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.BinaryObjectEntity;
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.BinaryObjectDao;
-
-import javax.inject.Named;
-
-/**
- * Implementation of {@link BinaryObjectDao}.
- *
- */
-@Named
-public class BinaryObjectDaoImpl extends ApplicationDaoImpl implements BinaryObjectDao {
-
- @Override
- public Class getEntityClass() {
-
- return BinaryObjectEntity.class;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/gui/api/LoginController.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/gui/api/LoginController.java
deleted file mode 100644
index 4f76b5db9..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/gui/api/LoginController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.gui.api;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * Controller for Login-Page.
- *
- */
-@Controller
-public class LoginController {
-
- /**
- * Default URL to redirect to after successfully login.
- */
- public final static String defaultTargetUrl = "/";
-
- /**
- * Builds the model for the login page---mainly focusing on the error message handling.
- *
- * @param authentication_failed flag for authentication failed
- * @param invalid_session flag for invalid session
- * @param access_denied flag for access denied
- * @param logout flag for successful logout
- * @return the view model
- */
- @RequestMapping(value = "/login**", method = RequestMethod.GET)
- public ModelAndView login(
- @RequestParam(value = "authentication_failed", required = false) boolean authentication_failed,
- @RequestParam(value = "invalid_session", required = false) boolean invalid_session,
- @RequestParam(value = "access_denied", required = false) boolean access_denied,
- @RequestParam(value = "logout", required = false) boolean logout) {
-
- final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (!authentication.getPrincipal().equals("anonymousUser")) {
- return new ModelAndView("redirect:" + defaultTargetUrl);
- }
-
- ModelAndView model = new ModelAndView();
- if (authentication_failed) {
- model.addObject("error", "Authentication failed!");
- } else if (invalid_session) {
- model.addObject("error", "You are currently not logged in!");
- } else if (access_denied) {
- model.addObject("error", "You have insufficient permissions to access this page!");
- } else if (logout) {
- model.addObject("msg", "Logout successful!");
- }
-
- return model;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/api/UseCase.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/api/UseCase.java
deleted file mode 100644
index 0ebf31d33..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/api/UseCase.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.api;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
-/**
- * This is a {@link Qualifier} to mark all use-cases. In your use-case implementation add the annotations
- * {@link javax.inject.Named} and {@link UseCase}. In your component facade implementation add the annotations
- * {@link javax.inject.Inject} and {@link UseCase} to the setters in order to inject your use case implementations.
- *
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Qualifier
-public @interface UseCase {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/api/to/BinaryObjectEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/api/to/BinaryObjectEto.java
deleted file mode 100644
index ca49e375f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/api/to/BinaryObjectEto.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.BinaryObject;
-import io.oasp.module.basic.common.api.to.AbstractEto;
-
-/**
- * The {@link io.oasp.module.basic.common.api.to.AbstractEto ETO} for a {@link BinaryObject}.
- *
- */
-public class BinaryObjectEto extends AbstractEto implements BinaryObject {
-
- private static final long serialVersionUID = 1L;
-
- private String mimeType;
-
- private long size;
-
- /**
- * Constructor.
- */
- public BinaryObjectEto() {
-
- super();
- }
-
- @Override
- public void setMimeType(String mimeType) {
-
- this.mimeType = mimeType;
-
- }
-
- @Override
- public String getMimeType() {
-
- return this.mimeType;
- }
-
- @Override
- public long getSize() {
-
- return this.size;
- }
-
- @Override
- public void setSize(long size) {
-
- this.size = size;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractComponentFacade.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractComponentFacade.java
deleted file mode 100644
index 44fe41611..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractComponentFacade.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.base;
-
-/**
- * Abstract base class for any logic implementation class in this application that directly implements Uc
- */
-public abstract class AbstractComponentFacade extends AbstractGenericEntityUtils {
- /**
- * The constructor.
- */
- public AbstractComponentFacade() {
-
- super();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractGenericEntityUtils.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractGenericEntityUtils.java
deleted file mode 100644
index ea45aedc2..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractGenericEntityUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.base;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.mmm.util.entity.api.GenericEntity;
-import net.sf.mmm.util.entity.api.PersistenceEntity;
-import net.sf.mmm.util.transferobject.api.AbstractTransferObject;
-import net.sf.mmm.util.transferobject.api.TransferObject;
-
-import io.oasp.gastronomy.restaurant.general.common.base.AbstractBeanMapperSupport;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-/**
- * Common code utilities for both AbstractUc and AbstractComponentFacade
- *
- */
-public class AbstractGenericEntityUtils extends AbstractBeanMapperSupport {
- /**
- *
- * The limit for {@link net.sf.mmm.util.search.base.AbstractSearchCriteria#getMaximumHitCount() maximum hit count} for
- * UI requests.
- */
- protected static final int MAXIMUM_HIT_LIMIT = 500;
-
- /**
- * Maps a {@link PaginatedListTo paginated list} of persistent entities to a {@link PaginatedListTo paginated list} of
- * transfer objects.
- *
- * @param is the generic type of the {@link AbstractTransferObject transfer object}.
- * @param is the generic type of the {@link PersistenceEntity entity}.
- * @param paginatedList is the paginated list to map from.
- * @param klass is the target class to map the paginated entities to.
- * @return a {@link PaginatedListTo paginated list of entity transfer objects}.
- */
- protected > PaginatedListTo mapPaginatedEntityList(
- PaginatedListTo paginatedList, Class klass) {
-
- List etoList = getBeanMapper().mapList(paginatedList.getResult(), klass);
- PaginatedListTo result = new PaginatedListTo<>(etoList, paginatedList.getPagination());
-
- return result;
- }
-
- /**
- * Creates a {@link Map} with all {@link GenericEntity entities} from the given {@link Collection} using their
- * {@link GenericEntity#getId() ID} as key. All {@link GenericEntity entities} without an {@link GenericEntity#getId()
- * ID} ({@code null}) will be ignored.
- *
- * @param is the generic type of the {@link GenericEntity#getId() ID}.
- * @param is the generic type of the {@link GenericEntity entity}.
- * @param entities is the {@link Collection} of {@link GenericEntity entities}.
- * @return a {@link Map} mapping from {@link GenericEntity#getId() ID} to {@link GenericEntity entity}.
- */
- protected static > Map getEntityMap(Collection entities) {
-
- Map id2EntityMap = new HashMap<>();
- for (E entity : entities) {
- ID id = entity.getId();
- if (id != null) {
- id2EntityMap.put(id, entity);
- }
- }
- return id2EntityMap;
- }
-
- /**
- * Determines the {@link GenericEntity entities} to delete if currentList is the current list from the
- * persistence and listToSave is the new list that shall be saved. In other words this method selects the
- * {@link GenericEntity entities} from currentList that are not contained in listToSave.
- *
- * @param is the generic type of the {@link GenericEntity#getId() ID}.
- * @param is the generic type of the {@link GenericEntity entity}.
- * @param currentEntities is the {@link Collection} of the {@link GenericEntity entities} currently persisted. We
- * assume that all objects in this list have an {@link GenericEntity#getId() ID} value (that is not
- * {@code null}).
- * @param entitiesToSave is the {@link Collection} that contains the {@link GenericEntity entities} that shall be
- * saved. It may contain {@link GenericEntity entities} that have no {@link GenericEntity#getId() ID} that
- * shall be newly created.
- * @return the {@link List} with the {@link GenericEntity entities} to delete.
- */
- protected static > List getEntities2Delete(Collection currentEntities,
- Collection entitiesToSave) {
-
- List result = new ArrayList<>(currentEntities.size());
- Map entityMap = getEntityMap(entitiesToSave);
- for (E entity : currentEntities) {
- if (!entityMap.containsKey(entity.getId())) {
- // entity from currentList is not contained in listToSave...
- result.add(entity);
- }
- }
- return result;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractUc.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractUc.java
deleted file mode 100644
index a823a4529..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/AbstractUc.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.base;
-
-/**
- * Abstract base class for any use case in this application. Actual implementations need to be annotated with
- * {@link javax.inject.Named} and {@link io.oasp.gastronomy.restaurant.general.logic.api.UseCase}.
- *
- */
-public abstract class AbstractUc extends AbstractGenericEntityUtils {
-
- /**
- * The constructor.
- */
- public AbstractUc() {
-
- super();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/UcManageBinaryObject.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/UcManageBinaryObject.java
deleted file mode 100644
index deaf2cd03..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/base/UcManageBinaryObject.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.base;
-
-import io.oasp.gastronomy.restaurant.general.logic.api.to.BinaryObjectEto;
-
-import java.sql.Blob;
-
-/**
- * Use case for managing BinaryObject.
- *
- */
-public interface UcManageBinaryObject {
-
- /**
- * @param data the Blob data to save
- * @param binaryObjectEto the {@link BinaryObjectEto}
- * @return {@link BinaryObjectEto}
- */
- BinaryObjectEto saveBinaryObject(Blob data, BinaryObjectEto binaryObjectEto);
-
- /**
- * @param binaryObjectId the ID of the {@link BinaryObjectEto} that should be deleted
- */
- void deleteBinaryObject(Long binaryObjectId);
-
- /**
- * @param binaryObjectId the ID of the {@link BinaryObjectEto} to find
- * @return {@link BinaryObjectEto}
- */
- BinaryObjectEto findBinaryObject(Long binaryObjectId);
-
- /**
- * @param binaryObjectId the ID of the {@link BinaryObjectEto} the blob corresponds to
- * @return {@link Blob}
- */
- Blob getBinaryObjectBlob(Long binaryObjectId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/impl/UcManageBinaryObjectImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/impl/UcManageBinaryObjectImpl.java
deleted file mode 100644
index 50999e63d..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/impl/UcManageBinaryObjectImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.impl;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.BinaryObjectEntity;
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.BinaryObjectDao;
-import io.oasp.gastronomy.restaurant.general.logic.api.to.BinaryObjectEto;
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc;
-import io.oasp.gastronomy.restaurant.general.logic.base.UcManageBinaryObject;
-
-import java.sql.Blob;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-/**
- * Implementation of the {@link UcManageBinaryObject} intreface.
- *
- */
-@Named
-public class UcManageBinaryObjectImpl extends AbstractUc implements UcManageBinaryObject {
-
- /** @see #binaryObjectDao */
- private BinaryObjectDao binaryObjectDao;
-
- /**
- * @return binaryObjectDao
- */
- public BinaryObjectDao binaryObjectDao() {
-
- return this.binaryObjectDao;
- }
-
- /**
- * @param binaryObjectDao the binaryObjectDao to set
- */
- @Inject
- public void setBinaryObjectDao(BinaryObjectDao binaryObjectDao) {
-
- this.binaryObjectDao = binaryObjectDao;
- }
-
- @Override
- public BinaryObjectEto saveBinaryObject(Blob data, BinaryObjectEto binaryObjectEto) {
-
- BinaryObjectEntity binaryObjectEntity = getBeanMapper().map(binaryObjectEto, BinaryObjectEntity.class);
- binaryObjectEntity.setData(data);
- this.binaryObjectDao.save(binaryObjectEntity);
- return getBeanMapper().map(binaryObjectEntity, BinaryObjectEto.class);
- }
-
- @Override
- public void deleteBinaryObject(Long binaryObjectId) {
-
- this.binaryObjectDao.delete(binaryObjectId);
-
- }
-
- @Override
- public BinaryObjectEto findBinaryObject(Long binaryObjectId) {
-
- return getBeanMapper().map(this.binaryObjectDao.findOne(binaryObjectId), BinaryObjectEto.class);
- }
-
- @Override
- public Blob getBinaryObjectBlob(Long binaryObjectId) {
-
- return this.binaryObjectDao.findOne(binaryObjectId).getData();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/impl/config/DefaultRolesPrefixPostProcessor.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/impl/config/DefaultRolesPrefixPostProcessor.java
deleted file mode 100644
index 98c20beca..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/logic/impl/config/DefaultRolesPrefixPostProcessor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.logic.impl.config;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.core.PriorityOrdered;
-import org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource;
-import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
-import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
-import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;
-
-/**
- * This is an implementation of {@link BeanPostProcessor} that allows to change the role prefix of spring-security. By
- * default spring-security is magically adding a strange prefix called "ROLE_" to your granted authorities. In order to
- * prevent this we use this class with an empty prefix.
- */
-public class DefaultRolesPrefixPostProcessor implements BeanPostProcessor, PriorityOrdered {
-
- private final String rolePrefix;
-
- /**
- * Der Konstruktor.
- *
- * @param rolePrefix das gewünschte Rollen-Präfix (z.B. der leere String).
- */
- public DefaultRolesPrefixPostProcessor(String rolePrefix) {
- super();
- this.rolePrefix = rolePrefix;
- }
-
- @Override
- public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-
- // remove this if you are not using JSR-250
- if (bean instanceof Jsr250MethodSecurityMetadataSource) {
- ((Jsr250MethodSecurityMetadataSource) bean).setDefaultRolePrefix(this.rolePrefix);
- }
-
- if (bean instanceof DefaultMethodSecurityExpressionHandler) {
- ((DefaultMethodSecurityExpressionHandler) bean).setDefaultRolePrefix(this.rolePrefix);
- }
- if (bean instanceof DefaultWebSecurityExpressionHandler) {
- ((DefaultWebSecurityExpressionHandler) bean).setDefaultRolePrefix(this.rolePrefix);
- }
- if (bean instanceof SecurityContextHolderAwareRequestFilter) {
- ((SecurityContextHolderAwareRequestFilter) bean).setRolePrefix(this.rolePrefix);
- }
- return bean;
- }
-
- @Override
- public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-
- return bean;
- }
-
- @Override
- public int getOrder() {
-
- return PriorityOrdered.HIGHEST_PRECEDENCE;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/BaseWebSecurityConfig.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/BaseWebSecurityConfig.java
deleted file mode 100644
index 35fa3dedb..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/BaseWebSecurityConfig.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.config;
-
-import javax.inject.Inject;
-import javax.servlet.Filter;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
-import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.logout.LogoutFilter;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
-import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
-import org.springframework.security.web.csrf.CsrfFilter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-import io.oasp.gastronomy.restaurant.general.common.impl.security.CsrfRequestMatcher;
-import io.oasp.module.security.common.impl.rest.AuthenticationSuccessHandlerSendingOkHttpStatusCode;
-import io.oasp.module.security.common.impl.rest.JsonUsernamePasswordAuthenticationFilter;
-import io.oasp.module.security.common.impl.rest.LogoutSuccessHandlerReturningOkHttpStatusCode;
-
-/**
- * This type serves as a base class for extensions of the {@code WebSecurityConfigurerAdapter} and provides a default
- * configuration.
- * Security configuration is based on {@link WebSecurityConfigurerAdapter}. This configuration is by purpose designed
- * most simple for two channels of authentication: simple login form and rest-url.
- */
-public abstract class BaseWebSecurityConfig extends WebSecurityConfigurerAdapter {
-
- @Value("${security.cors.enabled}")
- boolean corsEnabled = false;
-
- @Inject
- private UserDetailsService userDetailsService;
-
- private CorsFilter getCorsFilter() {
-
- UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
- CorsConfiguration config = new CorsConfiguration();
- config.setAllowCredentials(true);
- config.addAllowedOrigin("*");
- config.addAllowedHeader("*");
- config.addAllowedMethod("OPTIONS");
- config.addAllowedMethod("HEAD");
- config.addAllowedMethod("GET");
- config.addAllowedMethod("PUT");
- config.addAllowedMethod("POST");
- config.addAllowedMethod("DELETE");
- config.addAllowedMethod("PATCH");
- source.registerCorsConfiguration("/**", config);
- return new CorsFilter(source);
- }
-
- /**
- * Configure spring security to enable a simple webform-login + a simple rest login.
- */
- @Override
- public void configure(HttpSecurity http) throws Exception {
-
- String[] unsecuredResources =
- new String[] { "/login", "/security/**", "/services/rest/login", "/services/rest/logout" };
-
- http
- //
- .userDetailsService(this.userDetailsService)
- // define all urls that are not to be secured
- .authorizeRequests().antMatchers(unsecuredResources).permitAll().anyRequest().authenticated().and()
-
- // activate crsf check for a selection of urls (but not for login & logout)
- .csrf().requireCsrfProtectionMatcher(new CsrfRequestMatcher()).and()
-
- // configure parameters for simple form login (and logout)
- .formLogin().successHandler(new SimpleUrlAuthenticationSuccessHandler()).defaultSuccessUrl("/")
- .failureUrl("/login.html?error").loginProcessingUrl("/j_spring_security_login").usernameParameter("username")
- .passwordParameter("password").and()
- // logout via POST is possible
- .logout().logoutSuccessUrl("/login.html").and()
-
- // register login and logout filter that handles rest logins
- .addFilterAfter(getSimpleRestAuthenticationFilter(), BasicAuthenticationFilter.class)
- .addFilterAfter(getSimpleRestLogoutFilter(), LogoutFilter.class);
-
- if (this.corsEnabled) {
- http.addFilterBefore(getCorsFilter(), CsrfFilter.class);
- }
- }
-
- /**
- * Create a simple filter that allows logout on a REST Url /services/rest/logout and returns a simple HTTP status 200
- * ok.
- *
- * @return the filter.
- */
- protected Filter getSimpleRestLogoutFilter() {
-
- LogoutFilter logoutFilter =
- new LogoutFilter(new LogoutSuccessHandlerReturningOkHttpStatusCode(), new SecurityContextLogoutHandler());
-
- // configure logout for rest logouts
- logoutFilter.setLogoutRequestMatcher(new AntPathRequestMatcher("/services/rest/logout"));
-
- return logoutFilter;
- }
-
- /**
- * Create a simple authentication filter for REST logins that reads user-credentials from a json-parameter and returns
- * status 200 instead of redirect after login.
- *
- * @return the {@link JsonUsernamePasswordAuthenticationFilter}.
- * @throws Exception if something goes wrong.
- */
- protected JsonUsernamePasswordAuthenticationFilter getSimpleRestAuthenticationFilter() throws Exception {
-
- JsonUsernamePasswordAuthenticationFilter jsonFilter =
- new JsonUsernamePasswordAuthenticationFilter(new AntPathRequestMatcher("/services/rest/login"));
- jsonFilter.setPasswordParameter("j_password");
- jsonFilter.setUsernameParameter("j_username");
- jsonFilter.setAuthenticationManager(authenticationManager());
- // set failurehandler that uses no redirect in case of login failure; just HTTP-status: 401
- jsonFilter.setAuthenticationManager(authenticationManagerBean());
- jsonFilter.setAuthenticationFailureHandler(new SimpleUrlAuthenticationFailureHandler());
- // set successhandler that uses no redirect in case of login success; just HTTP-status: 200
- jsonFilter.setAuthenticationSuccessHandler(new AuthenticationSuccessHandlerSendingOkHttpStatusCode());
- return jsonFilter;
- }
-
- @SuppressWarnings("javadoc")
- @Inject
- public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-
- auth.inMemoryAuthentication().withUser("waiter").password("waiter").roles("Waiter").and().withUser("cook")
- .password("cook").roles("Cook").and().withUser("barkeeper").password("barkeeper").roles("Barkeeper").and()
- .withUser("chief").password("chief").roles("Chief");
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/ServletInitializer.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/ServletInitializer.java
deleted file mode 100644
index 992193dd0..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/ServletInitializer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.config;
-
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Configuration;
-
-import io.oasp.gastronomy.restaurant.SpringBootApp;
-
-/**
- * This auto configuration will be used by spring boot to enable traditional deployment to a servlet container. You may
- * remove this class if you run your application with embedded tomcat only. Tomcat startup will be twice as fast.
- */
-@Configuration
-@EnableAutoConfiguration
-public class ServletInitializer extends SpringBootServletInitializer {
-
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-
- return application.sources(SpringBootApp.class);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebConfig.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebConfig.java
deleted file mode 100644
index 50f35d29a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebConfig.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.config;
-
-import javax.servlet.Filter;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.filter.CharacterEncodingFilter;
-
-import io.oasp.module.logging.common.api.DiagnosticContextFacade;
-import io.oasp.module.logging.common.impl.DiagnosticContextFacadeImpl;
-import io.oasp.module.logging.common.impl.DiagnosticContextFilter;
-import io.oasp.module.logging.common.impl.PerformanceLogFilter;
-
-import io.oasp.module.logging.common.api.DiagnosticContextFacade;
-import io.oasp.module.logging.common.impl.DiagnosticContextFacadeImpl;
-import io.oasp.module.logging.common.impl.DiagnosticContextFilter;
-import io.oasp.module.logging.common.impl.PerformanceLogFilter;
-import io.oasp.module.service.common.api.constants.ServiceConstants;
-
-/**
- * Registers a number of filters for web requests.
- *
- */
-@Configuration
-public class WebConfig {
-
- private @Autowired AutowireCapableBeanFactory beanFactory;
-
- /**
- * Register PerformanceLogFilter to log running time of requests.
- *
- * @return filter
- */
- @Bean
- public FilterRegistrationBean performanceLogFilter() {
-
- FilterRegistrationBean registration = new FilterRegistrationBean();
- Filter performanceLogFilter = new PerformanceLogFilter();
- this.beanFactory.autowireBean(performanceLogFilter);
- registration.setFilter(performanceLogFilter);
- registration.addUrlPatterns("/*");
- return registration;
- }
-
- /**
- * Bean definition for DiagnosticContextFacade.
- *
- * @return DiagnosticContextFacade
- */
- @Bean(name = "DiagnosticContextFacade")
- public DiagnosticContextFacade diagnosticContextFacade() {
-
- return new DiagnosticContextFacadeImpl();
- }
-
- /**
- * Register DiagnosticContextFilter to log service calls with correlation id.
- *
- * @return filter
- */
- @Bean
- public FilterRegistrationBean diagnosticContextFilter() {
-
- FilterRegistrationBean registration = new FilterRegistrationBean();
- Filter diagnosticContextFilter = new DiagnosticContextFilter();
- this.beanFactory.autowireBean(diagnosticContextFilter);
- registration.setFilter(diagnosticContextFilter);
- registration.addUrlPatterns(ServiceConstants.URL_PATH_SERVICES + "/*");
- return registration;
- }
-
- /**
- * Register SetCharacterEncodingFilter to convert specical characters correctly.
- *
- * @return filter
- */
- @Bean
- public FilterRegistrationBean setCharacterEncodingFilter() {
-
- FilterRegistrationBean registration = new FilterRegistrationBean();
- CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
- characterEncodingFilter.setEncoding("UTF-8");
- characterEncodingFilter.setForceEncoding(false);
- this.beanFactory.autowireBean(characterEncodingFilter);
- registration.setFilter(characterEncodingFilter);
- registration.addUrlPatterns("/*");
- return registration;
- }
-}
\ No newline at end of file
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebSecurityBeansConfig.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebSecurityBeansConfig.java
deleted file mode 100644
index e2e26ef18..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebSecurityBeansConfig.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.web.csrf.CsrfTokenRepository;
-import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
-
-import io.oasp.gastronomy.restaurant.general.logic.impl.config.DefaultRolesPrefixPostProcessor;
-import io.oasp.module.security.common.api.accesscontrol.AccessControlProvider;
-import io.oasp.module.security.common.base.accesscontrol.AccessControlSchemaProvider;
-import io.oasp.module.security.common.impl.accesscontrol.AccessControlProviderImpl;
-import io.oasp.module.security.common.impl.accesscontrol.AccessControlSchemaProviderImpl;
-
-/**
- * This configuration class provides factory methods for several Spring security related beans.
- *
- */
-@Configuration
-public class WebSecurityBeansConfig {
-
- /**
- * This method provides a new instance of {@code AccessControlProvider}
- *
- * @return the newly created {@code AccessControlProvider}
- */
- @Bean
- public AccessControlProvider accessControlProvider() {
-
- return new AccessControlProviderImpl();
- }
-
- /**
- * This method provides a new instance of {@code AccessControlSchemaProvider}
- *
- * @return the newly created {@code AccessControlSchemaProvider}
- */
- @Bean
- public AccessControlSchemaProvider accessControlSchemaProvider() {
-
- return new AccessControlSchemaProviderImpl();
- }
-
- /**
- * This method provides a new instance of {@code CsrfTokenRepository}
- *
- * @return the newly created {@code CsrfTokenRepository}
- */
- @Bean
- public CsrfTokenRepository csrfTokenRepository() {
-
- return new HttpSessionCsrfTokenRepository();
- }
-
- /**
- * This method provides a new instance of {@code DefaultRolesPrefixPostProcessor}
- *
- * @return the newly create {@code DefaultRolesPrefixPostProcessor}
- */
- @Bean
- public static DefaultRolesPrefixPostProcessor defaultRolesPrefixPostProcessor() {
-
- // By default Spring-Security is setting the prefix "ROLE_" for all permissions/authorities.
- // We disable this undesired behavior here...
- return new DefaultRolesPrefixPostProcessor("");
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebSecurityConfig.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebSecurityConfig.java
deleted file mode 100644
index 4fb69ff06..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/config/WebSecurityConfig.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-import io.oasp.module.basic.common.api.config.SpringProfileConstants;
-
-/**
- * Security configuration based on {@link WebSecurityConfigurerAdapter}. This configuration is by purpose designed most
- * simple for two channels of authentication: simple login form and rest-url. (Copied from
- * {@link io.oasp.gastronomy.restaurant.general.service.impl.config.BaseWebSecurityConfig}
- *
- */
-@Configuration
-@EnableWebSecurity
-@Profile(SpringProfileConstants.NOT_JUNIT)
-public class WebSecurityConfig extends BaseWebSecurityConfig {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/ApplicationAccessDeniedHandler.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/ApplicationAccessDeniedHandler.java
deleted file mode 100644
index 7ba0bdcc9..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/ApplicationAccessDeniedHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.rest;
-
-import io.oasp.module.rest.service.impl.RestServiceExceptionFacade;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.Response;
-
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.web.access.AccessDeniedHandler;
-
-/**
- *
- */
-@Named("ApplicationAccessDeniedHandler")
-public class ApplicationAccessDeniedHandler implements AccessDeniedHandler {
-
- private RestServiceExceptionFacade exceptionFacade;
-
- @Override
- public void handle(HttpServletRequest request, HttpServletResponse response,
- AccessDeniedException accessDeniedException) throws IOException, ServletException {
-
- Response restResponse = this.exceptionFacade.toResponse(accessDeniedException);
- Object entity = restResponse.getEntity();
- response.setStatus(restResponse.getStatus());
- if (entity != null) {
- response.getWriter().write(entity.toString());
- }
- }
-
- /**
- * @param exceptionFacade the exceptionFacade to set
- */
- @Inject
- public void setExceptionFacade(RestServiceExceptionFacade exceptionFacade) {
-
- this.exceptionFacade = exceptionFacade;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/ApplicationObjectMapperFactory.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/ApplicationObjectMapperFactory.java
deleted file mode 100644
index 818162c2f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/ApplicationObjectMapperFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.rest;
-
-import javax.inject.Named;
-
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
-// BEGIN ARCHETYPE SKIP
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.DrinkEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.MealEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.SideDishEto;
-// END ARCHETYPE SKIP
-import io.oasp.module.json.common.base.ObjectMapperFactory;
-
-/**
- * The MappingFactory class to resolve polymorphic conflicts within the restaurant application.
- */
-@Named("ApplicationObjectMapperFactory")
-public class ApplicationObjectMapperFactory extends ObjectMapperFactory {
-
- /**
- * The constructor.
- */
- public ApplicationObjectMapperFactory() {
-
- super();
- // register polymorphic base classes
- // BEGIN ARCHETYPE SKIP
- setBaseClasses(ProductEto.class);
- // END ARCHETYPE SKIP
-
- NamedType[] subtypes;
- // register mapping for polymorphic sub-classes
- // BEGIN ARCHETYPE SKIP
- subtypes = new NamedType[] { new NamedType(MealEto.class, "Meal"), new NamedType(DrinkEto.class, "Drink"),
- new NamedType(SideDishEto.class, "SideDish") };
- setSubtypes(subtypes);
-
- // register (de)serializers for custom datatypes
- SimpleModule module = getExtensionModule();
- module.addDeserializer(Money.class, new MoneyJsonDeserializer());
- module.addSerializer(Money.class, new MoneyJsonSerializer());
- // END ARCHETYPE SKIP
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/MoneyJsonDeserializer.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/MoneyJsonDeserializer.java
deleted file mode 100644
index d0980d515..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/MoneyJsonDeserializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.rest;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-
-/**
- * The {@link JsonDeserializer JSON deserializer} for {@link Money}.
- *
- */
-public final class MoneyJsonDeserializer extends JsonDeserializer {
-
- @Override
- public Money deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
-
- BigDecimal value = jp.readValueAs(BigDecimal.class);
- if (value == null) {
- return null;
- } else {
- return new Money(value);
- }
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/MoneyJsonSerializer.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/MoneyJsonSerializer.java
deleted file mode 100644
index 6a69a6e11..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/MoneyJsonSerializer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.rest;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-/**
- * The {@link JsonSerializer} for {@link Money}.
- *
- */
-public final class MoneyJsonSerializer extends JsonSerializer {
-
- @Override
- public void serialize(Money value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-
- if (value != null) {
- jgen.writeString(value.getValue().toString());
- }
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/SecurityRestServiceImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/SecurityRestServiceImpl.java
deleted file mode 100644
index 7b4123ea0..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/general/service/impl/rest/SecurityRestServiceImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package io.oasp.gastronomy.restaurant.general.service.impl.rest;
-
-import javax.annotation.security.PermitAll;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.transaction.Transactional;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.web.csrf.CsrfToken;
-import org.springframework.security.web.csrf.CsrfTokenRepository;
-
-import io.oasp.gastronomy.restaurant.general.common.api.exception.NoActiveUserException;
-import io.oasp.gastronomy.restaurant.general.common.api.security.UserData;
-import io.oasp.gastronomy.restaurant.general.common.api.to.UserDetailsClientTo;
-import io.oasp.module.rest.common.api.RestService;
-
-/**
- * The security REST service provides access to the csrf token, the authenticated user's meta-data. Furthermore, it
- * provides functionality to check permissions and roles of the authenticated user.
- *
- */
-@Path("/security/v1")
-@Named("SecurityRestService")
-@Transactional
-public class SecurityRestServiceImpl implements RestService {
-
- /** Logger instance. */
- private static final Logger LOG = LoggerFactory.getLogger(SecurityRestServiceImpl.class);
-
- /**
- * Use {@link CsrfTokenRepository} for CSRF protection.
- */
- private CsrfTokenRepository csrfTokenRepository;
-
- /**
- * Retrieves the CSRF token from the server session.
- *
- * @param request {@link HttpServletRequest} to retrieve the current session from
- * @param response {@link HttpServletResponse} to send additional information
- * @return the Spring Security {@link CsrfToken}
- */
- @Produces(MediaType.APPLICATION_JSON)
- @GET
- @Path("/csrftoken/")
- @PermitAll
- public CsrfToken getCsrfToken(@Context HttpServletRequest request, @Context HttpServletResponse response) {
-
- // return (CsrfToken) request.getSession().getAttribute(
- // HttpSessionCsrfTokenRepository.class.getName().concat(".CSRF_TOKEN"));
- CsrfToken token = this.csrfTokenRepository.loadToken(request);
- if (token == null) {
- LOG.warn("No CsrfToken could be found - instanciating a new Token");
- token = this.csrfTokenRepository.generateToken(request);
- this.csrfTokenRepository.saveToken(token, request, response);
- }
- return token;
- }
-
- /**
- * Gets the profile of the user being currently logged in.
- *
- * @param request provided by the RS-Context
- * @return the {@link UserData} taken from the Spring Security context
- */
- @Produces(MediaType.APPLICATION_JSON)
- @GET
- @Path("/currentuser/")
- @PermitAll
- public UserDetailsClientTo getCurrentUser(@Context HttpServletRequest request) {
-
- if (request.getRemoteUser() == null) {
- throw new NoActiveUserException();
- }
- return UserData.get().toClientTo();
- }
-
- /**
- * @param csrfTokenRepository the csrfTokenRepository to set
- */
- @Inject
- public void setCsrfTokenRepository(CsrfTokenRepository csrfTokenRepository) {
-
- this.csrfTokenRepository = csrfTokenRepository;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/batch/impl/productimport/writer/ProductWriter.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/batch/impl/productimport/writer/ProductWriter.java
deleted file mode 100644
index 8f8c95814..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/batch/impl/productimport/writer/ProductWriter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.batch.impl.productimport.writer;
-
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.Offermanagement;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductEto;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.batch.item.ItemWriter;
-
-/**
- * ProductWriter is responsible for writing ProductEto to database.
- *
- */
-public class ProductWriter implements ItemWriter {
-
- private static final Logger LOG = LoggerFactory.getLogger(ProductWriter.class);
-
- private Offermanagement offerManagement;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void write(List items) throws Exception {
-
- LOG.debug("Writing " + items.size() + " products");
-
- for (ProductEto item : items) {
- LOG.debug("Saving product: " + item.getName());
- this.offerManagement.saveProduct(item);
- }
-
- }
-
- /**
- * @param offerManagement the offerManagement to set
- */
- @Inject
- public void setOfferManagement(Offermanagement offerManagement) {
-
- this.offerManagement = offerManagement;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Drink.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Drink.java
deleted file mode 100644
index f9843704c..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Drink.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api;
-
-/**
- * This is the interface for a {@link Product} that represents a {@link Drink}.
- *
- */
-public interface Drink extends Product {
-
- /**
- * @return {@code true} if this drink is containing alcohol, {@code false} otherwise.
- */
- boolean isAlcoholic();
-
- /**
- * @param alcoholic is the new value of {@link #isAlcoholic() alcoholic}.
- */
- void setAlcoholic(boolean alcoholic);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Meal.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Meal.java
deleted file mode 100644
index 4418faa79..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Meal.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api;
-
-/**
- * This is the interface for a {@link Product} that represents a {@link Meal}.
- *
- */
-public interface Meal extends Product {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/MenuItem.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/MenuItem.java
deleted file mode 100644
index 800d868b9..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/MenuItem.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api;
-
-import io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity;
-
-/**
- * This is the interface for a {@link MenuItem} what is either a {@link Product} or an {@link Offer}.
- *
- */
-public interface MenuItem extends ApplicationEntity {
-
- /**
- * @return a description with the details of this item.
- */
- String getDescription();
-
- /**
- * @param description is the new {@link #getDescription() description}.
- */
- void setDescription(String description);
-
- /**
- * @return the display name of this item.
- */
- String getName();
-
- /**
- * @param name is the new {@link #getName() name}.
- */
- void setName(String name);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Offer.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Offer.java
deleted file mode 100644
index 64a7d2a35..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Offer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.OfferState;
-
-/**
- * This is the interface for an {@link Offer} that combines {@link Product}s with a price for the menu of the
- * restaurant. The combined {@link Product}s are a {@link Meal}, a {@link SideDish}, and a {@link Drink}. All of them
- * are optional but at least one of the three has to be present in a valid {@link Offer}.
- *
- */
-public interface Offer extends MenuItem {
-
- /**
- * @return the unique number of this {@link Offer} used in the menu. While the {@link #getId() ID} of an {@link Offer}
- * is auto-generated and will never change, the number may be changed if the menu gets updated. This is the
- * identifier used by customers to displace orders.
- */
- Long getNumber();
-
- /**
- * @param number is the new {@link #getNumber() number}.
- */
- void setNumber(Long number);
-
- /**
- * @return the current price of the offer.
- */
- Money getPrice();
-
- /**
- * @param price is the new {@link #getPrice() price}.
- */
- void setPrice(Money price);
-
- /**
- * @return is the {@link Meal#getId() ID} of the {@link Meal} or {@code null} if no {@link Meal} is contained in
- * this {@link Offer}.
- */
- Long getMealId();
-
- /**
- * @param mealId is the new {@link #getMealId() mealId}.
- */
- void setMealId(Long mealId);
-
- /**
- * @return is the {@link Drink#getId() ID} of the {@link Drink} or {@code null} if no {@link Drink} is contained
- * in this {@link Offer}.
- */
- Long getDrinkId();
-
- /**
- * @param drinkId is the new {@link #getDrinkId() drinkId}.
- */
- void setDrinkId(Long drinkId);
-
- /**
- * @return is the {@link SideDish#getId() ID} of the {@link SideDish} or {@code null} if no {@link SideDish} is
- * contained in this {@link Offer}.
- */
- Long getSideDishId();
-
- /**
- * @param sideDishId is the new {@link #getSideDishId() sideDishId}.
- */
- void setSideDishId(Long sideDishId);
-
- /**
- * @return the {@link OfferState state} of this {@link Offer}.
- */
- OfferState getState();
-
- /**
- * @param state is the new {@link #getState() state}.
- */
- void setState(OfferState state);
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Product.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Product.java
deleted file mode 100644
index 3160d7c3d..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/Product.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api;
-
-import io.oasp.gastronomy.restaurant.general.logic.api.to.BinaryObjectEto;
-
-/**
- * This is the interface for a {@link Product} of the restaurant.
- *
- */
-public interface Product extends MenuItem {
-
- /**
- * @return the ID of a {@link BinaryObjectEto} that represents the picture
- */
- Long getPictureId();
-
- /**
- * @param binaryObjectId the ID of a {@link BinaryObjectEto} that represents the picture
- */
- void setPictureId(Long binaryObjectId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/SideDish.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/SideDish.java
deleted file mode 100644
index a81c095bd..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/SideDish.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api;
-
-/**
- * This is the interface for a {@link Product} that represents a {@link SideDish}.
- *
- */
-public interface SideDish extends Product {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/OfferSortByHitEntry.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/OfferSortByHitEntry.java
deleted file mode 100644
index 0e93ebf17..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/OfferSortByHitEntry.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype;
-
-/**
- * This enum identifies the entity, on which the sorting should be executed.
- *
- */
-public enum OfferSortByHitEntry {
-
- /**
- * Sort by id.
- */
- ID("id"),
- /**
- * Sort by description.
- */
- DESCRIPTION("description"),
- /**
- * Sort by price.
- */
- PRICE("price"),
- /**
- * Sort by meal.
- */
- MEAL("meal"),
- /**
- * Sort by side dish.
- */
- SIDEDISH("sideDish"),
- /**
- * Sort by drink.
- */
- DRINK("drink");
-
- private final String sortByAttributeName;
-
- private OfferSortByHitEntry(String sortByAttributeName) {
-
- this.sortByAttributeName = sortByAttributeName;
- }
-
- /**
- * @return sortByAttributeName
- */
- public String getSortByAttributeName() {
-
- return this.sortByAttributeName;
- }
-
- /**
- * This method returns an {@link OfferSortByHitEntry} for a given {@link #getSortByAttributeName() attribute name}.
- *
- * @param sortByAttributeName the name.
- * @return an {@link OfferSortByHitEntry}
- */
- public static OfferSortByHitEntry getEntryForAttributeName(String sortByAttributeName) {
-
- for (OfferSortByHitEntry entry : OfferSortByHitEntry.values()) {
- if (entry.sortByAttributeName.equals(sortByAttributeName)) {
- return entry;
- }
- }
-
- return null;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/OfferState.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/OfferState.java
deleted file mode 100644
index 1e34a4ab3..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/OfferState.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype;
-
-/**
- * Represents the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getState() state} of an
- * {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer}.
- *
- */
-public enum OfferState {
-
- /** The state of a normal {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer}. */
- NORMAL,
-
- /** The state of a special {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer}. */
- SPECIAL,
-
- /** The state of a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} that is soled-out. */
- SOLDOUT;
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.OfferEntity} is normal.
- */
- public boolean isNormal() {
-
- return (this == NORMAL);
- }
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.OfferEntity} is special.
- */
- public boolean isSpecial() {
-
- return (this == SPECIAL);
- }
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.OfferEntity} is sold out.
- */
- public boolean isSoldout() {
-
- return (this == SOLDOUT);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/ProductSortByHitEntry.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/ProductSortByHitEntry.java
deleted file mode 100644
index 144fb1a4a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/ProductSortByHitEntry.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype;
-
-/**
- * This enum identifies the entity, on which the sorting should be executed.
- *
- */
-public enum ProductSortByHitEntry {
-
- // to implement: Type column
- /** Sort by {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product#getId() product id}. */
- ID("id"),
-
- /**
- * Sort by {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product#getDescription() product
- * description}.
- */
- DESCRIPTION("description"),
-
- /**
- * Sort by {@link javax.persistence.DiscriminatorValue}
- *
- * @see Object#getClass()
- */
- DTYPE("dtype");
-
- private String sortByAttributeName;
-
- private ProductSortByHitEntry(String sortByAttributeName) {
-
- this.sortByAttributeName = sortByAttributeName;
- }
-
- /**
- * @return the name of the represented attribute of
- * {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product}.
- */
- public String getSortByAttributeName() {
-
- return this.sortByAttributeName;
- }
-
- /**
- * This method returns an {@link ProductSortByHitEntry} for a given {@link #getSortByAttributeName() attribute name}.
- *
- * @param sortByAttributeName the name.
- * @return an {@link ProductSortByHitEntry}
- */
- public static ProductSortByHitEntry getEntryForAttributeName(String sortByAttributeName) {
-
- for (ProductSortByHitEntry entry : ProductSortByHitEntry.values()) {
- if (entry.sortByAttributeName.equals(sortByAttributeName)) {
- return entry;
- }
- }
-
- return null;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/ProductType.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/ProductType.java
deleted file mode 100644
index be087551b..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/datatype/ProductType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype;
-
-
-/**
- * This enum contains the available types of a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product}.
- *
- */
-public enum ProductType {
-
- /**
- * This value identifies a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink}.
- */
- DRINK,
-
- /**
- * This value identifies a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal}.
- */
- MEAL,
-
- /**
- * This value identifies a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish}.
- */
- SIDEDISH;
-
- /**
- * @return {@code true}, if this value equals {@link ProductType#DRINK} . {@code false} otherwise.
- */
- public boolean isDrink() {
-
- return equals(DRINK);
- }
-
- /**
- * @return {@code true}, if this value equals {@link ProductType#MEAL}. {@code false} otherwise.
- */
- public boolean isMeal() {
-
- return equals(MEAL);
- }
-
- /**
- * @return {@code true}, if this value equals {@link ProductType#SIDEDISH}. {@code false} otherwise.
- */
- public boolean isSideDish() {
-
- return equals(SIDEDISH);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/exception/OfferEmptyException.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/exception/OfferEmptyException.java
deleted file mode 100644
index 5576bcfe8..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/common/api/exception/OfferEmptyException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.common.api.exception;
-
-import io.oasp.gastronomy.restaurant.general.common.api.NlsBundleApplicationRoot;
-import io.oasp.gastronomy.restaurant.general.common.api.exception.ApplicationBusinessException;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer;
-
-/**
- * This exception is thrown if an {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} is empty. Here
- * empty means that is has no {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getDrinkId() drink},
- * no {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getMealId() meal}, and no
- * {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getSideDishId() side-dish} associated.
- *
- */
-public class OfferEmptyException extends ApplicationBusinessException {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- /**
- * The constructor.
- *
- * @param offer is the empty {@link Offer}.
- */
- public OfferEmptyException(Offer offer) {
-
- super(createBundle(NlsBundleApplicationRoot.class).errorOfferEmpty());
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/DrinkEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/DrinkEntity.java
deleted file mode 100644
index 95eee50dc..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/DrinkEntity.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-
-import org.hibernate.envers.Audited;
-
-/**
- * The {@link io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity persistent entity} for
- * {@link Drink}.
- *
- */
-@Entity
-@DiscriminatorValue("Drink")
-@Audited
-public class DrinkEntity extends ProductEntity implements Drink {
-
- private static final long serialVersionUID = 1L;
-
- private boolean alcoholic;
-
- /**
- * The constructor.
- */
- public DrinkEntity() {
-
- super();
- }
-
- /**
- * Returns the field 'alcoholic'.
- *
- * @return Value of alcoholic
- */
- @Override
- public boolean isAlcoholic() {
-
- return this.alcoholic;
- }
-
- /**
- * Sets the field 'alcoholic'.
- *
- * @param alcoholic New value for alcoholic
- */
- @Override
- public void setAlcoholic(boolean alcoholic) {
-
- this.alcoholic = alcoholic;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/MealEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/MealEntity.java
deleted file mode 100644
index a286cc4da..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/MealEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-
-import org.hibernate.envers.Audited;
-
-/**
- * The {@link io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity persistent entity} for
- * {@link Meal}.
- *
- */
-@Entity
-@DiscriminatorValue("Meal")
-@Audited
-public class MealEntity extends ProductEntity implements Meal {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * The constructor.
- */
- public MealEntity() {
-
- super();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/MenuItemEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/MenuItemEntity.java
deleted file mode 100644
index fe5822514..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/MenuItemEntity.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.MenuItem;
-
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-
-import org.hibernate.envers.Audited;
-
-/**
- * The {@link io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity persistent entity} for
- * {@link MenuItem}.
- *
- */
-@MappedSuperclass
-@Audited
-public abstract class MenuItemEntity extends ApplicationPersistenceEntity implements MenuItem {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- private String description;
-
- /**
- * The constructor.
- */
- public MenuItemEntity() {
-
- super();
- }
-
- @Column(name = "name", unique = true)
- @Override
- public String getName() {
-
- return this.name;
- }
-
- @Override
- public void setName(String name) {
-
- this.name = name;
- }
-
- @Column(name = "description")
- @Override
- public String getDescription() {
-
- return this.description;
- }
-
- @Override
- public void setDescription(String description) {
-
- this.description = description;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/OfferEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/OfferEntity.java
deleted file mode 100644
index 3db0e3db1..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/OfferEntity.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.OfferState;
-
-/**
- * The {@link io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity persistent entity} for
- * {@link Offer}.
- *
- */
-@Entity
-@Table(name = "Offer", uniqueConstraints = { @UniqueConstraint(columnNames = { "description" }) })
-public class OfferEntity extends MenuItemEntity implements Offer {
-
- private static final long serialVersionUID = 1L;
-
- private Long number;
-
- private Money price;
-
- private MealEntity meal;
-
- private DrinkEntity drink;
-
- private SideDishEntity sideDish;
-
- private OfferState state;
-
- /**
- * The constructor.
- */
- public OfferEntity() {
-
- super();
- }
-
- /*
- * Uncomment the following Column annotation if the database used is Oracle 11g and comment the Column annotation just
- * before @Override annotation
- */
- // @Column(name = "\"number\"", unique = true)
-
- @Column(name = "number", unique = true)
- @Override
- public Long getNumber() {
-
- return this.number;
- }
-
- @Override
- public void setNumber(Long number) {
-
- this.number = number;
- }
-
- @Override
- public Money getPrice() {
-
- return this.price;
- }
-
- /**
- * Sets the field 'currentPrice'.
- *
- * @param currentPrice New value for currentPrice
- */
- @Override
- public void setPrice(Money currentPrice) {
-
- this.price = currentPrice;
- }
-
- /**
- * Returns the field 'meal'.
- *
- * @return Value of meal
- */
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "mealId")
- public MealEntity getMeal() {
-
- return this.meal;
- }
-
- /**
- * Sets the field 'meal'.
- *
- * @param meal New value for meal
- */
- public void setMeal(MealEntity meal) {
-
- this.meal = meal;
- }
-
- @Override
- @Transient
- public Long getMealId() {
-
- if (this.meal == null) {
- return null;
- }
- return this.meal.getId();
- }
-
- @Override
- public void setMealId(Long mealId) {
-
- if (mealId == null) {
- this.meal = null;
- } else {
- MealEntity mealEntity = new MealEntity();
- mealEntity.setId(mealId);
- this.meal = mealEntity;
- }
- }
-
- /**
- * @return Value of drink
- */
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "drinkId")
- public DrinkEntity getDrink() {
-
- return this.drink;
- }
-
- /**
- * Sets the field 'drink'.
- *
- * @param drink New value for drink
- */
- public void setDrink(DrinkEntity drink) {
-
- this.drink = drink;
- }
-
- @Override
- @Transient
- public Long getDrinkId() {
-
- if (this.drink == null) {
- return null;
- }
- return this.drink.getId();
- }
-
- @Override
- public void setDrinkId(Long drinkId) {
-
- if (drinkId == null) {
- this.drink = null;
- } else {
- DrinkEntity drinkEntity = new DrinkEntity();
- drinkEntity.setId(drinkId);
- this.drink = drinkEntity;
- }
- }
-
- /**
- * Returns the field 'sideDish'.
- *
- * @return Value of sideDish
- */
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sideDishId")
- public SideDishEntity getSideDish() {
-
- return this.sideDish;
- }
-
- /**
- * Sets the field 'sideDish'.
- *
- * @param sideDish New value for sideDish
- */
- public void setSideDish(SideDishEntity sideDish) {
-
- this.sideDish = sideDish;
- }
-
- @Override
- @Transient
- public Long getSideDishId() {
-
- if (this.sideDish == null) {
- return null;
- }
- return this.sideDish.getId();
- }
-
- @Override
- public void setSideDishId(Long sideDishId) {
-
- if (sideDishId == null) {
- this.sideDish = null;
- } else {
- SideDishEntity sideDishEntity = new SideDishEntity();
- sideDishEntity.setId(sideDishId);
- this.sideDish = sideDishEntity;
- }
- }
-
- /**
- * Returns the field 'state'.
- *
- * @return Value of state
- */
- @Override
- public OfferState getState() {
-
- return this.state;
- }
-
- /**
- * Sets the field 'state'.
- *
- * @param state New value for state
- */
- @Override
- public void setState(OfferState state) {
-
- this.state = state;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/ProductEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/ProductEntity.java
deleted file mode 100644
index eb4baed85..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/ProductEntity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Product;
-
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-
-import org.hibernate.envers.Audited;
-
-/**
- * The {@link io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity persistent entity} for
- * {@link Product}.
- *
- */
-@Entity
-@Table(name = "Product")
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(name = "dType", discriminatorType = DiscriminatorType.STRING)
-@Audited
-public abstract class ProductEntity extends MenuItemEntity implements Product {
-
- private static final long serialVersionUID = 1L;
-
- private Long pictureId;
-
- /**
- * The constructor.
- */
- public ProductEntity() {
-
- super();
- }
-
- @Override
- public Long getPictureId() {
-
- return this.pictureId;
- }
-
- @Override
- public void setPictureId(Long binaryObjectId) {
-
- this.pictureId = binaryObjectId;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/SideDishEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/SideDishEntity.java
deleted file mode 100644
index e5d6eb77a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/SideDishEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-
-import org.hibernate.envers.Audited;
-
-/**
- * The {@link io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity persistent entity} for
- * {@link SideDish}.
- *
- */
-@Entity
-@DiscriminatorValue("SideDish")
-@Audited
-public class SideDishEntity extends ProductEntity implements SideDish {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * The constructor.
- */
- public SideDishEntity() {
-
- super();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/DrinkDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/DrinkDao.java
deleted file mode 100644
index 98f21369e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/DrinkDao.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationRevisionedDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.DrinkEntity;
-import io.oasp.module.jpa.dataaccess.api.MasterDataDao;
-
-/**
- * {@link ApplicationRevisionedDao Data Access Object} for {@link DrinkEntity}.
- *
- */
-public interface DrinkDao extends ApplicationRevisionedDao, MasterDataDao {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/MealDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/MealDao.java
deleted file mode 100644
index 8ff52d8b4..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/MealDao.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationRevisionedDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.MealEntity;
-import io.oasp.module.jpa.dataaccess.api.MasterDataDao;
-
-/**
- * {@link ApplicationRevisionedDao Data Access Object} for {@link MealEntity}.
- *
- */
-public interface MealDao extends ApplicationRevisionedDao, MasterDataDao {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/OfferDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/OfferDao.java
deleted file mode 100644
index 12ba27866..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/OfferDao.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.OfferEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSortBy;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-import io.oasp.module.jpa.dataaccess.api.MasterDataDao;
-
-import java.util.List;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link OfferEntity} entity.
- *
- */
-public interface OfferDao extends ApplicationDao, MasterDataDao {
-
- /**
- * Returns a {@link List} of filtered {@link OfferEntity}s.
- *
- * @param offerFilterBo is the {@link OfferFilter offers filter criteria}. Any value, that should be applied as a
- * filter, have to be different to {@code null}.
- * @param sortBy is the {@link OfferSortBy} attribute, which defines the sorting.
- *
- * @return the {@link List} with all {@link OfferEntity}s that match the {@link OfferFilter offers filter criteria}.
- */
- @Deprecated
- List findOffersFiltered(OfferFilter offerFilterBo, OfferSortBy sortBy);
-
- /**
- * Finds the {@link OfferEntity} objects matching the given {@link OfferSearchCriteriaTo}.
- *
- * @param criteria is the {@link OfferSearchCriteriaTo}.
- * @return the {@link List} with the matching {@link OfferEntity} objects.
- */
- PaginatedListTo findOffers(OfferSearchCriteriaTo criteria);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/ProductDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/ProductDao.java
deleted file mode 100644
index a8337463c..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/ProductDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationRevisionedDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.ProductEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSortBy;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-import io.oasp.module.jpa.dataaccess.api.MasterDataDao;
-
-import java.util.List;
-
-/**
- * {@link ApplicationRevisionedDao Data Access Object} for {@link ProductEntity} entity.
- *
- */
-public interface ProductDao extends ApplicationRevisionedDao, MasterDataDao {
-
- /**
- * @param productFilter is the {@link ProductFilter}.
- * @param sortBy is the {@link ProductSortBy} criteria.
- * @return the {@link List} of filtered and sorted {@link ProductEntity products}.
- */
- @Deprecated
- List findProductsFiltered(ProductFilter productFilter, ProductSortBy sortBy);
-
- /**
- * Finds the {@link ProductEntity} objects matching the given {@link ProductSearchCriteriaTo}.
- *
- * @param criteria is the {@link ProductSearchCriteriaTo}.
- * @return the {@link List} with the matching {@link ProductEntity} objects.
- */
- PaginatedListTo findProducts(ProductSearchCriteriaTo criteria);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/SideDishDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/SideDishDao.java
deleted file mode 100644
index bb1a36a9a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/api/dao/SideDishDao.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationRevisionedDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.SideDishEntity;
-import io.oasp.module.jpa.dataaccess.api.MasterDataDao;
-
-/**
- * {@link ApplicationRevisionedDao Data Access Object} for {@link SideDishEntity}.
- *
- */
-public interface SideDishDao extends ApplicationRevisionedDao, MasterDataDao {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/DrinkDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/DrinkDaoImpl.java
deleted file mode 100644
index aa5e57448..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/DrinkDaoImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.impl.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationMasterDataDaoImpl;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.DrinkEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.DrinkDao;
-
-import javax.inject.Named;
-
-/**
- * Implementation of {@link DrinkDao}.
- *
- */
-@Named
-public class DrinkDaoImpl extends ApplicationMasterDataDaoImpl implements DrinkDao {
-
- /**
- * The constructor.
- */
- public DrinkDaoImpl() {
-
- super();
- }
-
- @Override
- protected Class getEntityClass() {
-
- return DrinkEntity.class;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/MealDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/MealDaoImpl.java
deleted file mode 100644
index 01710068e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/MealDaoImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.impl.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationMasterDataDaoImpl;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.MealEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.MealDao;
-
-import javax.inject.Named;
-
-/**
- * Implementation of {@link MealDao}.
- *
- */
-@Named
-public class MealDaoImpl extends ApplicationMasterDataDaoImpl implements MealDao {
-
- /**
- * The constructor.
- */
- public MealDaoImpl() {
-
- super();
- }
-
- @Override
- protected Class getEntityClass() {
-
- return MealEntity.class;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/OfferDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/OfferDaoImpl.java
deleted file mode 100644
index 565ea5d0f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/OfferDaoImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.impl.dao;
-
-import static com.mysema.query.alias.Alias.$;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationMasterDataDaoImpl;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.OfferSortByHitEntry;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.OfferState;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.DrinkEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.MealEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.OfferEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.SideDishEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.OfferDao;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSortBy;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Named;
-
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.alias.Alias;
-import com.mysema.query.jpa.JPQLQuery;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.path.EntityPathBase;
-
-/**
- * Implementation of {@link OfferDao}.
- *
- */
-@Named
-public class OfferDaoImpl extends ApplicationMasterDataDaoImpl implements OfferDao {
-
- /**
- * The constructor.
- */
- public OfferDaoImpl() {
-
- super();
- }
-
- @Override
- public Class getEntityClass() {
-
- return OfferEntity.class;
- }
-
- @Override
- @Deprecated
- public List findOffersFiltered(OfferFilter offerFilterBo, OfferSortBy sortBy) {
-
- /*
- * Default error handling
- */
- if (offerFilterBo == null || sortBy == null) {
- return new ArrayList<>(0);
- }
-
- OfferEntity offer = Alias.alias(OfferEntity.class);
- JPQLQuery query = new JPAQuery(getEntityManager()).from($(offer));
- BooleanBuilder builder = new BooleanBuilder();
-
- /*
- * Applying the filters
- */
- // Meal
- MealEntity meal = Alias.alias(MealEntity.class);
- if (offerFilterBo.getMealId() != null && offerFilterBo.getMealId() > 0) {
- query = query.join($(offer.getMeal()), $(meal));
- builder.and($(meal.getId()).eq(offerFilterBo.getMealId()));
- }
-
- // Drink
- DrinkEntity drink = Alias.alias(DrinkEntity.class);
- if (offerFilterBo.getDrinkId() != null && offerFilterBo.getDrinkId() > 0) {
- query.join($(offer.getDrink()), $(drink));
- builder.and($(drink.getId()).eq(offerFilterBo.getDrinkId()));
- }
-
- // SideDish
- SideDishEntity sideDish = Alias.alias(SideDishEntity.class);
- if (offerFilterBo.getSideDishId() != null && offerFilterBo.getSideDishId() > 0) {
- query.join($(offer.getSideDish()), $(sideDish));
- builder.and($(sideDish.getId()).eq(offerFilterBo.getSideDishId()));
- }
-
- // only min price is given
- if (offerFilterBo.getMinPrice() != null) {
- builder.and($(offer.getPrice()).goe(offerFilterBo.getMinPrice()));
- }
-
- // only max price is given
- if (offerFilterBo.getMaxPrice() != null) {
- builder.and($(offer.getPrice()).loe(offerFilterBo.getMaxPrice()));
- }
-
- // sorting
- if (sortBy.getSortByEntry().equals(OfferSortByHitEntry.DESCRIPTION)) {
- if (sortBy.getOrderBy().isDesc())
- query.where(builder).orderBy($(offer.getDescription()).desc());
- else
- query.where(builder).orderBy($(offer.getDescription()).asc());
- } else if (sortBy.getSortByEntry().equals(OfferSortByHitEntry.PRICE)) {
- if (sortBy.getOrderBy().isDesc())
- query.where(builder).orderBy($(offer.getPrice()).desc());
- else
- query.where(builder).orderBy($(offer.getPrice()).asc());
- } else if (sortBy.getSortByEntry().equals(OfferSortByHitEntry.MEAL)) {
- if (sortBy.getOrderBy().isDesc())
- query.where(builder).orderBy($(offer.getMeal().getDescription()).desc());
- else
- query.where(builder).orderBy($(offer.getMeal().getDescription()).asc());
- } else if (sortBy.getSortByEntry().equals(OfferSortByHitEntry.DRINK)) {
- if (sortBy.getOrderBy().isDesc())
- query.where(builder).orderBy($(offer.getDrink().getDescription()).desc());
- else
- query.where(builder).orderBy($(offer.getDrink().getDescription()).asc());
- } else if (sortBy.getSortByEntry().equals(OfferSortByHitEntry.SIDEDISH)) {
- if (sortBy.getOrderBy().isDesc())
- query.where(builder).orderBy($(offer.getSideDish().getDescription()).desc());
- else
- query.where(builder).orderBy($(offer.getSideDish().getDescription()).asc());
- } else {
- if (sortBy.getOrderBy().isDesc())
- query.where(builder).orderBy($(offer.getId()).desc());
- else
- query.where(builder).orderBy($(offer.getId()).asc());
- }
-
- /*
- * Result
- */
- List result = query.where(builder).list($(offer));
- return result;
- }
-
- @Override
- public PaginatedListTo findOffers(OfferSearchCriteriaTo criteria) {
-
- OfferEntity offer = Alias.alias(OfferEntity.class);
- EntityPathBase alias = $(offer);
- JPAQuery query = new JPAQuery(getEntityManager()).from(alias);
-
- Long number = criteria.getNumber();
- if (number != null) {
- query.where($(offer.getNumber()).eq(number));
- }
- Long mealId = criteria.getMealId();
- if (mealId != null) {
- query.where($(offer.getMealId()).eq(mealId));
- }
- Long drinkId = criteria.getDrinkId();
- if (drinkId != null) {
- query.where($(offer.getDrinkId()).eq(drinkId));
- }
- Long sideDishId = criteria.getSideDishId();
- if (sideDishId != null) {
- query.where($(offer.getSideDishId()).eq(sideDishId));
- }
- OfferState state = criteria.getState();
- if (state != null) {
- query.where($(offer.getState()).eq(state));
- }
-
- Money minPrice = criteria.getMinPrice();
- if (minPrice != null) {
- query.where($(offer.getPrice()).goe(minPrice));
- }
-
- Money maxPrice = criteria.getMaxPrice();
- if (maxPrice != null) {
- query.where($(offer.getPrice()).loe(maxPrice));
- }
-
- return findPaginated(criteria, query, alias);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/ProductDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/ProductDaoImpl.java
deleted file mode 100644
index c273f7e92..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/ProductDaoImpl.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.impl.dao;
-
-import static com.mysema.query.alias.Alias.$;
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationMasterDataDaoImpl;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.ProductSortByHitEntry;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.DrinkEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.MealEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.ProductEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.SideDishEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.ProductDao;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSortBy;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-import io.oasp.module.jpa.common.api.to.PaginationResultTo;
-import io.oasp.module.jpa.common.api.to.PaginationTo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Named;
-
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.alias.Alias;
-import com.mysema.query.jpa.JPQLQuery;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.path.EntityPathBase;
-
-/**
- * Implementation of {@link ProductDao}.
- *
- */
-@Named
-public class ProductDaoImpl extends ApplicationMasterDataDaoImpl implements ProductDao {
-
- /**
- * The constructor.
- */
- public ProductDaoImpl() {
-
- super();
- }
-
- @Override
- public Class getEntityClass() {
-
- return ProductEntity.class;
- }
-
- @Override
- @Deprecated
- public List findProductsFiltered(ProductFilter productFilterBo, ProductSortBy sortBy) {
-
- /*
- * Basic error handling
- */
- if (productFilterBo == null) {
- return new ArrayList<>();
- }
-
- ProductEntity product = Alias.alias(ProductEntity.class);
- JPQLQuery query = new JPAQuery(getEntityManager()).from($(product));
- BooleanBuilder builder = new BooleanBuilder();
-
- /*
- * Drinks
- */
- if (productFilterBo.getFetchDrinks()) {
- builder.or($(product).instanceOf(DrinkEntity.class));
- }
-
- /*
- * Meals
- */
- if (productFilterBo.getFetchMeals()) {
- builder.or($(product).instanceOf(MealEntity.class));
- }
-
- /*
- * SideDishes
- */
- if (productFilterBo.getFetchSideDishes()) {
- builder.or($(product).instanceOf(SideDishEntity.class));
- }
-
- if (sortBy.getSortByEntry().equals(ProductSortByHitEntry.DESCRIPTION)) {
- if (sortBy.getOrderBy().isDesc()) {
- query.where(builder).orderBy($(product.getDescription()).desc());
- } else {
- query.where(builder).orderBy($(product.getDescription()).asc());
- }
- } else {
- if (sortBy.getOrderBy().isDesc()) {
- query.where(builder).orderBy($(product.getId()).desc());
- } else {
- query.where(builder).orderBy($(product.getId()).asc());
- }
-
- }
-
- List result = query.list($(product));
- return result;
- }
-
- @Override
- public PaginatedListTo findProducts(ProductSearchCriteriaTo criteria) {
-
- ProductEntity product = Alias.alias(ProductEntity.class);
- EntityPathBase alias = $(product);
- JPAQuery query = new JPAQuery(getEntityManager()).from(alias);
-
- String name = criteria.getName();
- if (name != null) {
- query.where($(product.getName()).eq(name));
- }
-
- String description = criteria.getDescription();
- if (description != null) {
- query.where($(product.getDescription()).eq(description));
- }
-
- // include filter for entity type
-
- if (!(criteria.isFetchDrinks() || criteria.isFetchMeals() || criteria.isFetchSideDishes())) {
- // no product type was selected, return empty result
- PaginationTo pagination = criteria.getPagination();
-
- PaginationResultTo paginationResult = new PaginationResultTo(pagination, 0L);
- List paginatedList = new ArrayList<>();
-
- return new PaginatedListTo<>(paginatedList, paginationResult);
- }
-
- BooleanBuilder builder = new BooleanBuilder();
- if (criteria.isFetchSideDishes()) {
- builder.or($(product).instanceOf(SideDishEntity.class));
- }
- if (criteria.isFetchMeals()) {
- builder.or($(product).instanceOf(MealEntity.class));
- }
- if (criteria.isFetchDrinks()) {
- builder.or($(product).instanceOf(DrinkEntity.class));
- }
- query.where(builder);
-
- return findPaginated(criteria, query, alias);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/SideDishDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/SideDishDaoImpl.java
deleted file mode 100644
index f4bee95eb..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/dataaccess/impl/dao/SideDishDaoImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.dataaccess.impl.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationMasterDataDaoImpl;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.SideDishEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.SideDishDao;
-
-import javax.inject.Named;
-
-/**
- * Implementation of {@link SideDishDao}.
- *
- */
-@Named
-public class SideDishDaoImpl extends ApplicationMasterDataDaoImpl implements SideDishDao {
-
- /**
- * The constructor.
- */
- public SideDishDaoImpl() {
-
- super();
- }
-
- @Override
- protected Class getEntityClass() {
-
- return SideDishEntity.class;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/Offermanagement.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/Offermanagement.java
deleted file mode 100644
index f20929742..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/Offermanagement.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api;
-
-import io.oasp.gastronomy.restaurant.general.logic.api.to.BinaryObjectEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.DrinkEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.MealEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferCto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.SideDishEto;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.sql.Blob;
-import java.util.List;
-
-import javax.validation.Valid;
-
-/**
- * Interface for OfferManagement.
- *
- */
-public interface Offermanagement {
-
- /**
- * Gets an {@link OfferEto} using its entity identifier.
- *
- * @param id is the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getId() offer ID}.
- * @return the requested {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} or {@code null} if no
- * such {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} exists.
- */
- OfferEto findOffer(Long id);
-
- /**
- * Gets an {@link OfferCto} using its entity identifier.
- *
- * @param id is the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getId() offer ID}.
- * @return the requested {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} or {@code null} if no
- * such {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} exists.
- */
- OfferCto findOfferCto(Long id);
-
- /**
- * @return the {@link List} with all available {@link OfferEto}s.
- */
- List findAllOffers();
-
- /**
- * Returns a list of offers matching the search criteria.
- *
- * @param criteria the {@link OfferSearchCriteriaTo}.
- * @return the {@link List} of matching {@link OfferEto}s.
- */
- PaginatedListTo findOfferEtos(OfferSearchCriteriaTo criteria);
-
- /**
- * Checks, whether a given {@link ProductEto} is in use by at least one {@link OfferEto}.
- *
- * @param product product to check if it is in use
- * @return {@code true}, if there are no {@link OfferEto offers}, that use the given {@link ProductEto}. {@code false}
- * otherwise.
- */
- boolean isProductInUseByOffer(ProductEto product);
-
- /**
- * @param offerFilterBo is the {@link OfferFilter offers filter criteria}
- * @param sortBy is the {@link OfferSortBy} attribute, which defines the sorting.
- *
- * @return the {@link List} with all {@link OfferEto}s that match the {@link OfferFilter} criteria.
- */
- List findOffersFiltered(OfferFilter offerFilterBo, OfferSortBy sortBy);
-
- /**
- * Deletes an {@link OfferEto} by its {@link OfferEto#getId() id}.
- *
- * @param offerId is the {@link OfferEto#getId() id} that identifies the {@link OfferEto} to be deleted.
- */
- void deleteOffer(Long offerId);
-
- /**
- * If no ID is contained creates the {@link OfferEto} for the first time. Else it updates the {@link OfferEto} with
- * given ID. If no {@link OfferEto} with given ID is present, an exception will be thrown.
- *
- * @param offer the {@link OfferEto} to persist.
- * @return the generated/updated offer
- */
- OfferEto saveOffer(@Valid OfferEto offer);
-
- /**
- * Gets a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product} using its entity identifier.
- *
- * @param id is the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product#getId() product ID}.
- * @return the requested {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product} or {@code null} if
- * no such {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product} exists.
- */
- ProductEto findProduct(Long id);
-
- /**
- * Gets a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product} with a specific revision using its
- * entity identifier and a revision.
- *
- * @param id is the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product#getId() product ID}.
- * @param revision is the revision of the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product
- * Product}
- * @return the requested {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product} or {@code null} if
- * no such {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product} exists.
- */
- ProductEto findProductByRevision(Long id, Number revision);
-
- /**
- * Gets a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal} using its entity identifier.
- *
- * @param id is the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal#getId() product ID}.
- * @return the requested {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal} or {@code null} if no
- * such {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal} exists.
- */
- MealEto findMeal(Long id);
-
- /**
- * Gets a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink} using its entity identifier.
- *
- * @param id is the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink#getId() product ID}.
- * @return the requested {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink} or {@code null} if no
- * such {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink} exists.
- */
- DrinkEto findDrink(Long id);
-
- /**
- * Gets a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish} using its entity identifier.
- *
- * @param id is the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish#getId() product ID}.
- * @return the requested {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish} or {@code null} if
- * no such {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish} exists.
- */
- SideDishEto findSideDish(Long id);
-
- /**
- * @return the {@link List} with all {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product}s.
- */
- List findAllProducts();
-
- /**
- * @return the {@link List} with all {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal meals}.
- */
- List findAllMeals();
-
- /**
- * @return the {@link List} with all {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink drinks}.
- */
- List findAllDrinks();
-
- /**
- * @return the {@link List} with all {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish side
- * dishes}.
- */
- List findAllSideDishes();
-
- /**
- * Returns the {@link List} of filtered products sorted according to the specification.
- *
- * @param productFilterBo filter specification
- * @param sortBy sorting specification
- * @return a {@link List} of filtered products
- */
- List findProductsFiltered(ProductFilter productFilterBo, ProductSortBy sortBy);
-
- /**
- * @param productId the ID of the {@link ProductEto} to get the picture
- * @return the {@link BinaryObjectEto} that contains meta data about the picture
- */
- BinaryObjectEto findProductPicture(Long productId);
-
- /**
- * Returns a list of products matching the search criteria.
- *
- * @param criteria the {@link ProductSearchCriteriaTo}.
- * @return the {@link List} of matching {@link ProductEto}s.
- */
- PaginatedListTo findProductEtos(ProductSearchCriteriaTo criteria);
-
- /**
- * @param productId the ID of the {@link ProductEto} to get the picture data
- * @return the {@link Blob} that contains the data
- */
- Blob findProductPictureBlob(Long productId);
-
- /**
- * If no ID is contained creates the {@link ProductEto} for the first time. Else it updates the {@link ProductEto}
- * with given ID. If no {@link ProductEto} with given ID is present, an exception will be thrown.
- *
- * @param product the {@link ProductEto} to persist.
- * @return the persisted {@link ProductEto}.
- */
- ProductEto saveProduct(ProductEto product);
-
- /**
- * Deletes a {@link ProductEto}.
- *
- * @param productId is the ID of the {@link ProductEto} to delete
- */
- void deleteProduct(Long productId);
-
- /**
- * Updates the picture of the product.
- *
- * @param productId is the ID of the {@link ProductEto} to update the picture
- * @param blob is the binary representation of the picture
- * @param binaryObjectEto is the mimeType of the blob
- */
- void updateProductPicture(Long productId, Blob blob, BinaryObjectEto binaryObjectEto);
-
- /**
- * Deletes the Picture of the {@link ProductEto}.
- *
- * @param productId is the ID of the {@link ProductEto} to delte the picture
- */
- void deleteProductPicture(Long productId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/DrinkEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/DrinkEto.java
deleted file mode 100644
index 520461f12..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/DrinkEto.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink;
-
-/**
- * The {@link io.oasp.module.basic.common.api.to.AbstractEto ETO} for a {@link Drink}.
- *
- */
-public class DrinkEto extends ProductEto implements Drink {
-
- private static final long serialVersionUID = 1L;
-
- private boolean alcoholic;
-
- /**
- * The constructor.
- */
- public DrinkEto() {
-
- super();
- }
-
- /**
- * Returns the field 'alcoholic'.
- *
- * @return Value of alcoholic
- */
- @Override
- public boolean isAlcoholic() {
-
- return this.alcoholic;
- }
-
- /**
- * Sets the field 'alcoholic'.
- *
- * @param alcoholic New value for alcoholic
- */
- @Override
- public void setAlcoholic(boolean alcoholic) {
-
- this.alcoholic = alcoholic;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/MealEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/MealEto.java
deleted file mode 100644
index 3c6e31371..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/MealEto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Meal;
-
-/**
- * The {@link io.oasp.module.basic.common.api.to.AbstractEto ETO} for a {@link Meal}.
- *
- */
-public class MealEto extends ProductEto implements Meal {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- /**
- * The constructor.
- */
- public MealEto() {
-
- super();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/MenuItemEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/MenuItemEto.java
deleted file mode 100644
index 8746241c4..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/MenuItemEto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.MenuItem;
-import io.oasp.module.basic.common.api.to.AbstractEto;
-
-/**
- * The {@link AbstractEto ETO} for a {@link MenuItem}.
- *
- */
-public abstract class MenuItemEto extends AbstractEto implements MenuItem {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- private String description;
-
- /**
- * The constructor.
- */
- public MenuItemEto() {
-
- super();
- }
-
- @Override
- public String getName() {
-
- return this.name;
- }
-
- @Override
- public void setName(String name) {
-
- this.name = name;
- }
-
- @Override
- public String getDescription() {
-
- return this.description;
- }
-
- @Override
- public void setDescription(String description) {
-
- this.description = description;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferCto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferCto.java
deleted file mode 100644
index 215275095..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferCto.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.module.basic.common.api.to.AbstractCto;
-
-/**
- * The {@link AbstractCto CTO} for an {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer}.
- *
- */
-public class OfferCto extends AbstractCto {
-
- private static final long serialVersionUID = 1L;
-
- private OfferEto offer;
-
- private MealEto meal;
-
- private DrinkEto drink;
-
- private SideDishEto sideDish;
-
- /**
- * The constructor.
- */
- public OfferCto() {
-
- }
-
- /**
- * @return offer
- */
- public OfferEto getOffer() {
-
- return this.offer;
- }
-
- /**
- * @param offer the offer to set
- */
- public void setOffer(OfferEto offer) {
-
- this.offer = offer;
- }
-
- /**
- * @return meal
- */
- public MealEto getMeal() {
-
- return this.meal;
- }
-
- /**
- * @param meal the meal to set
- */
- public void setMeal(MealEto meal) {
-
- this.meal = meal;
- }
-
- /**
- * @return drink
- */
- public DrinkEto getDrink() {
-
- return this.drink;
- }
-
- /**
- * @param drink the drink to set
- */
- public void setDrink(DrinkEto drink) {
-
- this.drink = drink;
- }
-
- /**
- * @return sideDish
- */
- public SideDishEto getSideDish() {
-
- return this.sideDish;
- }
-
- /**
- * @param sideDish the sideDish to set
- */
- public void setSideDish(SideDishEto sideDish) {
-
- this.sideDish = sideDish;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferEto.java
deleted file mode 100644
index a46381fdf..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferEto.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.validation.NotNegativeMoney;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.OfferState;
-
-/**
- * The {@link io.oasp.module.basic.common.api.to.AbstractEto ETO} for an {@link Offer}.
- *
- */
-public class OfferEto extends MenuItemEto implements Offer {
-
- private static final long serialVersionUID = 1L;
-
- private Long number;
-
- @NotNegativeMoney
- private Money currentPrice;
-
- private Long mealId;
-
- private Long drinkId;
-
- private Long sideDishId;
-
- private OfferState state;
-
- /**
- * The constructor.
- */
- public OfferEto() {
-
- super();
- }
-
- @Override
- public Long getNumber() {
-
- return this.number;
- }
-
- @Override
- public void setNumber(Long number) {
-
- this.number = number;
- }
-
- @Override
- public Money getPrice() {
-
- return this.currentPrice;
- }
-
- @Override
- public void setPrice(Money currentPrice) {
-
- this.currentPrice = currentPrice;
- }
-
- @Override
- public Long getMealId() {
-
- return this.mealId;
- }
-
- @Override
- public void setMealId(Long mealId) {
-
- this.mealId = mealId;
- }
-
- @Override
- public Long getDrinkId() {
-
- return this.drinkId;
- }
-
- @Override
- public void setDrinkId(Long drinkId) {
-
- this.drinkId = drinkId;
- }
-
- @Override
- public Long getSideDishId() {
-
- return this.sideDishId;
- }
-
- @Override
- public void setSideDishId(Long sideDishId) {
-
- this.sideDishId = sideDishId;
- }
-
- @Override
- public OfferState getState() {
-
- return this.state;
- }
-
- @Override
- public void setState(OfferState state) {
-
- this.state = state;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferFilter.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferFilter.java
deleted file mode 100644
index cecd8f79e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferFilter.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.module.basic.common.api.to.AbstractTo;
-
-import net.sf.mmm.util.transferobject.api.AbstractTransferObject;
-
-/**
- * {@link AbstractTransferObject TO} to filter {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer}s.
- *
- */
-public class OfferFilter extends AbstractTo {
-
- private static final long serialVersionUID = 1L;
-
- private Long mealId;
-
- private Long sideDishId;
-
- private Long drinkId;
-
- private Money minPrice;
-
- private Money maxPrice;
-
- /**
- * The constructor.
- */
- public OfferFilter() {
-
- // initialize
- this.mealId = null;
- this.sideDishId = null;
- this.drinkId = null;
- this.minPrice = null;
- this.maxPrice = null;
- }
-
- /*
- * Constructor
- */
- /**
- * @param mealId Id of a meal as a Long
- * @param sideDishId Id of a Sidedish as a Long
- * @param drinkId Id of a Drink as a Long
- * @param minPrice minimal price for the filtered offers or null to ignore
- * @param maxPrice maximal price for the filtered offers or null to ignore
- */
- public OfferFilter(Long mealId, Long sideDishId, Long drinkId, Money minPrice, Money maxPrice) {
-
- this.mealId = mealId;
- this.sideDishId = sideDishId;
- this.drinkId = drinkId;
- this.minPrice = minPrice;
- this.maxPrice = maxPrice;
- }
-
- /**
- * Returns the field 'mealId'.
- *
- * @return Value of mealId
- */
- public Long getMealId() {
-
- return this.mealId;
- }
-
- /**
- * Returns the field 'sideDishId'.
- *
- * @return Value of sideDishId
- */
- public Long getSideDishId() {
-
- return this.sideDishId;
- }
-
- /**
- * Returns the field 'drinkId'.
- *
- * @return Value of drinkId
- */
- public Long getDrinkId() {
-
- return this.drinkId;
- }
-
- /**
- * Returns the field 'minPrice'.
- *
- * @return Value of minPrice
- */
- public Money getMinPrice() {
-
- return this.minPrice;
- }
-
- /**
- * Returns the field 'maxPrice'.
- *
- * @return Value of maxPrice
- */
- public Money getMaxPrice() {
-
- return this.maxPrice;
- }
-
- /**
- * Sets the field 'mealId'.
- *
- * @param mealId New value for mealId
- */
- public void setMealId(Long mealId) {
-
- this.mealId = mealId;
- }
-
- /**
- * Sets the field 'sideDishId'.
- *
- * @param sideDishId New value for sideDishId
- */
- public void setSideDishId(Long sideDishId) {
-
- this.sideDishId = sideDishId;
- }
-
- /**
- * Sets the field 'drinkId'.
- *
- * @param drinkId New value for drinkId
- */
- public void setDrinkId(Long drinkId) {
-
- this.drinkId = drinkId;
- }
-
- /**
- * Sets the field 'minPrice'.
- *
- * @param minPrice New value for minPrice
- */
- public void setMinPrice(Money minPrice) {
-
- this.minPrice = minPrice;
- }
-
- /**
- * Sets the field 'maxPrice'.
- *
- * @param maxPrice New value for maxPrice
- */
- public void setMaxPrice(Money maxPrice) {
-
- this.maxPrice = maxPrice;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferSearchCriteriaTo.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferSearchCriteriaTo.java
deleted file mode 100644
index f3e104a69..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferSearchCriteriaTo.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.OfferState;
-import io.oasp.module.jpa.common.api.to.SearchCriteriaTo;
-
-/**
- * This is the {@link SearchCriteriaTo search criteria} {@link net.sf.mmm.util.transferobject.api.TransferObject TO}
- * used to find {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order}s.
- *
- */
-public class OfferSearchCriteriaTo extends SearchCriteriaTo {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- private Long number;
-
- private Money minPrice;
-
- private Money maxPrice;
-
- private Long mealId;
-
- private Long drinkId;
-
- private Long sideDishId;
-
- private OfferState state;
-
- /**
- * The constructor.
- */
- public OfferSearchCriteriaTo() {
-
- super();
- }
-
- /**
- * @return number
- */
- public Long getNumber() {
-
- return this.number;
- }
-
- /**
- * @param number the number to set
- */
- public void setNumber(Long number) {
-
- this.number = number;
- }
-
- /**
- * @return minPrice
- */
- public Money getMinPrice() {
-
- return this.minPrice;
- }
-
- /**
- * @param minPrice the minPrice to set
- */
- public void setMinPrice(Money minPrice) {
-
- this.minPrice = minPrice;
- }
-
- /**
- * @return maxPrice
- */
- public Money getMaxPrice() {
-
- return this.maxPrice;
- }
-
- /**
- * @param maxPrice the maxPrice to set
- */
- public void setMaxPrice(Money maxPrice) {
-
- this.maxPrice = maxPrice;
- }
-
- /**
- * @return mealId
- */
- public Long getMealId() {
-
- return this.mealId;
- }
-
- /**
- * @param mealId the mealId to set
- */
- public void setMealId(Long mealId) {
-
- this.mealId = mealId;
- }
-
- /**
- * @return drinkId
- */
- public Long getDrinkId() {
-
- return this.drinkId;
- }
-
- /**
- * @param drinkId the drinkId to set
- */
- public void setDrinkId(Long drinkId) {
-
- this.drinkId = drinkId;
- }
-
- /**
- * @return sideDishId
- */
- public Long getSideDishId() {
-
- return this.sideDishId;
- }
-
- /**
- * @param sideDishId the sideDishId to set
- */
- public void setSideDishId(Long sideDishId) {
-
- this.sideDishId = sideDishId;
- }
-
- /**
- * @return state
- */
- public OfferState getState() {
-
- return this.state;
- }
-
- /**
- * @param state the state to set
- */
- public void setState(OfferState state) {
-
- this.state = state;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferSortBy.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferSortBy.java
deleted file mode 100644
index 559ff1574..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/OfferSortBy.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.OfferSortByHitEntry;
-import io.oasp.module.jpa.common.api.to.OrderDirection;
-
-/**
- *
- */
-public class OfferSortBy {
-
- private OfferSortByHitEntry sortByEntry;
-
- private OrderDirection orderBy;
-
- /**
- * The constructor.
- */
- public OfferSortBy() {
-
- this.sortByEntry = OfferSortByHitEntry.ID;
- this.orderBy = OrderDirection.ASC;
- }
-
- /**
- * Returns the field 'sortByEntry'.
- *
- * @return Value of sortByEntry
- */
- public OfferSortByHitEntry getSortByEntry() {
-
- return this.sortByEntry;
- }
-
- /**
- * Sets the field 'sortByEntry'.
- *
- * @param sortByEntry New value for sortByEntry
- */
- public void setSortByEntry(OfferSortByHitEntry sortByEntry) {
-
- this.sortByEntry = sortByEntry;
- }
-
- /**
- * Returns the field 'orderBy'.
- *
- * @return Value of orderBy
- */
- public OrderDirection getOrderBy() {
-
- return this.orderBy;
- }
-
- /**
- * Sets the field 'orderBy'.
- *
- * @param orderBy New value for orderBy
- */
- public void setOrderBy(OrderDirection orderBy) {
-
- this.orderBy = orderBy;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductEto.java
deleted file mode 100644
index 60d674621..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductEto.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Product;
-
-/**
- * The {@link io.oasp.module.basic.common.api.to.AbstractEto ETO} for a {@link Product}.
- *
- */
-public abstract class ProductEto extends MenuItemEto implements Product {
-
- private static final long serialVersionUID = 1L;
-
- private Long pictureId;
-
- /**
- * Constructor.
- */
- public ProductEto() {
-
- super();
- }
-
- @Override
- public void setPictureId(Long binaryObjectId) {
-
- this.pictureId = binaryObjectId;
- }
-
- @Override
- public Long getPictureId() {
-
- return this.pictureId;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductFilter.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductFilter.java
deleted file mode 100644
index b52aa30ef..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductFilter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.module.basic.common.api.to.AbstractTo;
-
-import net.sf.mmm.util.transferobject.api.AbstractTransferObject;
-
-/**
- * {@link AbstractTransferObject TO} to filter {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Product
- * products}.
- *
- */
-public class ProductFilter extends AbstractTo {
-
- private static final long serialVersionUID = 1L;
-
- private boolean fetchDrinks;
-
- private boolean fetchMeals;
-
- private boolean fetchSideDishes;
-
- /**
- * Constructor.
- *
- * Initializes the private fields fetchDrinks, fetchMeals and fetchSideDishes with {@code false}. So nothing is
- * fetched by default.
- */
- public ProductFilter() {
-
- this.fetchDrinks = false;
- this.fetchMeals = false;
- this.fetchSideDishes = false;
- }
-
- /**
- * Constructor.
- *
- * @param fetchDrinks is the flag for getting {@link DrinkEto drinks} from db (set this to {@code true})
- * @param fetchMeals is the flag for getting {@link MealEto meals} from db (set this to {@code true})
- * @param fetchSideDishes is the flag for getting {@link SideDishEto side dishes} from db (set this to {@code true})
- */
- public ProductFilter(boolean fetchDrinks, boolean fetchMeals, boolean fetchSideDishes) {
-
- this.fetchDrinks = fetchDrinks;
- this.fetchMeals = fetchMeals;
- this.fetchSideDishes = fetchSideDishes;
- }
-
- /**
- * Returns the field 'fetchSideDishes'.
- *
- * @return Value of fetchSideDishes
- */
- public boolean getFetchSideDishes() {
-
- return this.fetchSideDishes;
- }
-
- /**
- * Sets the field 'fetchSideDishes'.
- *
- * @param fetchSideDishes New value for fetchSideDishes
- */
- public void setFetchSideDishes(boolean fetchSideDishes) {
-
- this.fetchSideDishes = fetchSideDishes;
- }
-
- /**
- * Returns the field 'fetchMeals'.
- *
- * @return Value of fetchMeals
- */
- public boolean getFetchMeals() {
-
- return this.fetchMeals;
- }
-
- /**
- * Sets the field 'fetchMeals'.
- *
- * @param fetchMeals New value for fetchMeals
- */
- public void setFetchMeals(boolean fetchMeals) {
-
- this.fetchMeals = fetchMeals;
- }
-
- /**
- * Returns the field 'fetchDrinks'.
- *
- * @return Value of fetchDrinks
- */
- public boolean getFetchDrinks() {
-
- return this.fetchDrinks;
- }
-
- /**
- * Sets the field 'fetchDrinks'.
- *
- * @param fetchDrinks New value for fetchDrinks
- */
- public void setFetchDrinks(boolean fetchDrinks) {
-
- this.fetchDrinks = fetchDrinks;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductSearchCriteriaTo.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductSearchCriteriaTo.java
deleted file mode 100644
index 566d8ec9f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductSearchCriteriaTo.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Product;
-import io.oasp.module.jpa.common.api.to.SearchCriteriaTo;
-
-/**
- * This is the {@link SearchCriteriaTo search criteria} {@link net.sf.mmm.util.transferobject.api.TransferObject TO}
- * used to find {@link Product}s.
- *
- * If no boolean is set to true, no {@link Product}s will be found.
- *
- */
-public class ProductSearchCriteriaTo extends SearchCriteriaTo {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- private boolean fetchDrinks;
-
- private boolean fetchMeals;
-
- private boolean fetchSideDishes;
-
- private String name;
-
- private String description;
-
- /**
- * The constructor.
- */
- public ProductSearchCriteriaTo() {
-
- super();
-
- this.fetchDrinks = true;
- this.fetchMeals = true;
- this.fetchSideDishes = true;
-
- }
-
- /**
- * @return fetchDrinks
- */
- public boolean isFetchDrinks() {
-
- return this.fetchDrinks;
- }
-
- /**
- * @param fetchDrinks the fetchDrinks to set
- */
- public void setFetchDrinks(boolean fetchDrinks) {
-
- this.fetchDrinks = fetchDrinks;
- }
-
- /**
- * @return fetchMeals
- */
- public boolean isFetchMeals() {
-
- return this.fetchMeals;
- }
-
- /**
- * @param fetchMeals the fetchMeals to set
- */
- public void setFetchMeals(boolean fetchMeals) {
-
- this.fetchMeals = fetchMeals;
- }
-
- /**
- * @return fetchSideDishes
- */
- public boolean isFetchSideDishes() {
-
- return this.fetchSideDishes;
- }
-
- /**
- * @param fetchSideDishes the fetchSideDishes to set
- */
- public void setFetchSideDishes(boolean fetchSideDishes) {
-
- this.fetchSideDishes = fetchSideDishes;
- }
-
- /**
- * @return name
- */
- public String getName() {
-
- return this.name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
-
- this.name = name;
- }
-
- /**
- * @return description
- */
- public String getDescription() {
-
- return this.description;
- }
-
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
-
- this.description = description;
- }
-
- @Override
- protected void toString(StringBuilder buffer) {
-
- buffer.append("ProductSearchCriteriaTo [fetchDrinks=" + this.fetchDrinks + ", fetchMeals=" + this.fetchMeals
- + ", fetchSideDishes=" + this.fetchSideDishes + ", name=" + this.name + ", description=" + this.description
- + "]");
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductSortBy.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductSortBy.java
deleted file mode 100644
index 403a2621c..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/ProductSortBy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.ProductSortByHitEntry;
-import io.oasp.module.jpa.common.api.to.OrderDirection;
-
-/**
- *
- */
-public class ProductSortBy {
- private ProductSortByHitEntry sortByEntry;
-
- private OrderDirection orderBy;
-
- /**
- * Constructor for {@link ProductSortBy}.
- */
- public ProductSortBy() {
-
- this.sortByEntry = ProductSortByHitEntry.ID;
- this.orderBy = OrderDirection.ASC;
- }
-
- /**
- * Returns the field 'sortByEntry'.
- *
- * @return Value of sortByEntry
- */
- public ProductSortByHitEntry getSortByEntry() {
-
- return this.sortByEntry;
- }
-
- /**
- * Sets the field 'sortByEntry'.
- *
- * @param sortByEntry New value for sortByEntry
- */
- public void setSortByEntry(ProductSortByHitEntry sortByEntry) {
-
- this.sortByEntry = sortByEntry;
- }
-
- /**
- * Returns the field 'orderBy'.
- *
- * @return Value of orderBy
- */
- public OrderDirection getOrderBy() {
-
- return this.orderBy;
- }
-
- /**
- * Sets the field 'orderBy'.
- *
- * @param orderBy New value for orderBy
- */
- public void setOrderBy(OrderDirection orderBy) {
-
- this.orderBy = orderBy;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/SideDishEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/SideDishEto.java
deleted file mode 100644
index 30dcb879e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/api/to/SideDishEto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.SideDish;
-
-/**
- * The {@link io.oasp.module.basic.common.api.to.AbstractEto ETO} for a {@link SideDish}.
- *
- */
-public class SideDishEto extends ProductEto implements SideDish {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- /**
- * The constructor.
- */
- public SideDishEto() {
-
- super();
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/impl/OffermanagementImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/impl/OffermanagementImpl.java
deleted file mode 100644
index 88d6c606f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/logic/impl/OffermanagementImpl.java
+++ /dev/null
@@ -1,502 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.logic.impl;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.logic.api.to.BinaryObjectEto;
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractComponentFacade;
-import io.oasp.gastronomy.restaurant.general.logic.base.UcManageBinaryObject;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Product;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.datatype.ProductType;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.exception.OfferEmptyException;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.OfferEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.ProductEntity;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.DrinkDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.MealDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.OfferDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.ProductDao;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.dao.SideDishDao;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.Offermanagement;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.DrinkEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.MealEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferCto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.SideDishEto;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.sql.Blob;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.transaction.Transactional;
-import javax.validation.Valid;
-
-import net.sf.mmm.util.exception.api.ObjectMismatchException;
-import net.sf.mmm.util.exception.api.ObjectNotFoundUserException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Implementation class for {@link Offermanagement}.
- *
- */
-@Named
-@Transactional
-public class OffermanagementImpl extends AbstractComponentFacade implements Offermanagement {
-
- private static final Logger LOG = LoggerFactory.getLogger(OffermanagementImpl.class);
-
- /** @see #getOfferDao() */
- private OfferDao offerDao;
-
- /** @see #setProductDao(ProductDao) */
- private ProductDao productDao;
-
- /** @see #setMealDao(MealDao) */
- private MealDao mealDao;
-
- /** @see #setDrinkDao(DrinkDao) */
- private DrinkDao drinkDao;
-
- /** @see #setSideDishDao(SideDishDao) */
- private SideDishDao sideDishDao;
-
- /** **/
- private UcManageBinaryObject ucManageBinaryObject;
-
- /**
- * The constructor.
- */
- public OffermanagementImpl() {
-
- super();
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_OFFER)
- public OfferEto findOffer(Long id) {
-
- LOG.debug("Get OfferEto with id '{}' from database.", id);
- return getBeanMapper().map(getOfferDao().findOne(id), OfferEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_OFFER)
- public OfferCto findOfferCto(Long id) {
-
- LOG.debug("Get OfferCTO with id '{}' from database.", id);
- OfferCto result = new OfferCto();
- // offer
- OfferEto offerEto = findOffer(id);
- if (offerEto == null) {
- return null;
- }
- result.setOffer(offerEto);
- // meal
- Long mealId = offerEto.getMealId();
- if (mealId != null) {
- result.setMeal(findMeal(mealId));
- }
- // drink
- Long drinkId = offerEto.getDrinkId();
- if (drinkId != null) {
- result.setDrink(findDrink(drinkId));
- }
- // sideDish
- Long sideDishId = offerEto.getSideDishId();
- if (sideDishId != null) {
- result.setSideDish(findSideDish(sideDishId));
- }
- return result;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_OFFER)
- public List findAllOffers() {
-
- LOG.debug("Get all offers from database.");
- return getBeanMapper().mapList(getOfferDao().findAll(), OfferEto.class);
- }
-
- @Override
- @RolesAllowed({ PermissionConstants.FIND_OFFER, PermissionConstants.FIND_PRODUCT })
- public boolean isProductInUseByOffer(ProductEto product) {
-
- LOG.debug("Get all offers from database for the given product with id '" + product.getId() + "'.");
-
- List persistedOffers = findAllOffers();
-
- /*
- * Check the occurrence of a product within all offers. Therefore, only check for a instance of a product type
- * product type.
- */
- ProductType productType = null;
-
- if (product instanceof DrinkEto) {
- LOG.debug("The given product is an instance of Drink '" + product.getDescription() + "', id '" + product.getId()
- + "'. Check all Offer-Drinks for that given occurrence.");
- productType = ProductType.DRINK;
- } else if (product instanceof MealEto) {
- LOG.debug("The given product is an instance of Meal '" + product.getDescription() + "', id '" + product.getId()
- + "'. Check all Offer-Meals for that given occurrence.");
- productType = ProductType.MEAL;
- } else if (product instanceof SideDishEto) {
- LOG.debug("The given product is an instance of SideDish '" + product.getDescription() + "', id '"
- + product.getId() + "'. Check all Offer-SideDishes for that given occurrence.");
- productType = ProductType.SIDEDISH;
- }
-
- if (productType == null) {
- LOG.debug("The given product not in use by an offer.");
- return false;
- }
-
- for (OfferEto offer : persistedOffers) {
-
- if (productType.isDrink()) {
- if (Objects.equals(offer.getDrinkId(), product.getId())) {
- LOG.debug("The given product is in use by offer with id '" + offer.getId() + "', description '"
- + offer.getDescription() + "'.");
- return true;
- }
- continue;
-
- }
-
- if (productType.isMeal()) {
- if (Objects.equals(offer.getMealId(), product.getId())) {
- LOG.debug("The given product is in use by offer with id '" + offer.getId() + "', description '"
- + offer.getDescription() + "'.");
- return true;
- }
- continue;
- }
-
- if (productType.isSideDish()) {
- if (Objects.equals(offer.getSideDishId(), product.getId())) {
- LOG.debug("The given product is in use by offer with id '" + offer.getId() + "', description '"
- + offer.getDescription() + "'.");
- return true;
- }
- continue;
- }
- }
-
- LOG.debug("The given product not in use by an offer.");
- return false;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_OFFER)
- public List findOffersFiltered(OfferFilter offerFilterBo, OfferSortBy sortBy) {
-
- List offers = getOfferDao().findOffersFiltered(offerFilterBo, sortBy);
- LOG.debug("'" + offers.size() + "' offers fetched.");
-
- List offerBos = new ArrayList<>(offers.size());
- for (OfferEntity o : offers) {
- offerBos.add(getBeanMapper().map(o, OfferEto.class));
- }
- return offerBos;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.DELETE_OFFER)
- public void deleteOffer(Long offerId) {
-
- getOfferDao().delete(offerId);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_OFFER)
- public OfferEto saveOffer(@Valid OfferEto offer) {
-
- Objects.requireNonNull(offer, "offer");
-
- if ((offer.getMealId() == null) && (offer.getDrinkId() == null) && (offer.getSideDishId() == null)) {
- throw new OfferEmptyException(offer);
- } else {
- OfferEntity persistedOffer = getOfferDao().save(getBeanMapper().map(offer, OfferEntity.class));
- return getBeanMapper().map(persistedOffer, OfferEto.class);
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public ProductEto findProduct(Long id) {
-
- LOG.debug("Get Product with id '" + id + "' from database.");
- ProductEntity product = getProductDao().findOne(id);
- if (product == null) {
- return null;
- } else {
- return getBeanMapper().map(product, ProductEto.class);
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public MealEto findMeal(Long id) {
-
- ProductEto product = findProduct(id);
- try {
- return (MealEto) product;
- } catch (ClassCastException e) {
- throw new ObjectMismatchException(product, MealEto.class, e);
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public DrinkEto findDrink(Long id) {
-
- ProductEto product = findProduct(id);
- try {
- return (DrinkEto) product;
- } catch (ClassCastException e) {
- throw new ObjectMismatchException(product, DrinkEto.class, e);
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public SideDishEto findSideDish(Long id) {
-
- ProductEto product = findProduct(id);
- try {
- return (SideDishEto) product;
- } catch (ClassCastException e) {
- throw new ObjectMismatchException(product, SideDishEto.class, e);
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public List findAllProducts() {
-
- LOG.debug("Get all products from database.");
- return getBeanMapper().mapList(getProductDao().findAll(), ProductEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public List findAllMeals() {
-
- LOG.debug("Get all meals with from database.");
- return getBeanMapper().mapList(this.mealDao.findAll(), MealEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public List findAllDrinks() {
-
- LOG.debug("Get all drinks with from database.");
- return getBeanMapper().mapList(this.drinkDao.findAll(), DrinkEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public List findAllSideDishes() {
-
- LOG.debug("Get all sidedishes with from database.");
- return getBeanMapper().mapList(this.sideDishDao.findAll(), SideDishEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_OFFER)
- public List findProductsFiltered(ProductFilter productFilterBo, ProductSortBy sortBy) {
-
- LOG.debug("Fetch filtered offers.");
- return getBeanMapper().mapList(getProductDao().findProductsFiltered(productFilterBo, sortBy), ProductEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public BinaryObjectEto findProductPicture(Long productId) {
-
- ProductEto product = findProduct(productId);
- if (product != null) {
- return getUcManageBinaryObject().findBinaryObject(product.getPictureId());
- } else {
- return null;
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT_PICTURE)
- public Blob findProductPictureBlob(Long productId) {
-
- ProductEto product = findProduct(productId);
- if (product != null) {
- return getUcManageBinaryObject().getBinaryObjectBlob(product.getPictureId());
- } else {
- return null;
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT_PICTURE)
- public ProductEto findProductByRevision(Long id, Number revision) {
-
- LOG.debug("Get Product with id '" + id + "' and revision '" + revision + "' from database.");
- ProductEntity product = getProductDao().load(id, revision);
- if (product == null) {
- return null;
- } else {
- return getBeanMapper().map(product, ProductEto.class);
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_PRODUCT)
- public ProductEto saveProduct(ProductEto product) {
-
- Objects.requireNonNull(product, "product");
-
- ProductEntity persistedProduct = getProductDao().save(getBeanMapper().map(product, ProductEntity.class));
- return getBeanMapper().map(persistedProduct, ProductEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.DELETE_PRODUCT)
- public void deleteProduct(Long productId) {
-
- getProductDao().delete(productId);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_PRODUCT_PICTURE)
- public void updateProductPicture(Long productId, Blob blob, BinaryObjectEto binaryObjectEto) {
-
- ProductEntity product = getProductDao().findOne(productId);
- if (product != null) {
- binaryObjectEto = getUcManageBinaryObject().saveBinaryObject(blob, binaryObjectEto);
- product.setPictureId(binaryObjectEto.getId());
- getProductDao().save(product);
- } else {
- throw new ObjectNotFoundUserException(Product.class, productId);
- }
-
- }
-
- @Override
- @RolesAllowed(PermissionConstants.DELETE_PRODUCT_PICTURE)
- public void deleteProductPicture(Long productId) {
-
- ProductEntity product = getProductDao().findOne(productId);
- if (product != null) {
- getUcManageBinaryObject().deleteBinaryObject(product.getPictureId());
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_OFFER)
- public PaginatedListTo findOfferEtos(OfferSearchCriteriaTo criteria) {
-
- criteria.limitMaximumPageSize(MAXIMUM_HIT_LIMIT);
- PaginatedListTo offers = getOfferDao().findOffers(criteria);
- return mapPaginatedEntityList(offers, OfferEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_PRODUCT)
- public PaginatedListTo findProductEtos(ProductSearchCriteriaTo criteria) {
-
- criteria.limitMaximumPageSize(MAXIMUM_HIT_LIMIT);
- PaginatedListTo products = getProductDao().findProducts(criteria);
- return mapPaginatedEntityList(products, ProductEto.class);
- }
-
- /**
- * @return {@link OfferDao} instance.
- */
- public OfferDao getOfferDao() {
-
- return this.offerDao;
- }
-
- /**
- * Sets the field 'offerDao'.
- *
- * @param offerDao New value for offerDao
- */
- @Inject
- public void setOfferDao(OfferDao offerDao) {
-
- this.offerDao = offerDao;
- }
-
- /**
- * @param ucManageBinaryObject the ucManageBinaryObject to set
- */
- @Inject
- public void setUcManageBinaryObject(UcManageBinaryObject ucManageBinaryObject) {
-
- this.ucManageBinaryObject = ucManageBinaryObject;
- }
-
- /**
- * @return ucManageBinaryObject
- */
- public UcManageBinaryObject getUcManageBinaryObject() {
-
- return this.ucManageBinaryObject;
- }
-
- /**
- * @return productDao
- */
- public ProductDao getProductDao() {
-
- return this.productDao;
- }
-
- /**
- * Sets the field 'productDao'.
- *
- * @param productDao New value for productDao
- */
- @Inject
- public void setProductDao(ProductDao productDao) {
-
- this.productDao = productDao;
- }
-
- /**
- * @param mealDao the {@link MealDao} to {@link Inject}.
- */
- @Inject
- public void setMealDao(MealDao mealDao) {
-
- this.mealDao = mealDao;
- }
-
- /**
- * @param drinkDao the {@link DrinkDao} to {@link Inject}.
- */
- @Inject
- public void setDrinkDao(DrinkDao drinkDao) {
-
- this.drinkDao = drinkDao;
- }
-
- /**
- * @param sideDishDao the {@link SideDishDao} to {@link Inject}.
- */
- @Inject
- public void setSideDishDao(SideDishDao sideDishDao) {
-
- this.sideDishDao = sideDishDao;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/service/api/rest/OffermanagementRestService.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/service/api/rest/OffermanagementRestService.java
deleted file mode 100644
index 909f19db8..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/service/api/rest/OffermanagementRestService.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.service.api.rest;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.SQLException;
-import java.util.List;
-
-import javax.sql.rowset.serial.SerialException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.cxf.jaxrs.ext.multipart.Multipart;
-import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
-
-import io.oasp.gastronomy.restaurant.general.common.api.RestService;
-import io.oasp.gastronomy.restaurant.general.logic.api.to.BinaryObjectEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.Offermanagement;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.DrinkEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.MealEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.SideDishEto;
-import io.oasp.gastronomy.restaurant.offermanagement.service.impl.rest.OffermanagementRestServiceImpl;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-/**
- *
- * This class contains methods for REST calls. Some URI structures may seem deprecated, but in fact are not. See the
- * correspondent comments on top.
- *
- */
-
-@Path("/offermanagement/v1")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-public interface OffermanagementRestService extends RestService {
-
- /**
- * Delegates to {@link Offermanagement#findOffer}.
- *
- * @param id the ID of the {@link OfferEto}
- * @return the {@link OfferEto}
- */
- @GET
- @Path("/offer/{id}")
- OfferEto getOffer(@PathParam("id") long id);
-
- /**
- * Delegates to {@link Offermanagement#saveOffer}.
- *
- * @param offer the {@link OfferEto} to save
- *
- * @return the saved {@link OfferEto}
- */
- @POST
- @Path("/offer/")
- public OfferEto saveOffer(OfferEto offer);
-
- // although id in path is redundant, this structure is intentionally chosen
- // for further reasons behind this decision see one of the other ***ManagementRestServiceImpl
- /**
- * Delegates to {@link Offermanagement#saveOffer}.
- *
- * @param offer the {@link OfferEto} to be updated
- *
- * @return the updated {@link OfferEto}
- */
- @PUT
- @Path("/offer/{id}")
- @Deprecated
- OfferEto updateOffer(OfferEto offer);
-
- /**
- * Delegates to {@link Offermanagement#findAllOffers}.
- *
- * @return all {@link OfferEto}s as list
- */
- @GET
- @Path("/offer/")
- @Deprecated
- public List getAllOffers();
-
- /**
- * Delegates to {@link Offermanagement#findAllProducts}.
- *
- * @return all {@link ProductEto}s as list
- */
- @GET
- @Path("/product/")
- @Deprecated
- List getAllProducts();
-
- /**
- * Delegates to {@link Offermanagement#saveProduct}.
- *
- * @param product the product to save
- * @return the saved product
- */
- @POST
- @Path("/product/")
- ProductEto saveProduct(ProductEto product);
-
- /**
- * Delegates to {@link Offermanagement#findAllMeals}.
- *
- * @deprecated use {@link OffermanagementRestServiceImpl#findProductEtosByPost(ProductSearchCriteriaTo)} with
- * fetchMeals=true
- * @return all {@link MealEto}s as list
- */
- @GET
- @Path("/product/meal/")
- @Deprecated
- List getAllMeals();
-
- /**
- * Delegates to {@link Offermanagement#findAllDrinks}.
- *
- * @deprecated use {@link OffermanagementRestServiceImpl#findProductEtosByPost(ProductSearchCriteriaTo)} with
- * fetchDrinks=true
- * @return all {@link DrinkEto}s as list
- */
- @GET
- @Path("/product/drink/")
- @Deprecated
- List getAllDrinks();
-
- /**
- * Delegates to {@link Offermanagement#findAllSideDishes}.
- *
- * @deprecated use {@link OffermanagementRestServiceImpl#findProductEtosByPost(ProductSearchCriteriaTo)} with
- * fetchSideDishes=true
- * @return all {@link SideDishEto}s as list
- */
- @GET
- @Path("/product/side/")
- @Deprecated
- List getAllSideDishes();
-
- /**
- * Delegates to {@link Offermanagement#deleteOffer}.
- *
- * @param id ID of the {@link OfferEto} to delete
- */
- @DELETE
- @Path("/offer/{id}")
- void deleteOffer(@PathParam("id") long id);
-
- /**
- * Delegates to {@link Offermanagement#findProductByRevision}.
- *
- * @param id ID of the {@link ProductEto}
- * @param revision revision of the {@link ProductEto}
- * @return the {@link ProductEto}
- */
- @GET
- @Path("/product/{id}/{revision}")
- ProductEto findProductByRevision(@PathParam("id") long id, @PathParam("revision") Long revision);
-
- /**
- * Delegates to {@link Offermanagement#findProduct}.
- *
- * @param id ID of the {@link ProductEto}
- * @return the {@link ProductEto}
- */
- @GET
- @Path("/product/{id}")
- ProductEto findProduct(@PathParam("id") long id);
-
- // although id in path is redundant, this structure is intentionally chosen
- // for further reasons behind this decision see one of the other
- // *ManagementRestServiceImpl
- /**
- * Delegates to {@link Offermanagement#saveProduct}.
- *
- * @param product the {@link ProductEto} to be updated
- */
- @PUT
- @Path("/product/{id}")
- @Deprecated
- void updateProduct(ProductEto product);
-
- /**
- * Delegates to {@link Offermanagement#isProductInUseByOffer}.
- *
- * @param id ID of the {@link ProductEto}
- * @return true, if there are no offers, that use the given ProductEto. false otherwise.
- */
- @GET
- @Path("/product/{id}/inuse")
- boolean isProductInUseByOffer(@PathParam("id") long id);
-
- /**
- * Delegates to {@link Offermanagement#deleteProduct}.
- *
- * @param id ID of the ProductEto to delete
- */
- @DELETE
- @Path("/product/{id}")
- void deleteProduct(@PathParam("id") long id);
-
- /**
- * Delegates to {@link Offermanagement#findOffersFiltered}.
- *
- * @param offerFilter the offers filter criteria
- * @param sortBy sorting specification
- * @return list with all {@link OfferEto}s that match the {@link OfferFilter} criteria
- */
- @GET
- @Path("/sortby/{sortBy}")
- @Deprecated
- List getFilteredOffers(OfferFilter offerFilter, @PathParam("sortBy") OfferSortBy sortBy);
-
- /**
- * Delegates to {@link Offermanagement#findProductsFiltered}.
- *
- * @param productFilter filter specification
- * @param sortBy sorting specification
- * @return list with all {@link ProductEto}s that match the {@link ProductFilter} criteria
- */
- @GET
- @Path("/product/sortby/{sortBy}")
- @Deprecated
- List getFilteredProducts(ProductFilter productFilter, @PathParam("sortBy") ProductSortBy sortBy);
-
- @SuppressWarnings("javadoc")
- @Consumes("multipart/mixed")
- @POST
- @Path("/product/{id}/picture")
- public void updateProductPicture(@PathParam("id") long productId,
- @Multipart(value = "binaryObjectEto", type = MediaType.APPLICATION_JSON) BinaryObjectEto binaryObjectEto,
- @Multipart(value = "blob", type = MediaType.APPLICATION_OCTET_STREAM) InputStream picture)
- throws SerialException, SQLException, IOException;
-
- @SuppressWarnings("javadoc")
- @Produces("multipart/mixed")
- @GET
- @Path("/product/{id}/picture")
- public MultipartBody getProductPicture(@PathParam("id") long productId) throws SQLException, IOException;
-
- @SuppressWarnings("javadoc")
- @Produces(MediaType.APPLICATION_OCTET_STREAM)
- @GET
- @Path("/product/{id}/rawpicture")
- @Deprecated
- public Response getProductRawPicture(@PathParam("id") long productId) throws SQLException, IOException;
-
- @SuppressWarnings("javadoc")
- @DELETE
- @Path("/product/{id}/picture")
- public void deleteProductPicture(long productId);
-
- /**
- * Delegates to {@link Offermanagement#findOfferEtos}.
- *
- * @param searchCriteriaTo the pagination and search criteria to be used for finding offers.
- * @return the {@link PaginatedListTo list} of matching {@link OfferEto}s.
- */
- @Path("/offer/search")
- @POST
- public PaginatedListTo findOfferEtosByPost(OfferSearchCriteriaTo searchCriteriaTo);
-
- /**
- * Delegates to {@link Offermanagement#findProductEtos}.
- *
- * @param searchCriteriaTo the pagination and search criteria to be used for finding products.
- * @return the {@link PaginatedListTo list} of matching {@link ProductEto}s.
- */
- @Path("/product/search")
- @POST
- public PaginatedListTo findProductEtosByPost(ProductSearchCriteriaTo searchCriteriaTo);
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/service/impl/rest/OffermanagementRestServiceImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/service/impl/rest/OffermanagementRestServiceImpl.java
deleted file mode 100644
index 0dc031906..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/offermanagement/service/impl/rest/OffermanagementRestServiceImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package io.oasp.gastronomy.restaurant.offermanagement.service.impl.rest;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Blob;
-import java.sql.SQLException;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.sql.rowset.serial.SerialBlob;
-import javax.sql.rowset.serial.SerialException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
-
-import io.oasp.gastronomy.restaurant.general.logic.api.to.BinaryObjectEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.Offermanagement;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.DrinkEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.MealEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductEto;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductFilter;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.ProductSortBy;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.SideDishEto;
-import io.oasp.gastronomy.restaurant.offermanagement.service.api.rest.OffermanagementRestService;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-/**
- */
-@Named("OffermanagementRestService")
-public class OffermanagementRestServiceImpl implements OffermanagementRestService {
-
- private Offermanagement offermanagement;
-
- /**
- * @param offerManagement the offerManagement to be set
- */
- @Inject
- public void setOffermanagement(Offermanagement offerManagement) {
-
- this.offermanagement = offerManagement;
- }
-
- @Override
- public OfferEto getOffer(long id) {
-
- return this.offermanagement.findOffer(id);
- }
-
- @Override
- public OfferEto saveOffer(OfferEto offer) {
-
- return this.offermanagement.saveOffer(offer);
- }
-
- @Override
- @Deprecated
- public OfferEto updateOffer(OfferEto offer) {
-
- return this.offermanagement.saveOffer(offer);
- }
-
- @Override
- @Deprecated
- public List getAllOffers() {
-
- return this.offermanagement.findAllOffers();
- }
-
- @Override
- @Deprecated
- public List getAllProducts() {
-
- return this.offermanagement.findAllProducts();
- }
-
- @Override
- public ProductEto saveProduct(ProductEto product) {
-
- return this.offermanagement.saveProduct(product);
- }
-
- @Override
- @Deprecated
- public List getAllMeals() {
-
- return this.offermanagement.findAllMeals();
- }
-
- @Override
- @Deprecated
- public List getAllDrinks() {
-
- return this.offermanagement.findAllDrinks();
- }
-
- @Override
- @Deprecated
- public List getAllSideDishes() {
-
- return this.offermanagement.findAllSideDishes();
- }
-
- @Override
- public void deleteOffer(long id) {
-
- this.offermanagement.deleteOffer(id);
- }
-
- @Override
- public ProductEto findProductByRevision(long id, Long revision) {
-
- if (revision != null) {
- return this.offermanagement.findProductByRevision(id, revision);
- } else {
- return this.offermanagement.findProduct(id);
- }
- }
-
- @Override
- public ProductEto findProduct(long id) {
-
- return this.offermanagement.findProduct(id);
- }
-
- @Override
- @Deprecated
- public void updateProduct(ProductEto product) {
-
- this.offermanagement.saveProduct(product);
- }
-
- @Override
- public boolean isProductInUseByOffer(long id) {
-
- return this.offermanagement.isProductInUseByOffer(findProduct(id));
- }
-
- @Override
- public void deleteProduct(long id) {
-
- this.offermanagement.deleteProduct(id);
- }
-
- @Override
- @Deprecated
- public List getFilteredOffers(OfferFilter offerFilter, OfferSortBy sortBy) {
-
- return this.offermanagement.findOffersFiltered(offerFilter, sortBy);
- }
-
- @Override
- @Deprecated
- public List getFilteredProducts(ProductFilter productFilter, ProductSortBy sortBy) {
-
- return this.offermanagement.findProductsFiltered(productFilter, sortBy);
- }
-
- @Override
- public void updateProductPicture(long productId, BinaryObjectEto binaryObjectEto, InputStream picture)
- throws SerialException, SQLException, IOException {
-
- Blob blob = new SerialBlob(IOUtils.readBytesFromStream(picture));
- this.offermanagement.updateProductPicture(productId, blob, binaryObjectEto);
-
- }
-
- @Override
- public MultipartBody getProductPicture(long productId) throws SQLException, IOException {
-
- Blob blob = this.offermanagement.findProductPictureBlob(productId);
- // REVIEW arturk88 (hohwille) we need to find another way to stream the blob without loading into heap.
- // https://github.com/oasp/oasp4j-sample/pull/45
- byte[] data = IOUtils.readBytesFromStream(blob.getBinaryStream());
-
- List atts = new LinkedList<>();
- atts.add(new Attachment("binaryObjectEto", MediaType.APPLICATION_JSON,
- this.offermanagement.findProductPicture(productId)));
- atts.add(new Attachment("blob", MediaType.APPLICATION_OCTET_STREAM, new ByteArrayInputStream(data)));
- return new MultipartBody(atts, true);
-
- }
-
- @Override
- @Deprecated
- public Response getProductRawPicture(long productId) throws SQLException, IOException {
-
- Blob blob = this.offermanagement.findProductPictureBlob(productId);
- if (blob != null) {
- byte[] data = IOUtils.readBytesFromStream(blob.getBinaryStream());
- BinaryObjectEto metadata = this.offermanagement.findProductPicture(productId);
- return Response.ok(new ByteArrayInputStream(data)).header("Content-Type", metadata.getMimeType()).build();
- } else {
- return Response.noContent().build();
- }
- }
-
- @Override
- public void deleteProductPicture(long productId) {
-
- this.offermanagement.deleteProductPicture(productId);
- }
-
- @Override
- public PaginatedListTo findOfferEtosByPost(OfferSearchCriteriaTo searchCriteriaTo) {
-
- return this.offermanagement.findOfferEtos(searchCriteriaTo);
- }
-
- @Override
- public PaginatedListTo findProductEtosByPost(ProductSearchCriteriaTo searchCriteriaTo) {
-
- return this.offermanagement.findProductEtos(searchCriteriaTo);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/batch/impl/billexport/processor/BillProcessor.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/batch/impl/billexport/processor/BillProcessor.java
deleted file mode 100644
index 8f9081d0d..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/batch/impl/billexport/processor/BillProcessor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.batch.impl.billexport.processor;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillCto;
-
-import javax.inject.Inject;
-
-import org.springframework.batch.item.ItemProcessor;
-
-/**
- * Implementation of ItemProcessor. It finds BillCto by id and returns it.
- *
- */
-public class BillProcessor implements ItemProcessor {
-
- private Salesmanagement salesmanagement;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public BillCto process(Long item) throws Exception {
-
- return this.salesmanagement.findBill(item);
- }
-
- /**
- * @param salesmanagement the salesmanagement to set
- */
- @Inject
- public void setSalesmanagement(Salesmanagement salesmanagement) {
-
- this.salesmanagement = salesmanagement;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/batch/impl/billexport/writer/BillCompositeWriter.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/batch/impl/billexport/writer/BillCompositeWriter.java
deleted file mode 100644
index 1ef079937..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/batch/impl/billexport/writer/BillCompositeWriter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.batch.impl.billexport.writer;
-
-import static com.google.common.collect.Lists.newArrayList;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ItemStreamException;
-import org.springframework.batch.item.file.ResourceAwareItemWriterItemStream;
-import org.springframework.batch.item.file.transform.LineAggregator;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.io.Resource;
-
-/**
- * Implementation of ItemWriter. It gets BillCto and writes it in csv format into file.
- *
- */
-public class BillCompositeWriter implements ResourceAwareItemWriterItemStream, InitializingBean {
-
- private static final Logger LOG = LoggerFactory.getLogger(BillCompositeWriter.class);
-
- private ResourceAwareItemWriterItemStream delegate;
-
- private LineAggregator billLineAggregator;
-
- private LineAggregator positionLineAggregator;
-
- private Resource resource;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void afterPropertiesSet() throws Exception {
-
- LOG.debug("Resource: " + this.resource);
-
- this.delegate.setResource(this.resource);
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void open(ExecutionContext executionContext) throws ItemStreamException {
-
- this.delegate.open(executionContext);
-
- LOG.debug("Bill composite writed opened");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void update(ExecutionContext executionContext) throws ItemStreamException {
-
- this.delegate.update(executionContext);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void close() throws ItemStreamException {
-
- this.delegate.close();
-
- LOG.debug("Bill composite writed closed");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void write(List items) throws Exception {
-
- List lines = newArrayList();
- for (BillCto item : items) {
- String billLine = this.billLineAggregator.aggregate(item.getBill());
- for (OrderPositionEto position : item.getPositions()) {
- String positionLine = this.positionLineAggregator.aggregate(position);
- lines.add(billLine + "," + positionLine);
- LOG.debug("Write bill line, offer name: " + position.getOfferName());
- }
- }
- this.delegate.write(lines);
- }
-
- /**
- * {@inheritDoc}
- */
-
- @Override
- public void setResource(Resource resource) {
-
- this.resource = resource;
- }
-
- /**
- * @param delegate the delegate to set
- */
- public void setDelegate(ResourceAwareItemWriterItemStream delegate) {
-
- this.delegate = delegate;
- }
-
- /**
- * @param billLineAggregator the billLineAggregator to set
- */
- public void setBillLineAggregator(LineAggregator billLineAggregator) {
-
- this.billLineAggregator = billLineAggregator;
- }
-
- /**
- * @param positionLineAggregator the positionLineAggregator to set
- */
- public void setPositionLineAggregator(LineAggregator positionLineAggregator) {
-
- this.positionLineAggregator = positionLineAggregator;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/Bill.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/Bill.java
deleted file mode 100644
index 0e90ff839..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/Bill.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api;
-
-import io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.validation.NotNegativeMoney;
-
-import java.util.List;
-
-/**
- * This is the interface for a {@link Bill}. It represents the actual payment for an {@link Order}.
- *
- */
-public interface Bill extends ApplicationEntity {
-
- /**
- * @return the total amount that has to be payed for this {@link Bill}.
- */
- Money getTotal();
-
- /**
- * @param total is the new {@link #getTotal() total amount}.
- */
- void setTotal(Money total);
-
- /**
- * @return the tip (voluntary payment in addition to {@link #getTotal() total amount}).
- */
- @NotNegativeMoney(message = "The tip must not be negative!")
- Money getTip();
-
- /**
- * @param tip is the new {@link #getTip() tip}.
- */
- void setTip(Money tip);
-
- /**
- * @return {@code true} if this {@link Bill} has been payed, {@code false} otherwise.
- */
- boolean isPayed();
-
- /**
- * @param payed is the new value of {@link #isPayed() payed}.
- */
- void setPayed(boolean payed);
-
- /**
- * @return the {@link List} with the {@link OrderPosition#getId() IDs} of the {@link OrderPosition}s.
- */
- List getOrderPositionIds();
-
- /**
- * @param ids are the new {@link #getOrderPositionIds() orderPositionIds}.
- */
- void setOrderPositionIds(List ids);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/Order.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/Order.java
deleted file mode 100644
index ecb350819..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/Order.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api;
-
-import javax.validation.constraints.NotNull;
-
-import io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-
-/**
- * This is the interface for an {@link Order}. It is {@link #getTableId() associated} with a
- * {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table} and consists of multiple {@link OrderPosition
- * positions}.
- *
- */
-public interface Order extends ApplicationEntity {
-
- /**
- * @return the {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table#getId() ID} of the associated
- * {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table} where this {@link Order} was
- * disposed.
- */
- @NotNull
- long getTableId();
-
- /**
- * @param tableId the new {@link #getTableId() tableId}.
- */
- void setTableId(long tableId);
-
- /**
- * @return the {@link OrderState state} of this {@link Order}.
- */
- @NotNull
- OrderState getState();
-
- /**
- * @param state is the new {@link #getState() state}.
- */
- void setState(OrderState state);
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/OrderPosition.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/OrderPosition.java
deleted file mode 100644
index e09d6750b..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/OrderPosition.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api;
-
-import javax.validation.constraints.NotNull;
-
-import io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.validation.NotNegativeMoney;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.ProductOrderState;
-
-/**
- * This is the interface for an {@link OrderPosition}.
- *
- */
-public interface OrderPosition extends ApplicationEntity {
-
- /**
- * @return the {@link Order#getId ID} of the {@link Order} this {@link OrderPosition} belongs to.
- */
- @NotNull
- Long getOrderId();
-
- /**
- * @param orderId is the new {@link #getOrderId() orderId}.
- */
- void setOrderId(Long orderId);
-
- /**
- * @return the {@link io.oasp.gastronomy.restaurant.staffmanagement.common.api.StaffMember#getId() ID} of the
- * {@link io.oasp.gastronomy.restaurant.staffmanagement.common.api.StaffMember Cook} assigned to this
- * {@link OrderPosition} or {@code null} if it is unassigned.
- */
- Long getCookId();
-
- /**
- * @param cookId the new {@link #getCookId() cook ID} or {@code null} to remove the assignment.
- */
- void setCookId(Long cookId);
-
- /**
- * @return the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getId() ID} of the
- * {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} associated. Not stored as foreign
- * key and might not point to an existing
- * {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} for historic {@link OrderPosition}s.
- */
- @NotNull
- Long getOfferId();
-
- /**
- * @param offerId is the new {@link #getOfferId() offerId}.
- */
- void setOfferId(Long offerId);
-
- /**
- * @return the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer#getName() name} of the
- * {@link #getOfferId() associated} {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer}.
- * This is stored redundant so that it is still available later if the
- * {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} has been changed.
- */
- @NotNull
- String getOfferName();
-
- /**
- * @param offerName is the new {@link #getOfferName() offerName}.
- */
- void setOfferName(String offerName);
-
- /**
- * @return the current {@link OrderPositionState state}.
- */
- @NotNull
- OrderPositionState getState();
-
- /**
- * @return the current {@link ProductOrderState state}.
- */
- ProductOrderState getDrinkState();
-
- /**
- * @param state the new {@link #getState() state}.
- */
- void setState(OrderPositionState state);
-
- /**
- * @param drinkState the new {@link #getDrinkState() state}.
- */
- void setDrinkState(ProductOrderState drinkState);
-
- /**
- * @return the price of the {@link #getOfferId() associated}
- * {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer}. This is stored redundant so that it
- * is still available later if the {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer} has
- * been changed.
- */
- @NotNull
- @NotNegativeMoney
- Money getPrice();
-
- /**
- * @param price is the new {@link #getPrice() price}.
- */
- void setPrice(Money price);
-
- /**
- * @return the comment for this {@link OrderPosition} (e.g. "extra spicy").
- */
- String getComment();
-
- /**
- * @param comment is the new {@link #getComment() comment}.
- */
- void setComment(String comment);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/CreditCardType.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/CreditCardType.java
deleted file mode 100644
index a2a2492f8..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/CreditCardType.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype;
-
-/**
- * Enum with the types of a credit card.
- *
- */
-public enum CreditCardType {
-
- /** This represents the VISA card. */
- VISA,
-
- /** This represents the American Express card. */
- AMEX,
-
- /** This represents the Mastercard. */
- MASTERCARD;
-
- /**
- * @return {@code true}, if the {@link CreditCardType} equals {@link CreditCardType#VISA}. {@code false}
- * otherwise.
- */
- public boolean isVisa() {
-
- return this == VISA;
- }
-
- /**
- * @return {@code true}, if the {@link CreditCardType} equals {@link CreditCardType#AMEX}. {@code false}
- * otherwise.
- */
- public boolean isAmex() {
-
- return this == AMEX;
- }
-
- /**
- * @return {@code true}, if the {@link CreditCardType} equals {@link CreditCardType#MASTERCARD}.
- * {@code false} otherwise.
- */
- public boolean isMastercard() {
-
- return this == MASTERCARD;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/OrderPositionState.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/OrderPositionState.java
deleted file mode 100644
index 25bff1fe5..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/OrderPositionState.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype;
-
-/**
- * Represents the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition#getState() state} of an
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}.
- *
- */
-public enum OrderPositionState {
-
- /**
- * The initial state of an {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}.
- */
- ORDERED,
-
- /**
- * The state of an {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition} that has been
- * prepared by the kitchen and can be served by the waiter.
- */
- PREPARED,
-
- /**
- * The state of an {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition} that has been
- * delivered been delivered to the table by the waiter.
- */
- DELIVERED,
-
- /**
- * The state of an {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition} that has been payed
- * by the customer.
- */
- PAYED,
-
- /**
- * The state of an {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition} that has been
- * cancelled.
- */
- CANCELLED;
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity} is ordered
- */
- public boolean isOrdered() {
-
- return (this == ORDERED);
- }
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity} is closed (has
- * reached its final state).
- */
- public boolean isClosed() {
-
- return ((this == PAYED) || (this == CANCELLED));
- }
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity} is delivered.
- */
- public boolean isDelivered() {
-
- return (this == DELIVERED);
- }
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity} is prepared
- */
- public boolean isPrepared() {
-
- return (this == PREPARED);
- }
-
- /**
- * @return {@code true} if the
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity} is payed
- */
- public boolean isPayed() {
-
- return (this == PAYED);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/OrderState.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/OrderState.java
deleted file mode 100644
index bc4a02680..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/OrderState.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype;
-
-/**
- * Represents the state of an {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order}.
- *
- */
-public enum OrderState {
-
- /**
- * The state if the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order} has at least one open
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}.
- */
- OPEN,
-
- /**
- * The state if the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order} is closed. Then also all
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition} have to be closed.
- */
- CLOSED;
-
- /**
- * @return {@code true} if the {@link io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderEntity}
- * is ordered
- */
- public boolean isOpen() {
-
- return (this == OPEN);
- }
-
- /**
- * @return {@code true} if the {@link io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderEntity}
- * is closed (has reached its final state).
- */
- public boolean isClosed() {
-
- return ((this == CLOSED));
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/PaymentStatus.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/PaymentStatus.java
deleted file mode 100644
index 14a231eb7..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/PaymentStatus.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype;
-
-/**
- *
- */
-public enum PaymentStatus {
-
- /**
- * This status describes a successful payment transaction.
- */
- SUCCESS,
-
- /**
- * This status describes a unsuccessful payment transaction. The input data is not correct.
- */
- INPUT_DATA_ERROR,
-
- /**
- * This status describes a unsuccessful payment transaction. The connection timed out.
- */
- TIME_OUT_ERROR;
-
- /**
- * @return {@code true}, if the {@link PaymentStatus} equals {@link PaymentStatus#SUCCESS}.
- * {@code false} otherwise.
- */
- public boolean isSuccessful() {
- return this == SUCCESS;
- }
-
- /**
- *
- * @return {@code true}, if the {@link PaymentStatus} equals {@link PaymentStatus#INPUT_DATA_ERROR}
- * or {@link PaymentStatus#TIME_OUT_ERROR}. {@code false} otherwise.
- */
- public boolean isUnsuccessful() {
- return (this == INPUT_DATA_ERROR || this == TIME_OUT_ERROR);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/ProductOrderState.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/ProductOrderState.java
deleted file mode 100644
index a6bdba3bd..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/datatype/ProductOrderState.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype;
-
-/**
- * Represents the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition#getDrinkState() state}
- * of an {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}.
- *
- */
-public enum ProductOrderState {
-
- /**
- * The initial state of a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink }.
- */
- ORDERED,
-
- /**
- * The state of a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink} that has been prepared by the
- * bar keeper and can be served by the waiter.
- */
- PREPARED,
-
- /**
- * The state of a {@link io.oasp.gastronomy.restaurant.offermanagement.common.api.Drink} that has been delivered to
- * the table by the waiter.
- */
- DELIVERED;
-
- /**
- * @return true if the {@link io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.DrinkEntity}
- * is ordered
- */
- public boolean isOrdered() {
-
- return (this == ORDERED);
- }
-
- /**
- * @return true if the {@link io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.DrinkEntity}
- * is prepared
- */
- public boolean isPrepared() {
-
- return (this == PREPARED);
- }
-
- /**
- * @return true if the {@link io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.DrinkEntity}
- * is delivered.
- */
- public boolean isDelivered() {
-
- return (this == DELIVERED);
- }
-
-}
\ No newline at end of file
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/exception/ChangeTableIllegalStateCombinationException.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/exception/ChangeTableIllegalStateCombinationException.java
deleted file mode 100644
index 0b35f35fe..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/common/api/exception/ChangeTableIllegalStateCombinationException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.common.api.exception;
-
-import io.oasp.gastronomy.restaurant.general.common.api.NlsBundleApplicationRoot;
-import io.oasp.gastronomy.restaurant.general.common.api.exception.ApplicationBusinessException;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.tablemanagement.logic.api.to.TableEto;
-
-/**
- * This exception is thrown if a table has a specific state(occupied) that is illegal for the UcChangeTableImpl and
- * caused it to fail.
- *
- */
-public class ChangeTableIllegalStateCombinationException extends ApplicationBusinessException {
-
- /**
- * UID for serialization.
- */
- private static final long serialVersionUID = 1L;
-
- /**
- *
- * The constructor.
- *
- * @param order OrderEto which is going to be transfered to the targetTable
- * @param targetTable is the table which is getting the Order
- */
- public ChangeTableIllegalStateCombinationException(OrderEto order, TableEto targetTable) {
-
- super(createBundle(NlsBundleApplicationRoot.class).errorChangeTableIllegalStateCombination(order.getId(),
- targetTable.getNumber()));
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/BillEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/BillEntity.java
deleted file mode 100644
index 88d90b286..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/BillEntity.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.Bill;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition;
-
-/**
- * {@link ApplicationPersistenceEntity Entity} that represents the {@link Bill} related to one or multiple
- * {@link OrderPosition order positions}.
- *
- */
-@Entity
-@Table(name = "Bill")
-public class BillEntity extends ApplicationPersistenceEntity implements Bill {
-
- private static final long serialVersionUID = 1L;
-
- private boolean payed;
-
- private List orderPositions;
-
- private Money total;
-
- private Money tip;
-
- /**
- * The constructor.
- */
- public BillEntity() {
-
- super();
- }
-
- /**
- * @return the {@link List} of {@link OrderPositionEntity} objects associated with this {@link BillEntity}.
- */
- @ManyToMany(fetch = FetchType.EAGER)
- @Column(name = "orderPositionsId")
- @JoinTable(name = "BillOrderPosition", joinColumns = {
- @JoinColumn(name = "billId") }, inverseJoinColumns = @JoinColumn(name = "orderPositionsId")
-
- )
-
- public List getOrderPositions() {
-
- return this.orderPositions;
- }
-
- @Override
- @Transient
- public List getOrderPositionIds() {
-
- if (this.orderPositions == null) {
- return null;
- }
- List result = new ArrayList<>(this.orderPositions.size());
- for (OrderPositionEntity position : this.orderPositions) {
- result.add(position.getId());
- }
- return result;
- }
-
- @Override
- public void setOrderPositionIds(List ids) {
-
- if (ids == null) {
- this.orderPositions = null;
- } else {
- List list = new ArrayList<>(ids.size());
- for (Long id : ids) {
- OrderPositionEntity position = new OrderPositionEntity();
- position.setId(id);
- list.add(position);
- }
- this.orderPositions = list;
- }
- }
-
- /**
- * Sets the field 'orderPositions'.
- *
- * @param orderPositions New value for orderPositions
- */
- public void setOrderPositions(List orderPositions) {
-
- this.orderPositions = orderPositions;
- }
-
- @Override
- public Money getTotal() {
-
- return this.total;
- }
-
- @Override
- public void setTotal(Money total) {
-
- this.total = total;
- }
-
- @Override
- public Money getTip() {
-
- return this.tip;
- }
-
- @Override
- public void setTip(Money tip) {
-
- this.tip = tip;
- }
-
- @Override
- public boolean isPayed() {
-
- return this.payed;
- }
-
- @Override
- public void setPayed(boolean payed) {
-
- this.payed = payed;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/OrderEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/OrderEntity.java
deleted file mode 100644
index 11dca3ec9..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/OrderEntity.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *
- */
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-
-/**
- * {@link ApplicationPersistenceEntity Entity} that represents an {@link Order} of a customer associated with the
- * according {@link io.oasp.gastronomy.restaurant.tablemanagement.dataaccess.api.TableEntity}.
- *
- */
-@Entity
-// Order is a reserved word in SQL/RDBMS and can not be used as table name
-@Table(name = "RestaurantOrder")
-public class OrderEntity extends ApplicationPersistenceEntity implements Order {
-
- private static final long serialVersionUID = 1L;
-
- private long tableId;
-
- private OrderState state;
-
- /**
- * The constructor.
- */
- public OrderEntity() {
-
- super();
- this.state = OrderState.OPEN;
- }
-
- @Override
- @Column(name = "tableId")
- public long getTableId() {
-
- return this.tableId;
- }
-
- @Override
- public void setTableId(long tableId) {
-
- this.tableId = tableId;
- }
-
- @Override
- public OrderState getState() {
-
- return this.state;
- }
-
- @Override
- public void setState(OrderState state) {
-
- this.state = state;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/OrderPositionEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/OrderPositionEntity.java
deleted file mode 100644
index 43aa75267..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/OrderPositionEntity.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.ProductOrderState;
-
-/**
- * {@link ApplicationPersistenceEntity Entity} that represents a single {@link OrderPosition position} of an
- * {@link OrderEntity}.
- *
- */
-@Entity
-@Table(name = "OrderPosition")
-public class OrderPositionEntity extends ApplicationPersistenceEntity implements OrderPosition {
-
- private static final long serialVersionUID = 1L;
-
- private OrderEntity order;
-
- private Long cookId;
-
- private Long offerId;
-
- private String offerName;
-
- private OrderPositionState state;
-
- private ProductOrderState drinkState;
-
- private Money price;
-
- private String comment;
-
- /**
- * The constructor.
- */
- public OrderPositionEntity() {
-
- super();
- this.state = OrderPositionState.ORDERED;
- }
-
- /**
- * @return the {@link OrderEntity order} this {@link OrderPositionEntity} is associated with.
- */
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "orderId")
- @NotNull
- public OrderEntity getOrder() {
-
- return this.order;
- }
-
- /**
- * @param order the new value of {@link #getOrder()}.
- */
- public void setOrder(OrderEntity order) {
-
- this.order = order;
- }
-
- @Override
- @Transient
- public Long getOrderId() {
-
- if (this.order == null) {
- return null;
- }
- return this.order.getId();
- }
-
- @Override
- public void setOrderId(Long orderId) {
-
- if (orderId == null) {
- this.order = null;
- }
- OrderEntity orderEntity = new OrderEntity();
- orderEntity.setId(orderId);
- this.order = orderEntity;
- }
-
- @Override
- @Column(name = "cookId")
- public Long getCookId() {
-
- return this.cookId;
- }
-
- @Override
- public void setCookId(Long cookId) {
-
- this.cookId = cookId;
- }
-
- @Override
- @Column(name = "offerId")
- public Long getOfferId() {
-
- return this.offerId;
- }
-
- @Override
- public void setOfferId(Long offerId) {
-
- this.offerId = offerId;
- }
-
- @Override
- public String getOfferName() {
-
- return this.offerName;
- }
-
- @Override
- public void setOfferName(String offerName) {
-
- this.offerName = offerName;
- }
-
- @Override
- public OrderPositionState getState() {
-
- return this.state;
- }
-
- @Override
- public void setState(OrderPositionState state) {
-
- this.state = state;
- }
-
- @Override
- public Money getPrice() {
-
- return this.price;
- }
-
- @Override
- public void setPrice(Money price) {
-
- this.price = price;
- }
-
- @Override
- /*
- * Uncomment the following Column annotation if the database used is Oracle 11g
- */
- // @Column(name = "\"comment\"")
- public String getComment() {
-
- return this.comment;
- }
-
- @Override
- public void setComment(String comment) {
-
- this.comment = comment;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ProductOrderState getDrinkState() {
-
- return this.drinkState;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDrinkState(ProductOrderState drinkState) {
-
- this.drinkState = drinkState;
-
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/BillDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/BillDao.java
deleted file mode 100644
index b4a9a1114..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/BillDao.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.BillEntity;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link BillEntity} entity.
- *
- */
-public interface BillDao extends ApplicationDao {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/OrderDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/OrderDao.java
deleted file mode 100644
index 0f830fb98..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/OrderDao.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.util.List;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link OrderEntity} entity.
- *
- */
-public interface OrderDao extends ApplicationDao {
-
- /**
- * @param tableId the {@link io.oasp.gastronomy.restaurant.tablemanagement.dataaccess.api.TableEntity#getNumber()
- * table ID} for which the open {@link OrderEntity} is requested.
- * @return the {@link OrderEntity} with the given {@link OrderEntity#getTableId() table ID} in
- * {@link OrderEntity#getState() state}
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState#OPEN} or
- * {@code null} if no such entity exists.
- */
- OrderEntity findOpenOrderByTable(long tableId);
-
- /**
- * Finds the {@link OrderEntity orders} matching the given {@link OrderSearchCriteriaTo}.
- *
- * @param criteria is the {@link OrderSearchCriteriaTo}.
- * @return the {@link List} with the matching {@link OrderEntity} objects.
- */
- PaginatedListTo findOrders(OrderSearchCriteriaTo criteria);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/OrderPositionDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/OrderPositionDao.java
deleted file mode 100644
index 83dea7ee7..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/api/dao/OrderPositionDao.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionSearchCriteriaTo;
-
-import java.util.List;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link OrderPositionEntity} entity.
- *
- */
-public interface OrderPositionDao extends ApplicationDao {
-
- /**
- * @param orderId is the {@link io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto#getId() ID} for
- * which the {@link OrderPositionEntity}s are requested.
- * @return the {@link List} of all {@link OrderPositionEntity}s {@link OrderPositionEntity#getOrderId() associated}
- * with the given orderId.
- */
- List findOrderPositionsByOrder(Long orderId);
-
- /**
- * @param orderId is the {@link io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto#getId() table ID}
- * for which the {@link OrderPositionEntity}s are requested.
- * @return the {@link List} of all {@link OrderPositionEntity}s that are NOT
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState#isClosed()
- * closed} and are {@link io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto#getId() table
- * ID} with the given {@link io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto}. Will be the
- * empty {@link List} if no such {@link OrderPositionEntity} exists.
- */
- List findOpenOrderPositionsByOrder(Long orderId);
-
- /**
- * Finds the {@link OrderPositionEntity order positions} matching the given {@link OrderPositionSearchCriteriaTo}.
- *
- * @param criteria is the {@link OrderPositionSearchCriteriaTo}.
- * @return the {@link List} with the matching {@link OrderPositionEntity} objects.
- */
- List findOrderPositions(OrderPositionSearchCriteriaTo criteria);
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/BillDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/BillDaoImpl.java
deleted file mode 100644
index aed0f6a75..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/BillDaoImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.impl.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationDaoImpl;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.BillEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao.BillDao;
-
-import javax.inject.Named;
-
-/**
- * Implementation of {@link BillDao}.
- *
- */
-@Named
-public class BillDaoImpl extends ApplicationDaoImpl implements BillDao {
-
- @Override
- public Class getEntityClass() {
-
- return BillEntity.class;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/OrderDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/OrderDaoImpl.java
deleted file mode 100644
index 4d8e4c790..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/OrderDaoImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.impl.dao;
-
-import static com.mysema.query.alias.Alias.$;
-import io.oasp.gastronomy.restaurant.general.common.api.constants.NamedQueries;
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationDaoImpl;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao.OrderDao;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.util.List;
-
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.path.EntityPathBase;
-
-/**
- * Implementation of {@link OrderDao}.
- *
- */
-@Named
-public class OrderDaoImpl extends ApplicationDaoImpl implements OrderDao {
-
- /** Logger instance. */
- private static final Logger LOG = LoggerFactory.getLogger(OrderDaoImpl.class);
-
- /**
- * The constructor.
- */
- public OrderDaoImpl() {
-
- super();
- }
-
- @Override
- public Class getEntityClass() {
-
- return OrderEntity.class;
- }
-
- @Override
- public OrderEntity findOpenOrderByTable(long tableId) {
-
- List resultList =
- getEntityManager().createNamedQuery(NamedQueries.GET_OPEN_ORDER_FOR_TABLE, OrderEntity.class)
- .setParameter("tableId", tableId).getResultList();
- if (resultList.isEmpty()) {
- return null;
- } else {
- if (resultList.size() > 1) {
- // In this case we can be robust and continue even though a data inconsistency has been detected.
- LOG.error("Multiple open orders found for table {}: {}", Long.valueOf(tableId), resultList);
- }
- return resultList.get(0);
- }
- }
-
- @Override
- public PaginatedListTo findOrders(OrderSearchCriteriaTo criteria) {
-
- OrderEntity order = Alias.alias(OrderEntity.class);
- EntityPathBase alias = $(order);
- JPAQuery query = new JPAQuery(getEntityManager()).from(alias);
-
- Long tableId = criteria.getTableId();
- if (tableId != null) {
- query.where($(order.getTableId()).eq(tableId));
- }
- OrderState state = criteria.getState();
- if (state != null) {
- query.where($(order.getState()).eq(state));
- }
-
- return findPaginated(criteria, query, alias);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/OrderPositionDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/OrderPositionDaoImpl.java
deleted file mode 100644
index 6caad226e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/dataaccess/impl/dao/OrderPositionDaoImpl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.impl.dao;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.NamedQueries;
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationDaoImpl;
-import io.oasp.gastronomy.restaurant.offermanagement.dataaccess.api.OfferEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.ProductOrderState;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao.OrderPositionDao;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionSearchCriteriaTo;
-
-import java.util.List;
-
-import javax.inject.Named;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.jpa.JPASubQuery;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.query.ListSubQuery;
-
-/**
- * Implementation of {@link OrderPositionDao}.
- *
- */
-@Named
-public class OrderPositionDaoImpl extends ApplicationDaoImpl implements OrderPositionDao {
-
- @Override
- public Class getEntityClass() {
-
- return OrderPositionEntity.class;
- }
-
- @Override
- public List findOrderPositionsByOrder(Long orderId) {
-
- OrderPositionEntity orderPosition = Alias.alias(OrderPositionEntity.class);
- EntityPathBase alias = Alias.$(orderPosition);
- JPAQuery query = new JPAQuery(getEntityManager()).from(alias);
- query.where(Alias.$(orderPosition.getOrder().getId()).eq(orderId));
- return query.list(alias);
- }
-
- @Override
- public List findOpenOrderPositionsByOrder(Long orderId) {
-
- return getEntityManager()
- .createNamedQuery(NamedQueries.GET_OPEN_ORDER_POSITIONS_FOR_ORDER, OrderPositionEntity.class)
- .setParameter("orderId", orderId).getResultList();
- }
-
- @Override
- public List findOrderPositions(OrderPositionSearchCriteriaTo criteria) {
-
- OrderPositionEntity orderPosition = Alias.alias(OrderPositionEntity.class);
- EntityPathBase alias = Alias.$(orderPosition);
- JPAQuery query = new JPAQuery(getEntityManager()).from(alias);
- Long orderId = criteria.getOrderId();
- if (orderId != null) {
- query.where(Alias.$(orderPosition.getOrder().getId()).eq(orderId));
- }
- Long cookId = criteria.getCookId();
- if (cookId != null) {
- query.where(Alias.$(orderPosition.getCookId()).eq(cookId));
- }
- OrderPositionState state = criteria.getState();
- if (state != null) {
- query.where(Alias.$(orderPosition.getState()).eq(state));
- }
- ProductOrderState drinkState = criteria.getDrinkState();
- if (drinkState != null) {
- query.where(Alias.$(orderPosition.getDrinkState()).eq(drinkState));
- }
- if (criteria.isMealOrSideDish()) {
- OfferEntity offer = Alias.alias(OfferEntity.class);
- EntityPathBase offerAlias = Alias.$(offer);
- JPASubQuery subQuery =
- new JPASubQuery().from(offerAlias).where(
- Alias.$(offer.getMeal().getId()).isNotNull().or(Alias.$(offer.getSideDish().getId()).isNotNull()));
- ListSubQuery listSubQuery = subQuery.list(Alias.$(offer.getId()));
- query.where(Alias.$(orderPosition.getOfferId()).in(listSubQuery));
-
- //
- //
- // query.innerJoin(offer.).on(Alias.$(orderPosition.getOfferId()).eq(Alias.$(offer.getId())))
- // .where(Alias.$(offer.getMealId()).isNotNull().or(Alias.$(offer.getSideDishId()).isNotNull()));
- }
- applyPagination(criteria.getPagination(), query);
- return query.list(alias);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/Salesmanagement.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/Salesmanagement.java
deleted file mode 100644
index dbf5deb0a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/Salesmanagement.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcChangeTable;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrderPosition;
-
-/**
- * This is the interface for the {@link Salesmanagement} component of the application core.
- *
- */
-public interface Salesmanagement extends UcChangeTable, UcFindBill, UcFindOrder, UcFindOrderPosition, UcManageBill,
- UcManageOrder, UcManageOrderPosition {
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BankPaymentData.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BankPaymentData.java
deleted file mode 100644
index 046c3c986..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BankPaymentData.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-/**
- * This class acts as a POJO.
- *
- */
-public class BankPaymentData extends PaymentData {
-
- private static final long serialVersionUID = 1L;
-
- private String accountOwnerName;
-
- private Long accountNumber;
-
- private Long bankCode;
-
- private String bankName;
-
- /**
- * Returns the field 'accountOwnerName'.
- *
- * @return Value of accountOwnerName
- */
- public String getAccountOwnerName() {
-
- return this.accountOwnerName;
- }
-
- /**
- * Sets the field 'accountOwnerName'.
- *
- * @param accountOwnerName New value for accountOwnerName
- */
- public void setAccountOwnerName(String accountOwnerName) {
-
- this.accountOwnerName = accountOwnerName;
- }
-
- /**
- * Returns the field 'accountNumber'.
- *
- * @return Value of accountNumber
- */
- public Long getAccountNumber() {
-
- return this.accountNumber;
- }
-
- /**
- * Sets the field 'accountNumber'.
- *
- * @param accountNumber New value for accountNumber
- */
- public void setAccountNumber(Long accountNumber) {
-
- this.accountNumber = accountNumber;
- }
-
- /**
- * Returns the field 'bankCode'.
- *
- * @return Value of bankCode
- */
- public Long getBankCode() {
-
- return this.bankCode;
- }
-
- /**
- * Sets the field 'bankCode'.
- *
- * @param bankCode New value for bankCode
- */
- public void setBankCode(Long bankCode) {
-
- this.bankCode = bankCode;
- }
-
- /**
- * Returns the field 'bankName'.
- *
- * @return Value of bankName
- */
- public String getBankName() {
-
- return this.bankName;
- }
-
- /**
- * Sets the field 'bankName'.
- *
- * @param bankName New value for bankName
- */
- public void setBankName(String bankName) {
-
- this.bankName = bankName;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BillCto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BillCto.java
deleted file mode 100644
index 7a270da55..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BillCto.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.module.basic.common.api.to.AbstractCto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * {@link AbstractCto CTO} for an {@link #getBill() bill} with its {@link #getPositions() positions}.
- *
- */
-public class BillCto extends AbstractCto {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- private BillEto bill;
-
- private List positions;
-
- /**
- * The constructor.
- */
- public BillCto() {
-
- super();
- }
-
- /**
- * @return positions
- */
- public List getPositions() {
-
- if (this.positions == null) {
- this.positions = new ArrayList<>();
- }
- return this.positions;
- }
-
- /**
- * @param positions the positions to set
- */
- public void setPositions(List positions) {
-
- this.positions = positions;
- }
-
- /**
- * @param bill the bill to set
- */
- public void setBill(BillEto bill) {
-
- this.bill = bill;
- }
-
- /**
- * @return bill
- */
- public BillEto getBill() {
-
- return this.bill;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BillEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BillEto.java
deleted file mode 100644
index 6d6cf4706..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/BillEto.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.Bill;
-import io.oasp.module.basic.common.api.to.AbstractEto;
-
-import java.util.List;
-
-/**
- * {@link AbstractEto ETO} for {@link Bill}.
- *
- */
-public class BillEto extends AbstractEto implements Bill {
-
- private static final long serialVersionUID = 1L;
-
- private boolean payed;
-
- private List orderPositionIds;
-
- private Money total;
-
- private Money tip;
-
- /**
- * The constructor.
- */
- public BillEto() {
-
- super();
- }
-
- @Override
- public List getOrderPositionIds() {
-
- return this.orderPositionIds;
- }
-
- @Override
- public void setOrderPositionIds(List orderPositions) {
-
- this.orderPositionIds = orderPositions;
- }
-
- @Override
- public Money getTotal() {
-
- return this.total;
- }
-
- @Override
- public void setTotal(Money total) {
-
- this.total = total;
- }
-
- @Override
- public Money getTip() {
-
- return this.tip;
- }
-
- @Override
- public void setTip(Money tip) {
-
- this.tip = tip;
- }
-
- @Override
- public boolean isPayed() {
-
- return this.payed;
- }
-
- @Override
- public void setPayed(boolean payed) {
-
- this.payed = payed;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/CreditCardPaymentData.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/CreditCardPaymentData.java
deleted file mode 100644
index 05d9f8132..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/CreditCardPaymentData.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.CreditCardType;
-
-/**
- * This class acts as a POJO.
- *
- */
-public class CreditCardPaymentData extends PaymentData {
-
- private static final long serialVersionUID = 1L;
-
- private String creditCardNumber;
-
- private String creditCardCode;
-
- private String creditCardOwnerName;
-
- private String creditCardOwnerSurname;
-
- private String creditCardEndOfValidity;
-
- private CreditCardType creditCardType;
-
- /**
- * Returns the field 'creditCardNumber'.
- *
- * @return Value of creditCardNumber
- */
- public String getCreditCardNumber() {
-
- return this.creditCardNumber;
- }
-
- /**
- * Sets the field 'creditCardNumber'.
- *
- * @param creditCardNumber New value for creditCardNumber
- */
- public void setCreditCardNumber(String creditCardNumber) {
-
- this.creditCardNumber = creditCardNumber;
- }
-
- /**
- * Returns the field 'creditCardCode'.
- *
- * @return Value of creditCardCode
- */
- public String getCreditCardCode() {
-
- return this.creditCardCode;
- }
-
- /**
- * Sets the field 'creditCardCode'.
- *
- * @param creditCardCode New value for creditCardCode
- */
- public void setCreditCardCode(String creditCardCode) {
-
- this.creditCardCode = creditCardCode;
- }
-
- /**
- * Returns the field 'creditCardOwnerName'.
- *
- * @return Value of creditCardOwnerName
- */
- public String getCreditCardOwnerName() {
-
- return this.creditCardOwnerName;
- }
-
- /**
- * Sets the field 'creditCardOwnerName'.
- *
- * @param creditCardOwnerName New value for creditCardOwnerName
- */
- public void setCreditCardOwnerName(String creditCardOwnerName) {
-
- this.creditCardOwnerName = creditCardOwnerName;
- }
-
- /**
- * Returns the field 'creditCardOwnerSurname'.
- *
- * @return Value of creditCardOwnerSurname
- */
- public String getCreditCardOwnerSurname() {
-
- return this.creditCardOwnerSurname;
- }
-
- /**
- * Sets the field 'creditCardOwnerSurname'.
- *
- * @param creditCardOwnerSurname New value for creditCardOwnerSurname
- */
- public void setCreditCardOwnerSurname(String creditCardOwnerSurname) {
-
- this.creditCardOwnerSurname = creditCardOwnerSurname;
- }
-
- /**
- * Returns the field 'creditCardEndOfValidity'.
- *
- * @return Value of creditCardEndOfValidity
- */
- public String getCreditCardEndOfValidity() {
-
- return this.creditCardEndOfValidity;
- }
-
- /**
- * Sets the field 'creditCardEndOfValidity'.
- *
- * @param creditCardEndOfValidity New value for creditCardEndOfValidity
- */
- public void setCreditCardEndOfValidity(String creditCardEndOfValidity) {
-
- this.creditCardEndOfValidity = creditCardEndOfValidity;
- }
-
- /**
- * Returns the field 'creditCardType'.
- *
- * @return Value of creditCardType
- */
- public CreditCardType getCreditCardType() {
-
- return this.creditCardType;
- }
-
- /**
- * Sets the field 'creditCardType'.
- *
- * @param creditCardType New value for creditCardType
- */
- public void setCreditCardType(CreditCardType creditCardType) {
-
- this.creditCardType = creditCardType;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderCto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderCto.java
deleted file mode 100644
index b17ca2fa5..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderCto.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.module.basic.common.api.to.AbstractCto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * {@link AbstractCto CTO} for an {@link #getOrder() order} with its {@link #getPositions() positions}.
- *
- */
-public class OrderCto extends AbstractCto {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- private OrderEto order;
-
- private List positions;
-
- /**
- * The constructor.
- */
- public OrderCto() {
-
- super();
- }
-
- /**
- * @return orderEto
- */
- public OrderEto getOrder() {
-
- return this.order;
- }
-
- /**
- * @param orderEto the orderEto to set
- */
- public void setOrder(OrderEto orderEto) {
-
- this.order = orderEto;
- }
-
- /**
- * @return positions
- */
- public List getPositions() {
-
- if (this.positions == null) {
- this.positions = new ArrayList<>();
- }
- return this.positions;
- }
-
- /**
- * @param positions the positions to set
- */
- public void setPositions(List positions) {
-
- this.positions = positions;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderEto.java
deleted file mode 100644
index 2ea38a15d..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderEto.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- *
- */
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-import io.oasp.module.basic.common.api.to.AbstractEto;
-
-/**
- * {@link AbstractEto ETO} for an {@link Order}.
- *
- */
-public class OrderEto extends AbstractEto implements Order {
-
- private static final long serialVersionUID = 1L;
-
- private long tableId;
-
- private OrderState state;
-
- /**
- * The constructor.
- */
- public OrderEto() {
-
- this.state = OrderState.OPEN;
- }
-
- @Override
- public long getTableId() {
-
- return this.tableId;
- }
-
- @Override
- public void setTableId(long tableId) {
-
- this.tableId = tableId;
- }
-
- @Override
- public OrderState getState() {
-
- return this.state;
- }
-
- @Override
- public void setState(OrderState state) {
-
- this.state = state;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderPositionEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderPositionEto.java
deleted file mode 100644
index 2217eee06..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderPositionEto.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.ProductOrderState;
-import io.oasp.module.basic.common.api.to.AbstractEto;
-
-/**
- * {@link AbstractEto ETO} for an {@link OrderPosition}.
- *
- */
-public class OrderPositionEto extends AbstractEto implements OrderPosition {
-
- private static final long serialVersionUID = 1L;
-
- private Long orderId;
-
- private Long cookId;
-
- private Long offerId;
-
- private String offerName;
-
- private OrderPositionState state;
-
- private ProductOrderState drinkState;
-
- private Money price;
-
- private String comment;
-
- /**
- * The constructor.
- */
- public OrderPositionEto() {
-
- this.state = OrderPositionState.ORDERED;
-
- }
-
- @Override
- public Long getOrderId() {
-
- return this.orderId;
- }
-
- @Override
- public void setOrderId(Long orderId) {
-
- this.orderId = orderId;
- }
-
- @Override
- public Long getCookId() {
-
- return this.cookId;
- }
-
- @Override
- public void setCookId(Long cookId) {
-
- this.cookId = cookId;
- }
-
- @Override
- public Long getOfferId() {
-
- return this.offerId;
- }
-
- @Override
- public void setOfferId(Long offerId) {
-
- this.offerId = offerId;
- }
-
- @Override
- public String getOfferName() {
-
- return this.offerName;
- }
-
- @Override
- public void setOfferName(String offerName) {
-
- this.offerName = offerName;
- }
-
- @Override
- public OrderPositionState getState() {
-
- return this.state;
- }
-
- @Override
- public void setState(OrderPositionState state) {
-
- this.state = state;
- }
-
- @Override
- public Money getPrice() {
-
- return this.price;
- }
-
- @Override
- public void setPrice(Money price) {
-
- this.price = price;
- }
-
- /**
- * Returns the field 'comment'.
- *
- * @return Comment as string
- */
- @Override
- public String getComment() {
-
- return this.comment;
- }
-
- /**
- * Sets the field 'comment'.
- *
- * @param comment new value for comment
- */
- @Override
- public void setComment(String comment) {
-
- this.comment = comment;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ProductOrderState getDrinkState() {
-
- return this.drinkState;
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDrinkState(ProductOrderState drinkState) {
-
- this.drinkState = drinkState;
-
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderPositionSearchCriteriaTo.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderPositionSearchCriteriaTo.java
deleted file mode 100644
index 26650a48a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderPositionSearchCriteriaTo.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.ProductOrderState;
-import io.oasp.module.jpa.common.api.to.SearchCriteriaTo;
-
-/**
- * This is the {@link SearchCriteriaTo search criteria} {@link net.sf.mmm.util.transferobject.api.TransferObject TO}
- * used to find {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}s.
- *
- */
-public class OrderPositionSearchCriteriaTo extends SearchCriteriaTo {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- private OrderPositionState state;
-
- private ProductOrderState drinkState;
-
- private Long orderId;
-
- private Long cookId;
-
- private boolean mealOrSideDish;
-
- /**
- * The constructor.
- */
- public OrderPositionSearchCriteriaTo() {
-
- super();
- }
-
- /**
- * @return orderPositionState
- */
- public OrderPositionState getState() {
-
- return this.state;
- }
-
- /**
- * @param orderPositionState the orderPositionState to set
- */
- public void setState(OrderPositionState orderPositionState) {
-
- this.state = orderPositionState;
- }
-
- /**
- * @return drinkState of the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition }
- */
- public ProductOrderState getDrinkState() {
-
- return this.drinkState;
- }
-
- /**
- * @param drinkState the drinkState to set
- */
- public void setDrinkState(ProductOrderState drinkState) {
-
- this.drinkState = drinkState;
- }
-
- /**
- * @return the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition#getOrderId() order ID} of
- * the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}s to find or {@code null}
- * if no such criteria shall be added.
- */
- public Long getOrderId() {
-
- return this.orderId;
- }
-
- /**
- * @param orderId the orderId to set
- */
- public void setOrderId(Long orderId) {
-
- this.orderId = orderId;
- }
-
- /**
- * @return the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition#getCookId() cook ID} of
- * the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}s to find or {@code null}
- * if no such criteria shall be added.
- */
- public Long getCookId() {
-
- return this.cookId;
- }
-
- /**
- * @param cookId the cookId to set
- */
- public void setCookId(Long cookId) {
-
- this.cookId = cookId;
- }
-
- /**
- * @return {@code true} if only {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition}s shall
- * be found that have a meal or a side-dish associated (exclude drink only positions), {@code false} if no
- * such criteria shall be added.
- */
- public boolean isMealOrSideDish() {
-
- return this.mealOrSideDish;
- }
-
- /**
- * @param mealOrSideDish the mealOrSideDish to set
- */
- public void setMealOrSideDish(boolean mealOrSideDish) {
-
- this.mealOrSideDish = mealOrSideDish;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderSearchCriteriaTo.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderSearchCriteriaTo.java
deleted file mode 100644
index 5e9b3bf04..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/OrderSearchCriteriaTo.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-import io.oasp.module.jpa.common.api.to.SearchCriteriaTo;
-
-/**
- * This is the {@link SearchCriteriaTo search criteria} {@link net.sf.mmm.util.transferobject.api.TransferObject TO}
- * used to find {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order}s.
- *
- */
-public class OrderSearchCriteriaTo extends SearchCriteriaTo {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- private OrderState state;
-
- private Long tableId;
-
- /**
- * The constructor.
- */
- public OrderSearchCriteriaTo() {
-
- super();
- }
-
- /**
- * @return state
- */
- public OrderState getState() {
-
- return this.state;
- }
-
- /**
- * @param state the state to set
- */
- public void setState(OrderState state) {
-
- this.state = state;
- }
-
- /**
- * @return tableId
- */
- public Long getTableId() {
-
- return this.tableId;
- }
-
- /**
- * @param tableId the tableId to set
- */
- public void setTableId(Long tableId) {
-
- this.tableId = tableId;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/PaymentData.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/PaymentData.java
deleted file mode 100644
index 9250df8af..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/to/PaymentData.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to;
-
-import java.io.Serializable;
-
-/**
- * This class describes the abstract data type {@link PaymentData}.
- *
- */
-public abstract class PaymentData implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcChangeTable.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcChangeTable.java
deleted file mode 100644
index f3fb72fa0..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcChangeTable.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.tablemanagement.logic.api.to.TableEto;
-
-/**
- * Interface of {@link io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc use case} to
- * {@link #changeTable(long, long) change the table}.
- *
- * Interface of UcChangeTable to centralize documentation and signatures of methods.
- *
- */
-public interface UcChangeTable {
-
- /**
- * UseCase to change from one {@link TableEto table} to another. The people sitting at a table are identified by their
- * {@link OrderEto order} that has to be provided as argument.
- *
- * @param orderId the {@link OrderEto order}
- * @param newTableId the new {@link TableEto table} to switch to.
- */
- void changeTable(long orderId, long newTableId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindBill.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindBill.java
deleted file mode 100644
index 8c7fa7338..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindBill.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-
-/**
- * Interface of {@link io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc use case} to get specific or all
- * {@link BillEto bills}.
- *
- */
-public interface UcFindBill {
-
- /**
- * This method will return a {@link BillCto bill} identified the given id.
- *
- * @param id is the {@link BillEto#getId() id} of the Bill to fetch.
- * @return the {@link BillCto bill} for the given id.
- */
- BillCto findBill(long id);
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindOrder.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindOrder.java
deleted file mode 100644
index 5b12b87aa..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindOrder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.util.List;
-
-/**
- * Interface of {@link io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc use case} to get specific or all
- * {@link OrderEto orders}.
- *
- */
-public interface UcFindOrder {
-
- /**
- * @param criteria the {@link OrderSearchCriteriaTo}.
- * @return the {@link List} of matching {@link OrderEto}s.
- */
- PaginatedListTo findOrderEtos(OrderSearchCriteriaTo criteria);
-
- /**
- * @param criteria the {@link OrderSearchCriteriaTo}.
- * @return the {@link List} of matching {@link OrderCto}s.
- */
- PaginatedListTo findOrderCtos(OrderSearchCriteriaTo criteria);
-
- /**
- * @param order the {@link OrderEto}.
- * @return the corresponding {@link OrderCto} (order with order-positions).
- */
- OrderCto findOrderCto(OrderEto order);
-
- /**
- * This method returns an {@link OrderEto order}.
- *
- * @param orderId identifier of the searched {@link OrderEto order}
- * @return the {@link OrderEto order} with the given identifier. Will be {@code null} if the {@link OrderEto order}
- * does not exist.
- */
- OrderEto findOrder(long orderId);
-
- /**
- * This method returns a the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState#OPEN
- * open} {@link OrderEto order} for the specified table.
- *
- * @param tableId the {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table#getId() table ID} the
- * requested order shall be {@link OrderEto#getTableId() associated} with.
- * @return the {@link OrderEto order} {@link OrderEto#getTableId() associated} with the given tableId in
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState#OPEN open}
- * {@link OrderEto#getState() state} or {@code null} if no such {@link OrderEto order} exists.
- */
- OrderEto findOpenOrderForTable(long tableId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindOrderPosition.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindOrderPosition.java
deleted file mode 100644
index c7274a40e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcFindOrderPosition.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionSearchCriteriaTo;
-
-import java.util.List;
-
-/**
- * Interface of {@link io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc use case} to get or find specific
- * {@link OrderPositionEto order position}s.
- *
- */
-public interface UcFindOrderPosition {
-
- /**
- * @param orderPositionId is the {@link OrderPositionEto#getId() ID} of the requested {@link OrderPositionEto}.
- * @return the {@link OrderPositionEto} with the given ID. Will be {@code null} if the {@link OrderPositionEto} does
- * not exist.
- */
- OrderPositionEto findOrderPosition(long orderPositionId);
-
- /**
- * @param orderId is the {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order#getId() ID} of the
- * {@link io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order} for which the
- * {@link OrderPositionEto positions} are requested.
- * @return the {@link List} of {@link OrderPositionEto}s {@link OrderPositionEto#getOrderId() associated} with the
- * given orderId.
- */
- List findOrderPositionsByOrderId(long orderId);
-
- /**
- * @param criteria the {@link OrderPositionSearchCriteriaTo}.
- * @return the {@link List} of matching {@link OrderPositionEto}s.
- */
- List findOrderPositions(OrderPositionSearchCriteriaTo criteria);
-
- /**
- * @param orderId for which the {@link OrderPositionEto}s are requested.
- * @return the {@link List} of all {@link OrderPositionEto}s {@link OrderPositionEto#getId() associated} with the
- * given orderId. Will be the empty {@link List} if no such {@link OrderPositionEto} exists.
- */
- List findOpenOrderPositionsByOrderId(long orderId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageBill.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageBill.java
deleted file mode 100644
index d99e57df9..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageBill.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.PaymentStatus;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.PaymentData;
-
-/**
- * Interface of UcManageBill to centralize documentation and signatures of methods.
- *
- */
-public interface UcManageBill {
-
- /**
- * Create a {@link BillEto} and save it in the database by linking the billed {@link OrderPositionEto order positions}
- * with it. A bill also consists of the {@link Money total amount} as well as the {@link Money tip}, the waiter could
- * fill in. The tip is at default 0.0.
- *
- * @param bill that gets created in the database.
- * @return the created {@link BillEto}
- */
- BillEto createBill(BillEto bill);
-
- /**
- * This method deletes a {@link BillEto} from the database by its given id.
- *
- * @param billId the ID of the {@link BillEto} that has to be deleted.
- */
- void deleteBill(long billId);
-
- /**
- * This method provides the payment process. It provides the cash-only functionality without any additional
- * {@link PaymentData}.
- *
- * @param bill is the identifier of the {@link BillEto} on which the payment process takes place.
- * @return the {@link PaymentStatus status code} of the payment process.
- */
- PaymentStatus doPayment(BillEto bill);
-
- /**
- * This method provides the payment process.
- *
- * @param paymentDataDebitor is the {@link PaymentData} which holds special data for the payment process.
- * @param bill is the identifier of the {@link BillEto} on which the payment process takes place.
- * @return the {@link PaymentStatus status code} of the payment process.
- */
- PaymentStatus doPayment(BillEto bill, PaymentData paymentDataDebitor);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageOrder.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageOrder.java
deleted file mode 100644
index 122ec6461..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageOrder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-/**
- * Interface of UcMangeOrder to centralize documentation and signatures of methods.
- *
- */
-public interface UcManageOrder {
-
- /**
- * If no ID is contained creates the {@link OrderCto} for the first time. Else it updates the {@link OrderCto} with
- * given ID. If no {@link OrderCto} with given ID is present, an exception will be thrown.
- *
- * @param order the {@link OrderCto} to persist.
- * @return the persisted {@link OrderCto}.
- */
- OrderCto saveOrder(@NotNull OrderCto order);
-
- /**
- * If no ID is contained creates the {@link OrderEto} for the first time. Else it updates the {@link OrderEto} with
- * given ID. If no {@link OrderEto} with given ID is present, an exception will be thrown.
- *
- * @param order the {@link OrderEto} to persist.
- * @return the persisted {@link OrderEto}.
- */
- OrderEto saveOrder(@NotNull @Valid OrderEto order);
-
- /**
- * @param id is the {@link OrderEto#getId() ID} of the order to delete.
- */
- void deleteOrder(long id);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageOrderPosition.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageOrderPosition.java
deleted file mode 100644
index bc18efe4e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/api/usecase/UcManageOrderPosition.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase;
-
-import javax.validation.Valid;
-
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-
-/**
- * Interface of UcManageOrderPosition to centralize documentation and signatures of methods.
- *
- */
-public interface UcManageOrderPosition {
-
- /**
- * Creates an {@link OrderPositionEto} for the given {@link OfferEto} and a given {@link OrderEto}.
- *
- * @param offer is the {@link OfferEto} to be ordered.
- * @param order is the {@link OrderEto order} for which the {@link OrderPositionEto}s are
- * @param comment is the comment for special orders
- *
- * @return the new {@link OrderPositionEto}
- */
- OrderPositionEto createOrderPosition(OfferEto offer, OrderEto order, String comment);
-
- /**
- * Saves or updates the given {@link OrderPositionEto}.
- *
- * @param orderPosition is the {@link OrderPositionEto} to persist.
- * @return the saved {@link OrderPositionEto}.
- */
- OrderPositionEto saveOrderPosition(@Valid OrderPositionEto orderPosition);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractBillUc.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractBillUc.java
deleted file mode 100644
index 9c529b47e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractBillUc.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase;
-
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao.BillDao;
-
-import javax.inject.Inject;
-
-/**
- *
- */
-public abstract class AbstractBillUc extends AbstractUc {
-
- /** @see #getBillDao() */
- private BillDao billDao;
-
- /**
- * @return the {@link BillDao} instance.
- */
- public BillDao getBillDao() {
-
- return this.billDao;
- }
-
- /**
- * Sets the field 'billDao'.
- *
- * @param billDao New value for billDao
- */
- @Inject
- public void setBillDao(BillDao billDao) {
-
- this.billDao = billDao;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractOrderPositionUc.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractOrderPositionUc.java
deleted file mode 100644
index 853b7d4a6..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractOrderPositionUc.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase;
-
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao.OrderPositionDao;
-
-import javax.inject.Inject;
-
-/**
- *
- */
-public abstract class AbstractOrderPositionUc extends AbstractUc {
-
- /** @see #getOrderPositionDao() */
- private OrderPositionDao orderPositionDao;
-
- /**
- * @return the {@link OrderPositionDao} instance.
- */
- public OrderPositionDao getOrderPositionDao() {
-
- return this.orderPositionDao;
- }
-
- /**
- * Sets the field 'orderPositionDao'.
- *
- * @param orderPositionDao New value for orderPositionDao
- */
- @Inject
- public void setOrderPositionDao(OrderPositionDao orderPositionDao) {
-
- this.orderPositionDao = orderPositionDao;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractOrderUc.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractOrderUc.java
deleted file mode 100644
index 732a050b2..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/base/usecase/AbstractOrderUc.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase;
-
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.dao.OrderDao;
-
-import javax.inject.Inject;
-
-/**
- *
- */
-public abstract class AbstractOrderUc extends AbstractUc {
-
- /** @see #getOrderDao() */
- private OrderDao orderDao;
-
- /**
- * @return orderDao
- */
- public OrderDao getOrderDao() {
-
- return this.orderDao;
- }
-
- /**
- * Sets the field 'orderPositionDao'.
- *
- * @param orderDao New value for orderDao
- */
- @Inject
- public void setOrderDao(OrderDao orderDao) {
-
- this.orderDao = orderDao;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/SalesmanagementImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/SalesmanagementImpl.java
deleted file mode 100644
index fe3ba1db8..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/SalesmanagementImpl.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl;
-
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractComponentFacade;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.PaymentStatus;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.PaymentData;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcChangeTable;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrderPosition;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.transaction.Transactional;
-
-/**
- * This is the implementation of {@link Salesmanagement}.
- *
- */
-@Named
-@Transactional
-public class SalesmanagementImpl extends AbstractComponentFacade implements Salesmanagement {
-
- private UcFindOrderPosition ucFindOrderPosition;
-
- private UcManageOrderPosition ucManageOrderPosition;
-
- private UcFindOrder ucFindOrder;
-
- private UcManageOrder ucManageOrder;
-
- private UcFindBill ucFindBill;
-
- private UcManageBill ucManageBill;
-
- private UcChangeTable ucChangeTable;
-
- /**
- * The constructor.
- */
- public SalesmanagementImpl() {
-
- super();
- }
-
- /**
- * @param ucFindOrderPosition the {@link UcFindOrderPosition} to {@link Inject}.
- */
- @Inject
- @UseCase
- public void setUcFindOrderPosition(UcFindOrderPosition ucFindOrderPosition) {
-
- this.ucFindOrderPosition = ucFindOrderPosition;
- }
-
- /**
- * @param ucManageOrderPosition the {@link UcManageOrderPosition} to {@link Inject}.
- */
- @Inject
- @UseCase
- public void setUcManageOrderPosition(UcManageOrderPosition ucManageOrderPosition) {
-
- this.ucManageOrderPosition = ucManageOrderPosition;
- }
-
- /**
- * @param ucFindBill the {@link UcFindBill} to {@link Inject}.
- */
- @Inject
- @UseCase
- public void setUcFindBill(UcFindBill ucFindBill) {
-
- this.ucFindBill = ucFindBill;
- }
-
- /**
- * @param ucFindOrder the {@link UcFindOrder} to {@link Inject}.
- */
- @Inject
- @UseCase
- public void setUcFindOrder(UcFindOrder ucFindOrder) {
-
- this.ucFindOrder = ucFindOrder;
- }
-
- /**
- * @param ucManageOrder the {@link UcManageOrder} to {@link Inject}.
- */
- @Inject
- @UseCase
- public void setUcManageOrder(UcManageOrder ucManageOrder) {
-
- this.ucManageOrder = ucManageOrder;
- }
-
- /**
- * @param ucManageBill the {@link UcManageBill} to {@link Inject}.
- */
- @Inject
- @UseCase
- public void setUcManageBill(UcManageBill ucManageBill) {
-
- this.ucManageBill = ucManageBill;
- }
-
- /**
- * @param ucChangeTable the {@link UcChangeTable} to {@link Inject}.
- */
- @Inject
- @UseCase
- public void setUcChangeTable(UcChangeTable ucChangeTable) {
-
- this.ucChangeTable = ucChangeTable;
- }
-
- @Override
- public OrderEto findOrder(long id) {
-
- return this.ucFindOrder.findOrder(id);
- }
-
- @Override
- public PaginatedListTo findOrderEtos(OrderSearchCriteriaTo criteria) {
-
- return this.ucFindOrder.findOrderEtos(criteria);
- }
-
- @Override
- public PaginatedListTo findOrderCtos(OrderSearchCriteriaTo criteria) {
-
- return this.ucFindOrder.findOrderCtos(criteria);
- }
-
- @Override
- public OrderCto findOrderCto(OrderEto order) {
-
- return this.ucFindOrder.findOrderCto(order);
- }
-
- @Override
- public OrderEto findOpenOrderForTable(long tableId) {
-
- return this.ucFindOrder.findOpenOrderForTable(tableId);
- }
-
- @Override
- public void changeTable(long orderId, long tableId) {
-
- this.ucChangeTable.changeTable(orderId, tableId);
-
- }
-
- @Override
- public OrderPositionEto createOrderPosition(OfferEto offer, OrderEto order, String comment) {
-
- return this.ucManageOrderPosition.createOrderPosition(offer, order, comment);
- }
-
- @Override
- public OrderPositionEto findOrderPosition(long orderPositionId) {
-
- return this.ucFindOrderPosition.findOrderPosition(orderPositionId);
- }
-
- @Override
- public List findOrderPositions(OrderPositionSearchCriteriaTo criteria) {
-
- return this.ucFindOrderPosition.findOrderPositions(criteria);
- }
-
- @Override
- public List findOrderPositionsByOrderId(long orderId) {
-
- return this.ucFindOrderPosition.findOrderPositionsByOrderId(orderId);
- }
-
- @Override
- public List findOpenOrderPositionsByOrderId(long orderId) {
-
- return this.ucFindOrderPosition.findOpenOrderPositionsByOrderId(orderId);
- }
-
- @Override
- public PaymentStatus doPayment(BillEto bill) {
-
- return this.ucManageBill.doPayment(bill);
- }
-
- @Override
- public PaymentStatus doPayment(BillEto bill, PaymentData paymentData) {
-
- return this.ucManageBill.doPayment(bill, paymentData);
- }
-
- @Override
- public BillCto findBill(long id) {
-
- return this.ucFindBill.findBill(id);
-
- }
-
- @Override
- public void deleteBill(long billId) {
-
- this.ucManageBill.deleteBill(billId);
- }
-
- @Override
- public void deleteOrder(long id) {
-
- this.ucManageOrder.deleteOrder(id);
- }
-
- @Override
- public OrderCto saveOrder(OrderCto order) {
-
- return this.ucManageOrder.saveOrder(order);
- }
-
- @Override
- public OrderEto saveOrder(OrderEto order) {
-
- return this.ucManageOrder.saveOrder(order);
- }
-
- @Override
- public OrderPositionEto saveOrderPosition(OrderPositionEto orderPosition) {
-
- return this.ucManageOrderPosition.saveOrderPosition(orderPosition);
- }
-
- @Override
- public BillEto createBill(BillEto bill) {
-
- return this.ucManageBill.createBill(bill);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/PaymentAdapter.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/PaymentAdapter.java
deleted file mode 100644
index 7200abcef..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/PaymentAdapter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.paymentadapter;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.PaymentStatus;
-
-/**
- * Interface of the adapter for external payment.
- *
- */
-public interface PaymentAdapter {
-
- /**
- * @param paymentTransactionData paymentTransactionData
- * @return PaymentStatus
- */
- PaymentStatus pay(PaymentTransactionData paymentTransactionData);
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/PaymentTransactionData.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/PaymentTransactionData.java
deleted file mode 100644
index b58722101..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/PaymentTransactionData.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.paymentadapter;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.PaymentData;
-
-import java.io.Serializable;
-
-/**
- * This class acts as a simple POJO. The creditor acts as the receiver of the transfered total amount. The total amount
- * will be charged the debtor.
- *
- */
-public class PaymentTransactionData implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /** The creditor and his payment data of that payment transaction. */
- private PaymentData creditor;
-
- /** The debitor and his payment data of that payment transaction. */
- private PaymentData debitor;
-
- /** The total amount to transfer. */
- private Money totalAmount;
-
- /**
- * Returns the field 'creditor'.
- *
- * @return Value of creditor
- */
- public PaymentData getCreditor() {
-
- return this.creditor;
- }
-
- /**
- * Sets the field 'creditor'.
- *
- * @param creditor New value for creditor
- */
- public void setCreditor(PaymentData creditor) {
-
- this.creditor = creditor;
- }
-
- /**
- * Returns the field 'debitor'.
- *
- * @return Value of debitor
- */
- public PaymentData getDebitor() {
-
- return this.debitor;
- }
-
- /**
- * Sets the field 'debitor'.
- *
- * @param debitor New value for debitor
- */
- public void setDebitor(PaymentData debitor) {
-
- this.debitor = debitor;
- }
-
- /**
- * Returns the field 'totalAmount'.
- *
- * @return Value of totalAmount
- */
- public Money getTotalAmount() {
-
- return this.totalAmount;
- }
-
- /**
- * Sets the field 'totalAmount'.
- *
- * @param totalAmount New value for totalAmount
- */
- public void setTotalAmount(Money totalAmount) {
-
- this.totalAmount = totalAmount;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/impl/PaymentAdapterImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/impl/PaymentAdapterImpl.java
deleted file mode 100644
index 0c22d9108..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/paymentadapter/impl/PaymentAdapterImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.paymentadapter.impl;
-
-import io.oasp.gastronomy.restaurant.general.common.base.AbstractBeanMapperSupport;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.PaymentStatus;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.paymentadapter.PaymentAdapter;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.paymentadapter.PaymentTransactionData;
-
-import javax.inject.Named;
-
-/**
- * Implementation of the external payment functionalities.
- *
- */
-@Named
-public class PaymentAdapterImpl extends AbstractBeanMapperSupport implements PaymentAdapter {
-
- @Override
- public PaymentStatus pay(PaymentTransactionData paymentTransactionData) {
-
- return PaymentStatus.SUCCESS;
-
- // return dozer.map(statusTo, PaymentStatus.class);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcChangeTableImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcChangeTableImpl.java
deleted file mode 100644
index 0b0744f65..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcChangeTableImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.usecase;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractUc;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.exception.ChangeTableIllegalStateCombinationException;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcChangeTable;
-import io.oasp.gastronomy.restaurant.tablemanagement.common.api.datatype.TableState;
-import io.oasp.gastronomy.restaurant.tablemanagement.logic.api.Tablemanagement;
-import io.oasp.gastronomy.restaurant.tablemanagement.logic.api.to.TableEto;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-/**
- * UseCase: The guests can change a table to get a better table.
- *
- */
-@Named
-@UseCase
-public class UcChangeTableImpl extends AbstractUc implements UcChangeTable {
-
- private Tablemanagement tableManagement;
-
- private Salesmanagement salesManagement;
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_TABLE)
- public void changeTable(long orderId, long newTableId) {
-
- OrderEto order = this.salesManagement.findOrder(orderId);
- // save old table data
- long oldTableId = order.getTableId();
- if (oldTableId == newTableId) {
- return; // nothing to do...
- }
- TableEto oldTable = this.tableManagement.findTable(oldTableId);
- TableState oldTableState = oldTable.getState();
-
- // throw exception if the newTableState is occupied
- TableEto newTable = this.tableManagement.findTable(newTableId);
- if (newTable.getState().isOccupied()) {
- throw new ChangeTableIllegalStateCombinationException(order, newTable);
- }
-
- // update order
- order.setTableId(newTableId);
-
- // marks new table with copied status
- newTable.setState(oldTableState);
-
- this.tableManagement.saveTable(newTable);
-
- // saves Order for the new table
- this.salesManagement.saveOrder(order);
-
- // change table status:
- // marks old table as free
- oldTable.setState(TableState.FREE);
- this.tableManagement.saveTable(oldTable);
-
- }
-
- /**
- * @param tableManagement the {@link Tablemanagement} to {@link Inject}.
- */
- @Inject
- public void setTableManagement(Tablemanagement tableManagement) {
-
- this.tableManagement = tableManagement;
- }
-
- /**
- * @param salesManagement the {@link Salesmanagement} to {@link Inject}.
- */
- @Inject
- public void setSalesManagement(Salesmanagement salesManagement) {
-
- this.salesManagement = salesManagement;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindBillImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindBillImpl.java
deleted file mode 100644
index 668dcecc2..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindBillImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.usecase;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase.AbstractBillUc;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Implementation of {@link UcFindBill}.
- *
- */
-@Named
-@UseCase
-public class UcFindBillImpl extends AbstractBillUc implements UcFindBill {
-
- private static final Logger LOG = LoggerFactory.getLogger(UcFindBillImpl.class);
-
- private Salesmanagement salesmanagement;
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_BILL)
- public BillCto findBill(long id) {
-
- LOG.debug("Get Bill with id '" + id + "' from database.");
- BillCto billCto = new BillCto();
- BillEto bill = getBeanMapper().map(getBillDao().findOne(id), BillEto.class);
- if (bill == null) {
- return null;
- }
- billCto.setBill(bill);
-
- List orderPositions = new ArrayList<>();
- for (Long orderPositionId : bill.getOrderPositionIds()) {
- OrderPositionEto position = this.salesmanagement.findOrderPosition(orderPositionId);
- orderPositions.add(position);
- }
- billCto.setPositions(orderPositions);
-
- return billCto;
- }
-
- /**
- * @param salesmanagement the salesmanagement to set
- */
- @Inject
- public void setSalesmanagement(Salesmanagement salesmanagement) {
-
- this.salesmanagement = salesmanagement;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindOrderImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindOrderImpl.java
deleted file mode 100644
index db480be24..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindOrderImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.usecase;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase.AbstractOrderUc;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Use Case to find an order.
- *
- */
-@Named
-@UseCase
-public class UcFindOrderImpl extends AbstractOrderUc implements UcFindOrder {
-
- private static final Logger LOG = LoggerFactory.getLogger(UcFindOrderImpl.class);
-
- private Salesmanagement salesManagement;
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER)
- public OrderEto findOrder(long orderId) {
-
- LOG.debug("Get order.");
- return getBeanMapper().map(getOrderDao().findOne(orderId), OrderEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER)
- public PaginatedListTo findOrderEtos(OrderSearchCriteriaTo criteria) {
-
- criteria.limitMaximumPageSize(MAXIMUM_HIT_LIMIT);
- PaginatedListTo orders = getOrderDao().findOrders(criteria);
-
- return mapPaginatedEntityList(orders, OrderEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER)
- public PaginatedListTo findOrderCtos(OrderSearchCriteriaTo criteria) {
-
- PaginatedListTo orderEtos = findOrderEtos(criteria);
-
- List page = new ArrayList<>(orderEtos.getResult().size());
- for (OrderEto order : orderEtos.getResult()) {
- // REVIEW (hohwille) N+1 problem. Find a better and more efficient way to load the order positions.
- page.add(findOrderCto(order));
- }
-
- PaginatedListTo result = new PaginatedListTo<>(page, orderEtos.getPagination());
- return result;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER)
- public OrderCto findOrderCto(OrderEto order) {
-
- OrderCto result = new OrderCto();
- result.setOrder(order);
- List positions = this.salesManagement.findOrderPositionsByOrderId(order.getId());
- result.setPositions(positions);
- return result;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER)
- public OrderEto findOpenOrderForTable(long tableId) {
-
- OrderEntity order = getOrderDao().findOpenOrderByTable(tableId);
- return getBeanMapper().map(order, OrderEto.class);
- }
-
- /**
- * @param salesManagement the {@link Salesmanagement} to {@link Inject}.
- */
- @Inject
- public void setSalesManagement(Salesmanagement salesManagement) {
-
- this.salesManagement = salesManagement;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindOrderPositionImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindOrderPositionImpl.java
deleted file mode 100644
index 1ff30e383..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcFindOrderPositionImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.usecase;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase.AbstractOrderPositionUc;
-
-import java.util.List;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Implementation of {@link UcFindOrderPosition}.
- *
- */
-@Named
-@UseCase
-public class UcFindOrderPositionImpl extends AbstractOrderPositionUc implements UcFindOrderPosition {
-
- private static final Logger LOG = LoggerFactory.getLogger(UcFindOrderPositionImpl.class);
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER_POSITION)
- public OrderPositionEto findOrderPosition(long orderPositionId) {
-
- LOG.debug("Get order position.");
- OrderPositionEntity orderPositionEntities = getOrderPositionDao().findOne(orderPositionId);
- OrderPositionEto orderPositionBo = getBeanMapper().map(orderPositionEntities, OrderPositionEto.class);
- return orderPositionBo;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER_POSITION)
- public List findOrderPositionsByOrderId(long orderId) {
-
- List positions = getOrderPositionDao().findOrderPositionsByOrder(orderId);
- return getBeanMapper().mapList(positions, OrderPositionEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER_POSITION)
- public List findOpenOrderPositionsByOrderId(long orderId) {
-
- LOG.debug("Get all open order positions for order id '" + orderId + "'.");
- return getBeanMapper()
- .mapList(getOrderPositionDao().findOpenOrderPositionsByOrder(orderId), OrderPositionEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_ORDER_POSITION)
- public List findOrderPositions(OrderPositionSearchCriteriaTo criteria) {
-
- List positions = getOrderPositionDao().findOrderPositions(criteria);
- return getBeanMapper().mapList(positions, OrderPositionEto.class);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageBillImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageBillImpl.java
deleted file mode 100644
index f2c1e9b17..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageBillImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.usecase;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Money;
-import io.oasp.gastronomy.restaurant.general.common.api.exception.IllegalEntityStateException;
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.PaymentStatus;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.BillEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BankPaymentData;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.PaymentData;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase.AbstractBillUc;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.paymentadapter.PaymentAdapter;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.paymentadapter.PaymentTransactionData;
-
-/**
- * Implementation of {@link UcManageBill}.
- *
- */
-@Named
-@UseCase
-public class UcManageBillImpl extends AbstractBillUc implements UcManageBill {
-
- /** Logger instance. */
- private static final Logger LOG = LoggerFactory.getLogger(UcManageBillImpl.class);
-
- private Salesmanagement salesmanagement;
-
- private PaymentAdapter paymentAdapter;
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_BILL)
- public BillEto createBill(BillEto bill) {
-
- List orderPositions = bill.getOrderPositionIds();
- Objects.requireNonNull(bill, "bill must not be null");
-
- Money total = Money.ZERO;
- List myOrderPositions = new ArrayList<>();
-
- for (Long id : orderPositions) {
- OrderPositionEto orderPosition = this.salesmanagement.findOrderPosition(id);
- verifyNotClosed(orderPosition);
- total = total.add(orderPosition.getPrice());
-
- myOrderPositions.add(getBeanMapper().map(orderPosition, OrderPositionEntity.class));
- }
-
- Money localTip = bill.getTip();
- if (localTip == null) {
- localTip = Money.ZERO;
- }
-
- // Declare the bill
- BillEntity billEntity = new BillEntity();
-
- billEntity.setOrderPositions(myOrderPositions);
- billEntity.setTip(localTip);
- billEntity.setPayed(false);
- billEntity.setTotal(total);
-
- BillEntity savedBill = getBillDao().save(billEntity);
-
- BillEto returnBill = getBeanMapper().map(savedBill, BillEto.class);
-
- LOG.debug("The bill with id '{}' has been created.", returnBill.getId());
-
- return returnBill;
- }
-
- private void verifyNotClosed(OrderPosition position) {
-
- OrderPositionState state = position.getState();
- if ((state == null) || state.isClosed()) {
- throw new IllegalEntityStateException(position, state);
- }
- }
-
- /**
- * This method updates a {@link BillEntity} by checking the existence of a bill with that {@link BillEntity#getId()
- * id} in the database. If no such {@link BillEntity} exists, a new bill will be created by calling
- * {@link UcManageBillImpl#createBill(BillEto)}. Otherwise, the existing {@link BillEntity} will be updated by
- * overriding the set {@link BillEntity#getOrderPositions() order positions}, {@link BillEntity#getTip() tip} and the
- * {@link BillEntity#getTotal() total amount}.
- *
- * @param bill The {@link BillEntity} to update.
- *
- * @return the updated {@link BillEntity}
- */
- private BillEto update(BillEto bill) {
-
- Objects.requireNonNull(bill, "bill");
-
- Long billId = bill.getId();
- BillEntity targetBill = getBillDao().findOne(billId);
-
- List orderPositionIds = bill.getOrderPositionIds();
- if (targetBill == null) {
- // Bill does not yet exist. -> new Bill
- List orderPositions = new ArrayList<>();
- for (Long id : orderPositionIds) {
- OrderPositionEto position = this.salesmanagement.findOrderPosition(id);
- orderPositions.add(position);
- }
- return createBill(bill);
- } else {
- // Bill already exists. -> Update bill
- targetBill.setOrderPositionIds(orderPositionIds);
- targetBill.setPayed(bill.isPayed());
- targetBill.setTip(bill.getTip());
- targetBill.setTotal(bill.getTotal());
-
- /*
- * Save updated bill
- */
- getBillDao().save(targetBill);
- LOG.debug("The bill with id '{}' has been updated.", billId);
-
- return getBeanMapper().map(targetBill, BillEto.class);
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.DELETE_BILL)
- public void deleteBill(long billId) {
-
- getBillDao().delete(billId);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_BILL)
- public PaymentStatus doPayment(BillEto bill) {
-
- LOG.debug("The bill with id '" + bill.getId() + "' will be marked as payed.");
-
- // Return a PaymentStatus
- LOG.debug("The bill with id '" + bill.getId() + "' is succesfuly payed.");
- return PaymentStatus.SUCCESS;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_BILL)
- public PaymentStatus doPayment(BillEto bill, PaymentData paymentDataDebitor) {
-
- // REVIEW (hohwille) Remove this hack or replace with something reasonable.
- PaymentStatus status = null;
-
- // Creditor data: constant
- BankPaymentData paymentDataCreditor = new BankPaymentData();
- paymentDataCreditor.setAccountOwnerName("Restaurant_BlockHouse");
- paymentDataCreditor.setAccountNumber(191919L);
- paymentDataCreditor.setBankCode(760087698L);
- paymentDataCreditor.setBankName("RestaurantBank");
-
- // Step1: Prepare the TransactionDataTo object
- PaymentTransactionData paymentTransactionData = new PaymentTransactionData();
- paymentTransactionData.setCreditor(paymentDataCreditor);
- paymentTransactionData.setDebitor(paymentDataDebitor);
- paymentTransactionData.setTotalAmount(bill.getTotal());
-
- // Step2: Call the external system with the transactionDataTo
- status = this.paymentAdapter.pay(paymentTransactionData);
-
- // Step3: Call the function markBillAndOrderPositionsAsPayed (Mark
- // orderPositions and the current bill
- // as payed and eventually free table) if Step2 was successful
- if (PaymentStatus.SUCCESS == status) {
-
- bill.setPayed(true);
- for (Long orderPositionId : bill.getOrderPositionIds()) {
- this.salesmanagement.findOrderPosition(orderPositionId).setState(OrderPositionState.PAYED);
- }
- }
-
- // Step4: Return a PaymentStatus
- LOG.debug("The payment of bill with id '" + bill.getId() + "' has given that status '" + status + "' back.");
- return status;
- }
-
- /**
- * Sets the field 'paymentAdapter'.
- *
- * @param paymentAdapter New value for paymentAdapter
- */
- @Inject
- public void setPaymentAdapter(PaymentAdapter paymentAdapter) {
-
- this.paymentAdapter = paymentAdapter;
- }
-
- /**
- * @param salesmanagement the salesmanagement to set
- */
- @Inject
- public void setSalesmanagement(Salesmanagement salesmanagement) {
-
- this.salesmanagement = salesmanagement;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageOrderImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageOrderImpl.java
deleted file mode 100644
index 2977ac94a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageOrderImpl.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.usecase;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.common.api.exception.IllegalEntityStateException;
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.Order;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase.AbstractOrderUc;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import net.sf.mmm.util.exception.api.ObjectMismatchException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.validation.annotation.Validated;
-
-/**
- * Implementation of {@link UcManageOrder}.
- *
- */
-@Named
-@UseCase
-@Validated
-public class UcManageOrderImpl extends AbstractOrderUc implements UcManageOrder {
-
- /** Logger instance. */
- private static final Logger LOG = LoggerFactory.getLogger(UcManageOrderImpl.class);
-
- private Salesmanagement salesmanagement;
-
- /**
- * The constructor.
- */
- public UcManageOrderImpl() {
-
- super();
- }
-
- /**
- * @param salesmanagement the {@link Salesmanagement} to {@link Inject}.
- */
- @Inject
- public void setSalesmanagement(Salesmanagement salesmanagement) {
-
- this.salesmanagement = salesmanagement;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_ORDER)
- public OrderEto saveOrder(OrderEto order) {
-
- return saveOrder(order, null);
- }
-
- private OrderEto saveOrder(OrderEto order, List positions) {
-
- Objects.requireNonNull(order, "order");
- Long orderId = order.getId();
- if (orderId == null) {
- OrderState state = order.getState();
- if (state != OrderState.OPEN) {
- throw new IllegalEntityStateException(order, state);
- }
- } else {
- OrderEntity currentOrder = getOrderDao().find(orderId);
- verifyUpdate(currentOrder, order, positions);
- }
- OrderEntity orderEntity = getBeanMapper().map(order, OrderEntity.class);
- orderEntity = getOrderDao().save(orderEntity);
- LOG.debug("Saved order with id {}.", orderEntity.getId());
- return getBeanMapper().map(orderEntity, OrderEto.class);
- }
-
- /**
- * @param currentOrder is the current {@link Order} from the persistence.
- * @param updateOrder is the new {@link Order} to update to.
- * @param positions the {@link List} of {@link OrderPositionEto positions} or {@code null} if undefined.
- */
- private void verifyUpdate(Order currentOrder, Order updateOrder, List positions) {
-
- if (currentOrder.getTableId() != updateOrder.getTableId()) {
- LOG.info("Changing order from table-id {} to table-id {}", currentOrder.getTableId(), updateOrder.getTableId());
- }
- verifyOrderStateChange(updateOrder, currentOrder.getState(), updateOrder.getState(), positions);
- }
-
- /**
- * Verifies if an update of the {@link OrderPositionState} is legal.
- *
- * @param updateOrder the new {@link Order} to update to.
- * @param currentState the old/current {@link OrderState} of the {@link Order}.
- * @param newState new {@link OrderState} of the {@link Order} to be updated to.
- * @param positions the {@link List} of {@link OrderPositionEto positions} or {@code null} if undefined.
- */
- private void verifyOrderStateChange(Order updateOrder, OrderState currentState, OrderState newState,
- List positions) {
-
- if (currentState == newState) {
- return;
- }
- if (newState == OrderState.CLOSED) {
- if (positions == null) {
- throw new IllegalEntityStateException(updateOrder, currentState, newState);
- }
- // we can only close an order if all its positions are closed...
- for (OrderPositionEto position : positions) {
- OrderPositionState positionState = position.getState();
- if ((positionState == null) || !positionState.isClosed()) {
- IllegalEntityStateException cause = new IllegalEntityStateException(position, positionState);
- throw new IllegalEntityStateException(cause, updateOrder, currentState, newState);
- }
- }
- }
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_ORDER)
- public OrderCto saveOrder(OrderCto order) {
-
- Objects.requireNonNull(order, "order");
-
- OrderEto orderEto = order.getOrder();
- Long orderId = orderEto.getId();
- List currentOrderPositionList;
- if (orderId == null) {
- currentOrderPositionList = Collections.emptyList();
- } else {
- // we could add a relation OrderEntity.positions of type List...
- currentOrderPositionList = this.salesmanagement.findOrderPositionsByOrderId(orderId);
- }
- List positions = order.getPositions();
- orderEto = saveOrder(orderEto, positions);
- if (orderId == null) {
- orderId = orderEto.getId();
- }
- OrderCto result = new OrderCto();
- result.setOrder(orderEto);
-
- // we can not use hibernate (Cascade and Delete orphaned) as we need to validate and react on them...
-
- List positions2DeleteList = getEntities2Delete(currentOrderPositionList, positions);
- List savedPositionList = result.getPositions();
- if (positions2DeleteList.size() > 0) {
- LOG.warn("Marking {} number of order position(s) as cancelled that are missing in update of order with id {}",
- positions2DeleteList.size(), orderId);
- for (OrderPositionEto position : positions2DeleteList) {
- // only logically delete, actually the client should still send the cancelled positions...
- position.setState(OrderPositionState.CANCELLED);
- OrderPositionEto updatedOrderPosition = this.salesmanagement.saveOrderPosition(position);
- savedPositionList.add(updatedOrderPosition);
- }
- }
-
- for (OrderPositionEto position : positions) {
- Long positionOrderId = position.getOrderId();
- if (positionOrderId == null) {
- position.setOrderId(orderId);
- } else if (!positionOrderId.equals(orderId)) {
- throw new ObjectMismatchException(positionOrderId, orderId, "position.orderId");
- }
- OrderPositionEto updatedOrderPosition = this.salesmanagement.saveOrderPosition(position);
- savedPositionList.add(updatedOrderPosition);
- }
- return result;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.DELETE_ORDER)
- public void deleteOrder(long id) {
-
- getOrderDao().delete(id);
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageOrderPositionImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageOrderPositionImpl.java
deleted file mode 100644
index 62d74628f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/logic/impl/usecase/UcManageOrderPositionImpl.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.logic.impl.usecase;
-
-import java.util.Objects;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import net.sf.mmm.util.exception.api.ObjectNotFoundUserException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.validation.annotation.Validated;
-
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.common.api.exception.IllegalEntityStateException;
-import io.oasp.gastronomy.restaurant.general.common.api.exception.IllegalPropertyChangeException;
-import io.oasp.gastronomy.restaurant.general.logic.api.UseCase;
-import io.oasp.gastronomy.restaurant.offermanagement.common.api.Offer;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.Offermanagement;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.OrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.ProductOrderState;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.dataaccess.api.OrderPositionEntity;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.base.usecase.AbstractOrderPositionUc;
-
-/**
- * Implementation of {@link UcManageOrderPosition}.
- *
- */
-@Named
-@UseCase
-@Validated
-public class UcManageOrderPositionImpl extends AbstractOrderPositionUc implements UcManageOrderPosition {
-
- /** Logger instance. */
- private static final Logger LOG = LoggerFactory.getLogger(UcManageOrderPositionImpl.class);
-
- private Salesmanagement salesManagement;
-
- private Offermanagement offerManagement;
-
- /**
- * The constructor.
- */
- public UcManageOrderPositionImpl() {
-
- super();
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_ORDER_POSITION)
- public OrderPositionEto createOrderPosition(OfferEto offer, OrderEto order, String comment) {
-
- Objects.requireNonNull(offer, "offer");
- Long offerId = offer.getId();
- OfferEto offerFromDb = this.offerManagement.findOffer(offerId);
- if (offerFromDb == null) {
- throw new ObjectNotFoundUserException(Offer.class, offerId);
- }
- OrderPositionEntity orderPosition = new OrderPositionEntity();
-
- order.setState(OrderState.OPEN);
- // Declare the order position.
- orderPosition.setOfferId(offerId);
- orderPosition.setOfferName(offerFromDb.getDescription());
- orderPosition.setPrice(offerFromDb.getPrice());
- orderPosition.setOrder(getBeanMapper().map(this.salesManagement.saveOrder(order), OrderEntity.class));
- orderPosition.setComment(comment);
-
- // Save the order position and return it.
- getOrderPositionDao().save(orderPosition);
-
- LOG.debug("The order position with id '" + orderPosition.getId() + "' has been created. It's linked with order id '"
- + order.getId() + "' and offer id '" + offerId + "'.");
-
- return getBeanMapper().map(orderPosition, OrderPositionEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_ORDER_POSITION)
- public OrderPositionEto saveOrderPosition(OrderPositionEto orderPosition) {
-
- Objects.requireNonNull(orderPosition, "orderPosition");
-
- Long orderPositionId = orderPosition.getId();
- String action;
- if (orderPositionId == null) {
- action = "saved";
- Long offerId = orderPosition.getOfferId();
- OfferEto offer = this.offerManagement.findOffer(offerId);
- Objects.requireNonNull(offer, "Offer@" + offerId);
- orderPosition.setPrice(offer.getPrice());
- orderPosition.setOfferName(offer.getName());
- } else {
- OrderPositionEntity currentOrderPosition = getOrderPositionDao().find(orderPositionId);
- verifyUpdate(currentOrderPosition, orderPosition);
- action = "updated";
- }
-
- OrderPositionEntity orderPositionEntity = getBeanMapper().map(orderPosition, OrderPositionEntity.class);
- orderPositionEntity = getOrderPositionDao().save(orderPositionEntity);
- LOG.debug("The order position with id {} has been {}.", orderPositionEntity.getId(), action);
- return getBeanMapper().map(orderPositionEntity, OrderPositionEto.class);
- }
-
- /**
- * @param currentOrderPosition is the current {@link OrderPosition} from the persistence.
- * @param updateOrderPosition is the new {@link OrderPosition} to update to.
- */
- private void verifyUpdate(OrderPosition currentOrderPosition, OrderPosition updateOrderPosition) {
-
- if (!Objects.equals(currentOrderPosition.getOrderId(), currentOrderPosition.getOrderId())) {
- throw new IllegalPropertyChangeException(updateOrderPosition, "orderId");
- }
- if (!Objects.equals(currentOrderPosition.getOfferId(), currentOrderPosition.getOfferId())) {
- throw new IllegalPropertyChangeException(updateOrderPosition, "offerId");
- }
- if (!Objects.equals(currentOrderPosition.getPrice(), currentOrderPosition.getPrice())) {
- throw new IllegalPropertyChangeException(updateOrderPosition, "price");
- }
- if (!Objects.equals(currentOrderPosition.getOfferName(), currentOrderPosition.getOfferName())) {
- throw new IllegalPropertyChangeException(updateOrderPosition, "offerName");
- }
- OrderPositionState currentState = currentOrderPosition.getState();
- OrderPositionState newState = updateOrderPosition.getState();
- ProductOrderState newDrinkState = updateOrderPosition.getDrinkState();
-
- verifyOrderPositionStateChange(updateOrderPosition, currentState, newState);
-
- // TODO add verification methods of other sub-states of OrderPosition (i.e. Meal and SideDish)
- verifyDrinkStateChange(updateOrderPosition, currentState, newState, newDrinkState);
-
- }
-
- /**
- * Verifies if an update of the {@link OrderPositionState} is legal.
- *
- * @param updateOrderPosition the new {@link OrderPosition} to update to.
- * @param currentState the old/current {@link OrderPositionState} of the {@link OrderPosition}.
- * @param newState new {@link OrderPositionState} of the {@link OrderPosition} to be updated to.
- */
- private void verifyOrderPositionStateChange(OrderPosition updateOrderPosition, OrderPositionState currentState,
- OrderPositionState newState) {
-
- switch (currentState) {
- case CANCELLED:
- if ((newState != OrderPositionState.CANCELLED) && (newState != OrderPositionState.ORDERED)) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newState);
- }
- break;
- case ORDERED:
- if ((newState != OrderPositionState.ORDERED) && (newState != OrderPositionState.CANCELLED)
- && (newState != OrderPositionState.PREPARED)) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newState);
- }
- break;
- case PREPARED:
- // from here we can go to any other state (back to ORDERED in case that the kitchen has to rework)
- break;
- case DELIVERED:
- if ((newState == OrderPositionState.PREPARED) || (newState == OrderPositionState.ORDERED)) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newState);
- }
- break;
- case PAYED:
- if (newState != OrderPositionState.PAYED) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newState);
- }
- break;
- default:
- LOG.error("Illegal state {}", currentState);
- break;
- }
-
- }
-
- /**
- * Verifies if an update of the {@link ProductOrderState} is legal. This verification is based on both the states of
- * {@link ProductOrderState} and {@link OrderPositionState}.
- *
- * @param updateOrderPosition the new {@link OrderPosition} to update to.
- * @param currentState the old/current {@link OrderPositionState} of the {@link OrderPosition}.
- * @param newState new {@link OrderPositionState} of the {@link OrderPosition} to be updated to.
- * @param newDrinkState new {@link ProductOrderState} of the drink of the {@link OrderPosition} to be updated to.
- */
- private void verifyDrinkStateChange(OrderPosition updateOrderPosition, OrderPositionState currentState,
- OrderPositionState newState, ProductOrderState newDrinkState) {
-
- switch (currentState) {
- case CANCELLED:
- if ((newState != OrderPositionState.CANCELLED) && (newState != OrderPositionState.ORDERED)) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newDrinkState);
- }
- break;
- case ORDERED:
- if ((newState != OrderPositionState.ORDERED) && (newState != OrderPositionState.CANCELLED)
- && (newState != OrderPositionState.PREPARED) && (newDrinkState != ProductOrderState.ORDERED)
- && (newDrinkState != ProductOrderState.PREPARED)) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newDrinkState);
- }
- break;
- case PREPARED:
- // from here we can go to any other state (back to ORDERED in case that the kitchen has to rework)
- break;
- case DELIVERED:
- if ((newState == OrderPositionState.PREPARED) || (newState == OrderPositionState.ORDERED)
- || (newDrinkState == ProductOrderState.PREPARED) || (newDrinkState == ProductOrderState.ORDERED)) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newDrinkState);
- }
- break;
- case PAYED:
- if (newState != OrderPositionState.PAYED) {
- throw new IllegalEntityStateException(updateOrderPosition, currentState, newDrinkState);
- }
- break;
- default:
- LOG.error("Illegal state {}", currentState);
- break;
- }
-
- }
-
- /**
- * @param salesManagement the {@link Salesmanagement} to {@link Inject}.
- */
- @Inject
- public void setSalesManagement(Salesmanagement salesManagement) {
-
- this.salesManagement = salesManagement;
- }
-
- /**
- * @param offerManagement the {@link Offermanagement} to {@link Inject}.
- */
- @Inject
- public void setOfferManagement(Offermanagement offerManagement) {
-
- this.offerManagement = offerManagement;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/api/rest/SalesmanagementRestService.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/api/rest/SalesmanagementRestService.java
deleted file mode 100644
index e4e6a9aa5..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/api/rest/SalesmanagementRestService.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.service.api.rest;
-
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import io.oasp.gastronomy.restaurant.general.common.api.RestService;
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.PaymentStatus;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.PaymentData;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcChangeTable;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcFindOrderPosition;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageBill;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrder;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.usecase.UcManageOrderPosition;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-/**
- *
- * The service class for REST calls in order to execute the methods in {@link Salesmanagement}.
- *
- */
-
-@Path("/salesmanagement/v1")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-public interface SalesmanagementRestService extends RestService {
-
- /**
- * Delegates to {@link UcFindOrder#findOrder}.
- *
- * @param orderId specified for the order
- * @return the order
- */
- @Path("/order/{orderId}")
- @GET
- OrderEto findOrder(@PathParam("orderId") long orderId);
-
- /**
- * Delegates to {@link UcFindOrderPosition#findOrderPositions}.
- *
- * @param info is the {@link UriInfo}.
- * @return the {@link List} of matching {@link OrderCto}s.
- */
- @Path("/order")
- @GET
- PaginatedListTo findOrders(@Context UriInfo info);
-
- /**
- * Delegates to {@link UcFindOrderPosition#findOrderPositions}.
- *
- * @param searchCriteriaTo the pagination and search criteria to be used for finding orders.
- * @return the {@link PaginatedListTo list} of matching {@link OrderCto}s.
- */
- @Path("/order/search")
- @POST
- PaginatedListTo findOrdersByPost(OrderSearchCriteriaTo searchCriteriaTo);
-
- /**
- * Delegates to {@link UcFindOrderPosition#findOrderPositions}.
- *
- * @param info is the {@link UriInfo}.
- * @return the {@link List} of matching {@link OrderPositionEto}s.
- */
- @Path("/orderposition")
- @GET
- List findOrderPositions(@Context UriInfo info);
-
- /**
- * Delegates to {@link UcManageOrder#saveOrder}.
- *
- * @param order the {@link OrderCto} to update.
- * @param orderId the {@link OrderEto#getId() ID} of the order.
- * @return the updated {@link OrderCto}.
- */
- @Path("/order/{orderId}")
- @PUT
- @Deprecated
- public OrderCto updateOrder(OrderCto order, @PathParam("orderId") long orderId);
-
- /**
- * Delegates to {@link UcManageOrder#saveOrder}.
- *
- * @param order the {@link OrderCto} to save.
- * @return the saved {@link OrderCto} (with {@link OrderEto#getId() ID}(s) assigned).
- */
- @Path("/order/")
- @POST
- OrderCto saveOrder(OrderCto order);
-
- /**
- * Delegates to {@link UcFindOrderPosition#findOrderPosition}.
- *
- * @param orderPositionId id of the {@link OrderPositionEto}
- * @return the {@link OrderPositionEto}.
- */
- @Path("/orderposition/{orderPositionId}")
- @GET
- OrderPositionEto findOrderPosition(@PathParam("orderPositionId") long orderPositionId);
-
- /**
- * Delegates to {@link UcManageOrderPosition#createOrderPosition}.
- *
- * @param offer the offer as new position within an order as JSON
- * @param orderId the order id
- * @param comment the comment together with an orderPosition
- * @return a new orderPosition
- * @deprecated not REST style, will be removed.
- */
- @Path("/order/{orderId}/position/{comment}")
- @POST
- @Deprecated
- OrderPositionEto createOrderPosition(OfferEto offer, @PathParam("orderId") long orderId,
- @PathParam("comment") String comment);
-
- /**
- * Delegates to {@link UcManageOrderPosition#saveOrderPosition}.
- *
- * @param orderPosition the OrderPositionEto to save
- * @return the saved OrderPositionEto
- */
- @POST
- @Path("/orderposition/")
- OrderPositionEto saveOrderPosition(OrderPositionEto orderPosition);
-
- /**
- * Delegates to {@link UcFindBill#findBill}.
- *
- * @param billId id of the {@link BillEto}
- * @return the {@link BillEto}
- */
- @GET
- @Path("/bill/{billId}")
- BillCto findBill(@PathParam("billId") long billId);
-
- /**
- * Delegates to {@link UcManageBill#doPayment}.
- *
- * @param billId id of the bill
- * @return the {@link PaymentStatus}
- */
- @POST
- @Path("/bill/{billId}/payment")
- PaymentStatus doPayment(@PathParam("billId") long billId);
-
- /**
- * Delegates to {@link UcManageBill#doPayment(BillEto bill, PaymentData paymentDataDebitor)}.
- *
- * @param billId id of the {@link BillEto}
- * @param paymentData the {@link PaymentData}
- * @return the {@link PaymentStatus}
- */
- @Path("/bill/{billId}/payment")
- @POST
- PaymentStatus doPayment(@PathParam("billId") long billId, PaymentData paymentData);
-
- /**
- * Delegates to {@link UcManageBill#createBill}.
- *
- * @param bill the bill to create
- * @return the created {@link BillEto}
- */
- @POST
- @Path("/bill/")
- BillEto createBill(BillEto bill);
-
- /**
- * Delegates to {@link UcManageBill#deleteBill}.
- *
- * @param billId id of the {@link BillEto}
- */
- @Path("/bill/{billId}")
- @DELETE
- void deleteBill(@PathParam("billId") long billId);
-
- /**
- * Delegates to {@link UcChangeTable#changeTable}.
- *
- * @param orderId the Id of the order
- * @param newTableId the Id of the new table
- */
- @Path("/order/{orderId}")
- @POST
- void changeTable(@PathParam("orderId") long orderId, long newTableId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/api/websocket/PositionStatusChangeTo.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/api/websocket/PositionStatusChangeTo.java
deleted file mode 100644
index 019c47cde..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/api/websocket/PositionStatusChangeTo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.service.api.websocket;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class PositionStatusChangeTo {
- private Long id;
-
- private OrderPositionState status;
-
- /**
- *
- * The constructor.
- *
- * @param id OrderId
- * @param status OrderPositionState
- */
- @JsonCreator
- public PositionStatusChangeTo(@JsonProperty("id") Long id, @JsonProperty("status") OrderPositionState status) {
-
- this.id = id;
- this.status = status;
- }
-
- /**
- * @return id
- */
- public Long getId() {
-
- return this.id;
- }
-
- /**
- * @return OrderPosition status
- */
- public OrderPositionState getStatus() {
-
- return this.status;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/rest/SalesmanagementRestServiceImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/rest/SalesmanagementRestServiceImpl.java
deleted file mode 100644
index 14b6830a5..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/rest/SalesmanagementRestServiceImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.service.impl.rest;
-
-import java.util.List;
-import java.util.Objects;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.core.UriInfo;
-
-import io.oasp.gastronomy.restaurant.offermanagement.logic.api.to.OfferEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderPositionState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.OrderState;
-import io.oasp.gastronomy.restaurant.salesmanagement.common.api.datatype.PaymentStatus;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.Salesmanagement;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.BillEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderCto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionEto;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderPositionSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.OrderSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.salesmanagement.logic.api.to.PaymentData;
-import io.oasp.gastronomy.restaurant.salesmanagement.service.api.rest.SalesmanagementRestService;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-import io.oasp.module.jpa.common.api.to.PaginationTo;
-import io.oasp.module.rest.service.api.RequestParameters;
-
-/**
- */
-@Named("SalesmanagementRestService")
-public class SalesmanagementRestServiceImpl implements SalesmanagementRestService {
-
- private Salesmanagement salesmanagement;
-
- @Override
- public OrderEto findOrder(long orderId) {
-
- return this.salesmanagement.findOrder(orderId);
- }
-
- @Override
- public PaginatedListTo findOrders(UriInfo info) {
-
- RequestParameters parameters = RequestParameters.fromQuery(info);
- OrderSearchCriteriaTo criteria = new OrderSearchCriteriaTo();
- criteria.setTableId(parameters.get("tableId", Long.class, false));
- criteria.setState(parameters.get("state", OrderState.class, false));
-
- Integer page = parameters.get("pagination[page]", Integer.class, false);
- if (page != null) {
- PaginationTo pagination = new PaginationTo();
- pagination.setPage(page);
- pagination.setSize(parameters.get("pagination[size]", Integer.class, false));
- criteria.setPagination(pagination);
- }
-
- return this.salesmanagement.findOrderCtos(criteria);
- }
-
- @Override
- public PaginatedListTo findOrdersByPost(OrderSearchCriteriaTo searchCriteriaTo) {
-
- return this.salesmanagement.findOrderCtos(searchCriteriaTo);
- }
-
- @Override
- public List findOrderPositions(UriInfo info) {
-
- RequestParameters parameters = RequestParameters.fromQuery(info);
- OrderPositionSearchCriteriaTo criteria = new OrderPositionSearchCriteriaTo();
- criteria.setOrderId(parameters.get("orderId", Long.class, false));
- criteria.setCookId(parameters.get("cookId", Long.class, false));
- criteria.setState(parameters.get("state", OrderPositionState.class, false));
- criteria.setMealOrSideDish(parameters.get("mealOrSideDish", boolean.class, false));
- return this.salesmanagement.findOrderPositions(criteria);
- }
-
- @Override
- @Deprecated
- public OrderCto updateOrder(OrderCto order, long orderId) {
-
- Objects.requireNonNull(order, "order");
- OrderEto orderEto = order.getOrder();
- Objects.requireNonNull(orderEto, "order");
- Long jsonOrderId = orderEto.getId();
- if (jsonOrderId == null) {
- orderEto.setId(orderId);
- } else if (!jsonOrderId.equals(orderId)) {
- throw new BadRequestException("Order ID of URL does not match JSON payload!");
- }
- return this.salesmanagement.saveOrder(order);
- }
-
- @Override
- public OrderCto saveOrder(OrderCto order) {
-
- return this.salesmanagement.saveOrder(order);
- }
-
- @Override
- public OrderPositionEto findOrderPosition(long orderPositionId) {
-
- return this.salesmanagement.findOrderPosition(orderPositionId);
-
- }
-
- @Override
- @Deprecated
- public OrderPositionEto createOrderPosition(OfferEto offer, long orderId, String comment) {
-
- return this.salesmanagement.createOrderPosition(offer, findOrder(orderId), comment);
- }
-
- @Override
- public OrderPositionEto saveOrderPosition(OrderPositionEto orderPosition) {
-
- return this.salesmanagement.saveOrderPosition(orderPosition);
- }
-
- @Override
- public BillCto findBill(long billId) {
-
- return this.salesmanagement.findBill(billId);
- }
-
- @Override
- public PaymentStatus doPayment(long billId) {
-
- return this.salesmanagement.doPayment(findBill(billId).getBill());
- }
-
- @Override
- public PaymentStatus doPayment(long billId, PaymentData paymentData) {
-
- return this.salesmanagement.doPayment(findBill(billId).getBill(), paymentData);
- }
-
- @Override
- public BillEto createBill(BillEto bill) {
-
- return this.salesmanagement.createBill(bill);
- }
-
- @Override
- public void deleteBill(long billId) {
-
- this.salesmanagement.deleteBill(billId);
- }
-
- @Override
- public void changeTable(long orderId, long newTableId) {
-
- this.salesmanagement.changeTable(orderId, newTableId);
- }
-
- /**
- * This method sets the field salesmanagement.
- *
- * @param salesmanagement the new value of the field salesmanagement
- */
- @Inject
- public void setSalesmanagement(Salesmanagement salesmanagement) {
-
- this.salesmanagement = salesmanagement;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/websocket/OrderPositionWebSocketController.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/websocket/OrderPositionWebSocketController.java
deleted file mode 100644
index 73ff83c7c..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/websocket/OrderPositionWebSocketController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.service.impl.websocket;
-
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.stereotype.Controller;
-
-import io.oasp.gastronomy.restaurant.salesmanagement.service.api.websocket.PositionStatusChangeTo;
-
-@Controller
-public class OrderPositionWebSocketController {
- @MessageMapping("/positions")
- @SendTo("/topic/positionStatusChange")
- public PositionStatusChangeTo statusChanged(PositionStatusChangeTo positionStatusChange) {
- return positionStatusChange;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/websocket/config/WebSocketConfig.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/websocket/config/WebSocketConfig.java
deleted file mode 100644
index 6086a3171..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/salesmanagement/service/impl/websocket/config/WebSocketConfig.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.oasp.gastronomy.restaurant.salesmanagement.service.impl.websocket.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-
-@Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
-
- @Override
- public void configureMessageBroker(MessageBrokerRegistry config) {
-
- config.enableSimpleBroker("/topic");
- config.setApplicationDestinationPrefixes("/sample");
- }
-
- @Override
- public void registerStompEndpoints(StompEndpointRegistry registry) {
-
- registry.addEndpoint("/websocket/positions").withSockJS();
- }
-
-}
\ No newline at end of file
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/common/api/StaffMember.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/common/api/StaffMember.java
deleted file mode 100644
index 12eb9569a..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/common/api/StaffMember.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.common.api;
-
-import io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity;
-import io.oasp.gastronomy.restaurant.general.common.api.UserProfile;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Role;
-
-/**
- * This is the interface for a {@link StaffMember} that is an employee of the restaurant.
- *
- */
-public interface StaffMember extends ApplicationEntity, UserProfile {
-
- /**
- * @param name is the new {@link #getName() login}.
- */
- void setName(String name);
-
- /**
- * @param firstName is the new {@link #getFirstName() first name}.
- */
- void setFirstName(String firstName);
-
- /**
- * @param lastName is the new {@link #getLastName() last name}.
- */
- void setLastName(String lastName);
-
- /**
- * @param role the new {@link #getRole() role}.
- */
- void setRole(Role role);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/api/StaffMemberEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/api/StaffMemberEntity.java
deleted file mode 100644
index f73f86ad6..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/api/StaffMemberEntity.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Role;
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity;
-import io.oasp.gastronomy.restaurant.staffmanagement.common.api.StaffMember;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * The {@link io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity persistent entity} for
- * {@link StaffMember}.
- *
- */
-@Entity
-@Table(name = "StaffMember")
-public class StaffMemberEntity extends ApplicationPersistenceEntity implements StaffMember {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- private String firstName;
-
- private String lastName;
-
- private Role role;
-
- /**
- * The constructor.
- */
- public StaffMemberEntity() {
-
- super();
- }
-
- @Column(name = "login", unique = true)
- @Override
- public String getName() {
-
- return this.name;
- }
-
- @Override
- public void setName(String login) {
-
- this.name = login;
- }
-
- @Override
- public String getFirstName() {
-
- return this.firstName;
- }
-
- @Override
- public void setFirstName(String firstName) {
-
- this.firstName = firstName;
- }
-
- @Override
- public String getLastName() {
-
- return this.lastName;
- }
-
- @Override
- public void setLastName(String lastName) {
-
- this.lastName = lastName;
- }
-
- @Override
- public Role getRole() {
-
- return this.role;
- }
-
- @Override
- public void setRole(Role role) {
-
- this.role = role;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/api/dao/StaffMemberDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/api/dao/StaffMemberDao.java
deleted file mode 100644
index ffbf5c5d0..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/api/dao/StaffMemberDao.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api.StaffMemberEntity;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-import io.oasp.module.jpa.dataaccess.api.MasterDataDao;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link StaffMemberEntity} entity.
- *
- */
-public interface StaffMemberDao extends ApplicationDao, MasterDataDao {
-
- /**
- * Searchs the restaurant staff member with identifier 'login' within the database.
- *
- * @param login staff member identifier
- * @return Staffmember
- */
- StaffMemberEntity findByLogin(String login);
-
- /**
- * Finds the {@link StaffMemberEntity} objects matching the given {@link StaffMemberSearchCriteriaTo}-
- *
- * @param criteria is the {@link StaffMemberSearchCriteriaTo}.
- * @return the {@link PaginatedListTo} with the matching {@link StaffMemberEntity} objects.
- */
- PaginatedListTo findStaffMembers(StaffMemberSearchCriteriaTo criteria);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/impl/dao/StaffMemberDaoImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/impl/dao/StaffMemberDaoImpl.java
deleted file mode 100644
index 4809b0a2e..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/dataaccess/impl/dao/StaffMemberDaoImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.impl.dao;
-
-import static com.mysema.query.alias.Alias.$;
-import io.oasp.gastronomy.restaurant.general.common.api.constants.NamedQueries;
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Role;
-import io.oasp.gastronomy.restaurant.general.dataaccess.base.dao.ApplicationMasterDataDaoImpl;
-import io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api.StaffMemberEntity;
-import io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api.dao.StaffMemberDao;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import javax.inject.Named;
-import javax.persistence.TypedQuery;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.path.EntityPathBase;
-
-/**
- * Implementation of {@link StaffMemberDao}.
- *
- */
-@Named
-public class StaffMemberDaoImpl extends ApplicationMasterDataDaoImpl implements StaffMemberDao {
-
- /**
- * The constructor.
- */
- public StaffMemberDaoImpl() {
-
- super();
- }
-
- @Override
- public Class getEntityClass() {
-
- return StaffMemberEntity.class;
- }
-
- @Override
- public StaffMemberEntity findByLogin(String login) {
-
- TypedQuery query =
- getEntityManager().createNamedQuery(NamedQueries.GET_STAFF_MEMBER_BY_LOGIN, StaffMemberEntity.class);
- query.setParameter("login", login);
- return query.getSingleResult();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public PaginatedListTo findStaffMembers(StaffMemberSearchCriteriaTo criteria) {
-
- StaffMemberEntity staffMember = Alias.alias(StaffMemberEntity.class);
- EntityPathBase alias = $(staffMember);
- JPAQuery query = new JPAQuery(getEntityManager()).from(alias);
-
- String firstName = criteria.getFirstName();
- if (firstName != null) {
- query.where($(staffMember.getFirstName()).eq(firstName));
- }
- String lastName = criteria.getLastName();
- if (lastName != null) {
- query.where($(staffMember.getLastName()).eq(lastName));
- }
- String name = criteria.getName();
- if (name != null) {
- query.where($(staffMember.getName()).eq(name));
- }
- Role role = criteria.getRole();
- if (role != null) {
- query.where($(staffMember.getRole()).eq(role));
- }
-
- return findPaginated(criteria, query, alias);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/Staffmanagement.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/Staffmanagement.java
deleted file mode 100644
index b7870f973..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/Staffmanagement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.logic.api;
-
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberEto;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-import java.util.List;
-
-/**
- * Interface for StaffManagement component.
- *
- */
-public interface Staffmanagement {
-
- /**
- * @param id the {@link StaffMemberEto#getId() ID} of the requested staff member.
- * @return The {@link StaffMemberEto} with the given id or {@code null} if no such object exists.
- */
- StaffMemberEto findStaffMember(Long id);
-
- /**
- * @param login The {@link StaffMemberEto#getName() login} of the requested staff member.
- * @return The {@link StaffMemberEto} with the given login or {@code null} if no such object exists.
- */
- StaffMemberEto findStaffMemberByLogin(String login);
-
- /**
- * @return {@link List} of all existing {@link StaffMemberEto staff members}.
- */
- List findAllStaffMembers();
-
- /**
- * Returns a list of staff memberss matching the search criteria.
- *
- * @param criteria the {@link StaffMemberSearchCriteriaTo}.
- * @return the {@link List} of matching {@link StaffMemberEto}s.
- */
- PaginatedListTo findStaffMemberEtos(StaffMemberSearchCriteriaTo criteria);
-
- /**
- * @param staffMemberId the {@link StaffMemberEto#getId() ID} of a {@link StaffMemberEto} to delete.
- */
- void deleteStaffMember(Long staffMemberId);
-
- /**
- * @param login {@link StaffMemberEto#getName() login} of a {@link StaffMemberEto} to delete.
- */
- void deleteStaffMemberByLogin(String login);
-
- /**
- * Creates or updates a {@link StaffMemberEto}.
- *
- * @param staffMember The {@link StaffMemberEto} to create or update.
- * @return the saved {@link StaffMemberEto}
- */
- StaffMemberEto saveStaffMember(StaffMemberEto staffMember);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/to/StaffMemberEto.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/to/StaffMemberEto.java
deleted file mode 100644
index 833a80083..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/to/StaffMemberEto.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Role;
-import io.oasp.gastronomy.restaurant.staffmanagement.common.api.StaffMember;
-import io.oasp.module.basic.common.api.to.AbstractEto;
-
-import java.util.Locale;
-
-/**
- * The {@link AbstractEto ETO} for a {@link StaffMember}.
- *
- */
-public class StaffMemberEto extends AbstractEto implements StaffMember {
-
- // UUID
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- private String firstName;
-
- private String lastName;
-
- private Role role;
-
- private Locale language;
-
- /**
- * The constructor.
- */
- public StaffMemberEto() {
-
- super();
- }
-
- @Override
- public String getName() {
-
- return this.name;
- }
-
- @Override
- public void setName(String name) {
-
- this.name = name;
- }
-
- @Override
- public String getFirstName() {
-
- return this.firstName;
- }
-
- @Override
- public void setFirstName(String firstName) {
-
- this.firstName = firstName;
- }
-
- @Override
- public String getLastName() {
-
- return this.lastName;
- }
-
- @Override
- public void setLastName(String lastName) {
-
- this.lastName = lastName;
- }
-
- @Override
- public Role getRole() {
-
- return this.role;
- }
-
- @Override
- public void setRole(Role role) {
-
- this.role = role;
- }
-
- /**
- * @return language
- */
- public Locale getLanguage() {
-
- return this.language;
- }
-
- /**
- * @param language the language to set
- */
- public void setLanguage(Locale language) {
-
- this.language = language;
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/to/StaffMemberSearchCriteriaTo.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/to/StaffMemberSearchCriteriaTo.java
deleted file mode 100644
index 14d5e8cfc..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/api/to/StaffMemberSearchCriteriaTo.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to;
-
-import io.oasp.gastronomy.restaurant.general.common.api.datatype.Role;
-import io.oasp.module.jpa.common.api.to.SearchCriteriaTo;
-
-/**
- * This is the {@link SearchCriteriaTo search criteria} {@link net.sf.mmm.util.transferobject.api.TransferObject TO}
- * used to find {@link io.oasp.gastronomy.restaurant.staffmanagement.common.api.StaffMember}s.
- *
- */
-public class StaffMemberSearchCriteriaTo extends SearchCriteriaTo {
-
- /** UID for serialization. */
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- private String firstName;
-
- private String lastName;
-
- private Role role;
-
- /**
- * The constructor.
- */
- public StaffMemberSearchCriteriaTo() {
-
- super();
- }
-
- /**
- * @return name
- */
- public String getName() {
-
- return this.name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
-
- this.name = name;
- }
-
- /**
- * @return firstName
- */
- public String getFirstName() {
-
- return this.firstName;
- }
-
- /**
- * @param firstName the firstName to set
- */
- public void setFirstName(String firstName) {
-
- this.firstName = firstName;
- }
-
- /**
- * @return lastName
- */
- public String getLastName() {
-
- return this.lastName;
- }
-
- /**
- * @param lastName the lastName to set
- */
- public void setLastName(String lastName) {
-
- this.lastName = lastName;
- }
-
- /**
- * @return role
- */
- public Role getRole() {
-
- return this.role;
- }
-
- /**
- * @param role the role to set
- */
- public void setRole(Role role) {
-
- this.role = role;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/impl/StaffmanagementImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/impl/StaffmanagementImpl.java
deleted file mode 100644
index 5d05134db..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/logic/impl/StaffmanagementImpl.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.logic.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.transaction.Transactional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import io.oasp.gastronomy.restaurant.general.common.api.UserProfile;
-import io.oasp.gastronomy.restaurant.general.common.api.Usermanagement;
-import io.oasp.gastronomy.restaurant.general.common.api.constants.PermissionConstants;
-import io.oasp.gastronomy.restaurant.general.logic.base.AbstractComponentFacade;
-import io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api.StaffMemberEntity;
-import io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api.dao.StaffMemberDao;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.Staffmanagement;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberEto;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-/**
- * Implementation of {@link Staffmanagement}.
- *
- */
-@Named
-@Component
-@Transactional
-public class StaffmanagementImpl extends AbstractComponentFacade implements Staffmanagement, Usermanagement {
-
- /** Logger instance. */
- private static final Logger LOG = LoggerFactory.getLogger(StaffmanagementImpl.class);
-
- /** @see #getStaffMemberDao() */
- private StaffMemberDao staffMemberDao;
-
- /**
- * Do not extract this method as a service, because of PermitAll. (only for login)
- */
- @Override
- @RolesAllowed(PermissionConstants.FIND_STAFF_MEMBER)
- public StaffMemberEto findStaffMemberByLogin(String login) {
-
- return privateFindStaffMemberByLogin(login);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_STAFF_MEMBER)
- public StaffMemberEto findStaffMember(Long id) {
-
- return getBeanMapper().map(getStaffMemberDao().find(id), StaffMemberEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_STAFF_MEMBER)
- public List findAllStaffMembers() {
-
- List members = getStaffMemberDao().findAll();
- List membersBo = new ArrayList<>();
-
- for (StaffMemberEntity member : members) {
- membersBo.add(getBeanMapper().map(member, StaffMemberEto.class));
- }
-
- return membersBo;
- }
-
- @Override
- @RolesAllowed(PermissionConstants.FIND_STAFF_MEMBER)
- public PaginatedListTo findStaffMemberEtos(StaffMemberSearchCriteriaTo criteria) {
-
- // Uncomment next line in order to limit the maximum page size for the staff member search
- // criteria.limitMaximumPageSize(MAXIMUM_HIT_LIMIT);
-
- PaginatedListTo offers = getStaffMemberDao().findStaffMembers(criteria);
- return mapPaginatedEntityList(offers, StaffMemberEto.class);
- }
-
- @Override
- // used during authentication so not authorization annotation (not even @PermitAll) can be used here
- public UserProfile findUserProfileByLogin(String login) {
-
- return privateFindStaffMemberByLogin(login);
- }
-
- /**
- * Do not extract this method as a service, because of PermitAll. (only for login)
- */
- private StaffMemberEto privateFindStaffMemberByLogin(String login) {
-
- return getBeanMapper().map(getStaffMemberDao().findByLogin(login), StaffMemberEto.class);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.DELETE_STAFF_MEMBER)
- public void deleteStaffMemberByLogin(String login) {
-
- getStaffMemberDao().delete(getStaffMemberDao().findByLogin(login));
- }
-
- @Override
- @RolesAllowed(PermissionConstants.DELETE_STAFF_MEMBER)
- public void deleteStaffMember(Long staffMemberId) {
-
- getStaffMemberDao().delete(staffMemberId);
- }
-
- @Override
- @RolesAllowed(PermissionConstants.SAVE_STAFF_MEMBER)
- public StaffMemberEto saveStaffMember(StaffMemberEto staffMember) {
-
- Objects.requireNonNull(staffMember, "staffMember");
-
- Long id = staffMember.getId();
- StaffMemberEntity targetStaffMember = null;
-
- if (id != null) {
- targetStaffMember = getStaffMemberDao().find(id);
- }
- if (targetStaffMember == null) {
- // StaffMember is new: -> create
- LOG.debug("Saving StaffMember with id '{}' to the database.", id);
- } else {
- // StaffMember already exists: -> Update
- LOG.debug("Updating StaffMember with id '{}' in the database.", id);
- if (!Objects.equals(targetStaffMember.getName(), staffMember.getName())) {
- LOG.debug("Changing login of StaffMember with id '{}' from '{}' to '{}' in the database.", id,
- targetStaffMember.getName(), staffMember.getName());
- }
- }
- StaffMemberEntity persistedStaffMember =
- getStaffMemberDao().save(getBeanMapper().map(staffMember, StaffMemberEntity.class));
- return getBeanMapper().map(persistedStaffMember, StaffMemberEto.class);
- }
-
- /**
- * @return the {@link StaffMemberDao} instance.
- */
- public StaffMemberDao getStaffMemberDao() {
-
- return this.staffMemberDao;
- }
-
- /**
- * Sets the field 'staffMemberDao'.
- *
- * @param staffMemberDao New value for staffMemberDao
- */
- @Inject
- public void setStaffMemberDao(StaffMemberDao staffMemberDao) {
-
- this.staffMemberDao = staffMemberDao;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/service/api/rest/StaffmanagementRestService.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/service/api/rest/StaffmanagementRestService.java
deleted file mode 100644
index dc6cd0401..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/service/api/rest/StaffmanagementRestService.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.service.api.rest;
-
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import io.oasp.gastronomy.restaurant.general.common.api.RestService;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.Staffmanagement;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberEto;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-/**
- *
- * The service class for REST calls in order to execute the methods in {@link Staffmanagement}.
- *
- */
-@Path("/staffmanagement/v1/staff")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-public interface StaffmanagementRestService extends RestService {
-
- /**
- * @return a list of all {@link StaffMemberEto}
- *
- */
- @GET
- @Path("/")
- @Deprecated
- List getAllStaffMember();
-
- /**
- * @param login the login of a staff member
- * @return {@link StaffMemberEto}
- */
- @GET
- @Path("/{login}")
- StaffMemberEto getStaffMember(@PathParam("login") String login);
-
- /**
- * @param staffMemberBo the staffMember to be updated as JSON
- */
- @PUT
- @Path("/{login}")
- @Deprecated
- void updateStaffMember(StaffMemberEto staffMemberBo);
-
- /**
- * Calls {@link Staffmanagement#saveStaffMember}.
- *
- * @param staffMemberEto the staffMember to be created or updated
- * @return the saved {@link StaffMemberEto}
- */
- @POST
- @Path("/")
- StaffMemberEto saveStaffMember(StaffMemberEto staffMemberEto);
-
- /**
- * @param login the login
- */
- @DELETE
- @Path("/{login}")
- void deleteStaffMember(@PathParam("login") String login);
-
- /**
- * Delegates to {@link Staffmanagement#findStaffMemberEtos}.
- *
- * @param searchCriteriaTo the pagination and search criteria to be used for finding staffmembers.
- * @return the {@link PaginatedListTo list} of matching {@link StaffMemberEto}s.
- */
- @Path("/search")
- @POST
- PaginatedListTo findStaffMembersByPost(StaffMemberSearchCriteriaTo searchCriteriaTo);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/service/impl/rest/StaffmanagementRestServiceImpl.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/service/impl/rest/StaffmanagementRestServiceImpl.java
deleted file mode 100644
index c17799c9f..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/staffmanagement/service/impl/rest/StaffmanagementRestServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package io.oasp.gastronomy.restaurant.staffmanagement.service.impl.rest;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.Staffmanagement;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberEto;
-import io.oasp.gastronomy.restaurant.staffmanagement.logic.api.to.StaffMemberSearchCriteriaTo;
-import io.oasp.gastronomy.restaurant.staffmanagement.service.api.rest.StaffmanagementRestService;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-
-/**
- */
-@Named("StaffmanagementRestService")
-public class StaffmanagementRestServiceImpl implements StaffmanagementRestService {
-
- private Staffmanagement staffmanagement;
-
- /**
- * @param staffManagement the staffManagement to be set
- */
- @Inject
- public void setStaffmanagement(Staffmanagement staffManagement) {
-
- this.staffmanagement = staffManagement;
- }
-
- @Override
- public List getAllStaffMember() {
-
- return this.staffmanagement.findAllStaffMembers();
- }
-
- @Override
- public StaffMemberEto getStaffMember(String login) {
-
- return this.staffmanagement.findStaffMemberByLogin(login);
- }
-
- // although login is not explicitly needed here, the path structure is intentionally chosen
- // it is up to the GUI-Team to either insert a (maybe redundant) call on getStaffMember or to leave it
- // like that and do the update right in the view of a previously "loaded" StaffMember
-
- @Override
- @Deprecated
- public void updateStaffMember(StaffMemberEto staffMemberBo) {
-
- this.staffmanagement.saveStaffMember(staffMemberBo);
- }
-
- @Override
- public StaffMemberEto saveStaffMember(StaffMemberEto staffMemberEto) {
-
- return this.staffmanagement.saveStaffMember(staffMemberEto);
- }
-
- @Override
- public void deleteStaffMember(String login) {
-
- this.staffmanagement.deleteStaffMemberByLogin(login);
- }
-
- @Override
- public PaginatedListTo findStaffMembersByPost(StaffMemberSearchCriteriaTo searchCriteriaTo) {
-
- return this.staffmanagement.findStaffMemberEtos(searchCriteriaTo);
- }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/common/api/Table.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/common/api/Table.java
deleted file mode 100644
index 9d7c4ca1d..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/common/api/Table.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.oasp.gastronomy.restaurant.tablemanagement.common.api;
-
-import io.oasp.gastronomy.restaurant.general.common.api.ApplicationEntity;
-import io.oasp.gastronomy.restaurant.tablemanagement.common.api.datatype.TableState;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-/**
- * This is the interface for a table of the restaurant. It has a unique {@link #getNumber() number} can be
- * {@link TableState#isReserved() reserved}, {@link TableState#isOccupied() occupied} and may have a
- * {@link #getWaiterId() waiter} assigned.
- *
- */
-public interface Table extends ApplicationEntity {
-
- /**
- * @return the unique table number.
- */
- @NotNull
- @Min(0)
- Long getNumber();
-
- /**
- * @param number is the new {@link #getNumber() number}.
- */
- void setNumber(Long number);
-
- /**
- * @return the current {@link TableState state} of this {@link Table}.
- */
- TableState getState();
-
- /**
- * @param state is the new {@link #getState() state}.
- */
- void setState(TableState state);
-
- /**
- * @return the {@link io.oasp.gastronomy.restaurant.staffmanagement.common.api.StaffMember#getId() ID} of the waiter
- * currently responsible for this table.
- */
- Long getWaiterId();
-
- /**
- * Sets the field 'waiterId'.
- *
- * @param waiterId New value for waiterId
- */
- void setWaiterId(Long waiterId);
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/common/api/datatype/TableState.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/common/api/datatype/TableState.java
deleted file mode 100644
index bf0410fe6..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/common/api/datatype/TableState.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.oasp.gastronomy.restaurant.tablemanagement.common.api.datatype;
-
-/**
- * Represents the {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table#getState() state} of a
- * {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table}.
- *
- */
-public enum TableState {
- /** The state of a free {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table}. */
- FREE,
-
- /** The state of a reserved {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table}. */
- RESERVED,
-
- /** The state of a occupied {@link io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table}. */
- OCCUPIED;
-
- /**
- * @return {@code true} if {@link #FREE}, {@code false} otherwise.
- */
- public boolean isFree() {
-
- return (this == FREE);
- }
-
- /**
- * @return {@code true} if {@link #RESERVED}, {@code false} otherwise.
- */
- public boolean isReserved() {
-
- return (this == RESERVED);
- }
-
- /**
- * @return {@code true} if {@link #OCCUPIED}, {@code false} otherwise.
- */
- public boolean isOccupied() {
-
- return (this == OCCUPIED);
- }
-
- // /**
- // * @return {@code true} if the
- // * {@link io.oasp.gastronomy.restaurant.tablemanagement.persistence.api.entity.Table} has opened orders.
- // */
- // public boolean isOrdersopen() {
- //
- // return (this == ORDERSOPEN);
- // }
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/dataaccess/api/TableEntity.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/dataaccess/api/TableEntity.java
deleted file mode 100644
index 89132b457..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/dataaccess/api/TableEntity.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package io.oasp.gastronomy.restaurant.tablemanagement.dataaccess.api;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.ApplicationPersistenceEntity;
-import io.oasp.gastronomy.restaurant.tablemanagement.common.api.Table;
-import io.oasp.gastronomy.restaurant.tablemanagement.common.api.datatype.TableState;
-
-/**
- * {@link ApplicationPersistenceEntity Entity} representing a {@link Table} of the restaurant. A table has a unique
- * {@link #getNumber() number} can be {@link TableState#isReserved() reserved}, {@link TableState#isOccupied() occupied}
- * and may have a {@link io.oasp.gastronomy.restaurant.staffmanagement.dataaccess.api.StaffMemberEntity waiter}
- * assigned.
- *
- */
-@Entity
-// Table is a reserved word in SQL/RDBMS and can not be used as table name
-@javax.persistence.Table(name = "RestaurantTable")
-public class TableEntity extends ApplicationPersistenceEntity implements Table {
-
- private static final long serialVersionUID = 1L;
-
- private Long number;
-
- private Long waiterId;
-
- private TableState state;
-
- @Override
- /*
- * Uncomment the following Column annotation if the database used is Oracle 11g and comment the Column annotation just
- * before @Override annotation
- */
- // @Column(name = "\"number\"", unique = true)
- @Column(unique = true)
- public Long getNumber() {
-
- return this.number;
- }
-
- @Override
- public void setNumber(Long number) {
-
- this.number = number;
- }
-
- @Override
- @Column(name = "waiterId")
- public Long getWaiterId() {
-
- return this.waiterId;
- }
-
- @Override
- public void setWaiterId(Long waiterId) {
-
- this.waiterId = waiterId;
- }
-
- @Override
- public TableState getState() {
-
- return this.state;
- }
-
- @Override
- public void setState(TableState state) {
-
- this.state = state;
- }
-
-}
diff --git a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/dataaccess/api/dao/TableDao.java b/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/dataaccess/api/dao/TableDao.java
deleted file mode 100644
index baffc89d2..000000000
--- a/samples/core/src/main/java/io/oasp/gastronomy/restaurant/tablemanagement/dataaccess/api/dao/TableDao.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.oasp.gastronomy.restaurant.tablemanagement.dataaccess.api.dao;
-
-import io.oasp.gastronomy.restaurant.general.dataaccess.api.dao.ApplicationDao;
-import io.oasp.gastronomy.restaurant.tablemanagement.dataaccess.api.TableEntity;
-import io.oasp.gastronomy.restaurant.tablemanagement.logic.api.to.TableSearchCriteriaTo;
-import io.oasp.module.jpa.common.api.to.PaginatedListTo;
-import io.oasp.module.jpa.dataaccess.api.MasterDataDao;
-
-import java.util.List;
-
-/**
- * {@link ApplicationDao Data Access Object} for {@link TableEntity} entity.
- *
- */
-public interface TableDao extends ApplicationDao