first database connection from the backend

hausdoerfer
1 parent e9888632
Showing 5 changed files with 53 additions and 20 deletions
docker/wildfly/standalone.xml
services/Global/build.gradle
services/Global/src/main/java/de/bht/beuthbot/entities/User.java
services/Global/src/main/java/de/bht/beuthbot/persistence/UserManager.java
services/Global/src/main/resources/META-INF/persistence.xml
@@ -161,7 +161,7 @@
                     <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
                 </managed-scheduled-executor-services>
             </concurrent>
-            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/PostgreSQLDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
             <session-bean>
@@ -11,14 +11,15 @@ dependencies {
             "org.jboss.spec:jboss-javaee-7.0:1.1.0.Final",
             "com.google.code.gson:gson:2.8.1",
             "org.apache.httpcomponents:httpclient:4.5.3",
-            "commons-io:commons-io:2.5",
-            "org.hibernate:hibernate-core:5.2.12.Final",
-            "org.hibernate:hibernate-entitymanager:4.3.6.Final"
+            "commons-io:commons-io:2.5"
     compile group: 'org.postgresql', name: 'postgresql', version: '9.3-1100-jdbc4'
     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"
 package de.bht.beuthbot.entities;
-import de.bht.beuthbot.persistence.JsonHelper;
-import org.hibernate.annotations.Type;
-
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.util.HashMap;
-import java.util.Map;
 /**
  * Created by Benjamin Rühl on 19.11.2017.
  */
 @Entity
-@Table
+@Table(name = "user_entity")
 public class User extends EntityBase implements de.bht.beuthbot.model.entities.User {
     private String facebookUserId;
     private String telegramUserId;
-    @Type(type = "JsonMapType")
-    private Map<String, String> additionalData = new HashMap<>();
+    //@Type(type = "JsonMapType")
+    //private Map<String, String> additionalData = new HashMap<>();
     @Override
     public String getFacebookUserId() {
@@ -32,20 +27,30 @@ public class User extends EntityBase implements de.bht.beuthbot.model.entities.U
     }
     @Override
-    public <T extends Object> T getProperty(String propertyName, Class<T> propertyType) {
+    public <T> T getProperty(String propertyName, Class<T> propertyType) {
+        return null;
+    }
+
+    @Override
+    public void setProperty(String propertyName, Object propertyValue) {
+
+    }
+
+    //@Override
+    /*public <T extends Object> T getProperty(String propertyName, Class<T> propertyType) {
         String propertyValue = additionalData.getOrDefault(propertyName, null);
         if (propertyValue == null)
             return null;
         return (T) JsonHelper.fromJson(propertyValue, propertyType);
-    }
+    }*/
-    @Override
-    public void setProperty(String propertyName, Object propertyValue) {
+    //@Override
+    /*public void setProperty(String propertyName, Object propertyValue) {
         String valueAsJson = JsonHelper.toJson(propertyValue, propertyValue.getClass());
         additionalData.put(propertyName, valueAsJson);
-    }
+    }*/
     public void setFacebookUserId(String facebookUserId) {
         this.facebookUserId = facebookUserId;
@@ -6,10 +6,10 @@ import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-@Stateless
+//@Stateless
 public class UserManager {
-    @PersistenceContext(unitName="de.bht.beuthbot.jpa")
+    /*@PersistenceContext(unitName="PostgreSQLDS")
     protected EntityManager entityManager;
     public void createUser() {
@@ -18,5 +18,5 @@ public class UserManager {
         user.setTelegramUserId("TelegramUserId");
         entityManager.persist(user);
-    }
+    }*/
 }
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
+             version="2.1">
+
+    <persistence-unit name="PostgreSQLDS" transaction-type="RESOURCE_LOCAL">
+
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+
+        <jta-data-source>java:jboss/datasources/PostgreSQLDS</jta-data-source>
+
+        <class>de.bht.beuthbot.entities.User</class>
+
+        <properties>
+
+            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/> <!-- DB Dialect -->
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" /> <!-- create / create-drop / update / none -->
+            <property name="hibernate.archive.autodetection" value="class"/>
+
+            <property name="hibernate.show_sql" value="true" /> <!-- Show SQL in console -->
+            <property name="hibernate.format_sql" value="true" /> <!-- Show SQL formatted -->
+        </properties>
+
+    </persistence-unit>
+
+</persistence>
 \ No newline at end of file