fix SDK

Author: zxwing

rest/src/main/java/org/zstack/rest/RestServer.java

@@ -627,7 +627,7 @@ private void handleApi(Api api, Map body, String parameterName, HttpEntity<Strin
         }
 
         Object parameter;
-        if (req.getMethod().equals(HttpMethod.GET.toString())) {
+        if (req.getMethod().equals(HttpMethod.GET.toString()) || req.getMethod().equals(HttpMethod.DELETE.toString())) {
             // GET uses query string to pass parameters
             Map<String, Object> m = new HashMap<>();
 
@@ -659,7 +659,7 @@ private void handleApi(Api api, Map body, String parameterName, HttpEntity<Strin
 
         if (requestInfo.get().headers.containsKey(RestConstants.HEADER_JOB_UUID)) {
             String jobUuid = requestInfo.get().headers.get(RestConstants.HEADER_JOB_UUID).get(0);
-            if (!StringDSL.isZstackUuid(jobUuid)) {
+            if (jobUuid.length() != 32) {
                 throw new RestException(HttpStatus.BAD_REQUEST.value(), String.format("Invalid header[%s], it" +
                         " must be a UUID with '-' stripped", RestConstants.HEADER_JOB_UUID));
             }
@@ -673,7 +673,7 @@ private void handleApi(Api api, Map body, String parameterName, HttpEntity<Strin
             msg.setSession(session);
         }
 
-        if (!req.getMethod().equals(HttpMethod.GET.toString())) {
+        if (!req.getMethod().equals(HttpMethod.GET.toString()) && !req.getMethod().equals(HttpMethod.DELETE.toString())) {
             Object systemTags = body.get("systemTags");
             if (systemTags != null) {
                 msg.setSystemTags((List<String>) systemTags);

sdk/src/main/java/org/zstack/sdk/ZSClient.java

@@ -337,7 +337,7 @@ private void fillNonQueryApiRequestBuilder(Request.Builder reqBuilder) {
                 }
             }
 
-            if (info.httpMethod.equals("GET")) {
+            if (info.httpMethod.equals("GET") || info.httpMethod.equals("DELETE")) {
                 for (Map.Entry<String, Object> e : params.entrySet()) {
                     String k = e.getKey();
                     Object v = e.getValue();
@@ -347,13 +347,20 @@ private void fillNonQueryApiRequestBuilder(Request.Builder reqBuilder) {
                             builder.addQueryParameter(k, o.toString());
                         }
                     } else if (v instanceof Map) {
-                        throw new ApiException(String.format("GET won't support map as a parameter type. %s.%s", action.getClass(), k));
+                        throw new ApiException(String.format("%s won't support map as a parameter type. %s.%s",
+                                info.httpMethod, action.getClass(), k));
                     } else {
                         builder.addQueryParameter(k, v.toString());
                     }
                 }
 
-                reqBuilder.url(builder.build().url().toString()).get();
+                if (info.httpMethod.equals("GET")) {
+                    reqBuilder.url(builder.build().url().toString()).get();
+                } else if (info.httpMethod.equals("DELETE")) {
+                    reqBuilder.url(builder.build().url().toString()).delete();
+                } else {
+                    throw new RuntimeException("should not be here");
+                }
             } else {
                 Map m = new HashMap();
                 m.put(info.parameterName, params);

test/src/test/java/org/zstack/test/compute/zone/TestCreateZoneRest1.java

@@ -6,6 +6,7 @@
 import org.zstack.core.componentloader.ComponentLoader;
 import org.zstack.core.db.DatabaseFacade;
 import org.zstack.header.exception.CloudRuntimeException;
+import org.zstack.header.message.APIDeleteMessage;
 import org.zstack.header.rest.RESTFacade;
 import org.zstack.header.zone.ZoneState;
 import org.zstack.rest.RestConstants;
@@ -87,6 +88,7 @@ public void test() throws ApiSenderException, InterruptedException {
         DeleteZoneAction da = new DeleteZoneAction();
         da.uuid = zone.uuid;
         da.sessionId = api.getAdminSession().getUuid();
+        da.deleteMode = APIDeleteMessage.DeletionMode.Enforcing.toString();
         da.call();
 
         qaction = new QueryZoneAction();