Tidy more optional properties

labkey-tchad · labkey-tchad · commit 2c53948208de · 2022-10-17T09:44:12.000-07:00
diff --git a/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataResponse.java b/labkey-client-api/src/org/labkey/remoteapi/query/ImportDataResponse.java
@@ -32,9 +32,9 @@ public class ImportDataResponse extends CommandResponse
     public ImportDataResponse(String text, int statusCode, String contentType, JSONObject json, Command sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
-        _success = json.has("success") ? json.getBoolean("success") : Boolean.FALSE;
-        _rowCount = json.has("rowCount") ? json.getNumber("rowCount").intValue() : 0;
-        _jobId = json.has("jobId") ? json.getString("jobId") : null;
+        _success = json.optBoolean("success");
+        _rowCount = json.optInt("rowCount");
+        _jobId = json.optString("jobId");
     }
 
     public Boolean getSuccess()

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public class ImportDataResponse extends CommandResponse`
`32`	`32`	`public ImportDataResponse(String text, int statusCode, String contentType, JSONObject json, Command sourceCommand)`
`33`	`33`	`{`
`34`	`34`	`super(text, statusCode, contentType, json, sourceCommand);`
`35`		`- _success = json.has("success") ? json.getBoolean("success") : Boolean.FALSE;`
`36`		`- _rowCount = json.has("rowCount") ? json.getNumber("rowCount").intValue() : 0;`
`37`		`- _jobId = json.has("jobId") ? json.getString("jobId") : null;`
	`35`	`+ _success = json.optBoolean("success");`
	`36`	`+ _rowCount = json.optInt("rowCount");`
	`37`	`+ _jobId = json.optString("jobId");`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public Boolean getSuccess()`