dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring of private method after self review

Browse Source
This commit is contained in:
ShvaykaD 2024-01-10 13:07:19 +02:00
parent 29289baeb4
commit 4155fcd03f
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
View File

@ -2741,7 +2741,7 @@ public class RestClient implements Closeable {
addPageLinkToParam(params, pageLink); addPageLinkToParam(params, pageLink);
addTenantOnlyAndFullSearchToParams(tenantOnly, fullSearch, params); addTenantOnlyAndFullSearchToParams(tenantOnly, fullSearch, params);
return restTemplate.exchange( return restTemplate.exchange(
baseURL + "/api/widgetsBundles?" + getUrlParams(pageLink) + getWidgetsBundlePageRequestUrlParams(tenantOnly, fullSearch), baseURL + "/api/widgetsBundles?" + getUrlParams(pageLink) + getTenantOnlyAndFullSearchUrlParams(tenantOnly, fullSearch),
HttpMethod.GET, HttpMethod.GET,
HttpEntity.EMPTY, HttpEntity.EMPTY,
new ParameterizedTypeReference<PageData<WidgetsBundle>>() { new ParameterizedTypeReference<PageData<WidgetsBundle>>() {
@ -3776,27 +3776,10 @@ public class RestClient implements Closeable {
return urlParams; return urlParams;
} }
private String getWidgetsBundlePageRequestUrlParams(Boolean tenantOnly, Boolean fullSearch) {
String urlParams = "";
if (tenantOnly != null) {
urlParams = "&tenantOnly={tenantOnly}";
}
if (fullSearch != null) {
urlParams += "&fullSearch={fullSearch}";
}
return urlParams;
}
private String getWidgetTypeInfoPageRequestUrlParams(Boolean tenantOnly, Boolean fullSearch, private String getWidgetTypeInfoPageRequestUrlParams(Boolean tenantOnly, Boolean fullSearch,
DeprecatedFilter deprecatedFilter, DeprecatedFilter deprecatedFilter,
List<String> widgetTypeList) { List<String> widgetTypeList) {
String urlParams = ""; String urlParams = getTenantOnlyAndFullSearchUrlParams(tenantOnly, fullSearch);
if (tenantOnly != null) {
urlParams = "&tenantOnly={tenantOnly}";
}
if (fullSearch != null) {
urlParams += "&fullSearch={fullSearch}";
}
if (deprecatedFilter != null) { if (deprecatedFilter != null) {
urlParams += "&deprecatedFilter={deprecatedFilter}"; urlParams += "&deprecatedFilter={deprecatedFilter}";
} }
@ -3806,6 +3789,17 @@ public class RestClient implements Closeable {
return urlParams; return urlParams;
} }
private String getTenantOnlyAndFullSearchUrlParams(Boolean tenantOnly, Boolean fullSearch) {
String urlParams = "";
if (tenantOnly != null) {
urlParams = "&tenantOnly={tenantOnly}";
}
if (fullSearch != null) {
urlParams += "&fullSearch={fullSearch}";
}
return urlParams;
}
private void addTimePageLinkToParam(Map<String, String> params, TimePageLink pageLink) { private void addTimePageLinkToParam(Map<String, String> params, TimePageLink pageLink) {
this.addPageLinkToParam(params, pageLink); this.addPageLinkToParam(params, pageLink);
if (pageLink.getStartTime() != null) { if (pageLink.getStartTime() != null) {