This is an automated email from the ASF dual-hosted git repository.
hqtran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b03bb21920d830b3398830b210ae8d4fb2beaca8
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Thu Jul 10 10:33:29 2025 +0200
[ENHANCEMENT] Delete no longer needed CassandraACLTable.java
---
.../mailbox/cassandra/mail/CassandraACLDAOV2.java | 5 ++--
.../mailbox/cassandra/table/CassandraACLTable.java | 30 ----------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV2.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV2.java
index 8f2961f80d..71ee33537f 100644
---
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV2.java
+++
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV2.java
@@ -30,7 +30,6 @@ import jakarta.inject.Inject;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
-import org.apache.james.mailbox.cassandra.table.CassandraACLTable;
import org.apache.james.mailbox.cassandra.table.CassandraACLV2Table;
import org.apache.james.mailbox.model.MailboxACL;
@@ -101,13 +100,13 @@ public class CassandraACLDAOV2 {
public Mono<Void> delete(CassandraId cassandraId) {
return executor.executeVoid(
delete.bind()
- .setUuid(CassandraACLTable.ID, cassandraId.asUuid()));
+ .setUuid(CassandraACLV2Table.ID, cassandraId.asUuid()));
}
public Mono<MailboxACL> getACL(CassandraId cassandraId) {
return executor.executeRows(
read.bind()
- .set(CassandraACLTable.ID, cassandraId.asUuid(),
TypeCodecs.TIMEUUID))
+ .set(CassandraACLV2Table.ID, cassandraId.asUuid(),
TypeCodecs.TIMEUUID))
.map(Throwing.function(row -> {
MailboxACL.EntryKey entryKey =
MailboxACL.EntryKey.deserialize(row.getString(CassandraACLV2Table.KEY));
MailboxACL.Rfc4314Rights rights =
row.getSet(CassandraACLV2Table.RIGHTS, String.class)
diff --git
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraACLTable.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraACLTable.java
deleted file mode 100644
index d6b68db521..0000000000
---
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraACLTable.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mailbox.cassandra.table;
-
-import com.datastax.oss.driver.api.core.CqlIdentifier;
-
-public interface CassandraACLTable {
- String TABLE_NAME = "acl";
-
- CqlIdentifier ID = CqlIdentifier.fromCql("id");
- CqlIdentifier ACL = CqlIdentifier.fromCql("acl");
- CqlIdentifier VERSION = CqlIdentifier.fromCql("version");
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
