Skip to content

Commit 66ea3e1

Browse files
brendandburnsbrendandburns
committed
Update samples
1 parent 9abcf01 commit 66ea3e1

File tree

15 files changed

+510
-15
lines changed
  • samples/client
    • echo_api/java
      • okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client
      • okhttp-gson/src/main/java/org/openapitools/client
    • others/java
      • okhttp-gson-oneOf-array/src/main/java/org/openapitools/client
      • okhttp-gson-oneOf/src/main/java/org/openapitools/client
      • okhttp-gson-streaming/src/main/java/org/openapitools/client
    • petstore/java
      • okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client
      • okhttp-gson-3.1/src/main/java/org/openapitools/client
      • okhttp-gson-awsv4signature/src/main/java/org/openapitools/client
      • okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client
      • okhttp-gson-group-parameter/src/main/java/org/openapitools/client
      • okhttp-gson-nullable-required/src/main/java/org/openapitools/client
      • okhttp-gson-parcelableModel/src/main/java/org/openapitools/client
      • okhttp-gson-swagger1/src/main/java/org/openapitools/client
      • okhttp-gson-swagger2/src/main/java/org/openapitools/client
      • okhttp-gson/src/main/java/org/openapitools/client

15 files changed

+510
-15
lines changed

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
376376
return this;
377377
}
378378

379+
/**
380+
* Get TLS server name for SNI (Server Name Indication).
381+
*
382+
* @return The TLS server name
383+
*/
384+
public String getTlsServerName() {
385+
return tlsServerName;
386+
}
387+
388+
/**
389+
* Set TLS server name for SNI (Server Name Indication).
390+
* This is used to verify the server certificate against a specific hostname
391+
* instead of the hostname in the URL.
392+
*
393+
* @param tlsServerName The TLS server name to use for certificate verification
394+
* @return ApiClient
395+
*/
396+
public ApiClient setTlsServerName(String tlsServerName) {
397+
this.tlsServerName = tlsServerName;
398+
applySslSettings();
399+
return this;
400+
}
401+
379402
/**
380403
* <p>Getter for the field <code>dateFormat</code>.</p>
381404
*
@@ -1635,7 +1658,17 @@ public boolean verify(String hostname, SSLSession session) {
16351658
trustManagerFactory.init(caKeyStore);
16361659
}
16371660
trustManagers = trustManagerFactory.getTrustManagers();
1638-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1661+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1662+
hostnameVerifier = new HostnameVerifier() {
1663+
@Override
1664+
public boolean verify(String hostname, SSLSession session) {
1665+
// Verify the certificate against tlsServerName instead of the actual hostname
1666+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1667+
}
1668+
};
1669+
} else {
1670+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1671+
}
16391672
}
16401673

16411674
SSLContext sslContext = SSLContext.getInstance("TLS");

‎samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
304304
return this;
305305
}
306306

307+
/**
308+
* Get TLS server name for SNI (Server Name Indication).
309+
*
310+
* @return The TLS server name
311+
*/
312+
public String getTlsServerName() {
313+
return tlsServerName;
314+
}
315+
316+
/**
317+
* Set TLS server name for SNI (Server Name Indication).
318+
* This is used to verify the server certificate against a specific hostname
319+
* instead of the hostname in the URL.
320+
*
321+
* @param tlsServerName The TLS server name to use for certificate verification
322+
* @return ApiClient
323+
*/
324+
public ApiClient setTlsServerName(String tlsServerName) {
325+
this.tlsServerName = tlsServerName;
326+
applySslSettings();
327+
return this;
328+
}
329+
307330
/**
308331
* <p>Getter for the field <code>dateFormat</code>.</p>
309332
*
@@ -1565,7 +1588,17 @@ public boolean verify(String hostname, SSLSession session) {
15651588
trustManagerFactory.init(caKeyStore);
15661589
}
15671590
trustManagers = trustManagerFactory.getTrustManagers();
1568-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1591+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1592+
hostnameVerifier = new HostnameVerifier() {
1593+
@Override
1594+
public boolean verify(String hostname, SSLSession session) {
1595+
// Verify the certificate against tlsServerName instead of the actual hostname
1596+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1597+
}
1598+
};
1599+
} else {
1600+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1601+
}
15691602
}
15701603

15711604
SSLContext sslContext = SSLContext.getInstance("TLS");

‎samples/client/others/java/okhttp-gson-oneOf-array/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
300300
return this;
301301
}
302302

303+
/**
304+
* Get TLS server name for SNI (Server Name Indication).
305+
*
306+
* @return The TLS server name
307+
*/
308+
public String getTlsServerName() {
309+
return tlsServerName;
310+
}
311+
312+
/**
313+
* Set TLS server name for SNI (Server Name Indication).
314+
* This is used to verify the server certificate against a specific hostname
315+
* instead of the hostname in the URL.
316+
*
317+
* @param tlsServerName The TLS server name to use for certificate verification
318+
* @return ApiClient
319+
*/
320+
public ApiClient setTlsServerName(String tlsServerName) {
321+
this.tlsServerName = tlsServerName;
322+
applySslSettings();
323+
return this;
324+
}
325+
303326
/**
304327
* <p>Getter for the field <code>dateFormat</code>.</p>
305328
*
@@ -1539,7 +1562,17 @@ public boolean verify(String hostname, SSLSession session) {
15391562
trustManagerFactory.init(caKeyStore);
15401563
}
15411564
trustManagers = trustManagerFactory.getTrustManagers();
1542-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1565+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1566+
hostnameVerifier = new HostnameVerifier() {
1567+
@Override
1568+
public boolean verify(String hostname, SSLSession session) {
1569+
// Verify the certificate against tlsServerName instead of the actual hostname
1570+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1571+
}
1572+
};
1573+
} else {
1574+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1575+
}
15431576
}
15441577

15451578
SSLContext sslContext = SSLContext.getInstance("TLS");

‎samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
300300
return this;
301301
}
302302

303+
/**
304+
* Get TLS server name for SNI (Server Name Indication).
305+
*
306+
* @return The TLS server name
307+
*/
308+
public String getTlsServerName() {
309+
return tlsServerName;
310+
}
311+
312+
/**
313+
* Set TLS server name for SNI (Server Name Indication).
314+
* This is used to verify the server certificate against a specific hostname
315+
* instead of the hostname in the URL.
316+
*
317+
* @param tlsServerName The TLS server name to use for certificate verification
318+
* @return ApiClient
319+
*/
320+
public ApiClient setTlsServerName(String tlsServerName) {
321+
this.tlsServerName = tlsServerName;
322+
applySslSettings();
323+
return this;
324+
}
325+
303326
/**
304327
* <p>Getter for the field <code>dateFormat</code>.</p>
305328
*
@@ -1539,7 +1562,17 @@ public boolean verify(String hostname, SSLSession session) {
15391562
trustManagerFactory.init(caKeyStore);
15401563
}
15411564
trustManagers = trustManagerFactory.getTrustManagers();
1542-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1565+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1566+
hostnameVerifier = new HostnameVerifier() {
1567+
@Override
1568+
public boolean verify(String hostname, SSLSession session) {
1569+
// Verify the certificate against tlsServerName instead of the actual hostname
1570+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1571+
}
1572+
};
1573+
} else {
1574+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1575+
}
15431576
}
15441577

15451578
SSLContext sslContext = SSLContext.getInstance("TLS");

‎samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
300300
return this;
301301
}
302302

303+
/**
304+
* Get TLS server name for SNI (Server Name Indication).
305+
*
306+
* @return The TLS server name
307+
*/
308+
public String getTlsServerName() {
309+
return tlsServerName;
310+
}
311+
312+
/**
313+
* Set TLS server name for SNI (Server Name Indication).
314+
* This is used to verify the server certificate against a specific hostname
315+
* instead of the hostname in the URL.
316+
*
317+
* @param tlsServerName The TLS server name to use for certificate verification
318+
* @return ApiClient
319+
*/
320+
public ApiClient setTlsServerName(String tlsServerName) {
321+
this.tlsServerName = tlsServerName;
322+
applySslSettings();
323+
return this;
324+
}
325+
303326
/**
304327
* <p>Getter for the field <code>dateFormat</code>.</p>
305328
*
@@ -1562,7 +1585,17 @@ public boolean verify(String hostname, SSLSession session) {
15621585
trustManagerFactory.init(caKeyStore);
15631586
}
15641587
trustManagers = trustManagerFactory.getTrustManagers();
1565-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1588+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1589+
hostnameVerifier = new HostnameVerifier() {
1590+
@Override
1591+
public boolean verify(String hostname, SSLSession session) {
1592+
// Verify the certificate against tlsServerName instead of the actual hostname
1593+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1594+
}
1595+
};
1596+
} else {
1597+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1598+
}
15661599
}
15671600

15681601
SSLContext sslContext = SSLContext.getInstance("TLS");

‎samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
376376
return this;
377377
}
378378

379+
/**
380+
* Get TLS server name for SNI (Server Name Indication).
381+
*
382+
* @return The TLS server name
383+
*/
384+
public String getTlsServerName() {
385+
return tlsServerName;
386+
}
387+
388+
/**
389+
* Set TLS server name for SNI (Server Name Indication).
390+
* This is used to verify the server certificate against a specific hostname
391+
* instead of the hostname in the URL.
392+
*
393+
* @param tlsServerName The TLS server name to use for certificate verification
394+
* @return ApiClient
395+
*/
396+
public ApiClient setTlsServerName(String tlsServerName) {
397+
this.tlsServerName = tlsServerName;
398+
applySslSettings();
399+
return this;
400+
}
401+
379402
/**
380403
* <p>Getter for the field <code>dateFormat</code>.</p>
381404
*
@@ -1635,7 +1658,17 @@ public boolean verify(String hostname, SSLSession session) {
16351658
trustManagerFactory.init(caKeyStore);
16361659
}
16371660
trustManagers = trustManagerFactory.getTrustManagers();
1638-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1661+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1662+
hostnameVerifier = new HostnameVerifier() {
1663+
@Override
1664+
public boolean verify(String hostname, SSLSession session) {
1665+
// Verify the certificate against tlsServerName instead of the actual hostname
1666+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1667+
}
1668+
};
1669+
} else {
1670+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1671+
}
16391672
}
16401673

16411674
SSLContext sslContext = SSLContext.getInstance("TLS");

‎samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
376376
return this;
377377
}
378378

379+
/**
380+
* Get TLS server name for SNI (Server Name Indication).
381+
*
382+
* @return The TLS server name
383+
*/
384+
public String getTlsServerName() {
385+
return tlsServerName;
386+
}
387+
388+
/**
389+
* Set TLS server name for SNI (Server Name Indication).
390+
* This is used to verify the server certificate against a specific hostname
391+
* instead of the hostname in the URL.
392+
*
393+
* @param tlsServerName The TLS server name to use for certificate verification
394+
* @return ApiClient
395+
*/
396+
public ApiClient setTlsServerName(String tlsServerName) {
397+
this.tlsServerName = tlsServerName;
398+
applySslSettings();
399+
return this;
400+
}
401+
379402
/**
380403
* <p>Getter for the field <code>dateFormat</code>.</p>
381404
*
@@ -1635,7 +1658,17 @@ public boolean verify(String hostname, SSLSession session) {
16351658
trustManagerFactory.init(caKeyStore);
16361659
}
16371660
trustManagers = trustManagerFactory.getTrustManagers();
1638-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1661+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1662+
hostnameVerifier = new HostnameVerifier() {
1663+
@Override
1664+
public boolean verify(String hostname, SSLSession session) {
1665+
// Verify the certificate against tlsServerName instead of the actual hostname
1666+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1667+
}
1668+
};
1669+
} else {
1670+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1671+
}
16391672
}
16401673

16411674
SSLContext sslContext = SSLContext.getInstance("TLS");

‎samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,29 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
380380
return this;
381381
}
382382

383+
/**
384+
* Get TLS server name for SNI (Server Name Indication).
385+
*
386+
* @return The TLS server name
387+
*/
388+
public String getTlsServerName() {
389+
return tlsServerName;
390+
}
391+
392+
/**
393+
* Set TLS server name for SNI (Server Name Indication).
394+
* This is used to verify the server certificate against a specific hostname
395+
* instead of the hostname in the URL.
396+
*
397+
* @param tlsServerName The TLS server name to use for certificate verification
398+
* @return ApiClient
399+
*/
400+
public ApiClient setTlsServerName(String tlsServerName) {
401+
this.tlsServerName = tlsServerName;
402+
applySslSettings();
403+
return this;
404+
}
405+
383406
/**
384407
* <p>Getter for the field <code>dateFormat</code>.</p>
385408
*
@@ -1655,7 +1678,17 @@ public boolean verify(String hostname, SSLSession session) {
16551678
trustManagerFactory.init(caKeyStore);
16561679
}
16571680
trustManagers = trustManagerFactory.getTrustManagers();
1658-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1681+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1682+
hostnameVerifier = new HostnameVerifier() {
1683+
@Override
1684+
public boolean verify(String hostname, SSLSession session) {
1685+
// Verify the certificate against tlsServerName instead of the actual hostname
1686+
return OkHostnameVerifier.INSTANCE.verify(tlsServerName, session);
1687+
}
1688+
};
1689+
} else {
1690+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1691+
}
16591692
}
16601693

16611694
SSLContext sslContext = SSLContext.getInstance("TLS");

0 commit comments

Comments
 (0)