Skip to content

Commit 698c1eb

Browse files
U-CITRITE\vijayendra1Vijayendra Bhamidipati
U-CITRITE\vijayendra1
authored and
Vijayendra Bhamidipati
committed
Bug 13127: API error text refer to database ids instead of uuids
Description: 1) Adding two new classes, CloudException and RunTimeCloudException. The former extends Exception and the latter RunTimeException. These will be used by classes that formerly directly extended Exception and RuntimeException. These two classes have an attribute of type IdentityProxy to enable exceptions fill in db ids in separate attribute fields rather than in a string. Doing so will allow the serialization module (GSON for JSON and other for XML) to kick in and convert this db id to a uuid in ApiServer.java just before the JSON/XML responses are sent out. 2) Moving IdentityProxy.java from api/ to utils/ since both CloudException and RuntimeCloudException refer to it. 3) Changing references to IdentityProxy class from api/ to utils/. 4) While rebasing to master, a new file was added, merging api/src/com/cloud/api/response/IsoVmResponse.java to this diff.
1 parent b7b9b09 commit 698c1eb

79 files changed

Lines changed: 324 additions & 74 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/com/cloud/api/response/AccountResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222

2323
import com.cloud.api.ApiConstants;
24-
import com.cloud.api.IdentityProxy;
24+
import com.cloud.utils.IdentityProxy;
2525
import com.cloud.serializer.Param;
2626
import com.google.gson.annotations.SerializedName;
2727

‎api/src/com/cloud/api/response/AlertResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.List;
2222

2323
import com.cloud.api.ApiConstants;
24-
import com.cloud.api.IdentityProxy;
24+
import com.cloud.utils.IdentityProxy;
2525
import com.cloud.serializer.Param;
2626
import com.google.gson.annotations.SerializedName;
2727

‎api/src/com/cloud/api/response/AsyncJobResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.log4j.Logger;
2323

2424
import com.cloud.api.ApiConstants;
25-
import com.cloud.api.IdentityProxy;
25+
import com.cloud.utils.IdentityProxy;
2626
import com.cloud.api.ResponseObject;
2727
import com.cloud.async.AsyncJob;
2828
import com.cloud.serializer.Param;

‎api/src/com/cloud/api/response/BaseResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.cloud.api.response;
2020

2121
import com.cloud.api.ApiConstants;
22-
import com.cloud.api.IdentityProxy;
22+
import com.cloud.utils.IdentityProxy;
2323
import com.cloud.api.ResponseObject;
2424
import com.cloud.serializer.Param;
2525
import com.google.gson.annotations.SerializedName;

‎api/src/com/cloud/api/response/CapacityResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.cloud.api.response;
1919

2020
import com.cloud.api.ApiConstants;
21-
import com.cloud.api.IdentityProxy;
21+
import com.cloud.utils.IdentityProxy;
2222
import com.cloud.serializer.Param;
2323
import com.google.gson.annotations.SerializedName;
2424

‎api/src/com/cloud/api/response/CloudIdentifierResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.cloud.api.response;
2020

2121
import com.cloud.api.ApiConstants;
22-
import com.cloud.api.IdentityProxy;
22+
import com.cloud.utils.IdentityProxy;
2323
import com.cloud.serializer.Param;
2424
import com.google.gson.annotations.SerializedName;
2525

‎api/src/com/cloud/api/response/ClusterResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.List;
2222

2323
import com.cloud.api.ApiConstants;
24-
import com.cloud.api.IdentityProxy;
24+
import com.cloud.utils.IdentityProxy;
2525
import com.cloud.api.Parameter;
2626
import com.cloud.api.BaseCmd.CommandType;
2727
import com.cloud.serializer.Param;

‎api/src/com/cloud/api/response/CreateCmdResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.cloud.api.response;
2020

2121
import com.cloud.api.ApiConstants;
22-
import com.cloud.api.IdentityProxy;
22+
import com.cloud.utils.IdentityProxy;
2323
import com.google.gson.annotations.SerializedName;
2424

2525
public class CreateCmdResponse extends BaseResponse {

‎api/src/com/cloud/api/response/DiskOfferingResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Date;
2121

2222
import com.cloud.api.ApiConstants;
23-
import com.cloud.api.IdentityProxy;
23+
import com.cloud.utils.IdentityProxy;
2424
import com.cloud.serializer.Param;
2525
import com.google.gson.annotations.SerializedName;
2626

‎api/src/com/cloud/api/response/DomainResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.cloud.api.response;
1919

2020
import com.cloud.api.ApiConstants;
21-
import com.cloud.api.IdentityProxy;
21+
import com.cloud.utils.IdentityProxy;
2222
import com.cloud.serializer.Param;
2323
import com.google.gson.annotations.SerializedName;
2424

0 commit comments

Comments
 (0)