@@ -397,7 +397,7 @@ public void generateServiceHandlerFactory(GenerationContext context) {
397397 generateServiceMux (context );
398398 writer .addImport ("ServiceException" , "__ServiceException" , "@aws-smithy/server-common" );
399399 writer .openBlock ("const serFn: (op: $1T) => __OperationSerializer<$2T<Context>, $1T, __ServiceException> = "
400- + "(op) => {" , "};" , operationsSymbol , serviceSymbol , () -> {
400+ + "(op) => {" , "};" , operationsSymbol , serviceSymbol , () -> {
401401 writer .openBlock ("switch (op) {" , "}" , () -> {
402402 operations .stream ()
403403 .filter (o -> o .getTrait (HttpTrait .class ).isPresent ())
@@ -440,12 +440,12 @@ public void generateOperationHandlerFactory(GenerationContext context, Operation
440440
441441 if (context .getSettings ().isDisableDefaultValidation ()) {
442442 writer .write ("export const get$L = <Context>(operation: __Operation<$T, $T, Context>, "
443- + "customizer: __ValidationCustomizer<$S>): "
444- + "__ServiceHandler<Context, __HttpRequest, __HttpResponse> => {" ,
443+ + "customizer: __ValidationCustomizer<$S>): "
444+ + "__ServiceHandler<Context, __HttpRequest, __HttpResponse> => {" ,
445445 operationHandlerSymbol .getName (), inputType , outputType , operationSymbol .getName ());
446446 } else {
447447 writer .write ("export const get$L = <Context>(operation: __Operation<$T, $T, Context>): "
448- + "__ServiceHandler<Context, __HttpRequest, __HttpResponse> => {" ,
448+ + "__ServiceHandler<Context, __HttpRequest, __HttpResponse> => {" ,
449449 operationHandlerSymbol .getName (), inputType , outputType );
450450 }
451451 writer .indent ();
@@ -642,19 +642,25 @@ private void generateOperationRequestSerializer(
642642 // Ensure that the request type is imported.
643643 writer .addUseImports (requestType );
644644 writer .addImport ("Endpoint" , "__Endpoint" , "@aws-sdk/types" );
645+
646+ // e.g., se_ES
647+ String methodName = ProtocolGenerator .getSerFunctionShortName (symbol );
645648 // e.g., serializeAws_restJson1_1ExecuteStatement
646- String methodName = ProtocolGenerator .getSerFunctionName (symbol , getName ());
649+ String methodLongName = ProtocolGenerator .getSerFunctionName (symbol , getName ());
650+
647651 // Add the normalized input type.
648652 Symbol inputType = symbol .expectProperty ("inputType" , Symbol .class );
649653 String contextType = CodegenUtils .getOperationSerializerContextType (writer , context .getModel (), operation );
650654
655+ writer .writeDocs (methodLongName );
651656 writer .openBlock ("export const $L = async(\n "
652657 + " input: $T,\n "
653658 + " context: $L\n "
654659 + "): Promise<$T> => {" , "}" , methodName , inputType , contextType , requestType , () -> {
655660
656- // Get the hostname, path, port, and scheme from client's resolved endpoint. Then construct the request from
657- // them. The client's resolved endpoint can be default one or supplied by users.
661+ // Get the hostname, path, port, and scheme from client's resolved endpoint.
662+ // Then construct the request from them. The client's resolved endpoint can
663+ // be default one or supplied by users.
658664 writer .write ("const {hostname, protocol = $S, port, path: basePath} = await context.endpoint();" , "https" );
659665
660666 writeRequestHeaders (context , operation , bindingIndex );
@@ -777,12 +783,12 @@ private void writeResolvedPath(
777783 Shape target = model .expectShape (binding .getMember ().getTarget ());
778784
779785 String labelValueProvider = "() => " + getInputValue (
780- context ,
781- binding .getLocation (),
782- "input." + memberName + "!" ,
783- binding .getMember (),
784- target
785- );
786+ context ,
787+ binding .getLocation (),
788+ "input." + memberName + "!" ,
789+ binding .getMember (),
790+ target
791+ );
786792
787793 // Get the correct label to use.
788794 Segment uriLabel = uriLabels .stream ().filter (s -> s .getContent ().equals (memberName )).findFirst ().get ();
@@ -1342,7 +1348,7 @@ private String getNamedMembersInputParam(
13421348 switch (bindingType ) {
13431349 case PAYLOAD :
13441350 Symbol symbol = context .getSymbolProvider ().toSymbol (target );
1345- return ProtocolGenerator .getSerFunctionName (symbol , context . getProtocolName () )
1351+ return ProtocolGenerator .getSerFunctionShortName (symbol )
13461352 + "(" + dataSource + ", context)" ;
13471353 default :
13481354 throw new CodegenException ("Unexpected named member shape binding location `" + bindingType + "`" );
@@ -1887,17 +1893,18 @@ private void readDirectQueryBindings(GenerationContext context, List<HttpBinding
18871893 "@aws-smithy/server-common" );
18881894 writer .write ("let queryValue: string;" );
18891895 writer .openBlock ("if (Array.isArray(query[$S])) {" , "}" ,
1890- binding .getLocationName (),
1891- () -> {
1892- writer .openBlock ("if (query[$S].length === 1) {" , "}" ,
1893- binding .getLocationName (),
1894- () -> {
1895- writer .write ("queryValue = query[$S][0];" , binding .getLocationName ());
1896- });
1897- writer . openBlock ( "else {" , "}" , () -> {
1898- writer .write ( "throw new __SerializationException();" );
1899- } );
1896+ binding .getLocationName (),
1897+ () -> {
1898+ writer .openBlock ("if (query[$S].length === 1) {" , "}" ,
1899+ binding .getLocationName (),
1900+ () -> {
1901+ writer .write ("queryValue = query[$S][0];" , binding .getLocationName ());
1902+ }
1903+ );
1904+ writer .openBlock ( "else {" , "}" , () -> {
1905+ writer . write ( "throw new __SerializationException();" );
19001906 });
1907+ });
19011908 writer .openBlock ("else {" , "}" , () -> {
19021909 writer .write ("queryValue = query[$S] as string;" , binding .getLocationName ());
19031910 });
@@ -2052,18 +2059,21 @@ private void generateOperationResponseDeserializer(
20522059 // Ensure that the response type is imported.
20532060 writer .addUseImports (responseType );
20542061 // e.g., deserializeAws_restJson1_1ExecuteStatement
2055- String methodName = ProtocolGenerator .getDeserFunctionName (symbol , getName ());
2062+ String methodName = ProtocolGenerator .getDeserFunctionShortName (symbol );
2063+ String methodLongName = ProtocolGenerator .getDeserFunctionName (symbol , getName ());
20562064 String errorMethodName = methodName + "Error" ;
20572065 // Add the normalized output type.
20582066 Symbol outputType = symbol .expectProperty ("outputType" , Symbol .class );
20592067 String contextType = CodegenUtils .getOperationDeserializerContextType (context .getSettings (), writer ,
20602068 context .getModel (), operation );
20612069
20622070 // Handle the general response.
2071+ writer .writeDocs (methodLongName );
20632072 writer .openBlock ("export const $L = async(\n "
20642073 + " output: $T,\n "
20652074 + " context: $L\n "
2066- + "): Promise<$T> => {" , "}" , methodName , responseType , contextType , outputType , () -> {
2075+ + "): Promise<$T> => {" , "}" ,
2076+ methodName , responseType , contextType , outputType , () -> {
20672077 // Redirect error deserialization to the dispatcher if we receive an error range
20682078 // status code that's not the modeled code (300 or higher). This allows for
20692079 // returning other 2XX codes that don't match the defined value.
@@ -2103,10 +2113,13 @@ private void generateErrorDeserializer(GenerationContext context, StructureShape
21032113 HttpBindingIndex bindingIndex = HttpBindingIndex .of (context .getModel ());
21042114 Model model = context .getModel ();
21052115 Symbol errorSymbol = symbolProvider .toSymbol (error );
2106- String errorDeserMethodName = ProtocolGenerator .getDeserFunctionName (errorSymbol ,
2107- context .getProtocolName ()) + "Response" ;
2116+ String errorDeserMethodName = ProtocolGenerator .getDeserFunctionShortName (errorSymbol ) + "Res" ;
2117+ String errorDeserMethodLongName = ProtocolGenerator .getDeserFunctionName (errorSymbol , context .getProtocolName ())
2118+ + "Res" ;
2119+
21082120 String outputName = isErrorCodeInBody ? "parsedOutput" : "output" ;
21092121
2122+ writer .writeDocs (errorDeserMethodLongName );
21102123 writer .openBlock ("const $L = async (\n "
21112124 + " $L: any,\n "
21122125 + " context: __SerdeContext\n "
@@ -2661,8 +2674,8 @@ private String getNamedMembersOutputParam(
26612674 case PAYLOAD :
26622675 // Redirect to a deserialization function.
26632676 Symbol symbol = context .getSymbolProvider ().toSymbol (target );
2664- return ProtocolGenerator .getDeserFunctionName (symbol , context . getProtocolName () )
2665- + "(" + dataSource + ", context)" ;
2677+ return ProtocolGenerator .getDeserFunctionShortName (symbol )
2678+ + "(" + dataSource + ", context)" ;
26662679 default :
26672680 throw new CodegenException ("Unexpected named member shape binding location `" + bindingType + "`" );
26682681 }
0 commit comments