This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 8aaaf618601c0da52ec8ecda2b50914a7885020c Author: Benoit Tellier <[email protected]> AuthorDate: Wed Mar 23 10:08:38 2022 +0700 JAMES-3738 Move encryption to protocols/netty --- .../org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java | 2 +- .../james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java | 2 -- .../org/apache/james/protocols/netty/BasicChannelInboundHandler.java | 1 - .../src/main/java/org/apache/james/protocols/netty}/Encryption.java | 3 ++- .../src/main/java/org/apache/james/protocols/netty/NettyServer.java | 1 - .../test/java/org/apache/james/protocols/netty/NettyServerTest.java | 1 - .../java/org/apache/james/protocols/pop3/AbstractPOP3SServerTest.java | 2 +- .../apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java | 2 +- .../org/apache/james/protocols/pop3/netty/NettyPOP3SServerTest.java | 4 +--- .../james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java | 2 +- .../java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java | 2 +- .../org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java | 2 +- .../james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java | 2 +- .../src/main/java/org/apache/james/imapserver/netty/IMAPServer.java | 2 +- .../org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java | 2 +- .../main/java/org/apache/james/imapserver/netty/NettyImapSession.java | 2 +- .../james/protocols/lib/netty/AbstractConfigurableAsyncServer.java | 2 +- .../james/protocols/lib/AbstractConfigurableAsyncServerTest.java | 2 +- .../managesieveserver/netty/ManageSieveChannelUpstreamHandler.java | 2 +- .../org/apache/james/managesieveserver/netty/ManageSieveServer.java | 2 +- .../org/apache/james/smtpserver/netty/SMTPChannelInboundHandler.java | 2 +- 21 files changed, 18 insertions(+), 24 deletions(-) diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java index 43725d0fd8..98d6484384 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java @@ -2,11 +2,11 @@ package org.apache.james.protocols.lmtp.netty; import java.net.InetSocketAddress; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.lmtp.AbstractLMTPSServerTest; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.netty.NettyServer; public class NettyLMTPSServerTest extends AbstractLMTPSServerTest { diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java index 2292c28401..16b49f2790 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java @@ -20,8 +20,6 @@ package org.apache.james.protocols.netty; import javax.net.ssl.SSLEngine; -import org.apache.james.protocols.api.Encryption; - import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelInboundHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelInboundHandler.java index 3db739e422..9a8c2a4b46 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelInboundHandler.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelInboundHandler.java @@ -31,7 +31,6 @@ import java.util.concurrent.ConcurrentLinkedDeque; import javax.net.ssl.SSLEngine; import org.apache.james.protocols.api.CommandDetectionSession; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.ProtocolSessionImpl; diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/Encryption.java similarity index 98% rename from protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java rename to protocols/netty/src/main/java/org/apache/james/protocols/netty/Encryption.java index e0618905e1..5841a75f0f 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/Encryption.java @@ -17,12 +17,13 @@ * under the License. * ****************************************************************/ -package org.apache.james.protocols.api; +package org.apache.james.protocols.netty; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import org.apache.commons.lang3.ArrayUtils; +import org.apache.james.protocols.api.ClientAuth; /** * This class should be used to setup encrypted protocol handling diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java index 1eda6a5672..a830adcc7d 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java @@ -22,7 +22,6 @@ import java.util.Optional; import javax.inject.Inject; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import com.google.common.base.Preconditions; diff --git a/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java b/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java index 61bf0f658d..9c575784e8 100644 --- a/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java +++ b/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.mock; import javax.net.ssl.SSLContext; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.junit.jupiter.api.Test; diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3SServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3SServerTest.java index 6d7984cbc3..f258317145 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3SServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3SServerTest.java @@ -20,11 +20,11 @@ package org.apache.james.protocols.pop3; import org.apache.commons.net.pop3.POP3Client; import org.apache.commons.net.pop3.POP3SClient; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; +import org.apache.james.protocols.netty.Encryption; public abstract class AbstractPOP3SServerTest extends AbstractPOP3ServerTest { diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java index 03c1aea80e..bce04f9f00 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java @@ -26,13 +26,13 @@ import java.util.Arrays; import org.apache.commons.net.pop3.POP3Reply; import org.apache.commons.net.pop3.POP3SClient; import org.apache.james.metrics.tests.RecordingMetricFactory; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.handler.WiringException; import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; import org.apache.james.protocols.api.utils.ProtocolServerUtils; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.pop3.core.AbstractPassCmdHandler; import org.apache.james.protocols.pop3.utils.MockMailbox; import org.apache.james.protocols.pop3.utils.TestPassCmdHandler; diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3SServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3SServerTest.java index 590381efb7..9f39578b99 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3SServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3SServerTest.java @@ -20,13 +20,11 @@ package org.apache.james.protocols.pop3.netty; import java.net.InetSocketAddress; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.netty.NettyServer; import org.apache.james.protocols.pop3.AbstractPOP3SServerTest; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; public class NettyPOP3SServerTest extends AbstractPOP3SServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java index 2bcbd72a59..39f64cd09b 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java @@ -20,9 +20,9 @@ package org.apache.james.protocols.pop3.netty; import java.net.InetSocketAddress; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.netty.NettyServer; import org.apache.james.protocols.pop3.AbstractStartTlsPOP3ServerTest; diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java index 94249a8a7e..442a3ec87f 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java @@ -20,11 +20,11 @@ package org.apache.james.protocols.smtp; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPSClient; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; +import org.apache.james.protocols.netty.Encryption; public abstract class AbstractSMTPSServerTest extends AbstractSMTPServerTest { diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java index 36eb453686..21a0c33532 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java @@ -20,9 +20,9 @@ package org.apache.james.protocols.smtp.netty; import java.net.InetSocketAddress; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.netty.NettyServer; import org.apache.james.protocols.smtp.AbstractSMTPSServerTest; diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java index 8cfaf77bdc..394d8baf03 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java @@ -35,7 +35,6 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.net.smtp.SMTPReply; import org.apache.commons.net.smtp.SMTPSClient; import org.apache.james.metrics.tests.RecordingMetricFactory; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.handler.ProtocolHandler; @@ -46,6 +45,7 @@ import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; import org.apache.james.protocols.api.utils.ProtocolServerUtils; import org.apache.james.protocols.netty.AbstractChannelPipelineFactory; import org.apache.james.protocols.netty.AllButStartTlsLineChannelHandlerFactory; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.netty.NettyServer; import org.apache.james.protocols.smtp.SMTPConfigurationImpl; import org.apache.james.protocols.smtp.SMTPProtocol; diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java index 4e3ce1b928..0540a41012 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java @@ -32,13 +32,13 @@ import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.process.ImapProcessor; import org.apache.james.imap.decode.ImapDecoder; import org.apache.james.imap.encode.ImapEncoder; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.OidcSASLConfiguration; import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer; import org.apache.james.protocols.netty.AbstractChannelPipelineFactory; import org.apache.james.protocols.netty.ChannelHandlerFactory; import org.apache.james.protocols.netty.ConnectionLimitUpstreamHandler; import org.apache.james.protocols.netty.ConnectionPerIpLimitUpstreamHandler; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.netty.HandlerConstants; import org.apache.james.util.Size; import org.slf4j.Logger; diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java index d9017cfd02..a34dd6c4bf 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java @@ -37,7 +37,7 @@ import org.apache.james.imap.encode.ImapResponseComposer; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.main.ResponseEncoder; import org.apache.james.metrics.api.Metric; -import org.apache.james.protocols.api.Encryption; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.util.MDCBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java index e19f2c6750..0099d20af5 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java @@ -36,8 +36,8 @@ import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.encode.main.DefaultLocalizer; import org.apache.james.imap.message.Literal; import org.apache.james.imap.message.response.ImmutableStatusResponse; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.OidcSASLConfiguration; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.netty.LineHandlerAware; import io.netty.buffer.Unpooled; diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index a744bdf44f..de8b5f2397 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -42,12 +42,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.protocols.api.ClientAuth; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.lib.jmx.ServerMBean; import org.apache.james.protocols.netty.AbstractAsyncServer; import org.apache.james.protocols.netty.AbstractChannelPipelineFactory; import org.apache.james.protocols.netty.AbstractSSLAwareChannelPipelineFactory; import org.apache.james.protocols.netty.ChannelHandlerFactory; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.util.concurrent.NamedThreadFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/AbstractConfigurableAsyncServerTest.java b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/AbstractConfigurableAsyncServerTest.java index b12b7a046e..df072ea1d7 100644 --- a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/AbstractConfigurableAsyncServerTest.java +++ b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/AbstractConfigurableAsyncServerTest.java @@ -34,10 +34,10 @@ import java.util.Map; import org.apache.commons.lang3.NotImplementedException; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.protocols.api.ClientAuth; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.lib.mock.ConfigLoader; import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer; import org.apache.james.protocols.netty.ChannelHandlerFactory; +import org.apache.james.protocols.netty.Encryption; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java index 28c3acb1c3..8687f8df18 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java @@ -27,7 +27,7 @@ import org.apache.james.managesieve.api.SessionTerminatedException; import org.apache.james.managesieve.transcode.ManageSieveProcessor; import org.apache.james.managesieve.transcode.NotEnoughDataException; import org.apache.james.managesieve.util.SettableSession; -import org.apache.james.protocols.api.Encryption; +import org.apache.james.protocols.netty.Encryption; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java index 1254bd2420..492dd1172f 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java @@ -31,13 +31,13 @@ import org.apache.commons.configuration2.HierarchicalConfiguration; import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.james.managesieve.transcode.ManageSieveProcessor; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer; import org.apache.james.protocols.netty.AbstractChannelPipelineFactory; import org.apache.james.protocols.netty.AllButStartTlsLineChannelHandlerFactory; import org.apache.james.protocols.netty.ChannelHandlerFactory; import org.apache.james.protocols.netty.ConnectionLimitUpstreamHandler; import org.apache.james.protocols.netty.ConnectionPerIpLimitUpstreamHandler; +import org.apache.james.protocols.netty.Encryption; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelInboundHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelInboundHandler.java index 251522675c..44a695473d 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelInboundHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelInboundHandler.java @@ -19,10 +19,10 @@ package org.apache.james.smtpserver.netty; import org.apache.james.lifecycle.api.LifecycleUtil; -import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.netty.BasicChannelInboundHandler; +import org.apache.james.protocols.netty.Encryption; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.core.SMTPMDCContextFactory; import org.apache.james.smtpserver.SMTPConstants; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
