Fixed JPA metabodel bootstrap problem. Yeah!

Sda2/P/forum_1/pom.xml

@@ -131,6 +131,38 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<!-- Eclipse link JPA Metamodel -->
+			<plugin>
+				<groupId>org.bsc.maven</groupId>
+				<artifactId>maven-processor-plugin</artifactId>
+				<version>2.2.4</version>
+				<executions>
+					<execution>
+						<id>process</id>
+						<goals>
+							<goal>process</goal>
+						</goals>
+						<phase>generate-sources</phase>
+						<configuration>
+							<options>
+								<eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
+							</options>
+
+							<processors>
+								<processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
+							</processors>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.persistence</groupId>
+						<artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+						<version>${eclipse.link.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
 			<!-- As we are doing "inplace" GWT compilation, ensure the widgetset -->
 			<!-- directory is cleaned properly -->
 			<plugin>
@@ -206,38 +238,6 @@
 				</configuration>
 			</plugin>
 
-			<!-- Eclipse link JPA Metamodel -->
-			<plugin>
-				<groupId>org.bsc.maven</groupId>
-				<artifactId>maven-processor-plugin</artifactId>
-				<version>2.2.4</version>
-				<executions>
-					<execution>
-						<id>process</id>
-						<goals>
-							<goal>process</goal>
-						</goals>
-						<phase>generate-sources</phase>
-						<configuration>
-							<!-- Does not work: Bootstrap Problems! -->
-							<outputDirectory>src/main/java</outputDirectory>
-							<options>
-								<eclipselink.canonicalmodel.subpackage>jpametamodel</eclipselink.canonicalmodel.subpackage>
-							</options>
-							<processors>
-								<processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
-							</processors>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.eclipse.persistence</groupId>
-						<artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-						<version>${eclipse.link.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>

Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/tools/Credential.java

@@ -3,14 +3,13 @@ package de.hdm_stuttgart.mi.sda2.forum.tools;
 import java.util.List;
 
 import javax.persistence.EntityManager;
-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 de.hdm_stuttgart.mi.sda2.forum.domain.User;
-import de.hdm_stuttgart.mi.sda2.forum.domain.jpametamodel.User_;
+import de.hdm_stuttgart.mi.sda2.forum.domain.User_;
 
 
 public class Credential {
@@ -19,26 +18,22 @@ public class Credential {
 	
 	public static User check(final String email, final String cleartextPassword) {
 
-		final CriteriaBuilder qb = em.getCriteriaBuilder();
+		final CriteriaBuilder critBuilder = em.getCriteriaBuilder();
 		
-		final CriteriaQuery<User> allUsers = qb.createQuery(User.class);
-		final Root<User> u = allUsers.from(User.class);
-		Predicate condition = qb.equal(u.get(User_.email), email);
-		allUsers.where(condition);
+		final CriteriaQuery<User> userQuery = critBuilder.createQuery(User.class);
+		final Root<User> userRoot = userQuery.from(User.class);
+		final Predicate matchingEmail = critBuilder.equal(userRoot.get(User_.email), email);
+		userQuery.where(matchingEmail);
 		
-		TypedQuery<User> q = em.createQuery(allUsers); 
-		List<User> result = q.getResultList();
+		final List<User> result = em.createQuery(userQuery).getResultList();
 		if (1 == result.size()) {
 			final User user = result.get(0);
 			if (HashProvider.check(cleartextPassword.toCharArray(), user.getPassword())) {
 				return user;
-			} 
+			} else {
+				em.detach(user);
+			}
 		}
 		return null;
-//		em.getTransaction().begin();
-//		
-//		em.getTransaction().commit();
-		
 	}
-	
 }