You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2017/10/25 15:44:15 UTC
[11/11] james-project git commit: JAMES-2186 Fix Eclipse warnings
JAMES-2186 Fix Eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2140f42d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2140f42d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2140f42d
Branch: refs/heads/master
Commit: 2140f42df0263aff15744fdd85802a4435bda3b4
Parents: 703f2d1
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Oct 20 14:27:14 2017 +0200
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Oct 25 17:42:17 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/james/mailbox/RightManager.java | 2 --
.../apache/james/mailbox/acl/MailboxACLResolver.java | 2 --
.../james/mailbox/acl/UnionMailboxACLResolver.java | 4 +---
.../apache/james/mailbox/store/StoreRightManager.java | 7 +++----
.../methods/integration/GetMessageListMethodTest.java | 1 -
.../methods/integration/cucumber/DownloadStepdefs.java | 10 +++++-----
.../cucumber/GetMessageListMethodStepdefs.java | 2 +-
.../integration/cucumber/GetMessagesMethodStepdefs.java | 2 +-
.../cucumber/SetMailboxesMethodStepdefs.java | 6 +++---
.../integration/cucumber/SetMessagesMethodStepdefs.java | 6 +++---
.../methods/integration/cucumber/UploadStepdefs.java | 12 ++++++------
.../jmap/methods/integration/cucumber/UserStepdefs.java | 4 ++--
12 files changed, 25 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
index 0d2fc79..c021f92 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
@@ -20,12 +20,10 @@
package org.apache.james.mailbox;
import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.exception.UnsupportedRightException;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxACL.Right;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mime4j.dom.address.Mailbox;
public interface RightManager {
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
index 1c7f3aa..76691b0 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
@@ -20,8 +20,6 @@
package org.apache.james.mailbox.acl;
-import javax.mail.Flags;
-
import org.apache.james.mailbox.exception.UnsupportedRightException;
import org.apache.james.mailbox.model.MailboxACL;
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
index 78cd283..bdf6357 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
@@ -25,9 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.mail.Flags;
-import javax.mail.Flags.Flag;
-
import org.apache.james.mailbox.exception.UnsupportedRightException;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxACL.EntryKey;
@@ -35,6 +32,7 @@ import org.apache.james.mailbox.model.MailboxACL.NameType;
import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights;
import org.apache.james.mailbox.model.MailboxACL.Right;
import org.apache.james.mailbox.model.MailboxACL.SpecialName;
+import org.apache.james.mime4j.dom.address.Mailbox;
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
index 85dacc1..1ddfd6c 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
@@ -19,10 +19,11 @@
package org.apache.james.mailbox.store;
+import java.util.Optional;
+
import javax.inject.Inject;
import javax.mail.Flags;
-import com.github.fge.lambdas.Throwing;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.RightManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
@@ -40,12 +41,10 @@ import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.transaction.Mapper;
+import com.github.fge.lambdas.Throwing;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
-import java.util.Optional;
-import java.util.function.Function;
-
public class StoreRightManager implements RightManager {
private final MailboxSessionMapperFactory mailboxSessionMapperFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index 027af49..e9b1ea4 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -118,7 +118,6 @@ public abstract class GetMessageListMethodTest {
this.bob = "bob@" + domain;
String bobPassword = "bobPassword";
dataProbe.addUser(bob, bobPassword);
- HttpJmapAuthentication.authenticateJamesUser(baseUri(), bob, bobPassword);
}
private URIBuilder baseUri() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
index 2cf0ac0..05ad947 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
@@ -137,7 +137,7 @@ public class DownloadStepdefs {
@When("^\"([^\"]*)\" checks for the availability of the attachment endpoint$")
public void optionDownload(String username) throws Throwable {
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
URI target = mainStepdefs.baseUri().setPath("/download/" + ONE_ATTACHMENT_EML_ATTACHMENT_BLOB_ID).build();
Request request = Request.Options(target);
if (accessToken != null) {
@@ -182,7 +182,7 @@ public class DownloadStepdefs {
}
private Request authenticatedDownloadRequest(URIBuilder uriBuilder, String blobId, String username) throws URISyntaxException {
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
AttachmentAccessTokenKey key = new AttachmentAccessTokenKey(username, blobId);
if (attachmentAccessTokens.containsKey(key)) {
uriBuilder.addParameter("access_token", attachmentAccessTokens.get(key).serialize());
@@ -237,7 +237,7 @@ public class DownloadStepdefs {
private void trustForBlobId(String blobId, String username) throws Exception {
Response tokenGenerationResponse = Request.Post(mainStepdefs.baseUri().setPath("/download/" + blobId).build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(username).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.execute();
String serializedAttachmentAccessToken = tokenGenerationResponse.returnContent().asString();
attachmentAccessTokens.put(
@@ -252,7 +252,7 @@ public class DownloadStepdefs {
userStepdefs.execWithUser(username, () -> {
URIBuilder uriBuilder = mainStepdefs.baseUri().setPath("/download/badblobId");
response = Request.Get(uriBuilder.build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(username).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.execute()
.returnResponse();
@@ -332,7 +332,7 @@ public class DownloadStepdefs {
@When("^\"([^\"]*)\" asks for a token for attachment \"([^\"]*)\"$")
public void postDownload(String username, String attachmentId) throws Throwable {
String blobId = blobIdByAttachmentId.get(attachmentId);
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
response = Request.Post(mainStepdefs.baseUri().setPath("/download/" + blobId).build())
.addHeader("Authorization", accessToken.serialize())
.execute()
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
index 4a32a19..6858662 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
@@ -127,7 +127,7 @@ public class GetMessageListMethodStepdefs {
private void post(String requestBody) throws Exception {
response = Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(userStepdefs.getConnectedUser()).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(userStepdefs.getConnectedUser()).serialize())
.addHeader("Accept", org.apache.http.entity.ContentType.APPLICATION_JSON.getMimeType())
.bodyString(requestBody, org.apache.http.entity.ContentType.APPLICATION_JSON)
.execute()
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
index b2f22ff..b5da89f 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
@@ -498,7 +498,7 @@ public class GetMessagesMethodStepdefs {
private void post(String requestBody) throws Exception {
response = Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(userStepdefs.getConnectedUser()).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(userStepdefs.getConnectedUser()).serialize())
.addHeader("Accept", org.apache.http.entity.ContentType.APPLICATION_JSON.getMimeType())
.bodyString(requestBody, org.apache.http.entity.ContentType.APPLICATION_JSON)
.execute()
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
index 6adabc2..dfd785d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
@@ -98,7 +98,7 @@ public class SetMailboxesMethodStepdefs {
" ]" +
"]";
Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(username).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.bodyString(requestBody, ContentType.APPLICATION_JSON)
.execute()
.discardContent();
@@ -127,7 +127,7 @@ public class SetMailboxesMethodStepdefs {
"]";
Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(username).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.bodyString(requestBody, ContentType.APPLICATION_JSON)
.execute()
.discardContent();
@@ -142,7 +142,7 @@ public class SetMailboxesMethodStepdefs {
Awaitility.await().atMost(Duration.FIVE_SECONDS).pollDelay(slowPacedPollInterval).pollInterval(slowPacedPollInterval).until(() -> {
HttpResponse response = Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(username).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.bodyString("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId + "\"]}}, \"#0\"]]", ContentType.APPLICATION_JSON)
.execute().returnResponse();
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMessagesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMessagesMethodStepdefs.java
index 600070c..64a0d0b 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMessagesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMessagesMethodStepdefs.java
@@ -73,7 +73,7 @@ public class SetMessagesMethodStepdefs {
" ]" +
"]";
Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(username).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.bodyString(requestBody, ContentType.APPLICATION_JSON)
.execute()
.discardContent();
@@ -104,7 +104,7 @@ public class SetMessagesMethodStepdefs {
" ]" +
"]";
Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(userName).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(userName).serialize())
.bodyString(requestBody, ContentType.APPLICATION_JSON)
.execute()
.discardContent();
@@ -120,7 +120,7 @@ public class SetMessagesMethodStepdefs {
.collect(Collectors.joining(","));
Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
- .addHeader("Authorization", userStepdefs.getTokenForUser(username).serialize())
+ .addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.bodyString("[" +
" [" +
" \"setMessages\","+
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
index 5b54a6e..87e1f3b 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
@@ -73,7 +73,7 @@ public class UploadStepdefs {
@Given("^\"([^\"]*)\" is starting uploading a content$")
public void userStartUploadContent(String username) throws Throwable {
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
CountDownLatch startSignal = new CountDownLatch(2);
CountDownConsumeInputStream bodyStream = new CountDownConsumeInputStream(startSignal);
@@ -104,7 +104,7 @@ public class UploadStepdefs {
@When("^\"([^\"]*)\" upload a content$")
public void userUploadContent(String username) throws Throwable {
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
Request request = Request.Post(uploadUri)
.bodyStream(new BufferedInputStream(new ZeroedInputStream(_1M), _1M), org.apache.http.entity.ContentType.DEFAULT_BINARY);
@@ -121,7 +121,7 @@ public class UploadStepdefs {
@When("^\"([^\"]*)\" upload a content without content type$")
public void userUploadContentWithoutContentType(String username) throws Throwable {
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
Request request = Request.Post(uploadUri)
.bodyByteArray("some text".getBytes(Charsets.UTF_8));
if (accessToken != null) {
@@ -132,7 +132,7 @@ public class UploadStepdefs {
@When("^\"([^\"]*)\" upload a too big content$")
public void userUploadTooBigContent(String username) throws Throwable {
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
Request request = Request.Post(uploadUri)
.bodyStream(new BufferedInputStream(new ZeroedInputStream(_10M), _10M), org.apache.http.entity.ContentType.DEFAULT_BINARY);
if (accessToken != null) {
@@ -143,7 +143,7 @@ public class UploadStepdefs {
@When("^\"([^\"]*)\" checks for the availability of the upload endpoint$")
public void optionUpload(String username) throws Throwable {
- userStepdefs.getTokenForUser(username);
+ userStepdefs.authenticate(username);
Request request = Request.Options(uploadUri);
response = request.execute().returnResponse();
}
@@ -203,7 +203,7 @@ public class UploadStepdefs {
@Then("^\"([^\"]*)\" should be able to retrieve the content$")
public void contentShouldBeRetrievable(String username) throws Exception {
- AccessToken accessToken = userStepdefs.getTokenForUser(username);
+ AccessToken accessToken = userStepdefs.authenticate(username);
Request request = Request.Get(mainStepdefs.baseUri().setPath("/download/" + _1M_ZEROED_FILE_BLOB_ID).build());
if (accessToken != null) {
request.addHeader("Authorization", accessToken.serialize());
http://git-wip-us.apache.org/repos/asf/james-project/blob/2140f42d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
index fcb870f..2ef61e4 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
@@ -113,12 +113,12 @@ public class UserStepdefs {
@Given("^\"([^\"]*)\" is connected$")
public void connectUser(String username) throws Throwable {
- AccessToken accessToken = getTokenForUser(username);
+ AccessToken accessToken = authenticate(username);
tokenByUser.put(username, accessToken);
lastConnectedUser = Optional.of(username);
}
- public AccessToken getTokenForUser(String username) {
+ public AccessToken authenticate(String username) {
return tokenByUser.computeIfAbsent(username, (user) -> {
String password = passwordByUser.get(user);
Preconditions.checkState(password != null, "unknown user " + user);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org