This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new b705c7abd1 [CLEAN CODE] Annotation repetitions should not be wrapped
b705c7abd1 is described below
commit b705c7abd17d96a9fa636e776baf88c7f56e06c2
Author: Maksim Meliashchuk <[email protected]>
AuthorDate: Sun Jun 2 21:16:06 2024 +0300
[CLEAN CODE] Annotation repetitions should not be wrapped
---
.../james/mailbox/jpa/mail/model/JPAMailbox.java | 43 ++++++++++------------
.../jpa/mail/model/JPAMailboxAnnotation.java | 10 ++---
.../mailbox/jpa/user/model/JPASubscription.java | 15 +++-----
.../james/domainlist/jpa/model/JPADomain.java | 10 ++---
.../james/mailrepository/jpa/model/JPAMail.java | 23 +++++-------
.../james/mailrepository/jpa/model/JPAUrl.java | 6 +--
.../james/rrt/jpa/model/JPARecipientRewrite.java | 12 +++---
.../james/sieve/jpa/model/JPASieveQuota.java | 5 +--
.../james/sieve/jpa/model/JPASieveScript.java | 9 ++---
.../org/apache/james/user/jpa/model/JPAUser.java | 12 +++---
10 files changed, 60 insertions(+), 85 deletions(-)
diff --git
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
index 650aa79dc3..9ae7daffa1 100644
---
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
+++
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -25,7 +25,6 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -39,28 +38,26 @@ import com.google.common.annotations.VisibleForTesting;
@Entity(name = "Mailbox")
@Table(name = "JAMES_MAILBOX")
-@NamedQueries({
- @NamedQuery(name = "findMailboxById",
- query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.mailboxId =
:idParam"),
- @NamedQuery(name = "findMailboxByName",
- query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name =
:nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam"),
- @NamedQuery(name = "findMailboxByNameWithUser",
- query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name =
:nameParam and mailbox.user= :userParam and mailbox.namespace=
:namespaceParam"),
- @NamedQuery(name = "findMailboxWithNameLikeWithUser",
- query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE
:nameParam and mailbox.user= :userParam and mailbox.namespace=
:namespaceParam"),
- @NamedQuery(name = "findMailboxWithNameLike",
- query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE
:nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam"),
- @NamedQuery(name = "countMailboxesWithNameLikeWithUser",
- query = "SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name
LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace=
:namespaceParam"),
- @NamedQuery(name = "countMailboxesWithNameLike",
- query = "SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name
LIKE :nameParam and mailbox.user is NULL and mailbox.namespace=
:namespaceParam"),
- @NamedQuery(name = "listMailboxes",
- query = "SELECT mailbox FROM Mailbox mailbox"),
- @NamedQuery(name = "findHighestModSeq",
- query = "SELECT mailbox.highestModSeq FROM Mailbox mailbox WHERE
mailbox.mailboxId = :idParam"),
- @NamedQuery(name = "findLastUid",
- query = "SELECT mailbox.lastUid FROM Mailbox mailbox WHERE
mailbox.mailboxId = :idParam")
-})
+@NamedQuery(name = "findMailboxById",
+ query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.mailboxId =
:idParam")
+@NamedQuery(name = "findMailboxByName",
+ query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name =
:nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam")
+@NamedQuery(name = "findMailboxByNameWithUser",
+ query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name =
:nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam")
+@NamedQuery(name = "findMailboxWithNameLikeWithUser",
+ query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE
:nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam")
+@NamedQuery(name = "findMailboxWithNameLike",
+ query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE
:nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam")
+@NamedQuery(name = "countMailboxesWithNameLikeWithUser",
+ query = "SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name
LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace=
:namespaceParam")
+@NamedQuery(name = "countMailboxesWithNameLike",
+ query = "SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name
LIKE :nameParam and mailbox.user is NULL and mailbox.namespace=
:namespaceParam")
+@NamedQuery(name = "listMailboxes",
+ query = "SELECT mailbox FROM Mailbox mailbox")
+@NamedQuery(name = "findHighestModSeq",
+ query = "SELECT mailbox.highestModSeq FROM Mailbox mailbox WHERE
mailbox.mailboxId = :idParam")
+@NamedQuery(name = "findLastUid",
+ query = "SELECT mailbox.lastUid FROM Mailbox mailbox WHERE
mailbox.mailboxId = :idParam")
public class JPAMailbox {
private static final String TAB = " ";
diff --git
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotation.java
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotation.java
index 43c0079ef3..1ec6b69b9a 100644
---
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotation.java
+++
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotation.java
@@ -24,7 +24,6 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -32,11 +31,10 @@ import com.google.common.base.Objects;
@Entity(name = "MailboxAnnotation")
@Table(name = "JAMES_MAILBOX_ANNOTATION")
-@NamedQueries({
- @NamedQuery(name = "retrieveAllAnnotations", query = "SELECT annotation
FROM MailboxAnnotation annotation WHERE annotation.mailboxId = :idParam"),
- @NamedQuery(name = "retrieveByKey", query = "SELECT annotation FROM
MailboxAnnotation annotation WHERE annotation.mailboxId = :idParam AND
annotation.key = :keyParam"),
- @NamedQuery(name = "countAnnotationsInMailbox", query = "SELECT
COUNT(annotation) FROM MailboxAnnotation annotation WHERE annotation.mailboxId
= :idParam"),
- @NamedQuery(name = "retrieveByKeyLike", query = "SELECT annotation FROM
MailboxAnnotation annotation WHERE annotation.mailboxId = :idParam AND
annotation.key LIKE :keyParam")})
+@NamedQuery(name = "retrieveAllAnnotations", query = "SELECT annotation FROM
MailboxAnnotation annotation WHERE annotation.mailboxId = :idParam")
+@NamedQuery(name = "retrieveByKey", query = "SELECT annotation FROM
MailboxAnnotation annotation WHERE annotation.mailboxId = :idParam AND
annotation.key = :keyParam")
+@NamedQuery(name = "countAnnotationsInMailbox", query = "SELECT
COUNT(annotation) FROM MailboxAnnotation annotation WHERE annotation.mailboxId
= :idParam")
+@NamedQuery(name = "retrieveByKeyLike", query = "SELECT annotation FROM
MailboxAnnotation annotation WHERE annotation.mailboxId = :idParam AND
annotation.key LIKE :keyParam")
@IdClass(JPAMailboxAnnotationId.class)
public class JPAMailboxAnnotation {
diff --git
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
index 00d5bf5394..62869025eb 100644
---
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
+++
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
@@ -25,7 +25,6 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
@@ -45,14 +44,12 @@ import
org.apache.james.mailbox.store.user.model.Subscription;
"USER_NAME",
"MAILBOX_NAME"})
)
-@NamedQueries({
- @NamedQuery(name = JPASubscription.FIND_MAILBOX_SUBSCRIPTION_FOR_USER,
- query = "SELECT subscription FROM Subscription subscription WHERE
subscription.username = :userParam AND subscription.mailbox = :mailboxParam"),
- @NamedQuery(name = JPASubscription.FIND_SUBSCRIPTIONS_FOR_USER,
- query = "SELECT subscription FROM Subscription subscription WHERE
subscription.username = :userParam"),
- @NamedQuery(name = JPASubscription.DELETE_SUBSCRIPTION,
- query = "DELETE subscription FROM Subscription subscription WHERE
subscription.username = :userParam AND subscription.mailbox = :mailboxParam")
-})
+@NamedQuery(name = JPASubscription.FIND_MAILBOX_SUBSCRIPTION_FOR_USER,
+ query = "SELECT subscription FROM Subscription subscription WHERE
subscription.username = :userParam AND subscription.mailbox = :mailboxParam")
+@NamedQuery(name = JPASubscription.FIND_SUBSCRIPTIONS_FOR_USER,
+ query = "SELECT subscription FROM Subscription subscription WHERE
subscription.username = :userParam")
+@NamedQuery(name = JPASubscription.DELETE_SUBSCRIPTION,
+ query = "DELETE subscription FROM Subscription subscription WHERE
subscription.username = :userParam AND subscription.mailbox = :mailboxParam")
public class JPASubscription {
public static final String DELETE_SUBSCRIPTION = "deleteSubscription";
public static final String FIND_SUBSCRIPTIONS_FOR_USER =
"findSubscriptionsForUser";
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
index 8902b48162..dae214b8f2 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
@@ -21,7 +21,6 @@ package org.apache.james.domainlist.jpa.model;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -32,11 +31,10 @@ import org.apache.james.core.Domain;
*/
@Entity(name = "JamesDomain")
@Table(name = "JAMES_DOMAIN")
-@NamedQueries({
- @NamedQuery(name = "findDomainByName", query = "SELECT domain FROM
JamesDomain domain WHERE domain.name=:name"),
- @NamedQuery(name = "containsDomain", query = "SELECT COUNT(domain) FROM
JamesDomain domain WHERE domain.name=:name"),
- @NamedQuery(name = "listDomainNames", query = "SELECT domain.name FROM
JamesDomain domain"),
- @NamedQuery(name = "deleteDomainByName", query = "DELETE FROM JamesDomain
domain WHERE domain.name=:name") })
+@NamedQuery(name = "findDomainByName", query = "SELECT domain FROM JamesDomain
domain WHERE domain.name=:name")
+@NamedQuery(name = "containsDomain", query = "SELECT COUNT(domain) FROM
JamesDomain domain WHERE domain.name=:name")
+@NamedQuery(name = "listDomainNames", query = "SELECT domain.name FROM
JamesDomain domain")
+@NamedQuery(name = "deleteDomainByName", query = "DELETE FROM JamesDomain
domain WHERE domain.name=:name")
public class JPADomain {
/**
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAMail.java
b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAMail.java
index 70d1ab32fb..5437e898e5 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAMail.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAMail.java
@@ -31,7 +31,6 @@ import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
import jakarta.persistence.Index;
import jakarta.persistence.Lob;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -40,18 +39,16 @@ import jakarta.persistence.Table;
@Table(name = "JAMES_MAIL_STORE", indexes = {
@Index(name = "REPOSITORY_NAME_MESSAGE_NAME_INDEX", columnList =
"REPOSITORY_NAME, MESSAGE_NAME")
})
-@NamedQueries({
- @NamedQuery(name = "listMailMessages",
- query = "SELECT mail.messageName FROM JamesMailStore mail WHERE
mail.repositoryName = :repositoryName"),
- @NamedQuery(name = "countMailMessages",
- query = "SELECT COUNT(mail) FROM JamesMailStore mail WHERE
mail.repositoryName = :repositoryName"),
- @NamedQuery(name = "deleteMailMessages",
- query = "DELETE FROM JamesMailStore mail WHERE mail.repositoryName =
:repositoryName AND mail.messageName IN (:messageNames)"),
- @NamedQuery(name = "deleteAllMailMessages",
- query = "DELETE FROM JamesMailStore mail WHERE mail.repositoryName =
:repositoryName"),
- @NamedQuery(name = "findMailMessage",
- query = "SELECT mail FROM JamesMailStore mail WHERE
mail.repositoryName = :repositoryName AND mail.messageName = :messageName")
-})
+@NamedQuery(name = "listMailMessages",
+ query = "SELECT mail.messageName FROM JamesMailStore mail WHERE
mail.repositoryName = :repositoryName")
+@NamedQuery(name = "countMailMessages",
+ query = "SELECT COUNT(mail) FROM JamesMailStore mail WHERE
mail.repositoryName = :repositoryName")
+@NamedQuery(name = "deleteMailMessages",
+ query = "DELETE FROM JamesMailStore mail WHERE mail.repositoryName =
:repositoryName AND mail.messageName IN (:messageNames)")
+@NamedQuery(name = "deleteAllMailMessages",
+ query = "DELETE FROM JamesMailStore mail WHERE mail.repositoryName =
:repositoryName")
+@NamedQuery(name = "findMailMessage",
+ query = "SELECT mail FROM JamesMailStore mail WHERE mail.repositoryName =
:repositoryName AND mail.messageName = :messageName")
public class JPAMail {
static class JPAMailId implements Serializable {
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAUrl.java
b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAUrl.java
index a72f165745..39a0e8b313 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAUrl.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/model/JPAUrl.java
@@ -22,7 +22,6 @@ package org.apache.james.mailrepository.jpa.model;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -30,9 +29,8 @@ import org.apache.james.mailrepository.api.MailRepositoryUrl;
@Entity(name = "JamesMailRepos")
@Table(name = "JAMES_MAIL_REPOS")
-@NamedQueries({
- @NamedQuery(name = "listUrls", query = "SELECT url FROM JamesMailRepos
url"),
- @NamedQuery(name = "getUrl", query = "SELECT url FROM JamesMailRepos url
WHERE url.value=:value")})
+@NamedQuery(name = "listUrls", query = "SELECT url FROM JamesMailRepos url")
+@NamedQuery(name = "getUrl", query = "SELECT url FROM JamesMailRepos url WHERE
url.value=:value")
public class JPAUrl {
public static JPAUrl from(MailRepositoryUrl url) {
return new JPAUrl(url.asString());
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java
b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java
index 60eb60df28..ee0f5185fa 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java
@@ -30,7 +30,6 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -44,12 +43,11 @@ import com.google.common.base.Objects;
*/
@Entity(name = "JamesRecipientRewrite")
@Table(name = JPARecipientRewrite.JAMES_RECIPIENT_REWRITE)
-@NamedQueries({
- @NamedQuery(name = SELECT_USER_DOMAIN_MAPPING_QUERY, query = "SELECT
rrt FROM JamesRecipientRewrite rrt WHERE rrt.user=:user AND
rrt.domain=:domain"),
- @NamedQuery(name = SELECT_ALL_MAPPINGS_QUERY, query = "SELECT rrt FROM
JamesRecipientRewrite rrt"),
- @NamedQuery(name = DELETE_MAPPING_QUERY, query = "DELETE FROM
JamesRecipientRewrite rrt WHERE rrt.user=:user AND rrt.domain=:domain AND
rrt.targetAddress=:targetAddress"),
- @NamedQuery(name = UPDATE_MAPPING_QUERY, query = "UPDATE
JamesRecipientRewrite rrt SET rrt.targetAddress=:targetAddress WHERE
rrt.user=:user AND rrt.domain=:domain"),
- @NamedQuery(name = SELECT_SOURCES_BY_MAPPING_QUERY, query = "SELECT
rrt FROM JamesRecipientRewrite rrt WHERE rrt.targetAddress=:targetAddress")})
+@NamedQuery(name = SELECT_USER_DOMAIN_MAPPING_QUERY, query = "SELECT rrt FROM
JamesRecipientRewrite rrt WHERE rrt.user=:user AND rrt.domain=:domain")
+@NamedQuery(name = SELECT_ALL_MAPPINGS_QUERY, query = "SELECT rrt FROM
JamesRecipientRewrite rrt")
+@NamedQuery(name = DELETE_MAPPING_QUERY, query = "DELETE FROM
JamesRecipientRewrite rrt WHERE rrt.user=:user AND rrt.domain=:domain AND
rrt.targetAddress=:targetAddress")
+@NamedQuery(name = UPDATE_MAPPING_QUERY, query = "UPDATE JamesRecipientRewrite
rrt SET rrt.targetAddress=:targetAddress WHERE rrt.user=:user AND
rrt.domain=:domain")
+@NamedQuery(name = SELECT_SOURCES_BY_MAPPING_QUERY, query = "SELECT rrt FROM
JamesRecipientRewrite rrt WHERE rrt.targetAddress=:targetAddress")
@IdClass(JPARecipientRewrite.RecipientRewriteTableId.class)
public class JPARecipientRewrite {
public static final String SELECT_USER_DOMAIN_MAPPING_QUERY =
"selectUserDomainMapping";
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveQuota.java
b/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveQuota.java
index 5d3ce381ed..3e33d04907 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveQuota.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveQuota.java
@@ -24,7 +24,6 @@ import java.util.Objects;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -34,9 +33,7 @@ import com.google.common.base.MoreObjects;
@Entity(name = "JamesSieveQuota")
@Table(name = "JAMES_SIEVE_QUOTA")
-@NamedQueries({
- @NamedQuery(name = "findByUsername", query = "SELECT sieveQuota FROM
JamesSieveQuota sieveQuota WHERE sieveQuota.username=:username")
-})
+@NamedQuery(name = "findByUsername", query = "SELECT sieveQuota FROM
JamesSieveQuota sieveQuota WHERE sieveQuota.username=:username")
public class JPASieveQuota {
@Id
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveScript.java
b/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveScript.java
index 8971de4ac6..3df5b9e4c0 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveScript.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/sieve/jpa/model/JPASieveScript.java
@@ -26,7 +26,6 @@ import java.util.UUID;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
@@ -40,11 +39,9 @@ import com.google.common.base.Preconditions;
@Entity(name = "JamesSieveScript")
@Table(name = "JAMES_SIEVE_SCRIPT")
-@NamedQueries({
- @NamedQuery(name = "findAllByUsername", query = "SELECT sieveScript
FROM JamesSieveScript sieveScript WHERE sieveScript.username=:username"),
- @NamedQuery(name = "findActiveByUsername", query = "SELECT sieveScript
FROM JamesSieveScript sieveScript WHERE sieveScript.username=:username AND
sieveScript.isActive=true"),
- @NamedQuery(name = "findSieveScript", query = "SELECT sieveScript FROM
JamesSieveScript sieveScript WHERE sieveScript.username=:username AND
sieveScript.scriptName=:scriptName")
-})
+@NamedQuery(name = "findAllByUsername", query = "SELECT sieveScript FROM
JamesSieveScript sieveScript WHERE sieveScript.username=:username")
+@NamedQuery(name = "findActiveByUsername", query = "SELECT sieveScript FROM
JamesSieveScript sieveScript WHERE sieveScript.username=:username AND
sieveScript.isActive=true")
+@NamedQuery(name = "findSieveScript", query = "SELECT sieveScript FROM
JamesSieveScript sieveScript WHERE sieveScript.username=:username AND
sieveScript.scriptName=:scriptName")
public class JPASieveScript {
public static Builder builder() {
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
index 6606104ef1..9a7f049678 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
@@ -27,7 +27,6 @@ import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
-import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import jakarta.persistence.Version;
@@ -42,12 +41,11 @@ import com.google.common.hash.Hashing;
@Entity(name = "JamesUser")
@Table(name = "JAMES_USER")
-@NamedQueries({
- @NamedQuery(name = "findUserByName", query = "SELECT user FROM JamesUser
user WHERE user.name=:name"),
- @NamedQuery(name = "deleteUserByName", query = "DELETE FROM JamesUser user
WHERE user.name=:name"),
- @NamedQuery(name = "containsUser", query = "SELECT COUNT(user) FROM
JamesUser user WHERE user.name=:name"),
- @NamedQuery(name = "countUsers", query = "SELECT COUNT(user) FROM
JamesUser user"),
- @NamedQuery(name = "listUserNames", query = "SELECT user.name FROM
JamesUser user") })
+@NamedQuery(name = "findUserByName", query = "SELECT user FROM JamesUser user
WHERE user.name=:name")
+@NamedQuery(name = "deleteUserByName", query = "DELETE FROM JamesUser user
WHERE user.name=:name")
+@NamedQuery(name = "containsUser", query = "SELECT COUNT(user) FROM JamesUser
user WHERE user.name=:name")
+@NamedQuery(name = "countUsers", query = "SELECT COUNT(user) FROM JamesUser
user")
+@NamedQuery(name = "listUserNames", query = "SELECT user.name FROM JamesUser
user")
public class JPAUser implements User {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
