Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JAMES-3830 Implement JMAP Quota/get #1242

Merged
merged 5 commits into from Oct 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -21,6 +21,7 @@

import java.util.Optional;

import org.apache.james.core.Domain;
import org.apache.james.core.quota.QuotaCountLimit;
import org.apache.james.core.quota.QuotaCountUsage;
import org.apache.james.core.quota.QuotaSizeLimit;
Expand Down Expand Up @@ -54,4 +55,8 @@ public interface QuotaProbe {

void setGlobalMaxStorage(QuotaSizeLimit maxGlobalSize) throws MailboxException;

void setDomainMaxMessage(Domain domain, QuotaCountLimit count) throws MailboxException;

void setDomainMaxStorage(Domain domain, QuotaSizeLimit size) throws MailboxException;

}
Expand Up @@ -23,6 +23,7 @@

import javax.inject.Inject;

import org.apache.james.core.Domain;
import org.apache.james.core.quota.QuotaCountLimit;
import org.apache.james.core.quota.QuotaCountUsage;
import org.apache.james.core.quota.QuotaSizeLimit;
Expand Down Expand Up @@ -104,4 +105,14 @@ public void setGlobalMaxMessageCount(QuotaCountLimit maxGlobalMessageCount) thro
public void setGlobalMaxStorage(QuotaSizeLimit maxGlobalSize) throws MailboxException {
maxQuotaManager.setGlobalMaxStorage(maxGlobalSize);
}

@Override
public void setDomainMaxMessage(Domain domain, QuotaCountLimit count) throws MailboxException {
maxQuotaManager.setDomainMaxMessage(domain, count);
}

@Override
public void setDomainMaxStorage(Domain domain, QuotaSizeLimit size) throws MailboxException {
maxQuotaManager.setDomainMaxStorage(domain, size);
}
}
Expand Up @@ -64,6 +64,7 @@
import org.apache.james.jmap.method.Method;
import org.apache.james.jmap.method.PushSubscriptionGetMethod;
import org.apache.james.jmap.method.PushSubscriptionSetMethod;
import org.apache.james.jmap.method.QuotaGetMethod;
import org.apache.james.jmap.method.SystemZoneIdProvider;
import org.apache.james.jmap.method.ThreadChangesMethod;
import org.apache.james.jmap.method.ThreadGetMethod;
Expand Down Expand Up @@ -142,6 +143,7 @@ protected void configure() {
methods.addBinding().to(MDNSendMethod.class);
methods.addBinding().to(PushSubscriptionGetMethod.class);
methods.addBinding().to(PushSubscriptionSetMethod.class);
methods.addBinding().to(QuotaGetMethod.class);
methods.addBinding().to(ThreadChangesMethod.class);
methods.addBinding().to(ThreadGetMethod.class);
methods.addBinding().to(VacationResponseGetMethod.class);
Expand Down
@@ -0,0 +1,55 @@
/****************************************************************
* 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.jmap.rfc8621.distributed;

import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.QuotaGetMethodContract;
import org.apache.james.modules.AwsS3BlobStoreExtension;
import org.apache.james.modules.RabbitMQExtension;
import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.modules.blobstore.BlobStoreConfiguration;
import org.junit.jupiter.api.extension.RegisterExtension;

public class DistributedQuotaGetMethodTest implements QuotaGetMethodContract {

@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
CassandraRabbitMQJamesConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
.blobStore(BlobStoreConfiguration.builder()
.s3()
.disableCache()
.deduplication()
.noCryptoConfig())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
.build();
}