refactor: läuft jetzt

Thomas Ziemer
1 parent c77e2144
Showing 9 changed files with 28 additions and 82 deletions
.gitignore
pom.xml
src/main/java/net/ziemers/swxercise/db/BaseEntity.java
src/main/java/net/ziemers/swxercise/db/dao/GenericDao.java
src/main/java/net/ziemers/swxercise/db/utils/JpaTestUtils.java
src/main/java/net/ziemers/swxercise/lg/user/service/UserService.java
src/main/java/net/ziemers/swxercise/ui/RestController.java
src/main/resources/META-INF/persistence.xml
src/test/java/net/ziemers/swxercise/ui/RestControllerTest.java
 .classpath
 .project
 .settings/
+.idea/
 target/
+*.iml
@@ -40,12 +40,12 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j-version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 			<version>${mockito-version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.dbunit</groupId>
@@ -62,7 +62,7 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>${mysql-version}</version>
 		</dependency>
-	</dependencies>
+    </dependencies>
 	<build>
 		<finalName>swXercise</finalName>
@@ -2,7 +2,9 @@ package net.ziemers.swxercise.db;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+@MappedSuperclass
 public class BaseEntity {
     @Id
@@ -3,19 +3,19 @@ package net.ziemers.swxercise.db.dao;
 import java.util.Collection;
 import javax.ejb.Stateless;
-import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-// import javax.persistence.criteria.Predicate;
-// import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Root;
 import net.ziemers.swxercise.db.BaseEntity;
 @Stateless
 public class GenericDao {
-    @Inject
+    @PersistenceContext
     private EntityManager entityManager;
     /**
@@ -42,22 +42,22 @@ public class GenericDao {
      * @return die Entität mit gegebener Id oder <code>null</code>, wenn keine gefunden
      */
     public <T extends BaseEntity> T findById(Class<T> entityType, Long primaryKey) {
-        T entity = entityManager.find(entityType, primaryKey);
+        final T entity = entityManager.find(entityType, primaryKey);
         return entity;
     }
     /**
      * @param entityType Entity-Typ.
      * @param <T> Generic für den Entity-Typ.
-     * @return alle (aktiven) Entitäten vom gegebenen Typ
+     * @return alle Entitäten vom gegebenen Typ
      */
     public <T extends BaseEntity> Collection<T> findAll(Class<T> entityType) {
         CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-        CriteriaQuery<T> query = cb.createQuery(entityType);
-        // Root<T> root = query.from(entityType);
-        // Predicate activeStatus = cb.equal(root.get(STATUS), Status.ACTIVE);
-        // query.where(activeStatus);
-        return entityManager.createQuery(query).getResultList();
+        CriteriaQuery<T> cq = cb.createQuery(entityType);
+        Root<T> root = cq.from(entityType);
+        CriteriaQuery<T> selectAll = cq.select(root);
+        TypedQuery<T> query = entityManager.createQuery(selectAll);
+        return query.getResultList();
     }
 }
@@ -27,7 +27,6 @@ import org.dbunit.ext.mysql.MySqlDataTypeFactory;
 import org.dbunit.ext.mysql.MySqlMetadataHandler;
 import org.dbunit.operation.DatabaseOperation;
 import org.hibernate.internal.SessionImpl;
-import org.junit.After;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -254,15 +253,4 @@ public class JpaTestUtils {
         return String.format("DELETE FROM %s.%s;", schema, table);
     }
-    /**
-     * Rollt eine jetzt noch aktive Transaktion zurück.
-     */
-    @After
-    public void tearDown() {
-        EntityTransaction transaction = getEm().getTransaction();
-        if (transaction.isActive()) {
-            transaction.rollback();
-        }
-    }
-
 }
@@ -5,7 +5,6 @@ import java.util.Collection;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
-import net.ziemers.swxercise.db.BaseEntity;
 import net.ziemers.swxercise.db.dao.GenericDao;
 import net.ziemers.swxercise.lg.user.User;
@@ -15,15 +14,13 @@ public class UserService {
     @Inject
     private GenericDao genericDao;
-    public User findUser(final Long id) {
-        return genericDao.findById(User.class, id);
-    }
+    public User findUser(final Long id) { return genericDao.findById(User.class, id); }
     public Collection<User> findAllUsers() {
         return genericDao.findAll(User.class);
     }
-    public <T extends BaseEntity> Long saveUser(final User user) {
+    public Long saveUser(final User user) {
         return genericDao.save(user);
     }
@@ -2,7 +2,6 @@ package net.ziemers.swxercise.ui;
 import java.util.Collection;
-import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
@@ -13,8 +12,6 @@ import javax.ws.rs.core.MediaType;
 import net.ziemers.swxercise.lg.user.User;
 import net.ziemers.swxercise.lg.user.service.UserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 @ApplicationScoped
 @Path(RestController.webContextPath)
@@ -22,28 +19,19 @@ public class RestController {
     static final String webContextPath = "/user";
-    private Logger logger;
-
     @Inject
     private UserService userService;
-    @PostConstruct
-    public void init() {
-        logger = LoggerFactory.getLogger(RestController.class);
-    }
-
     /**
      * Schickt eine Hello-Nachricht zum Aufrufer zurück.
-     * 
-     * @param name
-     *            der Name, der in der Hallo-Nachricht angegeben wird
+     *
+     * @param name der Name, der in der Hallo-Nachricht angegeben wird
      * @return eine Hallo-Nachricht
      */
     @GET
     @Path("/hello/{name}")
     @Produces(MediaType.TEXT_PLAIN)
     public String helloPath(@PathParam("name") String name) {
-        logger.info("Hello {}", name);
         return String.format("Hello %s", name);
     }
@@ -8,40 +8,4 @@
 			<property name="hibernate.hbm2ddl.auto" value="update" />
 		</properties>
 	</persistence-unit>
-	<persistence-unit name="swXerciseTestPU"
-		transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<exclude-unlisted-classes>false</exclude-unlisted-classes>
-
-		<properties>
-			<!-- Property for WildFly to ignore this -->
-			<property name="jboss.as.jpa.managed" value="false" />
-			<!-- Properties for Hibernate -->
-			<property name="javax.persistence.jdbc.url"
-				value="jdbc:mariadb://${abisnext.test.host}:${abisnext.test.port}/${abisnext.test.schema}" />
-			<property name="javax.persistence.jdbc.user" value="${abisnext.test.user}" />
-			<property name="javax.persistence.jdbc.password" value="${abisnext.test.password}" />
-			<property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
-			<property name="hibernate.show_sql" value="false" />
-			<property name="hibernate.format_sql" value="false" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
-			<!--<property name="hibernate.hbm2ddl.auto" value="create-drop" /> -->
-			<property name="hibernate.connection.useUnicode" value="true" />
-			<property name="hibernate.connection.characterEncoding"
-				value="UTF-8" />
-			<property name="hibernate.connection.provider_class"
-				value="org.hibernate.connection.C3P0ConnectionProvider" />
-
-			<property name="hibernate.c3p0.min_size" value="2" />
-			<property name="hibernate.c3p0.max_size" value="100" />
-			<property name="hibernate.c3p0.timeout" value="10" />
-			<property name="hibernate.c3p0.max_statements" value="100" />
-			<property name="hibernate.c3p0.idle_test_period" value="30" />
-
-			<property name="hibernate.temp.use_jdbc_metadata_defaults"
-				value="false" />
-			<property name="hibernate.ejb.entitymanager_factory_name"
-				value="abisnext_test" />
-		</properties>
-	</persistence-unit>
 </persistence>
 \ No newline at end of file
 package net.ziemers.swxercise.ui;
-import net.ziemers.swxercise.ui.RestController;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -14,7 +14,12 @@ public class RestControllerTest {
     @Test
     public void test() {
-        
+        final String name = "Tom";
+        final String expected = "Hello " + name;
+        String actual;
+
+        actual = underTest.helloPath(name);
+        Assert.assertEquals(expected, actual);
     }
 }