Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: remove redundant variables from deser functions #1153

Merged
merged 9 commits into from
May 5, 2020
Merged

feat: remove redundant variables from deser functions #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f9c9bb9
feat: add util getArrayIfSingleItem
trivikr May 5, 2020
23758cd
chore: call getArrayIfSingleItem from deser functions
trivikr May 5, 2020
36a26c8
chore: codegen for getArrayIfSingleItem from deser functions
trivikr May 5, 2020
75365e0
chore: remove wrappedItem
trivikr May 5, 2020
5f0f5c6
chore: codegen to remove wrappedItem
trivikr May 5, 2020
aa5af54
chore: remove contents array from deser functions
trivikr May 5, 2020
bbd3473
chore: codegen to remove contents array
trivikr May 5, 2020
17afaf5
chore: remove mapParams object from deser function
trivikr May 5, 2020
825a28a
chore: codegen to remove mapParams object
trivikr May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
527 changes: 163 additions & 364 deletions clients/client-auto-scaling/protocols/Aws_query.ts
View file
Open in desktop

Large diffs are not rendered by default.

646 changes: 204 additions & 442 deletions clients/client-cloudformation/protocols/Aws_query.ts
View file
Open in desktop

Large diffs are not rendered by default.

518 changes: 172 additions & 346 deletions clients/client-cloudfront/protocols/Aws_restXml.ts
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 32 additions & 76 deletions clients/client-cloudsearch/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ import {
} from "@aws-sdk/protocol-http";
import {
SmithyException as __SmithyException,
extendedEncodeURIComponent as __extendedEncodeURIComponent
extendedEncodeURIComponent as __extendedEncodeURIComponent,
getArrayIfSingleItem as __getArrayIfSingleItem
} from "@aws-sdk/smithy-client";
import {
Endpoint as __Endpoint,
Expand Down Expand Up @@ -4379,11 +4380,9 @@ const deserializeAws_queryAnalysisSchemeStatusList = (
output: any,
context: __SerdeContext
): AnalysisSchemeStatus[] => {
const contents: any = [];
(output || []).map((entry: any) => {
contents.push(deserializeAws_queryAnalysisSchemeStatus(entry, context));
});
return contents;
return (output || []).map((entry: any) =>
deserializeAws_queryAnalysisSchemeStatus(entry, context)
);
};

const deserializeAws_queryAvailabilityOptionsStatus = (
Expand Down Expand Up @@ -4449,12 +4448,8 @@ const deserializeAws_queryBuildSuggestersResponse = (
output["FieldNames"] !== undefined &&
output["FieldNames"]["member"] !== undefined
) {
const wrappedItem =
output["FieldNames"]["member"] instanceof Array
? output["FieldNames"]["member"]
: [output["FieldNames"]["member"]];
contents.FieldNames = deserializeAws_queryFieldNameList(
wrappedItem,
__getArrayIfSingleItem(output["FieldNames"]["member"]),
context
);
}
Expand Down Expand Up @@ -4743,12 +4738,8 @@ const deserializeAws_queryDescribeAnalysisSchemesResponse = (
output["AnalysisSchemes"] !== undefined &&
output["AnalysisSchemes"]["member"] !== undefined
) {
const wrappedItem =
output["AnalysisSchemes"]["member"] instanceof Array
? output["AnalysisSchemes"]["member"]
: [output["AnalysisSchemes"]["member"]];
contents.AnalysisSchemes = deserializeAws_queryAnalysisSchemeStatusList(
wrappedItem,
__getArrayIfSingleItem(output["AnalysisSchemes"]["member"]),
context
);
}
Expand Down Expand Up @@ -4804,12 +4795,8 @@ const deserializeAws_queryDescribeDomainsResponse = (
output["DomainStatusList"] !== undefined &&
output["DomainStatusList"]["member"] !== undefined
) {
const wrappedItem =
output["DomainStatusList"]["member"] instanceof Array
? output["DomainStatusList"]["member"]
: [output["DomainStatusList"]["member"]];
contents.DomainStatusList = deserializeAws_queryDomainStatusList(
wrappedItem,
__getArrayIfSingleItem(output["DomainStatusList"]["member"]),
context
);
}
Expand All @@ -4831,12 +4818,8 @@ const deserializeAws_queryDescribeExpressionsResponse = (
output["Expressions"] !== undefined &&
output["Expressions"]["member"] !== undefined
) {
const wrappedItem =
output["Expressions"]["member"] instanceof Array
? output["Expressions"]["member"]
: [output["Expressions"]["member"]];
contents.Expressions = deserializeAws_queryExpressionStatusList(
wrappedItem,
__getArrayIfSingleItem(output["Expressions"]["member"]),
context
);
}
Expand All @@ -4858,12 +4841,8 @@ const deserializeAws_queryDescribeIndexFieldsResponse = (
output["IndexFields"] !== undefined &&
output["IndexFields"]["member"] !== undefined
) {
const wrappedItem =
output["IndexFields"]["member"] instanceof Array
? output["IndexFields"]["member"]
: [output["IndexFields"]["member"]];
contents.IndexFields = deserializeAws_queryIndexFieldStatusList(
wrappedItem,
__getArrayIfSingleItem(output["IndexFields"]["member"]),
context
);
}
Expand Down Expand Up @@ -4919,12 +4898,8 @@ const deserializeAws_queryDescribeSuggestersResponse = (
output["Suggesters"] !== undefined &&
output["Suggesters"]["member"] !== undefined
) {
const wrappedItem =
output["Suggesters"]["member"] instanceof Array
? output["Suggesters"]["member"]
: [output["Suggesters"]["member"]];
contents.Suggesters = deserializeAws_querySuggesterStatusList(
wrappedItem,
__getArrayIfSingleItem(output["Suggesters"]["member"]),
context
);
}
Expand Down Expand Up @@ -5038,14 +5013,13 @@ const deserializeAws_queryDomainNameMap = (
output: any,
context: __SerdeContext
): { [key: string]: string } => {
const mapParams: any = {};
output.forEach((pair: any) => {
mapParams[pair["key"]] =
return output.reduce((acc: any, pair: any) => {
acc[pair["key"]] =
pair["value"]["#text"] !== undefined
? pair["value"]["#text"]
: pair["value"];
});
return mapParams;
return acc;
}, {});
};

const deserializeAws_queryDomainStatus = (
Expand Down Expand Up @@ -5152,11 +5126,9 @@ const deserializeAws_queryDomainStatusList = (
output: any,
context: __SerdeContext
): DomainStatus[] => {
const contents: any = [];
(output || []).map((entry: any) => {
contents.push(deserializeAws_queryDomainStatus(entry, context));
});
return contents;
return (output || []).map((entry: any) =>
deserializeAws_queryDomainStatus(entry, context)
);
};

const deserializeAws_queryDoubleArrayOptions = (
Expand Down Expand Up @@ -5310,22 +5282,18 @@ const deserializeAws_queryExpressionStatusList = (
output: any,
context: __SerdeContext
): ExpressionStatus[] => {
const contents: any = [];
(output || []).map((entry: any) => {
contents.push(deserializeAws_queryExpressionStatus(entry, context));
});
return contents;
return (output || []).map((entry: any) =>
deserializeAws_queryExpressionStatus(entry, context)
);
};

const deserializeAws_queryFieldNameList = (
output: any,
context: __SerdeContext
): string[] => {
const contents: any = [];
(output || []).map((entry: any) => {
contents.push(entry["#text"] !== undefined ? entry["#text"] : entry);
});
return contents;
return (output || []).map((entry: any) =>
entry["#text"] !== undefined ? entry["#text"] : entry
);
};

const deserializeAws_queryIndexDocumentsResponse = (
Expand All @@ -5343,12 +5311,8 @@ const deserializeAws_queryIndexDocumentsResponse = (
output["FieldNames"] !== undefined &&
output["FieldNames"]["member"] !== undefined
) {
const wrappedItem =
output["FieldNames"]["member"] instanceof Array
? output["FieldNames"]["member"]
: [output["FieldNames"]["member"]];
contents.FieldNames = deserializeAws_queryFieldNameList(
wrappedItem,
__getArrayIfSingleItem(output["FieldNames"]["member"]),
context
);
}
Expand Down Expand Up @@ -5484,11 +5448,9 @@ const deserializeAws_queryIndexFieldStatusList = (
output: any,
context: __SerdeContext
): IndexFieldStatus[] => {
const contents: any = [];
(output || []).map((entry: any) => {
contents.push(deserializeAws_queryIndexFieldStatus(entry, context));
});
return contents;
return (output || []).map((entry: any) =>
deserializeAws_queryIndexFieldStatus(entry, context)
);
};

const deserializeAws_queryIntArrayOptions = (
Expand Down Expand Up @@ -5755,12 +5717,8 @@ const deserializeAws_queryListDomainNamesResponse = (
output["DomainNames"] !== undefined &&
output["DomainNames"]["entry"] !== undefined
) {
const wrappedItem =
output["DomainNames"]["entry"] instanceof Array
? output["DomainNames"]["entry"]
: [output["DomainNames"]["entry"]];
contents.DomainNames = deserializeAws_queryDomainNameMap(
wrappedItem,
__getArrayIfSingleItem(output["DomainNames"]["entry"]),
context
);
}
Expand Down Expand Up @@ -6054,11 +6012,9 @@ const deserializeAws_querySuggesterStatusList = (
output: any,
context: __SerdeContext
): SuggesterStatus[] => {
const contents: any = [];
(output || []).map((entry: any) => {
contents.push(deserializeAws_querySuggesterStatus(entry, context));
});
return contents;
return (output || []).map((entry: any) =>
deserializeAws_querySuggesterStatus(entry, context)
);
};

const deserializeAws_queryTextArrayOptions = (
Expand Down
Loading