From fd1d7e5473826fb97482fa06923bc0b7c5490a67 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Thu, 11 Jun 2020 11:17:22 +0200
Subject: [PATCH] Resolved JPA validation errors

These were partially caused by an old Hibernate validator which has now
been replaced by the EclipseLink validator for the current JPA standard.
Another error was caused by the use of non-standard JPQL in the user
search query which has now been replaced by a standardized one.
---
 .settings/org.eclipse.jpt.core.prefs      | 2 +-
 src/main/java/envoy/server/data/User.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.settings/org.eclipse.jpt.core.prefs b/.settings/org.eclipse.jpt.core.prefs
index 8aa2bb2..bc24399 100755
--- a/.settings/org.eclipse.jpt.core.prefs
+++ b/.settings/org.eclipse.jpt.core.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-org.eclipse.jpt.core.platform=hibernate2_1
+org.eclipse.jpt.core.platform=eclipselink2_5
 org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
diff --git a/src/main/java/envoy/server/data/User.java b/src/main/java/envoy/server/data/User.java
index fba93ab..f1076c1 100755
--- a/src/main/java/envoy/server/data/User.java
+++ b/src/main/java/envoy/server/data/User.java
@@ -31,9 +31,10 @@ import envoy.data.User.UserStatus;
 	@NamedQuery(
 		name = User.findContacts,
 		query = "SELECT u.contacts FROM User u WHERE u = :user"
-	), @NamedQuery(
+	),
+	@NamedQuery(
 		name = User.searchByName,
-		query = "SELECT u FROM User u WHERE (lower(u.name) LIKE lower(:searchPhrase) AND u <> :context AND NOT :context in elements(u.contacts))"
+		query = "SELECT u FROM User u WHERE (lower(u.name) LIKE lower(:searchPhrase) AND u <> :context AND :context NOT MEMBER OF u.contacts)"
 	)
 })
 public class User extends Contact {