Author: lindner
Date: Fri Jul 31 17:57:40 2009
New Revision: 799675
URL: http://svn.apache.org/viewvc?rev=799675&view=rev
Log:
SHINDIG-1134 | Fix for JsonProperty Annotations
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java?rev=799675&r1=799674&r2=799675&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
Fri Jul 31 17:57:40 2009
@@ -84,9 +84,11 @@
methods = Maps.newHashMap();
for (Method method : clazz.getMethods()) {
- String name = getPropertyName(method);
- if (name != null) {
- methods.put(name, method);
+ if (method.getParameterTypes().length == 0) {
+ String name = getPropertyName(method);
+ if (name != null) {
+ methods.put(name, method);
+ }
}
}
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java?rev=799675&r1=799674&r2=799675&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
Fri Jul 31 17:57:40 2009
@@ -96,9 +96,11 @@
methods = new HashMap<String, Method>();
for (Method method : type.getMethods()) {
- String name = getPropertyName(method);
- if (name != null) {
- methods.put(name, method);
+ if (method.getParameterTypes().length == 1) {
+ String name = getPropertyName(method);
+ if (name != null) {
+ methods.put(name, method);
+ }
}
}
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=799675&r1=799674&r2=799675&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
Fri Jul 31 17:57:40 2009
@@ -136,6 +136,22 @@
public Object getNullValue() {
return null;
}
+ @JsonProperty("simple!")
+ public void setSimpleName(int foo) {
+
+ }
+ @JsonProperty("invalid-setter-two-args")
+ public void setInvalidSetterTwoArgs(String foo, String bar) {
+ }
+
+ @JsonProperty("invalid-setter-no-args")
+ public void setInvalidSetterNoArgs() {
+ }
+
+ @JsonProperty("invalid-getter-args")
+ public String getInvalidGetterWithArgs(String foo) {
+ return "invalid";
+ }
}
@Test
