@@ -67,16 +67,16 @@ private void addRoleImports(List<String> roles, ControllerReader controller) {
6767 @ Override
6868 public void writeReadParameter (Append writer , ParamType paramType , String paramName ) {
6969 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 );
7171
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 );
7373
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 );
7575
7676 case HEADER -> writer .append (
7777 "req.headers().value(HeaderNames.create(\" %s\" )).orElse(null)" , paramName );
7878
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 );
8080
8181 default -> writer .append ("null // TODO req.%s().param(\" %s\" )" , paramType .type (), paramName );
8282 }
@@ -86,19 +86,19 @@ public void writeReadParameter(Append writer, ParamType paramType, String paramN
8686 public void writeReadParameter (Append writer , ParamType paramType , String paramName , String paramDefault ) {
8787 switch (paramType ) {
8888 case PATHPARAM -> writer .append (
89- "pathParams.first (\" %s\" ).orElse (\" %s\" )" , paramName , paramDefault );
89+ "pathParams.contains (\" %s\" ) ? pathParams.get (\" %s\" ) : \" %s \" " , paramName , paramName , paramDefault );
9090
9191 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 );
9393
9494 case FORMPARAM -> writer .append (
95- "formParams.first (\" %s\" ).orElse (\" %s\" )" , paramName , paramDefault );
95+ "formParams.contains (\" %s\" ) ? formParams.get (\" %s\" ) : \" %s \" " , paramName , paramName , paramDefault );
9696
9797 case HEADER -> writer .append (
9898 "req.headers().value(Http.Header.create(\" %s\" ).orElse(\" %s\" )" , paramName , paramDefault );
9999
100100 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 );
102102
103103 default -> writer .append ("null // TODO req.%s().param(\" %s\" )" , paramType .type (), paramName );
104104 }
0 commit comments