Juan Hernandez has uploaded a new change for review. Change subject: codegen: Don't generate duplicated commas ......................................................................
codegen: Don't generate duplicated commas Currently the generator of the SDK generates two commas inside the formal parameter list of the "delete" methods of resources that support both URL and header parameters. This patch fixes the generator so that it generates only one comman in this case. Change-Id: I2a84cb9b64839d3995cf0713640f6fbf5cbd7b64 Signed-off-by: Juan Hernandez <[email protected]> --- M generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/64/39564/1 diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java index f4335c2..54eb73e 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java @@ -75,10 +75,20 @@ String headersMethodParamsStr = (String) result[0]; String headersMapParamsStr = (String) result[1]; - String combinedMethodParams = - prmsStr + - (!headersMethodParamsStr.isEmpty()? ", ": "") + - headersMethodParamsStr; + StringBuilder combinedMethodParamsBuffer = new StringBuilder(); + if (prmsStr != null && !prmsStr.isEmpty()) { + if (combinedMethodParamsBuffer.length() > 0) { + combinedMethodParamsBuffer.append(", "); + } + combinedMethodParamsBuffer.append(prmsStr); + } + if (headersMethodParamsStr != null && !headersMethodParamsStr.isEmpty()) { + if (combinedMethodParamsBuffer.length() > 0) { + combinedMethodParamsBuffer.append(", "); + } + combinedMethodParamsBuffer.append(headersMethodParamsStr); + } + String combinedMethodParams = combinedMethodParamsBuffer.toString(); String bodyInstance = ParamUtils.getBodyInstance(link); String bodyInstanceStr = !bodyInstance.isEmpty()? "=" + bodyInstance: ""; -- To view, visit https://gerrit.ovirt.org/39564 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a84cb9b64839d3995cf0713640f6fbf5cbd7b64 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
