You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by do...@apache.org on 2008/08/26 02:05:35 UTC
svn commit: r688924 - in /incubator/shindig/trunk:
features/opensocial-current/
java/social-api/src/main/java/org/apache/shindig/social/core/model/
java/social-api/src/main/java/org/apache/shindig/social/core/util/
java/social-api/src/main/java/org/apa...
Author: doll
Date: Mon Aug 25 17:05:33 2008
New Revision: 688924
URL: http://svn.apache.org/viewvc?rev=688924&view=rev
Log:
0.8.1 change
Rename the enum.key field to enum.value.
Modified:
incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
Modified: incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js?rev=688924&r1=688923&r2=688924&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js (original)
+++ incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js Mon Aug 25 17:05:33 2008
@@ -311,9 +311,20 @@
}
}
+ this.translateEnumJson(serverJson.drinker);
+ this.translateEnumJson(serverJson.lookingFor);
+ this.translateEnumJson(serverJson.networkPresence);
+ this.translateEnumJson(serverJson.smoker);
+
return new JsonPerson(serverJson);
};
+JsonRpcContainer.prototype.translateEnumJson = function(enumJson) {
+ if (enumJson) {
+ enumJson.key = enumJson.value;
+ }
+}
+
JsonRpcContainer.prototype.translateUrlJson = function(urlJson) {
if (urlJson) {
urlJson.address = urlJson.value;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java?rev=688924&r1=688923&r2=688924&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java Mon Aug 25 17:05:33 2008
@@ -21,41 +21,41 @@
public final class EnumImpl<E extends Enum.EnumKey> implements Enum<E> {
private String displayValue;
- private E key = null;
+ private E value = null;
/**
* Constructs a Enum object.
- * @param key EnumKey The key to use
+ * @param value EnumKey The key to use
* @param displayValue String The display value
*/
- public EnumImpl(E key, String displayValue) {
- this.key = key;
+ public EnumImpl(E value, String displayValue) {
+ this.value = value;
this.displayValue = displayValue;
}
/**
* Constructs a Enum object.
- * @param key The key to use. Will use the value from getDisplayValue() as
+ * @param value The key to use. Will use the value from getDisplayValue() as
* the display value.
*/
- public EnumImpl(E key) {
- this(key, key.getDisplayValue());
+ public EnumImpl(E value) {
+ this(value, value.getDisplayValue());
}
public String getDisplayValue() {
- return this.displayValue;
+ return displayValue;
}
public void setDisplayValue(String displayValue) {
this.displayValue = displayValue;
}
- public E getKey() {
- return this.key;
+ public E getValue() {
+ return value;
}
- public void setKey(E key) {
- this.key = key;
+ public void setValue(E value) {
+ this.value = value;
}
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java?rev=688924&r1=688923&r2=688924&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java Mon Aug 25 17:05:33 2008
@@ -351,9 +351,9 @@
// TODO This isnt injector friendly but perhaps implementors dont need it. If they do a
// refactoring of the Enum handling in general is needed.
Object value;
- if (jsonEnum.has(Enum.Field.KEY.toString())) {
+ if (jsonEnum.has(Enum.Field.VALUE.toString())) {
Enum.EnumKey enumKey = (Enum.EnumKey) enumKeyType
- .getField(jsonEnum.getString(Enum.Field.KEY.toString())).get(null);
+ .getField(jsonEnum.getString(Enum.Field.VALUE.toString())).get(null);
value = new EnumImpl<Enum.EnumKey>(enumKey,
jsonEnum.getString(Enum.Field.DISPLAY_VALUE.toString()));
} else {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java?rev=688924&r1=688923&r2=688924&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java Mon Aug 25 17:05:33 2008
@@ -29,9 +29,7 @@
* Set of fields associated with an Enum object
*/
public static enum Field {
-
- KEY("key"),
- // TODO Shouldnt this be 'displayValue'
+ VALUE("value"),
DISPLAY_VALUE("displayValue");
private final String jsonString;
@@ -47,7 +45,6 @@
}
public interface EnumKey {
-
String getDisplayValue();
}
@@ -200,12 +197,12 @@
*
* @return java.lang.Enum key object for this Enum.
*/
- E getKey();
+ E getValue();
/**
* Sets the key for this Enum. Use this for logic within your gadget.
*
- * @param key The value to set.
+ * @param value The value to set.
*/
- void setKey(E key);
+ void setValue(E value);
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=688924&r1=688923&r2=688924&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java Mon Aug 25 17:05:33 2008
@@ -422,18 +422,18 @@
Person.Field field) throws JSONException {
JSONObject actual = result.getJSONObject(field.toString());
assertEquals(expected.getDisplayValue(), actual.getString("displayValue"));
- assertEquals(expected.getKey().toString(), actual.getString("key"));
+ assertEquals(expected.getValue().toString(), actual.getString("value"));
}
private void assertListEnumField(JSONObject result,
List<? extends Enum<? extends Enum.EnumKey>> expected,
Person.Field field) throws JSONException {
JSONArray actual = result.getJSONArray(field.toString());
- for (int i = 0; i < actual.length(); i++) {
+ for (int i = 0; i < actual.length(); i++) {
assertEquals(expected.get(i).getDisplayValue(),
actual.getJSONObject(i).getString("displayValue"));
- assertEquals(expected.get(i).getKey().toString(),
- actual.getJSONObject(i).getString("key"));
+ assertEquals(expected.get(i).getValue().toString(),
+ actual.getJSONObject(i).getString("value"));
}
}
Modified: incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/sampledata/canonicaldb.json?rev=688924&r1=688923&r2=688924&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/sampledata/canonicaldb.json (original)
+++ incubator/shindig/trunk/javascript/sampledata/canonicaldb.json Mon Aug 25 17:05:33 2008
@@ -54,7 +54,7 @@
},
"birthday" : "1975-01-01",
"drinker" : {
-"key" : "SOCIALLY",
+"value" : "SOCIALLY",
"displayValue" : "Socially"
},
"emails" : [{
@@ -102,8 +102,8 @@
"updated" : "2006-06-06T12:12:12Z",
"livingArrangement" : "in a house",
"lookingFor" : [
- { "key" : "RANDOM", "displayValue" : "Random"},
- { "key" : "NETWORKING", "displayValue" : "Networking"}
+ {"value" : "RANDOM", "displayValue" : "Random"},
+ {"value" : "NETWORKING", "displayValue" : "Networking"}
],
"movies" : ["Iron Man", "Nosferatu"],
"music" : ["Chieftains","Beck"],
@@ -116,7 +116,7 @@
"unstructured" : "Sir Shin H. Digg Social Butterfly"
},
"networkPresence" : {
-"key" : "ONLINE",
+"value" : "ONLINE",
"displayValue" : "Online"
},
"nickname" : "diggy",
@@ -161,7 +161,7 @@
}],
"sexualOrientation" : "north",
"smoker" : {
-"key" : "NO",
+"value" : "NO",
"displayValue" : "No"
},
"sports" : ["frisbee","rugby"],