rhtyd closed pull request #2632: listostypes: Fixes #2529 return boolean than
string in response
URL: https://github.com/apache/cloudstack/pull/2632
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
index 6822288a862..c1a57c3e0e1 100644
--- a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
@@ -41,7 +41,7 @@
@SerializedName(ApiConstants.IS_USER_DEFINED)
@Param(description = "is the guest OS user defined")
- private String isUserDefined;
+ private Boolean isUserDefined;
public String getId() {
return id;
@@ -67,11 +67,11 @@ public void setDescription(String description) {
this.description = description;
}
- public String getIsUserDefined() {
+ public Boolean getIsUserDefined() {
return isUserDefined;
}
- public void setIsUserDefined(String isUserDefined) {
+ public void setIsUserDefined(Boolean isUserDefined) {
this.isUserDefined = isUserDefined;
}
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java
b/server/src/com/cloud/api/ApiResponseHelper.java
index 88da6342b81..24fecb6d8d9 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3203,7 +3203,7 @@ public GuestOSResponse createGuestOSResponse(GuestOS
guestOS) {
GuestOSResponse response = new GuestOSResponse();
response.setDescription(guestOS.getDisplayName());
response.setId(guestOS.getUuid());
-
response.setIsUserDefined(Boolean.valueOf(guestOS.getIsUserDefined()).toString());
+ response.setIsUserDefined(guestOS.getIsUserDefined());
GuestOSCategoryVO category =
ApiDBUtils.findGuestOsCategoryById(guestOS.getCategoryId());
if (category != null) {
response.setOsCategoryId(category.getUuid());
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
