Merge changes Idcb8982f,I878421e7
* changes:
MergeUtil: Pass Charset directly to MergeFormatter.formatMerge
GroupApi: Add method variants with List<String>
diff --git a/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java b/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java
index 8aa86b1..c6e67ca 100644
--- a/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java
+++ b/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java
@@ -74,8 +74,12 @@
responses.add(enforcer.call(p -> p.dryRun(quotaGroup, requestContext, numTokens)));
}
} catch (RuntimeException e) {
- logger.atSevere().withCause(e).log("exception while enforcing quota");
- responses.add(QuotaResponse.error(e.getMessage()));
+ // Roll back the quota request for all enforcers that deducted the quota. Rethrow the
+ // exception to adhere to the API contract.
+ if (deduct) {
+ refillAfterErrorOrException(enforcers, responses, quotaGroup, requestContext, numTokens);
+ }
+ throw e;
}
}
@@ -83,11 +87,7 @@
// Roll back the quota request for all enforcers that deducted the quota (= the request
// succeeded). Don't touch failed enforcers as the interface contract said that failed
// requests should not be deducted.
- for (int i = 0; i < responses.size(); i++) {
- if (responses.get(i).status().isOk()) {
- enforcers.get(i).run(p -> p.refill(quotaGroup, requestContext, numTokens));
- }
- }
+ refillAfterErrorOrException(enforcers, responses, quotaGroup, requestContext, numTokens);
}
logger.atFine().log(
@@ -97,7 +97,20 @@
deduct ? "(deduction=yes)" : "(deduction=no)",
numTokens,
responses);
- return new AutoValue_QuotaResponse_Aggregated(ImmutableList.copyOf(responses));
+ return QuotaResponse.Aggregated.create(ImmutableList.copyOf(responses));
+ }
+
+ private static void refillAfterErrorOrException(
+ List<PluginSetEntryContext<QuotaEnforcer>> enforcers,
+ List<QuotaResponse> collectedResponses,
+ String quotaGroup,
+ QuotaRequestContext requestContext,
+ long numTokens) {
+ for (int i = 0; i < collectedResponses.size(); i++) {
+ if (collectedResponses.get(i).status().isOk()) {
+ enforcers.get(i).run(p -> p.refill(quotaGroup, requestContext, numTokens));
+ }
+ }
}
static class WithUser extends WithResource implements QuotaBackend.WithUser {
diff --git a/java/com/google/gerrit/server/quota/QuotaResponse.java b/java/com/google/gerrit/server/quota/QuotaResponse.java
index c239aaf..9a8a515 100644
--- a/java/com/google/gerrit/server/quota/QuotaResponse.java
+++ b/java/com/google/gerrit/server/quota/QuotaResponse.java
@@ -20,6 +20,7 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Streams;
+import java.util.Collection;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -77,6 +78,10 @@
@AutoValue
public abstract static class Aggregated {
+ public static Aggregated create(Collection<QuotaResponse> responses) {
+ return new AutoValue_QuotaResponse_Aggregated(ImmutableList.copyOf(responses));
+ }
+
protected abstract ImmutableList<QuotaResponse> responses();
public boolean hasError() {
diff --git a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
index 9b6083f..460cd30 100644
--- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
@@ -41,7 +41,6 @@
import com.google.gerrit.server.change.ChangeInserter;
import com.google.gerrit.server.change.ConsistencyChecker;
import com.google.gerrit.server.change.PatchSetInserter;
-import com.google.gerrit.server.config.AnonymousCowardName;
import com.google.gerrit.server.notedb.ChangeNoteUtil;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
@@ -84,8 +83,6 @@
@Inject private ChangeNoteUtil noteUtil;
- @Inject @AnonymousCowardName private String anonymousCowardName;
-
@Inject private Sequences sequences;
private RevCommit tip;
diff --git a/javatests/com/google/gerrit/acceptance/server/quota/BUILD b/javatests/com/google/gerrit/acceptance/server/quota/BUILD
new file mode 100644
index 0000000..1988b22
--- /dev/null
+++ b/javatests/com/google/gerrit/acceptance/server/quota/BUILD
@@ -0,0 +1,7 @@
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
+
+acceptance_tests(
+ srcs = glob(["*IT.java"]),
+ group = "server_quota",
+ labels = ["server"],
+)
diff --git a/javatests/com/google/gerrit/acceptance/server/quota/DefaultQuotaBackendIT.java b/javatests/com/google/gerrit/acceptance/server/quota/DefaultQuotaBackendIT.java
new file mode 100644
index 0000000..dea83ca
--- /dev/null
+++ b/javatests/com/google/gerrit/acceptance/server/quota/DefaultQuotaBackendIT.java
@@ -0,0 +1,154 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed 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 com.google.gerrit.acceptance.server.quota;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.resetToStrict;
+
+import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.extensions.annotations.Exports;
+import com.google.gerrit.extensions.config.FactoryModule;
+import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.quota.QuotaBackend;
+import com.google.gerrit.server.quota.QuotaEnforcer;
+import com.google.gerrit.server.quota.QuotaException;
+import com.google.gerrit.server.quota.QuotaRequestContext;
+import com.google.gerrit.server.quota.QuotaResponse;
+import com.google.inject.Inject;
+import com.google.inject.Module;
+import java.util.Collections;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DefaultQuotaBackendIT extends AbstractDaemonTest {
+
+ private static final QuotaEnforcer quotaEnforcer = EasyMock.createStrictMock(QuotaEnforcer.class);
+
+ private IdentifiedUser identifiedAdmin;
+ @Inject private QuotaBackend quotaBackend;
+
+ @Override
+ public Module createModule() {
+ return new FactoryModule() {
+ @Override
+ public void configure() {
+ bind(QuotaEnforcer.class)
+ .annotatedWith(Exports.named("TestQuotaEnforcer"))
+ .toProvider(() -> quotaEnforcer);
+ }
+ };
+ }
+
+ @Before
+ public void setUp() {
+ identifiedAdmin = identifiedUserFactory.create(admin.id);
+ resetToStrict(quotaEnforcer);
+ }
+
+ @Test
+ public void requestTokenForUser() {
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcer.requestTokens("testGroup", ctx, 1)).andReturn(QuotaResponse.ok());
+ replay(quotaEnforcer);
+ assertThat(quotaBackend.user(identifiedAdmin).requestToken("testGroup"))
+ .isEqualTo(singletonAggregation(QuotaResponse.ok()));
+ }
+
+ @Test
+ public void requestTokenForUserAndAccount() {
+ QuotaRequestContext ctx =
+ QuotaRequestContext.builder().user(identifiedAdmin).account(user.id).build();
+ expect(quotaEnforcer.requestTokens("testGroup", ctx, 1)).andReturn(QuotaResponse.ok());
+ replay(quotaEnforcer);
+ assertThat(quotaBackend.user(identifiedAdmin).account(user.id).requestToken("testGroup"))
+ .isEqualTo(singletonAggregation(QuotaResponse.ok()));
+ }
+
+ @Test
+ public void requestTokenForUserAndProject() {
+ QuotaRequestContext ctx =
+ QuotaRequestContext.builder().user(identifiedAdmin).project(project).build();
+ expect(quotaEnforcer.requestTokens("testGroup", ctx, 1)).andReturn(QuotaResponse.ok());
+ replay(quotaEnforcer);
+ assertThat(quotaBackend.user(identifiedAdmin).project(project).requestToken("testGroup"))
+ .isEqualTo(singletonAggregation(QuotaResponse.ok()));
+ }
+
+ @Test
+ public void requestTokenForUserAndChange() throws Exception {
+ Change.Id changeId = createChange().getChange().getId();
+ QuotaRequestContext ctx =
+ QuotaRequestContext.builder()
+ .user(identifiedAdmin)
+ .change(changeId)
+ .project(project)
+ .build();
+ expect(quotaEnforcer.requestTokens("testGroup", ctx, 1)).andReturn(QuotaResponse.ok());
+ replay(quotaEnforcer);
+ assertThat(
+ quotaBackend.user(identifiedAdmin).change(changeId, project).requestToken("testGroup"))
+ .isEqualTo(singletonAggregation(QuotaResponse.ok()));
+ }
+
+ @Test
+ public void requestTokens() {
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcer.requestTokens("testGroup", ctx, 123)).andReturn(QuotaResponse.ok());
+ replay(quotaEnforcer);
+ assertThat(quotaBackend.user(identifiedAdmin).requestTokens("testGroup", 123))
+ .isEqualTo(singletonAggregation(QuotaResponse.ok()));
+ }
+
+ @Test
+ public void dryRun() {
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcer.dryRun("testGroup", ctx, 123)).andReturn(QuotaResponse.ok());
+ replay(quotaEnforcer);
+ assertThat(quotaBackend.user(identifiedAdmin).dryRun("testGroup", 123))
+ .isEqualTo(singletonAggregation(QuotaResponse.ok()));
+ }
+
+ @Test
+ public void requestTokenError() throws Exception {
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcer.requestTokens("testGroup", ctx, 1))
+ .andReturn(QuotaResponse.error("failed"));
+ replay(quotaEnforcer);
+
+ QuotaResponse.Aggregated result = quotaBackend.user(identifiedAdmin).requestToken("testGroup");
+ assertThat(result).isEqualTo(singletonAggregation(QuotaResponse.error("failed")));
+ exception.expect(QuotaException.class);
+ exception.expectMessage("failed");
+ result.throwOnError();
+ }
+
+ @Test
+ public void requestTokenPluginThrowsAndRethrows() {
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcer.requestTokens("testGroup", ctx, 1)).andThrow(new NullPointerException());
+ replay(quotaEnforcer);
+
+ exception.expect(NullPointerException.class);
+ quotaBackend.user(identifiedAdmin).requestToken("testGroup");
+ }
+
+ private static QuotaResponse.Aggregated singletonAggregation(QuotaResponse response) {
+ return QuotaResponse.Aggregated.create(Collections.singleton(response));
+ }
+}
diff --git a/javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java b/javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java
new file mode 100644
index 0000000..31a8808
--- /dev/null
+++ b/javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java
@@ -0,0 +1,126 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed 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 com.google.gerrit.acceptance.server.quota;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.resetToStrict;
+import static org.easymock.EasyMock.verify;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.extensions.annotations.Exports;
+import com.google.gerrit.extensions.config.FactoryModule;
+import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.quota.QuotaBackend;
+import com.google.gerrit.server.quota.QuotaEnforcer;
+import com.google.gerrit.server.quota.QuotaRequestContext;
+import com.google.gerrit.server.quota.QuotaResponse;
+import com.google.inject.Inject;
+import com.google.inject.Module;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+public class MultipleQuotaPluginsIT extends AbstractDaemonTest {
+ private static final QuotaEnforcer quotaEnforcerA =
+ EasyMock.createStrictMock(QuotaEnforcer.class);
+ private static final QuotaEnforcer quotaEnforcerB =
+ EasyMock.createStrictMock(QuotaEnforcer.class);
+
+ private IdentifiedUser identifiedAdmin;
+ @Inject private QuotaBackend quotaBackend;
+
+ @Override
+ public Module createModule() {
+ return new FactoryModule() {
+ @Override
+ public void configure() {
+ bind(QuotaEnforcer.class)
+ .annotatedWith(Exports.named("TestQuotaEnforcerA"))
+ .toProvider(() -> quotaEnforcerA);
+
+ bind(QuotaEnforcer.class)
+ .annotatedWith(Exports.named("TestQuotaEnforcerB"))
+ .toProvider(() -> quotaEnforcerB);
+ }
+ };
+ }
+
+ @Before
+ public void setUp() {
+ identifiedAdmin = identifiedUserFactory.create(admin.id);
+ resetToStrict(quotaEnforcerA);
+ resetToStrict(quotaEnforcerB);
+ }
+
+ @Test
+ public void refillsOnError() {
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcerA.requestTokens("testGroup", ctx, 1)).andReturn(QuotaResponse.ok());
+ expect(quotaEnforcerB.requestTokens("testGroup", ctx, 1))
+ .andReturn(QuotaResponse.error("fail"));
+ quotaEnforcerA.refill("testGroup", ctx, 1);
+ expectLastCall();
+
+ replay(quotaEnforcerA);
+ replay(quotaEnforcerB);
+
+ assertThat(quotaBackend.user(identifiedAdmin).requestToken("testGroup"))
+ .isEqualTo(
+ QuotaResponse.Aggregated.create(
+ ImmutableList.of(QuotaResponse.ok(), QuotaResponse.error("fail"))));
+ }
+
+ @Test
+ public void refillsOnException() {
+ NullPointerException exception = new NullPointerException();
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcerA.requestTokens("testGroup", ctx, 1)).andThrow(exception);
+ expect(quotaEnforcerB.requestTokens("testGroup", ctx, 1)).andReturn(QuotaResponse.ok());
+ quotaEnforcerB.refill("testGroup", ctx, 1);
+ expectLastCall();
+
+ replay(quotaEnforcerA);
+ replay(quotaEnforcerB);
+
+ try {
+ quotaBackend.user(identifiedAdmin).requestToken("testGroup");
+ fail("expected a NullPointerException");
+ } catch (NullPointerException e) {
+ assertThat(exception).isEqualTo(e);
+ }
+
+ verify(quotaEnforcerA);
+ }
+
+ @Test
+ public void doesNotRefillNoOp() {
+ QuotaRequestContext ctx = QuotaRequestContext.builder().user(identifiedAdmin).build();
+ expect(quotaEnforcerA.requestTokens("testGroup", ctx, 1))
+ .andReturn(QuotaResponse.error("fail"));
+ expect(quotaEnforcerB.requestTokens("testGroup", ctx, 1)).andReturn(QuotaResponse.noOp());
+
+ replay(quotaEnforcerA);
+ replay(quotaEnforcerB);
+
+ assertThat(quotaBackend.user(identifiedAdmin).requestToken("testGroup"))
+ .isEqualTo(
+ QuotaResponse.Aggregated.create(
+ ImmutableList.of(QuotaResponse.error("fail"), QuotaResponse.noOp())));
+ }
+}
diff --git a/javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java b/javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java
new file mode 100644
index 0000000..a555ba4
--- /dev/null
+++ b/javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java
@@ -0,0 +1,136 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed 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 com.google.gerrit.acceptance.server.quota;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
+
+import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.extensions.common.ChangeInput;
+import com.google.gerrit.extensions.config.FactoryModule;
+import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.quota.QuotaBackend;
+import com.google.gerrit.server.quota.QuotaResponse;
+import com.google.inject.Module;
+import java.util.Collections;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+public class RestApiQuotaIT extends AbstractDaemonTest {
+ private static final QuotaBackend.WithResource quotaBackendWithResource =
+ EasyMock.createStrictMock(QuotaBackend.WithResource.class);
+ private static final QuotaBackend.WithUser quotaBackendWithUser =
+ EasyMock.createStrictMock(QuotaBackend.WithUser.class);
+
+ @Override
+ public Module createModule() {
+ return new FactoryModule() {
+ @Override
+ public void configure() {
+ bind(QuotaBackend.class)
+ .toInstance(
+ new QuotaBackend() {
+ @Override
+ public WithUser currentUser() {
+ return quotaBackendWithUser;
+ }
+
+ @Override
+ public WithUser user(CurrentUser user) {
+ return quotaBackendWithUser;
+ }
+ });
+ }
+ };
+ }
+
+ @Before
+ public void setUp() {
+ reset(quotaBackendWithResource);
+ reset(quotaBackendWithUser);
+ }
+
+ @Test
+ public void changeDetail() throws Exception {
+ Change.Id changeId = createChange().getChange().getId();
+ expect(quotaBackendWithResource.requestToken("/restapi/changes/detail:GET"))
+ .andReturn(singletonAggregation(QuotaResponse.ok()));
+ replay(quotaBackendWithResource);
+ expect(quotaBackendWithUser.change(changeId, project)).andReturn(quotaBackendWithResource);
+ replay(quotaBackendWithUser);
+ adminRestSession.get("/changes/" + changeId + "/detail").assertOK();
+ verify(quotaBackendWithUser);
+ verify(quotaBackendWithResource);
+ }
+
+ @Test
+ public void revisionDetail() throws Exception {
+ Change.Id changeId = createChange().getChange().getId();
+ expect(quotaBackendWithResource.requestToken("/restapi/changes/revisions/actions:GET"))
+ .andReturn(singletonAggregation(QuotaResponse.ok()));
+ replay(quotaBackendWithResource);
+ expect(quotaBackendWithUser.change(changeId, project)).andReturn(quotaBackendWithResource);
+ replay(quotaBackendWithUser);
+ adminRestSession.get("/changes/" + changeId + "/revisions/current/actions").assertOK();
+ verify(quotaBackendWithUser);
+ verify(quotaBackendWithResource);
+ }
+
+ @Test
+ public void createChangePost() throws Exception {
+ expect(quotaBackendWithUser.requestToken("/restapi/changes:POST"))
+ .andReturn(singletonAggregation(QuotaResponse.ok()));
+ replay(quotaBackendWithUser);
+ ChangeInput changeInput = new ChangeInput(project.get(), "master", "test");
+ adminRestSession.post("/changes/", changeInput).assertCreated();
+ verify(quotaBackendWithUser);
+ }
+
+ @Test
+ public void accountDetail() throws Exception {
+ expect(quotaBackendWithResource.requestToken("/restapi/accounts/detail:GET"))
+ .andReturn(singletonAggregation(QuotaResponse.ok()));
+ replay(quotaBackendWithResource);
+ expect(quotaBackendWithUser.account(admin.id)).andReturn(quotaBackendWithResource);
+ replay(quotaBackendWithUser);
+ adminRestSession.get("/accounts/self/detail").assertOK();
+ verify(quotaBackendWithUser);
+ verify(quotaBackendWithResource);
+ }
+
+ @Test
+ public void config() throws Exception {
+ expect(quotaBackendWithUser.requestToken("/restapi/config/version:GET"))
+ .andReturn(singletonAggregation(QuotaResponse.ok()));
+ replay(quotaBackendWithUser);
+ adminRestSession.get("/config/server/version").assertOK();
+ }
+
+ @Test
+ public void outOfQuotaReturnsError() throws Exception {
+ expect(quotaBackendWithUser.requestToken("/restapi/config/version:GET"))
+ .andReturn(singletonAggregation(QuotaResponse.error("no quota")));
+ replay(quotaBackendWithUser);
+ adminRestSession.get("/config/server/version").assertStatus(429);
+ }
+
+ private static QuotaResponse.Aggregated singletonAggregation(QuotaResponse response) {
+ return QuotaResponse.Aggregated.create(Collections.singleton(response));
+ }
+}
diff --git a/javatests/com/google/gerrit/mail/AbstractParserTest.java b/javatests/com/google/gerrit/mail/AbstractParserTest.java
index c375aff..bcff6a7 100644
--- a/javatests/com/google/gerrit/mail/AbstractParserTest.java
+++ b/javatests/com/google/gerrit/mail/AbstractParserTest.java
@@ -41,7 +41,7 @@
String message, MailComment comment, Comment inReplyTo) {
assertThat(comment.fileName).isNull();
assertThat(comment.message).isEqualTo(message);
- assertThat(comment.inReplyTo).isEqualTo(inReplyTo);
+ assertThat(comment.inReplyTo.key).isEqualTo(inReplyTo.key);
assertThat(comment.type).isEqualTo(MailComment.CommentType.INLINE_COMMENT);
}
