@@ -67,16 +67,16 @@ private void addRoleImports(List<String> roles, ControllerReader controller) {
67
67
@ Override
68
68
public void writeReadParameter (Append writer , ParamType paramType , String paramName ) {
69
69
switch (paramType ) {
70
- case PATHPARAM -> writer .append ("pathParams.first (\" %s\" ).get()" , paramName );
70
+ case PATHPARAM -> writer .append ("pathParams.contains (\" %s\" ) ? pathParams .get(\" %s \" ) : null" , paramName , paramName );
71
71
72
- case QUERYPARAM -> writer .append ("req.query().first (\" %s\" ).orElse(null)" , paramName );
72
+ case QUERYPARAM -> writer .append ("req.query().contains (\" %s\" ) ? req.query().get( \" %s \" ) : null" , paramName , paramName );
73
73
74
- case FORMPARAM -> writer .append ("formParams.first (\" %s\" ).orElse(null)" , paramName );
74
+ case FORMPARAM -> writer .append ("formParams.contains (\" %s\" ) ? formParams.get( \" %s \" ) : null" , paramName , paramName );
75
75
76
76
case HEADER -> writer .append (
77
77
"req.headers().value(HeaderNames.create(\" %s\" )).orElse(null)" , paramName );
78
78
79
- case COOKIE -> writer .append ("req.headers().cookies().first (\" %s\" ).orElse(null)" , paramName );
79
+ case COOKIE -> writer .append ("req.headers().cookies().contains (\" %s\" ) ? req.headers().cookies().get( \" %s \" ) : null" , paramName , paramName );
80
80
81
81
default -> writer .append ("null // TODO req.%s().param(\" %s\" )" , paramType .type (), paramName );
82
82
}
@@ -86,19 +86,19 @@ public void writeReadParameter(Append writer, ParamType paramType, String paramN
86
86
public void writeReadParameter (Append writer , ParamType paramType , String paramName , String paramDefault ) {
87
87
switch (paramType ) {
88
88
case PATHPARAM -> writer .append (
89
- "pathParams.first (\" %s\" ).orElse (\" %s\" )" , paramName , paramDefault );
89
+ "pathParams.contains (\" %s\" ) ? pathParams.get (\" %s\" ) : \" %s \" " , paramName , paramName , paramDefault );
90
90
91
91
case QUERYPARAM -> writer .append (
92
- "req.query().first (\" %s\" ).orElse( \" %s\" )" , paramName , paramDefault );
92
+ "req.query().contains (\" %s\" ) ? req.query().get( \" %s\" ) : \" %s \" " , paramName , paramName , paramDefault );
93
93
94
94
case FORMPARAM -> writer .append (
95
- "formParams.first (\" %s\" ).orElse (\" %s\" )" , paramName , paramDefault );
95
+ "formParams.contains (\" %s\" ) ? formParams.get (\" %s\" ) : \" %s \" " , paramName , paramName , paramDefault );
96
96
97
97
case HEADER -> writer .append (
98
98
"req.headers().value(Http.Header.create(\" %s\" ).orElse(\" %s\" )" , paramName , paramDefault );
99
99
100
100
case COOKIE -> writer .append (
101
- "req.headers().cookies().first (\" %s\" ).orElse( \" %s\" )" , paramName , paramDefault );
101
+ "req.headers().cookies().contains (\" %s\" ) ? req.headers().cookies().get( \" %s\" ) : \" %s \" " , paramName , paramName , paramDefault );
102
102
103
103
default -> writer .append ("null // TODO req.%s().param(\" %s\" )" , paramType .type (), paramName );
104
104
}
0 commit comments