persistence in common moved and imports adjusted

hausdoerfer
1 parent 5a166841
Showing 21 changed files with 55 additions and 54 deletions
services/Common/build.gradle
services/Common/src/main/java/de/bht/beuthbot/dataAccess/UserDAO.java → services/Common/src/main/java/de/bht/beuthbot/daos/AppUserDAO.java
services/Global/src/main/java/de/bht/beuthbot/daos/AppUserDAO.java → services/Common/src/main/java/de/bht/beuthbot/daos/AppUserDAOImpl.java
services/Common/src/main/java/de/bht/beuthbot/dataAccess/GenericDAO.java → services/Common/src/main/java/de/bht/beuthbot/daos/GenericDAO.java
services/Global/src/main/java/de/bht/beuthbot/daos/GenericHibernateDAO.java → services/Common/src/main/java/de/bht/beuthbot/daos/GenericHibernateDAO.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/User.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/AppUser.java
services/Global/src/main/java/de/bht/beuthbot/entities/AppUser.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/AppUserImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/Entity.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/EntityBase.java
services/Global/src/main/java/de/bht/beuthbot/entities/EntityBase.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/EntityBaseImpl.java
services/Global/src/main/java/de/bht/beuthbot/entities/GenericEntity.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntity.java
services/Global/src/main/java/de/bht/beuthbot/entities/GenericEntityAttribute.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntityAttribute.java
services/Global/src/main/java/de/bht/beuthbot/entities/GenericEntityAttributeValue.java → services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntityAttributeValue.java
services/Global/src/main/java/de/bht/beuthbot/persistence/ExtendedPostgreSQLDialect.java → services/Common/src/main/java/de/bht/beuthbot/persistence/ExtendedPostgreSQLDialect.java
services/Global/src/main/java/de/bht/beuthbot/persistence/GenericEntityAccessFacade.java → services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityAccessFacade.java
services/Global/src/main/java/de/bht/beuthbot/persistence/GenericEntityAttributeDeserializer.java → services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityAttributeDeserializer.java
services/Global/src/main/java/de/bht/beuthbot/persistence/GenericEntityDeserializer.java → services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityDeserializer.java
services/Global/src/main/java/de/bht/beuthbot/persistence/GenericEntityJsonConverter.java → services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityJsonConverter.java
services/Global/src/main/java/de/bht/beuthbot/persistence/JsonHelper.java → services/Common/src/main/java/de/bht/beuthbot/persistence/JsonHelper.java
services/Global/src/main/java/de/bht/beuthbot/persistence/JsonMapUserType.java → services/Common/src/main/java/de/bht/beuthbot/persistence/JsonMapUserType.java
services/Global/src/main/resources/META-INF/persistence.xml → services/Common/src/main/resources/META-INF/persistence.xml
@@ -9,6 +9,12 @@ dependencies {
     compile "org.jboss.spec:jboss-javaee-7.0:1.1.0.Final",
             "com.google.code.gson:gson:2.8.1",
             "org.slf4j:slf4j-api:1.7.25"
+
+    compile group: 'org.postgresql', name: 'postgresql', version: '9.3-1100-jdbc4'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.0.1'
+
+    compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '5.2.12.Final'
+    compileOnly group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.6.Final'
 }
 sourceCompatibility = 1.8
 \ No newline at end of file
-package de.bht.beuthbot.dataAccess;
+package de.bht.beuthbot.daos;
-import de.bht.beuthbot.model.entities.User;
+import de.bht.beuthbot.model.entities.AppUser;
 import javax.ejb.Remote;
@@ -8,7 +8,7 @@ import javax.ejb.Remote;
  * Created by Benjamin Rühl on 19.12.2017.
  */
 @Remote
-public interface UserDAO extends GenericDAO<User, Long> {
+public interface AppUserDAO extends GenericDAO<AppUser, Long> {
-    User createUser();
+    AppUser createUser();
 }
 package de.bht.beuthbot.daos;
-import de.bht.beuthbot.dataAccess.UserDAO;
-import de.bht.beuthbot.entities.AppUser;
-import de.bht.beuthbot.model.entities.User;
+import de.bht.beuthbot.model.entities.AppUserImpl;
+import de.bht.beuthbot.model.entities.AppUser;
 import javax.ejb.Stateless;
@@ -10,10 +9,10 @@ import javax.ejb.Stateless;
  * Created by Benjamin Rühl on 19.12.2017.
  */
 @Stateless
-public class AppUserDAO extends GenericHibernateDAO<User, AppUser, Long> implements UserDAO {
+public class AppUserDAOImpl extends GenericHibernateDAO<AppUser, AppUserImpl, Long> implements AppUserDAO {
     @Override
-    public User createUser() {
-        return new AppUser();
+    public AppUser createUser() {
+        return new AppUserImpl();
     }
 }
-package de.bht.beuthbot.dataAccess;
+package de.bht.beuthbot.daos;
-import de.bht.beuthbot.model.entities.Entity;
+import de.bht.beuthbot.model.entities.EntityBase;
 import javax.ejb.Remote;
 import java.io.Serializable;
@@ -10,7 +10,7 @@ import java.util.List;
  * Created by Benjamin Rühl on 19.12.2017.
  */
 @Remote
-public interface GenericDAO<T extends Entity, ID extends Serializable> {
+public interface GenericDAO<T extends EntityBase, ID extends Serializable> {
     T findById(ID id);
 package de.bht.beuthbot.daos;
-import de.bht.beuthbot.dataAccess.GenericDAO;
-import de.bht.beuthbot.model.entities.Entity;
-import org.hibernate.Session;
+import de.bht.beuthbot.model.entities.EntityBase;
 import javax.annotation.PostConstruct;
 import javax.ejb.Stateless;
@@ -27,7 +25,7 @@ import java.util.List;
  * @param <ID> Type of entity's primary id
  */
 @Stateless
-public class GenericHibernateDAO<I extends Entity, T extends I, ID extends Serializable> implements GenericDAO<I, ID> {
+public class GenericHibernateDAO<I extends EntityBase, T extends I, ID extends Serializable> implements GenericDAO<I, ID> {
     private Class<T> entityClass;
@@ -3,9 +3,11 @@ package de.bht.beuthbot.model.entities;
 /**
  * Created by Benjamin Rühl on 19.11.2017.
  */
-public interface User extends Entity {
+public interface AppUser extends EntityBase {
+    void setFacebookUserId(String facebookUserId);
     String getFacebookUserId();
+    void setTelegramUserId(String telegramUserId);
     String getTelegramUserId();
     <T extends Object> T getProperty(String propertyName, Class<T> propertyType);
     void setProperty(String propertyName, Object propertyValue);
-package de.bht.beuthbot.entities;
+package de.bht.beuthbot.model.entities;
 import de.bht.beuthbot.persistence.GenericEntityAccessFacade;
-import de.bht.beuthbot.persistence.GenericEntityJsonConverter;
-import de.bht.beuthbot.persistence.JsonHelper;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
 /**
  * Created by Benjamin Rühl on 19.11.2017.
@@ -19,7 +14,7 @@ import java.util.stream.Collectors;
  */
 @Entity
 @Table
-public class AppUser extends EntityBase implements de.bht.beuthbot.model.entities.User {
+public class AppUserImpl extends EntityBaseImpl implements AppUser {
     private String facebookUserId;
@@ -31,7 +26,7 @@ public class AppUser extends EntityBase implements de.bht.beuthbot.model.entitie
     //@Type(type = "JsonMapType")
     //private Map<String, String> additionalData = new HashMap<>();
-    public AppUser() {
+    public AppUserImpl() {
         additionalData = new GenericEntity();
         additionalData.setName("User");
     }
@@ -6,7 +6,7 @@ import java.util.Date;
 /**
  * Created by Benjamin Rühl on 19.11.2017.
  */
-public interface Entity extends Serializable {
+public interface EntityBase extends Serializable {
     Long getId();
-package de.bht.beuthbot.entities;
+package de.bht.beuthbot.model.entities;
-import de.bht.beuthbot.model.entities.Entity;
 import de.bht.beuthbot.persistence.JsonMapUserType;
+
 import org.hibernate.annotations.TypeDef;
 import javax.persistence.*;
@@ -14,7 +14,7 @@ import java.util.Objects;
 @MappedSuperclass
 @Access(AccessType.FIELD)
 @TypeDef(name = "JsonMapType", typeClass = JsonMapUserType.class)
-public class EntityBase implements Entity {
+public class EntityBaseImpl implements EntityBase {
     @Id
     @GeneratedValue
@@ -62,7 +62,7 @@ public class EntityBase implements Entity {
         if (obj.getClass() != getClass())
             return false;
-        EntityBase other = (EntityBase)obj;
+        EntityBaseImpl other = (EntityBaseImpl)obj;
         if (other.getId() == 0 && getId() == 0)
             return super.equals(obj);
-package de.bht.beuthbot.entities;
+package de.bht.beuthbot.model.entities;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -15,7 +15,7 @@ import java.util.stream.Collectors;
  */
 @Entity
 @Table
-public class GenericEntity extends EntityBase {
+public class GenericEntity extends EntityBaseImpl {
     /**
      * name is not mandatory, but can help to identify the entity's purpose for the developer
-package de.bht.beuthbot.entities;
+package de.bht.beuthbot.model.entities;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.util.List;
  */
 @Entity
 @Table
-public class GenericEntityAttribute extends EntityBase {
+public class GenericEntityAttribute extends EntityBaseImpl {
     private String name;
-package de.bht.beuthbot.entities;
+package de.bht.beuthbot.model.entities;
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 /**
  * Created by Benjamin Rühl on 22.12.2017.
@@ -9,7 +12,7 @@ import javax.persistence.*;
  */
 @Entity
 @Table
-public class GenericEntityAttributeValue extends EntityBase {
+public class GenericEntityAttributeValue extends EntityBaseImpl {
     private Boolean valueAsBool;
@@ -2,8 +2,9 @@ package de.bht.beuthbot.persistence;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import de.bht.beuthbot.entities.GenericEntity;
-import de.bht.beuthbot.entities.GenericEntityAttribute;
+
+import de.bht.beuthbot.model.entities.GenericEntity;
+import de.bht.beuthbot.model.entities.GenericEntityAttribute;
 import java.io.IOException;
 import java.util.List;
@@ -5,9 +5,10 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import de.bht.beuthbot.entities.GenericEntity;
-import de.bht.beuthbot.entities.GenericEntityAttribute;
-import de.bht.beuthbot.entities.GenericEntityAttributeValue;
+
+import de.bht.beuthbot.model.entities.GenericEntity;
+import de.bht.beuthbot.model.entities.GenericEntityAttribute;
+import de.bht.beuthbot.model.entities.GenericEntityAttributeValue;
 import javax.naming.OperationNotSupportedException;
 import java.io.IOException;
@@ -5,8 +5,9 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import de.bht.beuthbot.entities.GenericEntity;
-import de.bht.beuthbot.entities.GenericEntityAttribute;
+
+import de.bht.beuthbot.model.entities.GenericEntity;
+import de.bht.beuthbot.model.entities.GenericEntityAttribute;
 import java.io.IOException;
@@ -2,9 +2,10 @@ package de.bht.beuthbot.persistence;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
-import de.bht.beuthbot.entities.GenericEntity;
-import de.bht.beuthbot.entities.GenericEntityAttribute;
-import de.bht.beuthbot.entities.GenericEntityAttributeValue;
+
+import de.bht.beuthbot.model.entities.GenericEntity;
+import de.bht.beuthbot.model.entities.GenericEntityAttribute;
+import de.bht.beuthbot.model.entities.GenericEntityAttributeValue;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -13,14 +13,8 @@ dependencies {
             "org.apache.httpcomponents:httpclient:4.5.3",
             "commons-io:commons-io:2.5"
-    compile group: 'org.postgresql', name: 'postgresql', version: '9.3-1100-jdbc4'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.0.1'
-
     providedCompile "org.slf4j:slf4j-api:1.7.25"
-    compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '5.2.12.Final'
-    compileOnly group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.6.Final'
-
     testCompile "org.jboss.arquillian.junit:arquillian-junit-container:1.1.13.Final",
                 "junit:junit:4.12"