projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up imports.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
JsonReturnObject.java
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
(file)
--- 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 java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonProperty;
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;
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. */
private final boolean success;
/** The returned values. */
- @JsonUnwrapped
private final Map<String, JsonNode> content = Maps.newHashMap();
/**
private final Map<String, JsonNode> content = Maps.newHashMap();
/**
@@
-67,6
+66,16
@@
public class JsonReturnObject {
return content.get(key);
}
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
//
//
// ACTIONS
//