@@ -3242,8 +3242,9 @@ public void validateCommonTlsContext_combinedValidationContext_isRequiredForClie
3242
3242
.build ();
3243
3243
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3244
3244
XdsClusterResource .validateCommonTlsContext (commonTlsContext , null , false ));
3245
- assertThat (e ).hasMessageThat ().isEqualTo ("ca_certificate_provider_instance or system_root_certs is required "
3246
- + "in upstream-tls-context" );
3245
+ assertThat (e ).hasMessageThat ().isEqualTo (
3246
+ "ca_certificate_provider_instance or system_root_certs is required "
3247
+ + "in upstream-tls-context" );
3247
3248
}
3248
3249
3249
3250
@ Test
@@ -3277,7 +3278,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextForS
3277
3278
.build ();
3278
3279
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3279
3280
XdsClusterResource .validateCommonTlsContext (commonTlsContext , ImmutableSet .of ("" ), true ));
3280
- assertThat (e ).hasMessageThat ().isEqualTo ("match_subject_alt_names only allowed in upstream_tls_context" );
3281
+ assertThat (e ).hasMessageThat ().isEqualTo (
3282
+ "match_subject_alt_names only allowed in upstream_tls_context" );
3281
3283
}
3282
3284
3283
3285
@ Test
@@ -3294,8 +3296,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextVeri
3294
3296
.build ();
3295
3297
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3296
3298
XdsClusterResource .validateCommonTlsContext (commonTlsContext , ImmutableSet .of ("" ), false ));
3297
- assertThat (e ).hasMessageThat ().isEqualTo ("verify_certificate_spki in default_validation_context is not "
3298
- + " supported" );
3299
+ assertThat (e ).hasMessageThat ().isEqualTo (
3300
+ "verify_certificate_spki in default_validation_context is not supported" );
3299
3301
}
3300
3302
3301
3303
@ Test
@@ -3312,8 +3314,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextVeri
3312
3314
.build ();
3313
3315
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3314
3316
XdsClusterResource .validateCommonTlsContext (commonTlsContext , ImmutableSet .of ("" ), false ));
3315
- assertThat (e ).hasMessageThat ().isEqualTo ("verify_certificate_hash in default_validation_context is not "
3316
- + " supported" );
3317
+ assertThat (e ).hasMessageThat ().isEqualTo (
3318
+ "verify_certificate_hash in default_validation_context is not supported" );
3317
3319
}
3318
3320
3319
3321
@ Test
@@ -3367,16 +3369,17 @@ public void validateCommonTlsContext_combinedValContextWithDfltValContextCustomV
3367
3369
.build ();
3368
3370
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3369
3371
XdsClusterResource .validateCommonTlsContext (commonTlsContext , ImmutableSet .of ("" ), false ));
3370
- assertThat (e ).hasMessageThat ().isEqualTo ("custom_validator_config in default_validation_context is not "
3371
- + " supported" );
3372
+ assertThat (e ).hasMessageThat ().isEqualTo (
3373
+ "custom_validator_config in default_validation_context is not supported" );
3372
3374
}
3373
3375
3374
3376
@ Test
3375
3377
public void validateDownstreamTlsContext_noCommonTlsContext () throws ResourceInvalidException {
3376
3378
DownstreamTlsContext downstreamTlsContext = DownstreamTlsContext .getDefaultInstance ();
3377
3379
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3378
3380
XdsListenerResource .validateDownstreamTlsContext (downstreamTlsContext , null ));
3379
- assertThat (e ).hasMessageThat ().isEqualTo ("common-tls-context is required in downstream-tls-context" );
3381
+ assertThat (e ).hasMessageThat ().isEqualTo (
3382
+ "common-tls-context is required in downstream-tls-context" );
3380
3383
}
3381
3384
3382
3385
@ Test
@@ -3396,7 +3399,8 @@ public void validateDownstreamTlsContext_hasRequireSni() throws ResourceInvalidE
3396
3399
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3397
3400
XdsListenerResource .validateDownstreamTlsContext (downstreamTlsContext ,
3398
3401
ImmutableSet .of ("" )));
3399
- assertThat (e ).hasMessageThat ().isEqualTo ("downstream-tls-context with require-sni is not supported" );
3402
+ assertThat (e ).hasMessageThat ().isEqualTo (
3403
+ "downstream-tls-context with require-sni is not supported" );
3400
3404
}
3401
3405
3402
3406
@ Test
@@ -3425,7 +3429,8 @@ public void validateUpstreamTlsContext_noCommonTlsContext() throws ResourceInval
3425
3429
UpstreamTlsContext upstreamTlsContext = UpstreamTlsContext .getDefaultInstance ();
3426
3430
ResourceInvalidException e = assertThrows (ResourceInvalidException .class , () ->
3427
3431
XdsClusterResource .validateUpstreamTlsContext (upstreamTlsContext , null ));
3428
- assertThat (e ).hasMessageThat ().isEqualTo ("common-tls-context is required in upstream-tls-context" );
3432
+ assertThat (e ).hasMessageThat ().isEqualTo (
3433
+ "common-tls-context is required in upstream-tls-context" );
3429
3434
}
3430
3435
3431
3436
@ Test
0 commit comments