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 00:17:28 UTC
svn commit: r688902 - 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 15:17:28 2008
New Revision: 688902
URL: http://svn.apache.org/viewvc?rev=688902&view=rev
Log:
0.8.1 change
phone.number is now phone.value which made the phone object itself unneeded. so person.phoneNumbers has been replaced with a list of ListField objects.
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PhoneImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
Modified:
incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
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/BeanJsonLibConfig.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.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
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.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=688902&r1=688901&r2=688902&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js (original)
+++ incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js Mon Aug 25 15:17:28 2008
@@ -277,6 +277,12 @@
}
}
+ if (serverJson.phoneNumbers) {
+ for (var p = 0; p < serverJson.phoneNumbers.length; p++) {
+ serverJson.phoneNumbers[p].number = serverJson.phoneNumbers[p].value;
+ }
+ }
+
if (serverJson.birthday) {
serverJson.dateOfBirth = serverJson.birthday;
}
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=688902&r1=688901&r2=688902&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 Aug 25 15:17:28 2008
@@ -25,7 +25,6 @@
import org.apache.shindig.social.opensocial.model.Name;
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.Phone;
import org.apache.shindig.social.opensocial.model.Url;
import com.google.common.collect.Lists;
@@ -73,7 +72,7 @@
private Enum<Enum.NetworkPresence> networkPresence;
private String nickname;
private String pets;
- private List<Phone> phoneNumbers;
+ private List<ListField> phoneNumbers;
private List<ListField> photos;
private String politicalViews;
private Url profileSong;
@@ -395,11 +394,11 @@
this.pets = pets;
}
- public List<Phone> getPhoneNumbers() {
+ public List<ListField> getPhoneNumbers() {
return phoneNumbers;
}
- public void setPhoneNumbers(List<Phone> phoneNumbers) {
+ public void setPhoneNumbers(List<ListField> phoneNumbers) {
this.phoneNumbers = phoneNumbers;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java?rev=688902&r1=688901&r2=688902&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java Mon Aug 25 15:17:28 2008
@@ -22,7 +22,6 @@
import org.apache.shindig.social.opensocial.model.ListField;
import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.model.Organization;
-import org.apache.shindig.social.opensocial.model.Phone;
import org.apache.shindig.social.opensocial.model.Url;
import com.google.inject.Inject;
@@ -47,13 +46,12 @@
static {
MorpherRegistry morpherRegistry = JSONUtils.getMorpherRegistry();
morpherRegistry.registerMorpher(new EnumMorpher(Address.Field.class));
- morpherRegistry.registerMorpher(new EnumMorpher(Phone.Field.class));
+ morpherRegistry.registerMorpher(new EnumMorpher(ListField.Field.class));
morpherRegistry.registerMorpher(new EnumMorpher(ListField.Field.class));
morpherRegistry.registerMorpher(new EnumMorpher(MediaItem.Field.class));
morpherRegistry.registerMorpher(new EnumMorpher(MediaItem.Type.class));
morpherRegistry.registerMorpher(new EnumMorpher(Enum.Drinker.class));
morpherRegistry.registerMorpher(new EnumMorpher(Enum.Field.class));
- morpherRegistry.registerMorpher(new EnumMorpher(Enum.Gender.class));
morpherRegistry.registerMorpher(new EnumMorpher(Enum.NetworkPresence.class));
morpherRegistry.registerMorpher(new EnumMorpher(Enum.Smoker.class));
morpherRegistry.registerMorpher(new JsonObjectToMapMorpher());
@@ -108,7 +106,7 @@
// Person map
classMap.put("addresses", Address.class);
- classMap.put("phoneNumbers", Phone.class);
+ classMap.put("phoneNumbers", ListField.class);
classMap.put("emails", ListField.class);
classMap.put("mediaItems", MediaItem.class);
classMap.put("jobs", Organization.class);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=688902&r1=688901&r2=688902&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Mon Aug 25 15:17:28 2008
@@ -755,20 +755,18 @@
void setPets(String pets);
/**
- * Get the Phone numbers associated with the person, specified as an List of {@link Phones}.
- * Container support for this field is OPTIONAL.
+ * Get the Phone numbers associated with the person.
*
* @return the Phone numbers associated with the person
*/
- List<Phone> getPhoneNumbers();
+ List<ListField> getPhoneNumbers();
/**
- * Set the Phone numbers associated with the person, specified as an List of {@link Phones}.
- * Container support for this field is OPTIONAL.
+ * Set the Phone numbers associated with the person.
*
* @param phoneNumbers the Phone numbers associated with the person
*/
- void setPhoneNumbers(List<Phone> phoneNumbers);
+ void setPhoneNumbers(List<ListField> phoneNumbers);
List<ListField> getPhotos();
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=688902&r1=688901&r2=688902&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 15:17:28 2008
@@ -24,7 +24,6 @@
import org.apache.shindig.social.core.model.NameImpl;
import org.apache.shindig.social.core.model.OrganizationImpl;
import org.apache.shindig.social.core.model.PersonImpl;
-import org.apache.shindig.social.core.model.PhoneImpl;
import org.apache.shindig.social.core.model.UrlImpl;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.BodyType;
@@ -33,12 +32,10 @@
import org.apache.shindig.social.opensocial.model.Name;
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.Phone;
import org.apache.shindig.social.opensocial.model.Url;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -148,8 +145,8 @@
canonical.setNetworkPresence(new EnumImpl<Enum.NetworkPresence>(Enum.NetworkPresence.ONLINE));
canonical.setNickname("diggy");
canonical.setPets("dog,cat");
- canonical.setPhoneNumbers(Lists.<Phone>newArrayList(new PhoneImpl("111-111-111", "work"),
- new PhoneImpl("999-999-999", "mobile")));
+ canonical.setPhoneNumbers(Lists.<ListField>newArrayList(new ListFieldImpl("work", "111-111-111"),
+ new ListFieldImpl("mobile", "999-999-999")));
canonical.setPoliticalViews("open leaning");
canonical.setProfileSong(new UrlImpl("http://www.example.org/songs/OnlyTheLonely.mp3",
@@ -318,12 +315,12 @@
assertEquals(canonical.getPhoneNumbers().size(), phoneArray.length());
for (int i = 0; i < canonical.getPhoneNumbers().size(); i++) {
- Phone expectedPhone = canonical.getPhoneNumbers().get(i);
+ ListField expectedPhone = canonical.getPhoneNumbers().get(i);
JSONObject actualPhone = phoneArray.getJSONObject(i);
assertEquals(expectedPhone.getType(), actualPhone.getString(
- Phone.Field.TYPE.toString()));
- assertEquals(expectedPhone.getNumber(), actualPhone.getString(
- Phone.Field.NUMBER.toString()));
+ ListField.Field.TYPE.toString()));
+ assertEquals(expectedPhone.getValue(), actualPhone.getString(
+ ListField.Field.VALUE.toString()));
}
assertStringField(result, canonical.getPoliticalViews(),
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=688902&r1=688901&r2=688902&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 Aug 25 15:17:28 2008
@@ -24,14 +24,12 @@
import org.apache.shindig.social.core.model.MediaItemImpl;
import org.apache.shindig.social.core.model.NameImpl;
import org.apache.shindig.social.core.model.PersonImpl;
-import org.apache.shindig.social.core.model.PhoneImpl;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.ListField;
import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.Phone;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -52,10 +50,10 @@
public void setUp() throws Exception {
super.setUp();
johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
- johnDoe.setPhoneNumbers(Lists.<Phone>newArrayList(
- new PhoneImpl("+33H000000000", "home"),
- new PhoneImpl("+33M000000000", "mobile"),
- new PhoneImpl("+33W000000000", "work")));
+ johnDoe.setPhoneNumbers(Lists.<ListField>newArrayList(
+ new ListFieldImpl("home", "+33H000000000"),
+ new ListFieldImpl("mobile", "+33M000000000"),
+ new ListFieldImpl("work", "+33W000000000")));
johnDoe.setAddresses(Lists.<Address>newArrayList(new AddressImpl("My home address")));
@@ -109,10 +107,10 @@
assertEquals(3, phoneArray.length());
for (int i = 0; i < johnDoe.getPhoneNumbers().size(); i++) {
- Phone expectedPhone = johnDoe.getPhoneNumbers().get(i);
+ ListField expectedPhone = johnDoe.getPhoneNumbers().get(i);
JSONObject actualPhone = phoneArray.getJSONObject(i);
assertEquals(expectedPhone.getType(), actualPhone.getString("type"));
- assertEquals(expectedPhone.getNumber(), actualPhone.getString("number"));
+ assertEquals(expectedPhone.getValue(), actualPhone.getString("value"));
}
JSONArray emailArray = result.getJSONArray("emails");
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=688902&r1=688901&r2=688902&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 Aug 25 15:17:28 2008
@@ -24,7 +24,6 @@
import org.apache.shindig.social.core.model.MediaItemImpl;
import org.apache.shindig.social.core.model.NameImpl;
import org.apache.shindig.social.core.model.PersonImpl;
-import org.apache.shindig.social.core.model.PhoneImpl;
import org.apache.shindig.social.core.util.BeanJsonLibConversionException;
import org.apache.shindig.social.core.util.BeanJsonLibConverter;
import org.apache.shindig.social.opensocial.model.Activity;
@@ -33,7 +32,6 @@
import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.model.Name;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.Phone;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -77,8 +75,10 @@
public void setUp() throws Exception {
super.setUp();
johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
- johnDoe.setPhoneNumbers(Lists.<Phone>newArrayList(new PhoneImpl("+33H000000000", "home"),
- new PhoneImpl("+33M000000000", "mobile"), new PhoneImpl("+33W000000000", "work")));
+ johnDoe.setPhoneNumbers(Lists.<ListField>newArrayList(
+ new ListFieldImpl("home", "+33H000000000"),
+ new ListFieldImpl("mobile", "+33M000000000"),
+ new ListFieldImpl("work", "+33W000000000")));
johnDoe.setAddresses(Lists.<Address>newArrayList(new AddressImpl("My home address")));
@@ -220,10 +220,10 @@
assertEquals(3, parsedPerson.getPhoneNumbers().size());
for (int i = 0; i < johnDoe.getPhoneNumbers().size(); i++) {
- Phone expectedPhone = johnDoe.getPhoneNumbers().get(i);
- Phone actualPhone = parsedPerson.getPhoneNumbers().get(i);
+ ListField expectedPhone = johnDoe.getPhoneNumbers().get(i);
+ ListField actualPhone = parsedPerson.getPhoneNumbers().get(i);
assertEquals(expectedPhone.getType(), actualPhone.getType());
- assertEquals(expectedPhone.getNumber(), actualPhone.getNumber());
+ assertEquals(expectedPhone.getValue(), actualPhone.getValue());
}
assertEquals(2, parsedPerson.getEmails().size());
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java?rev=688902&r1=688901&r2=688902&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java Mon Aug 25 15:17:28 2008
@@ -24,14 +24,12 @@
import org.apache.shindig.social.core.model.MediaItemImpl;
import org.apache.shindig.social.core.model.NameImpl;
import org.apache.shindig.social.core.model.PersonImpl;
-import org.apache.shindig.social.core.model.PhoneImpl;
import org.apache.shindig.social.core.util.BeanXmlConverter;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.ListField;
import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.Phone;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -53,10 +51,10 @@
public void setUp() throws Exception {
super.setUp();
johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
- johnDoe.setPhoneNumbers(Lists.<Phone>newArrayList(
- new PhoneImpl("+33H000000000", "home"),
- new PhoneImpl("+33M000000000", "mobile"),
- new PhoneImpl("+33W000000000", "work")));
+ johnDoe.setPhoneNumbers(Lists.<ListField>newArrayList(
+ new ListFieldImpl("home", "+33H000000000"),
+ new ListFieldImpl("mobile", "+33M000000000"),
+ new ListFieldImpl("work", "+33W000000000")));
johnDoe.setAddresses(Lists.<Address>newArrayList(new AddressImpl("My home address")));
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java?rev=688902&r1=688901&r2=688902&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java Mon Aug 25 15:17:28 2008
@@ -25,7 +25,6 @@
import org.apache.shindig.social.core.model.MediaItemImpl;
import org.apache.shindig.social.core.model.NameImpl;
import org.apache.shindig.social.core.model.PersonImpl;
-import org.apache.shindig.social.core.model.PhoneImpl;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanJsonLibConverter;
import org.apache.shindig.social.opensocial.model.Activity;
@@ -33,7 +32,6 @@
import org.apache.shindig.social.opensocial.model.ListField;
import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.Phone;
import com.google.common.collect.Lists;
import com.google.inject.Guice;
@@ -58,9 +56,10 @@
public void setUp() throws Exception {
super.setUp();
johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
- johnDoe.setPhoneNumbers(Lists.<Phone> newArrayList(new PhoneImpl(
- "+33H000000000", "home"), new PhoneImpl("+33M000000000", "mobile"),
- new PhoneImpl("+33W000000000", "work")));
+ johnDoe.setPhoneNumbers(Lists.<ListField>newArrayList(
+ new ListFieldImpl("home", "+33H000000000"),
+ new ListFieldImpl("mobile", "+33M000000000"),
+ new ListFieldImpl("work", "+33W000000000")));
johnDoe.setAddresses(Lists.<Address>newArrayList(
new AddressImpl("My home address")));
Modified: incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/sampledata/canonicaldb.json?rev=688902&r1=688901&r2=688902&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/sampledata/canonicaldb.json (original)
+++ incubator/shindig/trunk/javascript/sampledata/canonicaldb.json Mon Aug 25 15:17:28 2008
@@ -122,10 +122,10 @@
"nickname" : "diggy",
"pets" : "dog,cat",
"phoneNumbers" : [{
-"number" : "111-111-111",
+"value" : "111-111-111",
"type" : "work"
},{
-"number" : "999-999-999",
+"value" : "999-999-999",
"type" : "mobile"
}],
"politicalViews" : "open leaning",