From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 9 Jul 2013 21:21:57 +0000 (+0200)
Subject: Fix unwrapping of the content map.
X-Git-Tag: 0.8.7^2~39
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=924578ceaf81c975fed9360593de93ad185f1c8b

Fix unwrapping of the content map.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonReturnObject.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonReturnObject.java
index 6161616..ca29f3c 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonReturnObject.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonReturnObject.java
@@ -6,8 +6,8 @@ package net.pterodactylus.sone.web.ajax;
 
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.BooleanNode;
 import com.fasterxml.jackson.databind.node.IntNode;
@@ -27,7 +27,6 @@ public class JsonReturnObject {
 	private final boolean success;
 
 	/** The returned values. */
-	@JsonUnwrapped
 	private final Map<String, JsonNode> content = Maps.newHashMap();
 
 	/**
@@ -67,6 +66,16 @@ public class JsonReturnObject {
 		return content.get(key);
 	}
 
+	/**
+	 * Returns the content of this object for serialization.
+	 *
+	 * @return The content of this object
+	 */
+	@JsonAnyGetter
+	public Map<String, JsonNode> getContent() {
+		return content;
+	}
+
 	//
 	// ACTIONS
 	//