@@ -69,15 +69,15 @@ class SslServerCustomizer implements JettyServerCustomizer {
69
69
70
70
@ Override
71
71
public void customize (Server server ) {
72
- SslContextFactory sslContextFactory = new SslContextFactory ();
72
+ SslContextFactory . Server sslContextFactory = new SslContextFactory . Server ();
73
73
configureSsl (sslContextFactory , this .ssl , this .sslStoreProvider );
74
74
ServerConnector connector = createConnector (server , sslContextFactory ,
75
75
this .address );
76
76
server .setConnectors (new Connector [] { connector });
77
77
}
78
78
79
79
private ServerConnector createConnector (Server server ,
80
- SslContextFactory sslContextFactory , InetSocketAddress address ) {
80
+ SslContextFactory . Server sslContextFactory , InetSocketAddress address ) {
81
81
HttpConfiguration config = new HttpConfiguration ();
82
82
config .setSendServerVersion (false );
83
83
config .setSecureScheme ("https" );
@@ -91,7 +91,7 @@ private ServerConnector createConnector(Server server,
91
91
}
92
92
93
93
private ServerConnector createServerConnector (Server server ,
94
- SslContextFactory sslContextFactory , HttpConfiguration config ) {
94
+ SslContextFactory . Server sslContextFactory , HttpConfiguration config ) {
95
95
if (this .http2 == null || !this .http2 .isEnabled ()) {
96
96
return createHttp11ServerConnector (server , config , sslContextFactory );
97
97
}
@@ -104,7 +104,7 @@ private ServerConnector createServerConnector(Server server,
104
104
}
105
105
106
106
private ServerConnector createHttp11ServerConnector (Server server ,
107
- HttpConfiguration config , SslContextFactory sslContextFactory ) {
107
+ HttpConfiguration config , SslContextFactory . Server sslContextFactory ) {
108
108
HttpConnectionFactory connectionFactory = new HttpConnectionFactory (config );
109
109
SslConnectionFactory sslConnectionFactory = new SslConnectionFactory (
110
110
sslContextFactory , HttpVersion .HTTP_1_1 .asString ());
@@ -121,7 +121,7 @@ private boolean isConscryptPresent() {
121
121
}
122
122
123
123
private ServerConnector createHttp2ServerConnector (Server server ,
124
- HttpConfiguration config , SslContextFactory sslContextFactory ) {
124
+ HttpConfiguration config , SslContextFactory . Server sslContextFactory ) {
125
125
HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory (config );
126
126
ALPNServerConnectionFactory alpn = new ALPNServerConnectionFactory ();
127
127
sslContextFactory .setCipherComparator (HTTP2Cipher .COMPARATOR );
@@ -134,11 +134,11 @@ private ServerConnector createHttp2ServerConnector(Server server,
134
134
135
135
/**
136
136
* Configure the SSL connection.
137
- * @param factory the Jetty {@link SslContextFactory}.
137
+ * @param factory the Jetty {@link SslContextFactory.Server }.
138
138
* @param ssl the ssl details.
139
139
* @param sslStoreProvider the ssl store provider
140
140
*/
141
- protected void configureSsl (SslContextFactory factory , Ssl ssl ,
141
+ protected void configureSsl (SslContextFactory . Server factory , Ssl ssl ,
142
142
SslStoreProvider sslStoreProvider ) {
143
143
factory .setProtocol (ssl .getProtocol ());
144
144
configureSslClientAuth (factory , ssl );
@@ -166,7 +166,7 @@ protected void configureSsl(SslContextFactory factory, Ssl ssl,
166
166
}
167
167
}
168
168
169
- private void configureSslClientAuth (SslContextFactory factory , Ssl ssl ) {
169
+ private void configureSslClientAuth (SslContextFactory . Server factory , Ssl ssl ) {
170
170
if (ssl .getClientAuth () == Ssl .ClientAuth .NEED ) {
171
171
factory .setNeedClientAuth (true );
172
172
factory .setWantClientAuth (true );
@@ -176,7 +176,7 @@ else if (ssl.getClientAuth() == Ssl.ClientAuth.WANT) {
176
176
}
177
177
}
178
178
179
- private void configureSslPasswords (SslContextFactory factory , Ssl ssl ) {
179
+ private void configureSslPasswords (SslContextFactory . Server factory , Ssl ssl ) {
180
180
if (ssl .getKeyStorePassword () != null ) {
181
181
factory .setKeyStorePassword (ssl .getKeyStorePassword ());
182
182
}
@@ -185,7 +185,7 @@ private void configureSslPasswords(SslContextFactory factory, Ssl ssl) {
185
185
}
186
186
}
187
187
188
- private void configureSslKeyStore (SslContextFactory factory , Ssl ssl ) {
188
+ private void configureSslKeyStore (SslContextFactory . Server factory , Ssl ssl ) {
189
189
try {
190
190
URL url = ResourceUtils .getURL (ssl .getKeyStore ());
191
191
factory .setKeyStoreResource (Resource .newResource (url ));
@@ -202,7 +202,7 @@ private void configureSslKeyStore(SslContextFactory factory, Ssl ssl) {
202
202
}
203
203
}
204
204
205
- private void configureSslTrustStore (SslContextFactory factory , Ssl ssl ) {
205
+ private void configureSslTrustStore (SslContextFactory . Server factory , Ssl ssl ) {
206
206
if (ssl .getTrustStorePassword () != null ) {
207
207
factory .setTrustStorePassword (ssl .getTrustStorePassword ());
208
208
}
0 commit comments