CLOUDSTACK-8708 bypass exclusion cache in adaptors

DaanHoogland · DaanHoogland · commit 29b0dda959c2 · 2015-10-15T16:44:18.000+02:00
diff --git a/core/src/com/cloud/serializer/GsonHelper.java b/core/src/com/cloud/serializer/GsonHelper.java
@@ -26,6 +26,7 @@
 import org.apache.cloudstack.agent.transport.CommandTypeAdaptor;
 import org.apache.log4j.Logger;
 
+import com.google.gson.ExclusionStrategy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
@@ -46,13 +47,15 @@ public class GsonHelper {
 
     protected static final Gson s_gson;
     protected static final Gson s_gogger;
+    private static final ExclusionStrategy excluder;
 
     static {
         GsonBuilder gsonBuilder = new GsonBuilder();
         s_gson = setDefaultGsonConfig(gsonBuilder);
         GsonBuilder loggerBuilder = new GsonBuilder();
         loggerBuilder.disableHtmlEscaping();
-        loggerBuilder.setExclusionStrategies(new LoggingExclusionStrategy(s_logger));
+        excluder = new LoggingExclusionStrategy(s_logger);
+        loggerBuilder.setExclusionStrategies(getExcluder());
         s_gogger = setDefaultGsonConfig(loggerBuilder);
         s_logger.info("Default Builder inited.");
     }
@@ -93,4 +96,8 @@ public final static Gson getGsonLogger() {
     public final static Logger getLogger() {
         return s_logger;
     }
+
+    public static ExclusionStrategy getExcluder() {
+        return excluder;
+    }
 }
diff --git a/core/src/org/apache/cloudstack/agent/transport/AnswerArrayTypeAdaptor.java b/core/src/org/apache/cloudstack/agent/transport/AnswerArrayTypeAdaptor.java
@@ -20,8 +20,10 @@ protected void writeElement(JsonWriter out, Answer elem) {
         try {
             String data = _gson.toJson(elem);
             if(data != null && !data.equals("null")) {
+                out.beginObject();
                 out.name(elem.getClass().getCanonicalName());
                 out.jsonValue(data);
+                out.endObject();
             }
         } catch (IOException e) {
             throw new CloudRuntimeException("serializing json failed for " + elem.getClass(), e);
diff --git a/core/src/org/apache/cloudstack/agent/transport/CommandArrayTypeAdaptor.java b/core/src/org/apache/cloudstack/agent/transport/CommandArrayTypeAdaptor.java
@@ -4,6 +4,8 @@
 import java.lang.reflect.Array;
 
 import com.cloud.agent.api.Command;
+import com.cloud.serializer.GsonHelper;
+import com.google.gson.ExclusionStrategy;
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonWriter;
@@ -21,7 +23,13 @@ public void initGson(Gson gson) {
 
     @Override
     protected void writeElement(JsonWriter out, Command elem) throws IOException {
-        _adaptor.write(out,elem);
+        // get the gsonHelper.
+        ExclusionStrategy excluder = GsonHelper.getExcluder();
+        if (!excluder.shouldSkipClass(elem.getClass())) {
+            out.beginObject();
+            _adaptor.write(out,elem);
+            out.endObject();
+        }
     }
 
 }
diff --git a/core/src/org/apache/cloudstack/agent/transport/GenericArrayTypeAdaptor.java b/core/src/org/apache/cloudstack/agent/transport/GenericArrayTypeAdaptor.java
@@ -28,9 +28,7 @@ public void write(JsonWriter out, T[] value) throws IOException {
         }
         out.beginArray();
         for (T elem : (T[])value) {
-            out.beginObject();
             writeElement(out, elem);
-            out.endObject();
         }
         out.endArray();
     }
diff --git a/core/test/com/cloud/agent/transport/RequestTest.java b/core/test/com/cloud/agent/transport/RequestTest.java
@@ -219,8 +219,10 @@ public void testLogging() {
         Logger logger = Logger.getLogger(GsonHelper.class);
         Level level = logger.getLevel();
 
+        String log;
+
         logger.setLevel(Level.DEBUG);
-        String log = sreq.log("Debug", true, Level.DEBUG);
+        log = sreq.log("Debug", true, Level.DEBUG);
         assertNull("did not expect a string for this level." + log , log);
 
         log = sreq.log("Debug", false, Level.DEBUG);

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ public void write(JsonWriter out, T[] value) throws IOException {`
`28`	`28`	`}`
`29`	`29`	`out.beginArray();`
`30`	`30`	`for (T elem : (T[])value) {`
`31`		`- out.beginObject();`
`32`	`31`	`writeElement(out, elem);`
`33`		`- out.endObject();`
`34`	`32`	`}`
`35`	`33`	`out.endArray();`
`36`	`34`	`}`