@@ -354,7 +354,7 @@ private MethodDefinition createRpcTestMethod(
354
354
AssignmentExpr .builder ()
355
355
.setVariableExpr (responsesElementVarExpr .toBuilder ().setIsDecl (true ).build ())
356
356
.setValueExpr (
357
- DefaultValueComposer .createDefaultValue (
357
+ DefaultValueComposer .createValue (
358
358
Field .builder ()
359
359
.setType (repeatedResponseType )
360
360
.setName ("responsesElement" )
@@ -377,23 +377,23 @@ private MethodDefinition createRpcTestMethod(
377
377
method .name (), methodOutputMessage .name ()));
378
378
379
379
expectedResponseValExpr =
380
- DefaultValueComposer .createSimplePagedResponse (
380
+ DefaultValueComposer .createSimplePagedResponseValue (
381
381
method .outputType (),
382
382
firstRepeatedField .name (),
383
383
responsesElementVarExpr ,
384
384
firstRepeatedField .isMap ());
385
385
} else {
386
386
if (messageTypes .containsKey (methodOutputType .reference ().fullName ())) {
387
387
expectedResponseValExpr =
388
- DefaultValueComposer .createSimpleMessageBuilderExpr (
388
+ DefaultValueComposer .createSimpleMessageBuilderValue (
389
389
messageTypes .get (methodOutputType .reference ().fullName ()),
390
390
resourceNames ,
391
391
messageTypes );
392
392
} else {
393
393
// Wrap this in a field so we don't have to split the helper into lots of different methods,
394
394
// or duplicate it for VariableExpr.
395
395
expectedResponseValExpr =
396
- DefaultValueComposer .createDefaultValue (
396
+ DefaultValueComposer .createValue (
397
397
Field .builder ()
398
398
.setType (methodOutputType )
399
399
.setIsMessage (true )
@@ -422,7 +422,7 @@ private MethodDefinition createRpcTestMethod(
422
422
AssignmentExpr .builder ()
423
423
.setVariableExpr (resultOperationVarExpr .toBuilder ().setIsDecl (true ).build ())
424
424
.setValueExpr (
425
- DefaultValueComposer .createSimpleOperationBuilderExpr (
425
+ DefaultValueComposer .createSimpleOperationBuilderValue (
426
426
String .format ("%sTest" , JavaStyle .toLowerCamelCase (method .name ())),
427
427
expectedResponseVarExpr ))
428
428
.build ());
@@ -457,22 +457,32 @@ private MethodDefinition createRpcTestMethod(
457
457
argExprs .add (requestVarExpr );
458
458
requestMessage = messageTypes .get (method .inputType ().reference ().fullName ());
459
459
Preconditions .checkNotNull (requestMessage );
460
+ Map <String , String > pathParamValuePatterns = Collections .emptyMap ();
461
+ if (getTransportContext ().useValuePatterns () && method .hasHttpBindings ()) {
462
+ pathParamValuePatterns = method .httpBindings ().getPathParametersValuePatterns ();
463
+ }
460
464
Expr valExpr =
461
- DefaultValueComposer .createSimpleMessageBuilderExpr (
462
- requestMessage , resourceNames , messageTypes );
465
+ DefaultValueComposer .createSimpleMessageBuilderValue (
466
+ requestMessage , resourceNames , messageTypes , pathParamValuePatterns );
463
467
methodExprs .add (
464
468
AssignmentExpr .builder ()
465
469
.setVariableExpr (requestVarExpr .toBuilder ().setIsDecl (true ).build ())
466
470
.setValueExpr (valExpr )
467
471
.build ());
468
472
} else {
473
+ Map <String , String > valuePatterns = Collections .emptyMap ();
474
+ if (getTransportContext ().useValuePatterns () && method .hasHttpBindings ()) {
475
+ valuePatterns = method .httpBindings ().getPathParametersValuePatterns ();
476
+ }
469
477
for (MethodArgument methodArg : methodSignature ) {
470
478
String methodArgName = JavaStyle .toLowerCamelCase (methodArg .name ());
471
479
VariableExpr varExpr =
472
480
VariableExpr .withVariable (
473
481
Variable .builder ().setType (methodArg .type ()).setName (methodArgName ).build ());
474
482
argExprs .add (varExpr );
475
- Expr valExpr = createDefaultValue (methodArg , resourceNames );
483
+ Expr valExpr =
484
+ DefaultValueComposer .createMethodArgValue (
485
+ methodArg , resourceNames , messageTypes , valuePatterns );
476
486
methodExprs .add (
477
487
AssignmentExpr .builder ()
478
488
.setVariableExpr (varExpr .toBuilder ().setIsDecl (true ).build ())
@@ -737,9 +747,6 @@ protected abstract List<Statement> createStreamingRpcExceptionTestStatements(
737
747
Map <String , ResourceName > resourceNames ,
738
748
Map <String , Message > messageTypes );
739
749
740
- protected abstract Expr createDefaultValue (
741
- MethodArgument methodArg , Map <String , ResourceName > resourceNames );
742
-
743
750
protected List <Statement > createRpcExceptionTestStatements (
744
751
Method method ,
745
752
List <MethodArgument > methodSignature ,
@@ -748,6 +755,7 @@ protected List<Statement> createRpcExceptionTestStatements(
748
755
Map <String , Message > messageTypes ) {
749
756
List <VariableExpr > argVarExprs = new ArrayList <>();
750
757
List <Expr > tryBodyExprs = new ArrayList <>();
758
+
751
759
if (methodSignature .isEmpty ()) {
752
760
// Construct the actual request.
753
761
VariableExpr varExpr =
@@ -756,22 +764,32 @@ protected List<Statement> createRpcExceptionTestStatements(
756
764
argVarExprs .add (varExpr );
757
765
Message requestMessage = messageTypes .get (method .inputType ().reference ().fullName ());
758
766
Preconditions .checkNotNull (requestMessage );
767
+ Map <String , String > valuePatterns = Collections .emptyMap ();
768
+ if (getTransportContext ().useValuePatterns () && method .hasHttpBindings ()) {
769
+ valuePatterns = method .httpBindings ().getPathParametersValuePatterns ();
770
+ }
759
771
Expr valExpr =
760
- DefaultValueComposer .createSimpleMessageBuilderExpr (
761
- requestMessage , resourceNames , messageTypes );
772
+ DefaultValueComposer .createSimpleMessageBuilderValue (
773
+ requestMessage , resourceNames , messageTypes , valuePatterns );
762
774
tryBodyExprs .add (
763
775
AssignmentExpr .builder ()
764
776
.setVariableExpr (varExpr .toBuilder ().setIsDecl (true ).build ())
765
777
.setValueExpr (valExpr )
766
778
.build ());
767
779
} else {
780
+ Map <String , String > valuePatterns = Collections .emptyMap ();
781
+ if (getTransportContext ().useValuePatterns () && method .hasHttpBindings ()) {
782
+ valuePatterns = method .httpBindings ().getPathParametersValuePatterns ();
783
+ }
768
784
for (MethodArgument methodArg : methodSignature ) {
769
785
String methodArgName = JavaStyle .toLowerCamelCase (methodArg .name ());
770
786
VariableExpr varExpr =
771
787
VariableExpr .withVariable (
772
788
Variable .builder ().setType (methodArg .type ()).setName (methodArgName ).build ());
773
789
argVarExprs .add (varExpr );
774
- Expr valExpr = createDefaultValue (methodArg , resourceNames );
790
+ Expr valExpr =
791
+ DefaultValueComposer .createMethodArgValue (
792
+ methodArg , resourceNames , messageTypes , valuePatterns );
775
793
tryBodyExprs .add (
776
794
AssignmentExpr .builder ()
777
795
.setVariableExpr (varExpr .toBuilder ().setIsDecl (true ).build ())
0 commit comments