Skip to content

Commit

Permalink
JAMES-1925 Rename FirstUserConnectionFilter to UserProvisioningFilter
Browse files Browse the repository at this point in the history
  • Loading branch information
aduprat committed Feb 9, 2017
1 parent 4473335 commit dea8f2e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
Expand Up @@ -40,7 +40,7 @@ public class JMAPServer implements Configurable {
@Inject
private JMAPServer(JMAPConfiguration jmapConfiguration,
AuthenticationServlet authenticationServlet, JMAPServlet jmapServlet, DownloadServlet downloadServlet, UploadServlet uploadServlet,
AuthenticationFilter authenticationFilter, FirstUserConnectionFilter firstUserConnectionFilter) {
AuthenticationFilter authenticationFilter, UserProvisioningFilter userProvisioningFilter) {

server = JettyHttpServer.create(
configurationBuilderFor(jmapConfiguration)
Expand All @@ -53,7 +53,7 @@ private JMAPServer(JMAPConfiguration jmapConfiguration,
.with(jmapServlet)
.filter(JMAPUrls.JMAP)
.with(new AllowAllCrossOriginRequests(bypass(authenticationFilter).on("OPTIONS").only()))
.and(firstUserConnectionFilter)
.and(userProvisioningFilter)
.only()
.serveAsOneLevelTemplate(JMAPUrls.DOWNLOAD)
.with(downloadServlet)
Expand Down
Expand Up @@ -47,15 +47,15 @@
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;

public class FirstUserConnectionFilter implements Filter {
public class UserProvisioningFilter implements Filter {

private static final ImmutableList<String> DEFAULT_MAILBOXES = ImmutableList.of("INBOX", "Outbox", "Sent", "Trash");
private static final Logger LOGGER = LoggerFactory.getLogger(FirstUserConnectionFilter.class);
private static final Logger LOGGER = LoggerFactory.getLogger(UserProvisioningFilter.class);
private final UsersRepository usersRepository;
private final MailboxManager mailboxManager;

@Inject
@VisibleForTesting FirstUserConnectionFilter(UsersRepository usersRepository, MailboxManager mailboxManager) {
@VisibleForTesting UserProvisioningFilter(UsersRepository usersRepository, MailboxManager mailboxManager) {
this.usersRepository = usersRepository;
this.mailboxManager = mailboxManager;
}
Expand Down
Expand Up @@ -35,16 +35,16 @@
import org.junit.Before;
import org.junit.Test;

public class FirstUserConnectionFilterTest {
public class UserProvisioningFilterTest {

private FirstUserConnectionFilter sut;
private UserProvisioningFilter sut;
private InMemoryUsersRepository usersRepository;

@Before
public void setup() {
usersRepository = new InMemoryUsersRepository();
MailboxManager mailboxManager = mock(MailboxManager.class);
sut = new FirstUserConnectionFilter(usersRepository, mailboxManager);
sut = new UserProvisioningFilter(usersRepository, mailboxManager);
}

@Test
Expand Down
Expand Up @@ -52,9 +52,9 @@
import com.google.testing.threadtester.ThreadedMain;
import com.google.testing.threadtester.ThreadedSecondary;

public class FirstUserConnectionFilterThreadTest {
public class UserProvisioningFilterThreadTest {

private FirstUserConnectionFilter sut;
private UserProvisioningFilter sut;
private InMemoryUsersRepository usersRepository;
private MailboxSession session;
private MailboxManager mailboxManager;
Expand All @@ -64,7 +64,7 @@ public void before() {
usersRepository = new InMemoryUsersRepository();
session = new MockMailboxSession("username");
mailboxManager = new FakeMailboxManager(session) ;
sut = new FirstUserConnectionFilter(usersRepository, mailboxManager);
sut = new UserProvisioningFilter(usersRepository, mailboxManager);
}

@ThreadedMain
Expand All @@ -85,7 +85,7 @@ public void after() {
@Test
public void testConcurrentAccessToFilterShouldNotThrow() {
AnnotatedTestRunner runner = new AnnotatedTestRunner();
runner.runTests(this.getClass(), FirstUserConnectionFilter.class);
runner.runTests(this.getClass(), UserProvisioningFilter.class);
}

private static class FakeMailboxManager implements MailboxManager {
Expand Down

0 comments on commit dea8f2e

Please sign in to comment.