Skip to content

Commit 35fcd1d

Browse files
vietjvietj
committed
The TCPSSLOptions data object class has setters overload for keyCertOptions and trustOptions with different sub interfaces of the base interfaces, e.g. setPfxTrustOptions(PfxTrustOptions) for setTrustOptions(TrustOptions). This was initially done to let the JSON generated converter work since KeyCertOptions and TrustOptions are used through their implementations.
This deprecates those un-necessary. The corresponding methods are removed in Vert.x 5
1 parent a38b0ba commit 35fcd1d

File tree

8 files changed

+105
-4
lines changed

8 files changed

+105
-4
lines changed

‎src/main/java/io/vertx/core/eventbus/EventBusOptions.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,35 +361,41 @@ public EventBusOptions setIdleTimeoutUnit(TimeUnit idleTimeoutUnit) {
361361

362362
@Override
363363
@GenIgnore
364+
@Deprecated
364365
public EventBusOptions setKeyCertOptions(KeyCertOptions options) {
365366
super.setKeyCertOptions(options);
366367
return this;
367368
}
368369

370+
@Deprecated
369371
@Override
370372
public EventBusOptions setKeyStoreOptions(JksOptions options) {
371373
super.setKeyStoreOptions(options);
372374
return this;
373375
}
374376

377+
@Deprecated
375378
@Override
376379
public EventBusOptions setPemKeyCertOptions(PemKeyCertOptions options) {
377380
super.setPemKeyCertOptions(options);
378381
return this;
379382
}
380383

384+
@Deprecated
381385
@Override
382386
public EventBusOptions setPemTrustOptions(PemTrustOptions options) {
383387
super.setPemTrustOptions(options);
384388
return this;
385389
}
386390

391+
@Deprecated
387392
@Override
388393
public EventBusOptions setPfxKeyCertOptions(PfxOptions options) {
389394
super.setPfxKeyCertOptions(options);
390395
return this;
391396
}
392397

398+
@Deprecated
393399
@Override
394400
public EventBusOptions setPfxTrustOptions(PfxOptions options) {
395401
super.setPfxTrustOptions(options);
@@ -426,6 +432,7 @@ public EventBusOptions setTrustOptions(TrustOptions options) {
426432
return this;
427433
}
428434

435+
@Deprecated
429436
@Override
430437
public EventBusOptions setTrustStoreOptions(JksOptions options) {
431438
super.setTrustStoreOptions(options);
@@ -472,11 +479,13 @@ public EventBusOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions) {
472479
return (EventBusOptions) super.setSslEngineOptions(sslEngineOptions);
473480
}
474481

482+
@Deprecated
475483
@Override
476484
public EventBusOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
477485
return (EventBusOptions) super.setJdkSslEngineOptions(sslEngineOptions);
478486
}
479487

488+
@Deprecated
480489
@Override
481490
public EventBusOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
482491
return (EventBusOptions) super.setOpenSslEngineOptions(sslEngineOptions);

‎src/main/java/io/vertx/core/http/HttpClientOptions.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,18 +482,21 @@ public HttpClientOptions setSsl(boolean ssl) {
482482
return this;
483483
}
484484

485+
@Deprecated
485486
@Override
486487
public HttpClientOptions setKeyCertOptions(KeyCertOptions options) {
487488
super.setKeyCertOptions(options);
488489
return this;
489490
}
490491

492+
@Deprecated
491493
@Override
492494
public HttpClientOptions setKeyStoreOptions(JksOptions options) {
493495
super.setKeyStoreOptions(options);
494496
return this;
495497
}
496498

499+
@Deprecated
497500
@Override
498501
public HttpClientOptions setPfxKeyCertOptions(PfxOptions options) {
499502
return (HttpClientOptions) super.setPfxKeyCertOptions(options);
@@ -505,22 +508,26 @@ public HttpClientOptions setTrustOptions(TrustOptions options) {
505508
return this;
506509
}
507510

511+
@Deprecated
508512
@Override
509513
public HttpClientOptions setPemKeyCertOptions(PemKeyCertOptions options) {
510514
return (HttpClientOptions) super.setPemKeyCertOptions(options);
511515
}
512516

517+
@Deprecated
513518
@Override
514519
public HttpClientOptions setTrustStoreOptions(JksOptions options) {
515520
super.setTrustStoreOptions(options);
516521
return this;
517522
}
518523

524+
@Deprecated
519525
@Override
520526
public HttpClientOptions setPfxTrustOptions(PfxOptions options) {
521527
return (HttpClientOptions) super.setPfxTrustOptions(options);
522528
}
523529

530+
@Deprecated
524531
@Override
525532
public HttpClientOptions setPemTrustOptions(PemTrustOptions options) {
526533
return (HttpClientOptions) super.setPemTrustOptions(options);
@@ -1121,11 +1128,13 @@ public HttpClientOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions)
11211128
return (HttpClientOptions) super.setSslEngineOptions(sslEngineOptions);
11221129
}
11231130

1131+
@Deprecated
11241132
@Override
11251133
public HttpClientOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
11261134
return (HttpClientOptions) super.setSslEngineOptions(sslEngineOptions);
11271135
}
11281136

1137+
@Deprecated
11291138
@Override
11301139
public HttpClientOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
11311140
return (HttpClientOptions) super.setSslEngineOptions(sslEngineOptions);

‎src/main/java/io/vertx/core/http/HttpServerOptions.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,23 +395,27 @@ public HttpServerOptions setUseAlpn(boolean useAlpn) {
395395
return this;
396396
}
397397

398+
@Deprecated
398399
@Override
399400
public HttpServerOptions setKeyCertOptions(KeyCertOptions options) {
400401
super.setKeyCertOptions(options);
401402
return this;
402403
}
403404

405+
@Deprecated
404406
@Override
405407
public HttpServerOptions setKeyStoreOptions(JksOptions options) {
406408
super.setKeyStoreOptions(options);
407409
return this;
408410
}
409411

412+
@Deprecated
410413
@Override
411414
public HttpServerOptions setPfxKeyCertOptions(PfxOptions options) {
412415
return (HttpServerOptions) super.setPfxKeyCertOptions(options);
413416
}
414417

418+
@Deprecated
415419
@Override
416420
public HttpServerOptions setPemKeyCertOptions(PemKeyCertOptions options) {
417421
return (HttpServerOptions) super.setPemKeyCertOptions(options);
@@ -423,17 +427,20 @@ public HttpServerOptions setTrustOptions(TrustOptions options) {
423427
return this;
424428
}
425429

430+
@Deprecated
426431
@Override
427432
public HttpServerOptions setTrustStoreOptions(JksOptions options) {
428433
super.setTrustStoreOptions(options);
429434
return this;
430435
}
431436

437+
@Deprecated
432438
@Override
433439
public HttpServerOptions setPemTrustOptions(PemTrustOptions options) {
434440
return (HttpServerOptions) super.setPemTrustOptions(options);
435441
}
436442

443+
@Deprecated
437444
@Override
438445
public HttpServerOptions setPfxTrustOptions(PfxOptions options) {
439446
return (HttpServerOptions) super.setPfxTrustOptions(options);
@@ -516,11 +523,13 @@ public HttpServerOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions)
516523
return this;
517524
}
518525

526+
@Deprecated
519527
@Override
520528
public HttpServerOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
521529
return (HttpServerOptions) super.setSslEngineOptions(sslEngineOptions);
522530
}
523531

532+
@Deprecated
524533
@Override
525534
public HttpServerOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
526535
return (HttpServerOptions) super.setSslEngineOptions(sslEngineOptions);

‎src/main/java/io/vertx/core/http/WebSocketClientOptions.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,21 +497,25 @@ public WebSocketClientOptions setSsl(boolean ssl) {
497497
return (WebSocketClientOptions)super.setSsl(ssl);
498498
}
499499

500+
@Deprecated
500501
@Override
501502
public WebSocketClientOptions setKeyCertOptions(KeyCertOptions options) {
502503
return (WebSocketClientOptions)super.setKeyCertOptions(options);
503504
}
504505

506+
@Deprecated
505507
@Override
506508
public WebSocketClientOptions setKeyStoreOptions(JksOptions options) {
507509
return (WebSocketClientOptions)super.setKeyStoreOptions(options);
508510
}
509511

512+
@Deprecated
510513
@Override
511514
public WebSocketClientOptions setPfxKeyCertOptions(PfxOptions options) {
512515
return (WebSocketClientOptions)super.setPfxKeyCertOptions(options);
513516
}
514517

518+
@Deprecated
515519
@Override
516520
public WebSocketClientOptions setPemKeyCertOptions(PemKeyCertOptions options) {
517521
return (WebSocketClientOptions)super.setPemKeyCertOptions(options);
@@ -522,16 +526,19 @@ public WebSocketClientOptions setTrustOptions(TrustOptions options) {
522526
return (WebSocketClientOptions)super.setTrustOptions(options);
523527
}
524528

529+
@Deprecated
525530
@Override
526531
public WebSocketClientOptions setTrustStoreOptions(JksOptions options) {
527532
return (WebSocketClientOptions)super.setTrustStoreOptions(options);
528533
}
529534

535+
@Deprecated
530536
@Override
531537
public WebSocketClientOptions setPfxTrustOptions(PfxOptions options) {
532538
return (WebSocketClientOptions)super.setPfxTrustOptions(options);
533539
}
534540

541+
@Deprecated
535542
@Override
536543
public WebSocketClientOptions setPemTrustOptions(PemTrustOptions options) {
537544
return (WebSocketClientOptions)super.setPemTrustOptions(options);
@@ -547,11 +554,13 @@ public WebSocketClientOptions setSslEngineOptions(SSLEngineOptions sslEngineOpti
547554
return (WebSocketClientOptions)super.setSslEngineOptions(sslEngineOptions);
548555
}
549556

557+
@Deprecated
550558
@Override
551559
public WebSocketClientOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
552560
return (WebSocketClientOptions)super.setJdkSslEngineOptions(sslEngineOptions);
553561
}
554562

563+
@Deprecated
555564
@Override
556565
public WebSocketClientOptions setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
557566
return (WebSocketClientOptions)super.setOpenSslEngineOptions(sslEngineOptions);

‎src/main/java/io/vertx/core/net/ClientOptionsBase.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,21 +287,25 @@ public ClientOptionsBase setSsl(boolean ssl) {
287287
return (ClientOptionsBase) super.setSsl(ssl);
288288
}
289289

290+
@Deprecated
290291
@Override
291292
public ClientOptionsBase setKeyCertOptions(KeyCertOptions options) {
292293
return (ClientOptionsBase) super.setKeyCertOptions(options);
293294
}
294295

296+
@Deprecated
295297
@Override
296298
public ClientOptionsBase setKeyStoreOptions(JksOptions options) {
297299
return (ClientOptionsBase) super.setKeyStoreOptions(options);
298300
}
299301

302+
@Deprecated
300303
@Override
301304
public ClientOptionsBase setPfxKeyCertOptions(PfxOptions options) {
302305
return (ClientOptionsBase) super.setPfxKeyCertOptions(options);
303306
}
304307

308+
@Deprecated
305309
@Override
306310
public ClientOptionsBase setPemKeyCertOptions(PemKeyCertOptions options) {
307311
return (ClientOptionsBase) super.setPemKeyCertOptions(options);
@@ -312,16 +316,19 @@ public ClientOptionsBase setTrustOptions(TrustOptions options) {
312316
return (ClientOptionsBase) super.setTrustOptions(options);
313317
}
314318

319+
@Deprecated
315320
@Override
316321
public ClientOptionsBase setTrustStoreOptions(JksOptions options) {
317322
return (ClientOptionsBase) super.setTrustStoreOptions(options);
318323
}
319324

325+
@Deprecated
320326
@Override
321327
public ClientOptionsBase setPfxTrustOptions(PfxOptions options) {
322328
return (ClientOptionsBase) super.setPfxTrustOptions(options);
323329
}
324330

331+
@Deprecated
325332
@Override
326333
public ClientOptionsBase setPemTrustOptions(PemTrustOptions options) {
327334
return (ClientOptionsBase) super.setPemTrustOptions(options);
@@ -337,11 +344,13 @@ public ClientOptionsBase setSslEngineOptions(SSLEngineOptions sslEngineOptions)
337344
return (ClientOptionsBase) super.setSslEngineOptions(sslEngineOptions);
338345
}
339346

347+
@Deprecated
340348
@Override
341349
public ClientOptionsBase setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
342350
return (ClientOptionsBase) super.setJdkSslEngineOptions(sslEngineOptions);
343351
}
344352

353+
@Deprecated
345354
@Override
346355
public ClientOptionsBase setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
347356
return (ClientOptionsBase) super.setOpenSslEngineOptions(sslEngineOptions);

‎src/main/java/io/vertx/core/net/NetClientOptions.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,23 +183,27 @@ public NetClientOptions setSsl(boolean ssl) {
183183
return this;
184184
}
185185

186+
@Deprecated
186187
@Override
187188
public NetClientOptions setKeyCertOptions(KeyCertOptions options) {
188189
super.setKeyCertOptions(options);
189190
return this;
190191
}
191192

193+
@Deprecated
192194
@Override
193195
public NetClientOptions setKeyStoreOptions(JksOptions options) {
194196
super.setKeyStoreOptions(options);
195197
return this;
196198
}
197199

200+
@Deprecated
198201
@Override
199202
public NetClientOptions setPfxKeyCertOptions(PfxOptions options) {
200203
return (NetClientOptions) super.setPfxKeyCertOptions(options);
201204
}
202205

206+
@Deprecated
203207
@Override
204208
public NetClientOptions setPemKeyCertOptions(PemKeyCertOptions options) {
205209
return (NetClientOptions) super.setPemKeyCertOptions(options);
@@ -211,17 +215,20 @@ public NetClientOptions setTrustOptions(TrustOptions options) {
211215
return this;
212216
}
213217

218+
@Deprecated
214219
@Override
215220
public NetClientOptions setTrustStoreOptions(JksOptions options) {
216221
super.setTrustStoreOptions(options);
217222
return this;
218223
}
219224

225+
@Deprecated
220226
@Override
221227
public NetClientOptions setPemTrustOptions(PemTrustOptions options) {
222228
return (NetClientOptions) super.setPemTrustOptions(options);
223229
}
224230

231+
@Deprecated
225232
@Override
226233
public NetClientOptions setPfxTrustOptions(PfxOptions options) {
227234
return (NetClientOptions) super.setPfxTrustOptions(options);
@@ -260,6 +267,7 @@ public NetClientOptions setSslEngineOptions(SSLEngineOptions sslEngineOptions) {
260267
return (NetClientOptions) super.setSslEngineOptions(sslEngineOptions);
261268
}
262269

270+
@Deprecated
263271
@Override
264272
public NetClientOptions setJdkSslEngineOptions(JdkSSLEngineOptions sslEngineOptions) {
265273
return (NetClientOptions) super.setJdkSslEngineOptions(sslEngineOptions);
@@ -280,6 +288,7 @@ public NetClientOptions setTcpQuickAck(boolean tcpQuickAck) {
280288
return (NetClientOptions) super.setTcpQuickAck(tcpQuickAck);
281289
}
282290

291+
@Deprecated
283292
@Override
284293
public ClientOptionsBase setOpenSslEngineOptions(OpenSSLEngineOptions sslEngineOptions) {
285294
return super.setOpenSslEngineOptions(sslEngineOptions);

0 commit comments

Comments
 (0)