Revert "api,server: encryptformat in volume response (#9106)"

This reverts commit fcca3e8.

Author: kiranchavala

api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java

@@ -290,17 +290,13 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co
     private String externalUuid;
 
     @SerializedName(ApiConstants.VOLUME_CHECK_RESULT)
-    @Param(description = "details for the volume check result, they may vary for different hypervisors", since = "4.19.1")
+    @Param(description = "details for the volume check result, they may vary for different hypervisors, since = 4.19.1")
     private Map<String, String> volumeCheckResult;
 
     @SerializedName(ApiConstants.VOLUME_REPAIR_RESULT)
-    @Param(description = "details for the volume repair result, they may vary for different hypervisors", since = "4.19.1")
+    @Param(description = "details for the volume repair result, they may vary for different hypervisors, since = 4.19.1")
     private Map<String, String> volumeRepairResult;
 
-    @SerializedName(ApiConstants.ENCRYPT_FORMAT)
-    @Param(description = "the encrypt format of the volume", since = "4.19.1")
-    private String encryptFormat;
-
     public String getPath() {
         return path;
     }
@@ -846,8 +842,4 @@ public Map<String, String> getVolumeRepairResult() {
     public void setVolumeRepairResult(Map<String, String> volumeRepairResult) {
         this.volumeRepairResult = volumeRepairResult;
     }
-
-    public void setEncryptFormat(String encryptFormat) {
-        this.encryptFormat = encryptFormat;
-    }
 }

engine/schema/src/main/resources/META-INF/db/views/cloud.volume_view.sql

@@ -39,7 +39,6 @@ SELECT
     `volumes`.`path` AS `path`,
     `volumes`.`chain_info` AS `chain_info`,
     `volumes`.`external_uuid` AS `external_uuid`,
-    `volumes`.`encrypt_format` AS `encrypt_format`,
     `account`.`id` AS `account_id`,
     `account`.`uuid` AS `account_uuid`,
     `account`.`account_name` AS `account_name`,

server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java

@@ -180,7 +180,6 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
 
         if (view == ResponseView.Full) {
             volResponse.setPath(volume.getPath());
-            volResponse.setEncryptFormat(volume.getEncryptFormat());
         }
 
         // populate owner.

server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java

@@ -275,9 +275,6 @@ public class VolumeJoinVO extends BaseViewWithTagInformationVO implements Contro
     @Column(name = "external_uuid")
     private String externalUuid = null;
 
-    @Column(name = "encrypt_format")
-    private String encryptFormat;
-
     public VolumeJoinVO() {
     }
 
@@ -613,10 +610,6 @@ public void setExternalUuid(String externalUuid) {
         this.externalUuid = externalUuid;
     }
 
-    public String getEncryptFormat() {
-        return encryptFormat;
-    }
-
     @Override
     public Class<?> getEntityType() {
         return Volume.class;