You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ie...@apache.org on 2008/09/02 01:19:56 UTC
svn commit: r691080 - in /incubator/shindig/trunk/java/social-api/src:
main/java/org/apache/shindig/social/core/model/
main/java/org/apache/shindig/social/core/util/
test/java/org/apache/shindig/social/opensocial/util/
Author: ieb
Date: Mon Sep 1 16:19:56 2008
New Revision: 691080
URL: http://svn.apache.org/viewvc?rev=691080&view=rev
Log:
Cleaned up incorrect use of keySet and some unnecessary use of null variables, mainly reported by FindBugs.
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java?rev=691080&r1=691079&r2=691080&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java Mon Sep 1 16:19:56 2008
@@ -329,7 +329,7 @@
public void setUpdated(Date updated) {
if (updated == null) {
- this.updated = updated;
+ this.updated = null;
} else {
this.updated = new Date(updated.getTime());
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java?rev=691080&r1=691079&r2=691080&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java Mon Sep 1 16:19:56 2008
@@ -20,6 +20,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.Map.Entry;
+
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -42,8 +44,10 @@
* the indent to be used per object nesting.
*/
public static final void dumpJsonObject(JSONObject jsonObject, String indent) {
- for (Object key : jsonObject.keySet()) {
- Object value = jsonObject.get(key);
+ for (Object o : jsonObject.entrySet()) {
+ Entry<?, ?> entry = (Entry<?, ?>) o;
+ Object key = entry.getKey();
+ Object value = entry.getValue();
if (value instanceof JSONObject) {
LOG.info(indent + key + ":JSONObject");
dumpJsonObject((JSONObject) value, indent + " ");
@@ -52,7 +56,7 @@
dumpJsonArray((JSONArray) value, indent + " ");
} else {
if (value == null) {
- LOG.info(indent + key + ":" + value + ":" + "na");
+ LOG.info(indent + key + ":null:na");
} else {
LOG.info(indent + key + ":" + value + ":" + value.getClass());
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java?rev=691080&r1=691079&r2=691080&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java Mon Sep 1 16:19:56 2008
@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import net.sf.ezmorph.Morpher;
import net.sf.ezmorph.ObjectMorpher;
@@ -52,8 +53,8 @@
public Object morph(Object bean) {
Map<Object, Object> result = new HashMap<Object, Object>();
JSONObject jsonObject = (JSONObject) bean;
- for (Object key : jsonObject.keySet()) {
- result.put(key, jsonObject.get(key));
+ for (Object entry : jsonObject.entrySet()) {
+ result.put(((Entry)entry).getKey(), ((Entry)entry).getValue());
}
return result;
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java?rev=691080&r1=691079&r2=691080&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java Mon Sep 1 16:19:56 2008
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -401,10 +402,10 @@
*/
public static void dump(Map<?, ?> nameJSON) {
if (log.isDebugEnabled()) {
- for (Object k : nameJSON.keySet()) {
- Object o = nameJSON.get(k);
- log.info("Key [" + k + "] value:["
- + (o == null ? o : o + ":" + o.getClass()) + "]");
+ for (Entry<?, ?> entry : nameJSON.entrySet()) {
+ Object k = entry.getKey();
+ Object o = entry.getValue();
+ log.info("Key [" + k + "] value:[" + (o == null ? "null" : o + ":" + o.getClass()) + "]");
}
}
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=691080&r1=691079&r2=691080&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java Mon Sep 1 16:19:56 2008
@@ -39,6 +39,7 @@
import org.json.JSONObject;
import java.util.Map;
+import java.util.Map.Entry;
public class BeanJsonConverterTest extends TestCase {
private Person johnDoe;
@@ -213,8 +214,9 @@
assertEquals(2, data.size());
- for (String key : data.keySet()) {
- String value = data.get(key);
+ for (Entry<String, String> entry : data.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
if (key.equals("count")) {
assertEquals("0", value);
} else if (key.equals("favoriteColor")) {
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java?rev=691080&r1=691079&r2=691080&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java Mon Sep 1 16:19:56 2008
@@ -44,6 +44,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
public class BeanJsonLibConverterTest extends TestCase {
@@ -346,14 +347,15 @@
@SuppressWarnings("unchecked")
public void testJsonToMap() throws Exception {
String jsonActivity = "{count : 0, favoriteColor : 'yellow'}";
- Map<String, String> data = Maps.newHashMap();
- data = beanJsonConverter.convertToObject(jsonActivity, (Class<Map<String, String>>) data
+ Map<String, Object> data = Maps.newHashMap();
+ data = beanJsonConverter.convertToObject(jsonActivity, (Class<Map<String, Object>>) data
.getClass());
assertEquals(2, data.size());
- for (String key : data.keySet()) {
- Object value = data.get(key);
+ for (Entry<String, Object> entry : data.entrySet()) {
+ String key = entry.getKey();
+ Object value = entry.getValue();
if (key.equals("count")) {
assertEquals(0, value);
} else if (key.equals("favoriteColor")) {