pom.xml: Upgrade gson version to 2.10.1

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -325,6 +325,8 @@ public class ApiConstants {
     public static final String MIN_CPU_NUMBER = "mincpunumber";
     public static final String MIN_MEMORY = "minmemory";
     public static final String MIGRATION_TYPE = "migrationtype";
+    public static final String MIGRATION_JOB_ID = "migrationjobid";
+    public static final String MIGRATION_JOB_STATUS = "migrationjobstatus";
     public static final String MIGRATIONS = "migrations";
     public static final String MEMORY = "memory";
     public static final String MODE = "mode";

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

@@ -55,10 +55,6 @@ public class AsyncJobResponse extends BaseResponse {
     @Param(description = "the async command executed")
     private String cmd;
 
-    @SerializedName("jobstatus")
-    @Param(description = "the current job status-should be 0 for PENDING")
-    private Integer jobStatus;
-
     @SerializedName("jobprocstatus")
     @Param(description = "the progress information of the PENDING job")
     private Integer jobProcStatus;
@@ -119,11 +115,6 @@ public void setCmd(String cmd) {
         this.cmd = cmd;
     }
 
-    @Override
-    public void setJobStatus(Integer jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
     public void setJobProcStatus(Integer jobProcStatus) {
         this.jobProcStatus = jobProcStatus;
     }

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

@@ -50,13 +50,13 @@
     @Param(description = "Destination host for VM migration")
     String destHostName;
 
-    @SerializedName(ApiConstants.JOB_ID)
+    @SerializedName(ApiConstants.MIGRATION_JOB_ID)
     @Param(description = "id of VM migration async job")
-    private Long jobId;
+    private Long migrationJobId;
 
-    @SerializedName(ApiConstants.JOB_STATUS)
+    @SerializedName(ApiConstants.MIGRATION_JOB_STATUS)
     @Param(description = "Job status of VM migration async job")
-    private JobInfo.Status jobStatus;
+    private JobInfo.Status migrationJobStatus;
 
 
     public ClusterDrsPlanMigrationResponse(String vmId, String vmName, String srcHostId, String srcHostName,
@@ -68,8 +68,8 @@
         this.srcHostName = srcHostName;
         this.destHostId = destHostId;
         this.destHostName = destHostName;
-        this.jobId = jobId;
-        this.jobStatus = jobStatus;
+        this.migrationJobId = jobId;
+        this.migrationJobStatus = jobStatus;
         this.setObjectName(ApiConstants.MIGRATIONS);
     }
 }

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

@@ -208,14 +208,6 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
     @Param(description = "Name of the VPC to which this network belongs", since = "4.15")
     private String vpcName;
 
-    @SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID)
-    @Param(description = "the ID of the Network associated with this network")
-    private String associatedNetworkId;
-
-    @SerializedName(ApiConstants.ASSOCIATED_NETWORK)
-    @Param(description = "the name of the Network associated with this network")
-    private String associatedNetworkName;
-
     @SerializedName(ApiConstants.TUNGSTEN_VIRTUAL_ROUTER_UUID)
     @Param(description = "Tungsten-Fabric virtual router the network belongs to")
     private String tungstenVirtualRouterUuid;
@@ -612,14 +604,6 @@ public void setVpcName(String vpcName) {
         this.vpcName = vpcName;
     }
 
-    public void setAssociatedNetworkId(String associatedNetworkId) {
-        this.associatedNetworkId = associatedNetworkId;
-    }
-
-    public void setAssociatedNetworkName(String associatedNetworkName) {
-        this.associatedNetworkName = associatedNetworkName;
-    }
-
     @Override
     public void setResourceIconResponse(ResourceIconResponse icon) {
         this.icon = icon;

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

@@ -38,14 +38,6 @@ public class SystemVmResponse extends BaseResponseWithAnnotations {
     @Param(description = "the system VM type")
     private String systemVmType;
 
-    @SerializedName("jobid")
-    @Param(description = "the job ID associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job.")
-    private String jobId;
-
-    @SerializedName("jobstatus")
-    @Param(description = "the job status associated with the system VM.  This is only displayed if the router listed is part of a currently running asynchronous job.")
-    private Integer jobStatus;
-
     @SerializedName("zoneid")
     @Param(description = "the Zone ID for the system VM")
     private String zoneId;

core/src/main/java/com/cloud/agent/transport/ArrayTypeAdaptor.java

@@ -35,8 +35,6 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
-import com.cloud.utils.exception.CloudRuntimeException;
-
 public class ArrayTypeAdaptor<T> implements JsonDeserializer<T[]>, JsonSerializer<T[]> {
 
     protected Gson _gson = null;
@@ -75,13 +73,17 @@
             try {
                 clazz = Class.forName(name);
             } catch (ClassNotFoundException e) {
-                throw new CloudRuntimeException("can't find " + name);
+                throw new JsonParseException("can't find " + name);
             }
             T cmd = (T)_gson.fromJson(entry.getValue(), clazz);
             cmds.add(cmd);
         }
-        Class<?> type = ((Class<?>)typeOfT).getComponentType();
-        T[] ts = (T[])Array.newInstance(type, cmds.size());
-        return cmds.toArray(ts);
+        try {
+            Class<?> type = Class.forName(typeOfT.getTypeName().replace("[]", ""));
+            T[] ts = (T[])Array.newInstance(type, cmds.size());
+            return cmds.toArray(ts);
+        } catch (ClassNotFoundException e) {
+            throw new JsonParseException("can't find " + typeOfT.getTypeName());
+        }
     }
 }

plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java

@@ -712,7 +712,7 @@
             metricsResponse.setCpuTotal(hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
             metricsResponse.setCpuUsed(hostResponse.getCpuUsed(), hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
             metricsResponse.setCpuAllocated(hostResponse.getCpuAllocated(), hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
-            metricsResponse.setLoadAverage(hostResponse.getAverageLoad());
+            metricsResponse.setCpuAverageLoad(hostResponse.getAverageLoad());
             metricsResponse.setMemTotal(hostResponse.getMemoryTotal());
             metricsResponse.setMemAllocated(hostResponse.getMemoryAllocated());
             metricsResponse.setMemUsed(hostResponse.getMemoryUsed());

plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java

@@ -52,10 +52,6 @@ public class HostMetricsResponse extends HostResponse {
     @Param(description = "the total cpu allocated in Ghz")
     private String cpuAllocated;
 
-    @SerializedName("cpuloadaverage")
-    @Param(description = "the average cpu load the last minute")
-    private Double loadAverage;
-
     @SerializedName("memorytotalgb")
     @Param(description = "the total memory capacity in GiB")
     private String memTotal;
@@ -132,12 +128,6 @@ public void setCpuUsed(final String cpuUsed, final Integer cpuNumber, final Long
         }
     }
 
-    public void setLoadAverage(final Double loadAverage) {
-        if (loadAverage != null) {
-            this.loadAverage = loadAverage;
-        }
-    }
-
     public void setCpuAllocated(final String cpuAllocated, final Integer cpuNumber, final Long cpuSpeed) {
         if (cpuAllocated != null && cpuNumber != null && cpuSpeed != null) {
             this.cpuAllocated = String.format("%.2f Ghz", parseCPU(cpuAllocated) * cpuNumber * cpuSpeed / (100.0 * 1000.0));

pom.xml

@@ -142,7 +142,7 @@
         <cs.gmavenplus.version>3.0.2</cs.gmavenplus.version>
         <cs.google-http-client>1.42.3</cs.google-http-client>
         <cs.groovy.version>2.4.17</cs.groovy.version>
-        <cs.gson.version>1.7.2</cs.gson.version>
+        <cs.gson.version>2.10.1</cs.gson.version>
         <cs.guava.version>31.1-jre</cs.guava.version>
         <cs.httpclient.version>4.5.14</cs.httpclient.version>
         <cs.httpcore.version>4.4.16</cs.httpcore.version>

server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java

@@ -86,8 +86,8 @@ public static String unescape(String escaped) {
 
     public static String toJSONSerializedString(ResponseObject result, StringBuilder log) {
         if (result != null && log != null) {
-            Gson responseBuilder = ApiResponseGsonHelper.getBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).create();
-            Gson logBuilder = ApiResponseGsonHelper.getLogBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).create();
+            Gson responseBuilder = ApiResponseGsonHelper.getBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.STATIC).create();
+            Gson logBuilder = ApiResponseGsonHelper.getLogBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.STATIC).create();
 
             StringBuilder sb = new StringBuilder();
 

server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java

@@ -2046,7 +2046,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<State, Event> t
     }
 
     public static String logDeploymentWithoutException(VirtualMachine vm, DeploymentPlan plan, ExcludeList avoids, DeploymentPlanner planner) {
-        return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner);
+        return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner != null ? planner.getName() : null);
     }
     @Override
     public ConfigKey<?>[] getConfigKeys() {

ui/src/views/infra/ClusterDRSTab.vue

@@ -84,7 +84,7 @@
     </template>
     <template #bodyCell="{ column, text }">
       <template v-if="column.key === 'successfulMigrations'">
-        {{  text.migrations.filter(m => m.jobstatus === 'SUCCEEDED').length }} / {{  text.migrations.length }}
+        {{  text.migrations.filter(m => m.migrationjobstatus === 'SUCCEEDED').length }} / {{  text.migrations.length }}
         <!-- {{  text.migrations }} -->
       </template>
       <template v-else-if="column.key === 'created'">
@@ -214,9 +214,9 @@ export default {
       generatedPlanMigrationColumns: generatedPlanMigrationColumns,
       migrationColumns: generatedPlanMigrationColumns.concat([
         {
-          key: 'jobstatus',
+          key: 'migrationjobstatus',
           title: this.$t('label.status'),
-          dataIndex: 'jobstatus'
+          dataIndex: 'migrationjobstatus'
         }
       ]),
       loading: false,

utils/src/test/java/com/cloud/utils/LogUtilsTest.java

@@ -24,7 +24,7 @@ public class LogUtilsTest {
 
     @Test
     public void logGsonWithoutExceptionTestLogCorrectlyPrimitives() {
-        String expected = "test primitives: int [1], double [1.11], float [1.2222], boolean [true], null [], char [\"c\"].";
+        String expected = "test primitives: int [1], double [1.11], float [1.2222], boolean [true], null [null], char [\"c\"].";
         String log = LogUtils.logGsonWithoutException("test primitives: int [%s], double [%s], float [%s], boolean [%s], null [%s], char [%s].",
                 1, 1.11d, 1.2222f, true, null, 'c');
         assertEquals(expected, log);