Author: ieb
Date: Tue Jan 20 15:34:20 2009
New Revision: 736171
URL: http://svn.apache.org/viewvc?rev=736171&view=rev
Log:
SHINDIG-787
Revert the effects of SHINDIG-764 on the branch.
Modified:
incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/fieldtranslations.js
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/NameDb.java
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml
incubator/shindig/branches/1.0.x-incubating/javascript/sampledata/canonicaldb.json
Modified:
incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/fieldtranslations.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/fieldtranslations.js?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/fieldtranslations.js
(original)
+++
incubator/shindig/branches/1.0.x-incubating/features/opensocial-base/fieldtranslations.js
Tue Jan 20 15:34:20 2009
@@ -84,6 +84,11 @@
}
}
}
+
+ if (serverJson.name) {
+ serverJson.name.unstructured = serverJson.name.formatted;
+ }
+
}
FieldTranslations.translateEnumJson = function(enumJson) {
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/NameDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/NameDb.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/NameDb.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/NameDb.java
Tue Jan 20 15:34:20 2009
@@ -125,8 +125,8 @@
* @see org.apache.shindig.social.opensocial.model.Name
*/
@Basic
- @Column(name = "unstructured", length = 255)
- private String unstructured;
+ @Column(name = "formatted", length = 255)
+ private String formatted;
/**
*
@@ -135,10 +135,10 @@
}
/**
- * @param unstructured
+ * @param formatted
*/
- public NameDb(String unstructured) {
- this.unstructured = unstructured;
+ public NameDb(String formatted) {
+ this.formatted = formatted;
}
/**
@@ -262,18 +262,18 @@
/**
* {...@inheritdoc}
*
- * @see org.apache.shindig.social.opensocial.model.Name#getUnstructured()
+ * @see org.apache.shindig.social.opensocial.model.Name#getFormatted()
*/
- public String getUnstructured() {
- return unstructured;
+ public String getFormatted() {
+ return formatted;
}
/**
* {...@inheritdoc}
*
- * @see
org.apache.shindig.social.opensocial.model.Name#setUnstructured(java.lang.String)
+ * @see
org.apache.shindig.social.opensocial.model.Name#setFormatted(java.lang.String)
*/
- public void setUnstructured(String unstructured) {
- this.unstructured = unstructured;
+ public void setFormatted(String formatted) {
+ this.formatted = formatted;
}
}
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
Tue Jan 20 15:34:20 2009
@@ -232,7 +232,7 @@
name.setGivenName("GivenName");
name.setHonorificPrefix("Hprefix");
name.setHonorificSuffix("HSufix");
- name.setUnstructured("unstructured");
+ name.setFormatted("formatted");
name.setAdditionalName("Additional Names");
}
return name;
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
Tue Jan 20 15:34:20 2009
@@ -26,21 +26,21 @@
private String givenName;
private String honorificPrefix;
private String honorificSuffix;
- private String unstructured;
+ private String formatted;
public NameImpl() {
}
- public NameImpl(String unstructured) {
- this.unstructured = unstructured;
+ public NameImpl(String formatted) {
+ this.formatted = formatted;
}
- public String getUnstructured() {
- return unstructured;
+ public String getFormatted() {
+ return formatted;
}
- public void setUnstructured(String unstructured) {
- this.unstructured = unstructured;
+ public void setFormatted(String formatted) {
+ this.formatted = formatted;
}
public String getAdditionalName() {
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
Tue Jan 20 15:34:20 2009
@@ -58,9 +58,9 @@
*/
HONORIFIC_SUFFIX("honorificSuffix"),
/**
- * The unstructured name.
+ * The formatted name.
*/
- UNSTRUCTURED("unstructured");
+ FORMATTED("formatted");
/**
* the json key for this field.
@@ -86,15 +86,15 @@
}
/**
- * @return the name, unstructured.
+ * @return the name, formatted.
*/
- String getUnstructured();
+ String getFormatted();
/**
- * set the name unstructured.
- * @param unstructured the name, unstructured.
+ * set the name formatted.
+ * @param formatted the name, formatted.
*/
- void setUnstructured(String unstructured);
+ void setFormatted(String formatted);
/**
* @return get the additional name.
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Tue Jan 20 15:34:20 2009
@@ -64,8 +64,8 @@
private static final Comparator<Person> NAME_COMPARATOR = new
Comparator<Person>() {
public int compare(Person person, Person person1) {
- String name = person.getName().getUnstructured();
- String name1 = person1.getName().getUnstructured();
+ String name = person.getName().getFormatted();
+ String name1 = person1.getName().getFormatted();
return name.compareTo(name1);
}
};
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
Tue Jan 20 15:34:20 2009
@@ -182,12 +182,12 @@
*
* { 'entry' : {
* 'id' : 'john.doe',
- * 'name' : {'unstructured' : 'John Doe'},
+ * 'name' : {'formatted' : 'John Doe'},
* 'phoneNumbers' : [
* { 'number' : '+33H000000000', 'type' : 'home'},
* ],
* 'addresses' : [
- * {'formattedAddress' : 'My home address'}
+ * {'formatted' : 'My home address'}
* ],
* 'emails' : [
* { 'value' : '[email protected]', 'type' : 'work'},
@@ -291,9 +291,9 @@
assertStringListField(result, canonical.getMovies(), Person.Field.MOVIES);
assertStringListField(result, canonical.getMusic(), Person.Field.MUSIC);
- assertEquals(canonical.getName().getUnstructured(),
+ assertEquals(canonical.getName().getFormatted(),
result.getJSONObject(Person.Field.NAME.toString()).getString(
- Name.Field.UNSTRUCTURED.toString()));
+ Name.Field.FORMATTED.toString()));
assertEnumField(result, canonical.getNetworkPresence(),
Person.Field.NETWORKPRESENCE);
@@ -498,7 +498,7 @@
private void assertPerson(JSONObject person, String expectedId, String
expectedName)
throws Exception {
assertEquals(expectedId, person.getString("id"));
- assertEquals(expectedName,
person.getJSONObject("name").getString("unstructured"));
+ assertEquals(expectedName,
person.getJSONObject("name").getString("formatted"));
}
// TODO: Add tests for fields parameter
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
Tue Jan 20 15:34:20 2009
@@ -202,9 +202,9 @@
*
* { 'entry' :
* { 'id' : 'john.doe',
- * 'name' : {'unstructured' : 'John Doe'},
+ * 'name' : {'formatted' : 'John Doe'},
* 'phoneNumbers' : [ { 'number' : '+33H000000000', 'type' : 'home'}, ],
- * 'addresses' : [ {'formattedAddress' : 'My home address'} ],
+ * 'addresses' : [ {'formatted' : 'My home address'} ],
* 'emails' : [
* { 'value' : '[email protected]', 'type' : 'work'}, ]
*
@@ -327,9 +327,9 @@
assertStringListField(result, canonical.getMovies(), Person.Field.MOVIES);
assertStringListField(result, canonical.getMusic(), Person.Field.MUSIC);
- assertEquals(canonical.getName().getUnstructured(), childNodesToMap(
+ assertEquals(canonical.getName().getFormatted(), childNodesToMap(
childNodeMap.get(Person.Field.NAME.toString()).get(0)).get(
- Name.Field.UNSTRUCTURED.toString()).get(0));
+ Name.Field.FORMATTED.toString()).get(0));
assertEnumField(childNodeMap, canonical.getNetworkPresence(),
Person.Field.NETWORKPRESENCE);
@@ -588,7 +588,7 @@
String expectedName) throws Exception {
assertEquals(expectedId, person.get("id").get(0).getTextContent());
assertEquals(expectedName, childNodesToMap(person.get("name").get(0)).get(
- "unstructured").get(0));
+ "formatted").get(0));
}
// TODO: Add tests for fields parameter
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
Tue Jan 20 15:34:20 2009
@@ -97,8 +97,8 @@
assertEquals(johnDoe.getId(), result.getString("id"));
- assertEquals(johnDoe.getName().getUnstructured(),
- result.getJSONObject("name").getString("unstructured"));
+ assertEquals(johnDoe.getName().getFormatted(),
+ result.getJSONObject("name").getString("formatted"));
assertEquals(johnDoe.getAddresses().get(0).getFormatted(),
result.getJSONArray("addresses").getJSONObject(0)
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
Tue Jan 20 15:34:20 2009
@@ -62,7 +62,7 @@
// taken from opensocial-reference/name.js
private static final String[] NAME_FIELDS = { "familyName", "givenName",
"additionalName",
- "honorificPrefix", "honorificSuffix", "unstructured" };
+ "honorificPrefix", "honorificSuffix", "formatted" };
private Person johnDoe;
private Activity activity;
@@ -157,7 +157,7 @@
Name name = parseCassie.getName();
Name cassieName = cassie.getName();
assertNotNull(name);
- assertEquals(cassieName.getUnstructured(), name.getUnstructured());
+ assertEquals(cassieName.getFormatted(), name.getFormatted());
assertEquals(cassieName.getAdditionalName(), name.getAdditionalName());
assertEquals(cassieName.getFamilyName(), name.getFamilyName());
assertEquals(cassieName.getGivenName(), name.getGivenName());
@@ -184,9 +184,9 @@
optional, nullfields);
ApiValidator.dump(nameJSON);
- assertNotNull(nameJSON.get("unstructured"));
- assertEquals(String.class, nameJSON.get("unstructured").getClass());
- assertEquals(name, nameJSON.get("unstructured"));
+ assertNotNull(nameJSON.get("formatted"));
+ assertEquals(String.class, nameJSON.get("formatted").getClass());
+ assertEquals(name, nameJSON.get("formatted"));
// additional name
assertNull(nameJSON.get("additionalName"));
@@ -201,7 +201,7 @@
Person parsedPerson = beanJsonConverter.convertToObject(result,
Person.class);
assertEquals(johnDoe.getId(), parsedPerson.getId());
- assertEquals(johnDoe.getName().getUnstructured(),
parsedPerson.getName().getUnstructured());
+ assertEquals(johnDoe.getName().getFormatted(),
parsedPerson.getName().getFormatted());
List<Address> addresses = parsedPerson.getAddresses();
if (outputInfo) {
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
Tue Jan 20 15:34:20 2009
@@ -222,7 +222,7 @@
<xs:element minOccurs="0" name="givenName" type="xs:string" />
<xs:element minOccurs="0" name="honorificPrefix" type="xs:string" />
<xs:element minOccurs="0" name="honorificSuffix" type="xs:string" />
- <xs:element minOccurs="0" name="unstructured" type="xs:string" />
+ <xs:element minOccurs="0" name="formatted" type="xs:string" />
</xs:all>
</xs:complexType>
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/testxml/person1.xml
Tue Jan 20 15:34:20 2009
@@ -4,6 +4,6 @@
<gender>female</gender>
<id></id>
<name>
- <unstructured>Jane Doe</unstructured>
+ <formatted>Jane Doe</formatted>
</name>
-</person>
+</person>
\ No newline at end of file
Modified:
incubator/shindig/branches/1.0.x-incubating/javascript/sampledata/canonicaldb.json
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/javascript/sampledata/canonicaldb.json?rev=736171&r1=736170&r2=736171&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/javascript/sampledata/canonicaldb.json
(original)
+++
incubator/shindig/branches/1.0.x-incubating/javascript/sampledata/canonicaldb.json
Tue Jan 20 15:34:20 2009
@@ -116,7 +116,7 @@
"givenName" : "Shin",
"honorificPrefix" : "Sir",
"honorificSuffix" : "Social Butterfly",
-"unstructured" : "Sir Shin H. Digg Social Butterfly"
+"formatted" : "Sir Shin H. Digg Social Butterfly"
},
"networkPresence" : {
"value" : "ONLINE",
@@ -179,7 +179,7 @@
"name" : {
"familyName" : "Doe",
"givenName" : "John",
-"unstructured" : "John Doe"
+"formatted" : "John Doe"
}
},
{
@@ -190,7 +190,7 @@
"name" : {
"familyName" : "Doe",
"givenName" : "Jane",
-"unstructured" : "Jane Doe"
+"formatted" : "Jane Doe"
}
},
{
@@ -201,7 +201,7 @@
"name" : {
"familyName" : "Doe",
"givenName" : "George",
-"unstructured" : "George Doe"
+"formatted" : "George Doe"
}
},
{
@@ -212,7 +212,7 @@
"name" : {
"familyName" : "Rossi",
"givenName" : "Mario",
-"unstructured" : "Mario Rossi"
+"formatted" : "Mario Rossi"
}
},
{
@@ -223,7 +223,7 @@
"name" : {
"familyName" : "Meikäläinen",
"givenName" : "Maija",
-"unstructured" : "Maija Meikäläinen"
+"formatted" : "Maija Meikäläinen"
}
}],
//
