Juan Hernandez has uploaded a new change for review. Change subject: codegen: Don't add parameters with null values ......................................................................
codegen: Don't add parameters with null values Currently the methods that receive header or URL parameters add them to the request even if the value is null. This patch changes those methods to not add the header or URL parameter in this case. Change-Id: I6d8b8936f219db148cff9de2825773908a289f92 Bug-Url: https://bugzilla.redhat.com/856273 Signed-off-by: Juan Hernandez <[email protected]> --- M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionActionMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionAddMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionListMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodWithBodyTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/HeaderBuilderParameterTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ResourceActionMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionAddMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionListMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UpdateMethodTemplate M ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UrlBuilderParameterTemplate 11 files changed, 42 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/47/22947/1 diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionActionMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionActionMethodTemplate index 112761e..8e6e116 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionActionMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionActionMethodTemplate @@ -16,11 +16,11 @@ String url = this.parent.getHref() + SLASH + getName() + SLASH + "$actionName$"; - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - url = new UrlBuilder(url)$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(url);$urlParamsToBuild$ + url = urlBuilder.build(); return getProxy().action(url, action, Action.class, Action.class, headers); } diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionAddMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionAddMethodTemplate index b33d04e..f3b4a25 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionAddMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionAddMethodTemplate @@ -15,11 +15,11 @@ ClientProtocolException, ServerException, IOException { String url = SLASH + getName(); - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - url = new UrlBuilder(url)$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(url);$urlParamsToBuild$ + url = urlBuilder.build(); return getProxy().add(url, $publicEntityNameLowerCase$, org.ovirt.engine.sdk.entities.$publicEntityName$.class, diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionListMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionListMethodTemplate index 83a2980..97a1b7b 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionListMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/CollectionListMethodTemplate @@ -14,11 +14,11 @@ public List<$decoratorName$> list($methodExtraParamsDef$) throws ClientProtocolException, ServerException, IOException { - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - String url = new UrlBuilder(SLASH + getName())$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(SLASH + getName());$urlParamsToBuild$ + String url = urlBuilder.build(); return list(url, org.ovirt.engine.sdk.entities.$publicCollectionName$.class, $decoratorName$.class, headers); diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodTemplate index 7bb0748..d9043c0 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodTemplate @@ -15,11 +15,11 @@ ServerException, IOException { String url = this.getHref(); - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - url = new UrlBuilder(url)$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(url);$urlParamsToBuild$ + url = urlBuilder.build(); return getProxy().delete(url, Response.class, headers); } diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodWithBodyTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodWithBodyTemplate index a801c24..d988e4b 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodWithBodyTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/DeleteMethodWithBodyTemplate @@ -15,11 +15,11 @@ ServerException, IOException { String url = this.getHref(); - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - url = new UrlBuilder(url)$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(url);$urlParamsToBuild$ + url = urlBuilder.build(); return getProxy().delete(url, $deleteBodyLowerCase$, org.ovirt.engine.sdk.entities.$deleteBody$.class, Response.class, headers); diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/HeaderBuilderParameterTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/HeaderBuilderParameterTemplate index 2c55ce3..fc41266 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/HeaderBuilderParameterTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/HeaderBuilderParameterTemplate @@ -1 +1,3 @@ - .add("$realUrlParamName$", $headerParamName$) \ No newline at end of file + if ($headerParamName$ != null) { + headersBuilder.add("$realUrlParamName$", $headerParamName$); + } \ No newline at end of file diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ResourceActionMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ResourceActionMethodTemplate index 215db68..90ef7b0 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ResourceActionMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ResourceActionMethodTemplate @@ -15,11 +15,11 @@ ServerException, IOException { String url = this.getHref() + "/$actionName$"; - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - url = new UrlBuilder(url)$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(url);$urlParamsToBuild$ + url = urlBuilder.build(); return getProxy().action(url, action, Action.class, Action.class, headers); } diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionAddMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionAddMethodTemplate index 0a3e9d4..c0eb5b8 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionAddMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionAddMethodTemplate @@ -15,11 +15,11 @@ ClientProtocolException, ServerException, IOException { String url = this.parent.getHref() + SLASH + getName(); - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - url = new UrlBuilder(url)$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(url);$urlParamsToBuild$ + url = urlBuilder.build(); return getProxy().add(url, $publicEntityNameLowerCase$, org.ovirt.engine.sdk.entities.$publicEntityName$.class, diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionListMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionListMethodTemplate index 278bb42..5bcfaeb 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionListMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/SubCollectionListMethodTemplate @@ -14,11 +14,11 @@ public List<$decoratorName$> list($methodExtraParamsDef$) throws ClientProtocolException, ServerException, IOException { - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - String url = new UrlBuilder(this.parent.getHref() + SLASH + getName())$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(this.parent.getHref() + SLASH + getName());$urlParamsToBuild$ + String url = urlBuilder.build(); return list(url, org.ovirt.engine.sdk.entities.$publicCollectionName$.class, $decoratorName$.class, headers); diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UpdateMethodTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UpdateMethodTemplate index e119d82..eabfb09 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UpdateMethodTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UpdateMethodTemplate @@ -15,11 +15,11 @@ ServerException, IOException { String url = this.getHref(); - List<Header> headers = new HttpHeaderBuilder()$headersToBuild$ - .build(); + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder();$headersToBuild$ + List<Header> headers = headersBuilder.build(); - url = new UrlBuilder(url)$urlParamsToBuild$ - .build(); + UrlBuilder urlBuilder = new UrlBuilder(url);$urlParamsToBuild$ + url = urlBuilder.build(); return getProxy().update( url, diff --git a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UrlBuilderParameterTemplate b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UrlBuilderParameterTemplate index fc372f2..b1e40a2 100644 --- a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UrlBuilderParameterTemplate +++ b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/UrlBuilderParameterTemplate @@ -1 +1,3 @@ - .add("$realUrlParamName$", $urlParamName$, UrlParameterType.$urlParamType$) \ No newline at end of file + if ($urlParamName$ != null) { + urlBuilder.add("$realUrlParamName$", $urlParamName$, UrlParameterType.$urlParamType$); + } -- To view, visit http://gerrit.ovirt.org/22947 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d8b8936f219db148cff9de2825773908a289f92 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk-java Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
