Fixes javaeekickoff/java-ee-kickoff-app#44 : use annotation NamedQuery

src/main/java/org/example/kickoff/business/service/LoginTokenService.java

@@ -45,13 +45,14 @@ public String generate(String email, String ipAddress, String description, Token
 	}
 
 	public void remove(String loginToken) {
-		createNamedQuery("LoginToken.remove")
+		createNamedQuery(LoginToken.REMOVE)
 			.setParameter("tokenHash", digest(loginToken, MESSAGE_DIGEST_ALGORITHM))
 			.executeUpdate();
 	}
 
 	public void removeExpired() {
-		createNamedQuery("LoginToken.removeExpired")
+		createNamedQuery(LoginToken.REMOVE_EXPIRED)
+			.setParameter("expiration", Instant.now())
 			.executeUpdate();
 	}
 

src/main/java/org/example/kickoff/business/service/PersonService.java

@@ -5,6 +5,7 @@
 import static org.omnifaces.persistence.JPA.getOptionalSingleResult;
 import static org.omnifaces.utils.security.MessageDigests.digest;
 
+import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.Map;
@@ -111,13 +112,14 @@ public void requestResetPassword(String email, String ipAddress, String callback
 	}
 
 	public Optional<Person> findByEmail(String email) {
-		return getOptionalSingleResult(createNamedTypedQuery("Person.getByEmail")
+		return getOptionalSingleResult(createNamedTypedQuery(Person.BY_EMAIL)
 			.setParameter("email", email));
 	}
 
 	public Optional<Person> findByLoginToken(String loginToken, TokenType type) {
-		return getOptionalSingleResult(createNamedTypedQuery("Person.getByLoginToken")
+		return getOptionalSingleResult(createNamedTypedQuery(Person.BY_LOGIN_TOKEN)
 			.setParameter("tokenHash", digest(loginToken, "SHA-256"))
+			.setParameter("expiration", Instant.now())
 			.setParameter("tokenType", type));
 	}
 
@@ -155,4 +157,4 @@ public void setPassword(Person person, String password) {
 		credentials.setPassword(password);
 	}
 
-}
+}

src/main/java/org/example/kickoff/model/LoginToken.java

@@ -9,14 +9,31 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
 import jakarta.persistence.PrePersist;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
 import org.omnifaces.persistence.model.GeneratedIdEntity;
 
+@NamedQuery(name = LoginToken.REMOVE, query =
+  "DELETE"
++ " FROM"
++ "	LoginToken _loginToken"
++ " WHERE"
++ "	_loginToken.tokenHash = :tokenHash"
+)
+@NamedQuery(name = LoginToken.REMOVE_EXPIRED, query =
+  "DELETE"
++ " FROM"
++ "	LoginToken _loginToken"
++ " WHERE"
++ "	_loginToken.expiration < :expiration"
+)
 @Entity
 public class LoginToken extends GeneratedIdEntity<Long> {
+	public final static String REMOVE = "LoginToken.remove";
+	public final static String REMOVE_EXPIRED = "LoginToken.removeExpired";
 
 	private static final long serialVersionUID = 1L;
 
@@ -116,4 +133,4 @@ public void setTimestamps() {
 		}
 	}
 
-}
+}

src/main/java/org/example/kickoff/model/Person.java

@@ -16,6 +16,7 @@
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.NamedQuery;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Transient;
@@ -25,8 +26,32 @@
 import org.example.kickoff.model.validator.Email;
 import org.omnifaces.persistence.model.TimestampedEntity;
 
+@NamedQuery(name = Person.BY_EMAIL, query =
+  "SELECT"
++ "	_person"
++ " FROM"
++ "	Person _person"
++ " WHERE"
++ "	_person.email = :email"
+)
+@NamedQuery(name = Person.BY_LOGIN_TOKEN, query =
+  "SELECT"
++ "	_person"
++ " FROM"
++ "	Person _person"
++ "		JOIN"
++ "	_person.loginTokens _loginToken"
++ "		JOIN FETCH"
++ "	_person.loginTokens"
++ " WHERE"
++ "	_loginToken.tokenHash = :tokenHash AND"
++ "	_loginToken.type = :tokenType AND"
++ "	_loginToken.expiration > :expiration"
+)
 @Entity
 public class Person extends TimestampedEntity<Long> {
+	public final static String BY_LOGIN_TOKEN = "Person.getByLoginToken";
+	public final static String BY_EMAIL = "Person.getByEmail";
 
 	private static final long serialVersionUID = 1L;
 
@@ -136,4 +161,4 @@ public Set<String> getRolesAsStrings() {
 		return getRoles().stream().map(Role::name).collect(toSet());
 	}
 
-}
+}

src/main/resources/META-INF/persistence.xml

@@ -8,9 +8,6 @@
 	<persistence-unit name="kickoff">
 		<jta-data-source>java:app/kickoff/DataSource</jta-data-source>
 
-		<mapping-file>META-INF/LoginToken.xml</mapping-file>
-		<mapping-file>META-INF/Person.xml</mapping-file>
-
 		<properties>
 			<property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" />
 

src/test/resources/test-persistence.xml

@@ -11,9 +11,6 @@
 	<persistence-unit name="kickoff">
 		<jta-data-source>java:app/kickoff/TestDataSource</jta-data-source>
 
-		<mapping-file>META-INF/LoginToken.xml</mapping-file>
-		<mapping-file>META-INF/Person.xml</mapping-file>
-
 		<properties>
 			<property name="jakarta.persistence.schema-generation.database.action" value="create" />
 
@@ -47,4 +44,4 @@
 
 		</properties>
 	</persistence-unit>
-</persistence>
+</persistence>