svn commit: r688896 - 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/opensocial/model/ java/social-api/src/test/java/...

[do...@apache.org]

Author: doll
Date: Mon Aug 25 15:01:33 2008
New Revision: 688896

URL: http://svn.apache.org/viewvc?rev=688896&view=rev
Log:
0.8.1 change
person.gender is no longer an opensocial enum - its just a regular string value which we will represent in java by a normal enum. 



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/opensocial/model/Enum.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/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=688896&r1=688895&r2=688896&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js (original)
+++ incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js Mon Aug 25 15:01:33 2008
@@ -288,7 +288,12 @@
   if (serverJson.addresses) {
     for (var j = 0; j < serverJson.addresses.length; j++) {
       serverJson.addresses[j].unstructuredAddress = serverJson.addresses[j].formatted;
-    }    
+    }
+  }
+
+  if (serverJson.gender) {
+    var key = serverJson.gender == 'male' ? 'MALE' : 'FEMALE';
+    serverJson.gender = {key : key, displayValue : serverJson.gender};
   }
 
   return new JsonPerson(serverJson);

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=688896&r1=688895&r2=688896&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:01:33 2008
@@ -53,7 +53,7 @@
   private String ethnicity;
   private String fashion;
   private List<String> food;
-  private Enum<Enum.Gender> gender;
+  private Gender gender;
   private String happiestWhen;
   private Boolean hasApp;
   private List<String> heroes;
@@ -235,11 +235,11 @@
     this.food = food;
   }
 
-  public Enum<Enum.Gender> getGender() {
-    return this.gender;
+  public Gender getGender() {
+    return gender;
   }
 
-  public void setGender(Enum<Enum.Gender> newGender) {
+  public void setGender(Gender newGender) {
     this.gender = newGender;
   }
 

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=688896&r1=688895&r2=688896&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 15:01:33 2008
@@ -85,33 +85,6 @@
   }
 
   /**
-   * public java.lang.Enum for opensocial.Enum.Gender.
-   */
-  public enum Gender implements EnumKey {
-
-    FEMALE("FEMALE", "Female"),
-    MALE("MALE", "Male");
-
-    private final String jsonString;
-
-    private final String displayValue;
-
-    private Gender(String jsonString, String displayValue) {
-      this.jsonString = jsonString;
-      this.displayValue = displayValue;
-    }
-
-    @Override
-    public String toString() {
-      return this.jsonString;
-    }
-
-    public String getDisplayValue() {
-      return displayValue;
-    }
-  }
-
-  /**
    * public java.lang.Enum for opensocial.Enum.Smoker.
    */
   public enum Smoker implements EnumKey {

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=688896&r1=688895&r2=688896&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:01:33 2008
@@ -38,6 +38,10 @@
   public static final String PROFILE_URL_TYPE = "profile";
   public static final String THUMBNAIL_PHOTO_TYPE = "thumbnail";
 
+  public enum Gender {
+    female, male
+  }
+
   /**
    * The fields that represent the person object ion json form.
    */
@@ -453,20 +457,18 @@
   void setFood(List<String> food);
 
   /**
-   * Get a person's gender, specified as an {@link Enum} with the enum's key referencing
-   * {@link Enum.Gender} Container support for this field is OPTIONAL.
+   * Get a person's gender, specified as an {@link Gender}
    *
    * @return the person's gender
    */
-  Enum<Enum.Gender> getGender();
+  Gender getGender();
 
   /**
-   * Set a person's gender, specified as an {@link Enum} with the enum's key referencing
-   * {@link Enum.Gender} Container support for this field is OPTIONAL.
+   * Set a person's gender, specified as an {@link Gender}
    *
    * @param newGender the person's gender
    */
-  void setGender(Enum<Enum.Gender> newGender);
+  void setGender(Gender newGender);
 
   /**
    * Get a description of when the person is happiest, specified as a string. Container support for

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=688896&r1=688895&r2=688896&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:01:33 2008
@@ -101,7 +101,7 @@
     canonical.setEthnicity("developer");
     canonical.setFashion("t-shirts");
     canonical.setFood(Lists.newArrayList("sushi", "burgers"));
-    canonical.setGender(new EnumImpl<Enum.Gender>(Enum.Gender.MALE));
+    canonical.setGender(Person.Gender.male);
     canonical.setHappiestWhen("coding");
     canonical.setHasApp(true);
     canonical.setHeroes(Lists.newArrayList("Doug Crockford", "Charles Babbage"));
@@ -279,7 +279,7 @@
     assertStringField(result, canonical.getEthnicity(), Person.Field.ETHNICITY);
     assertStringField(result, canonical.getFashion(), Person.Field.FASHION);
     assertStringListField(result, canonical.getFood(), Person.Field.FOOD);
-    assertEnumField(result, canonical.getGender(), Person.Field.GENDER);
+    assertStringField(result, canonical.getGender().toString(), Person.Field.GENDER);
     assertStringField(result, canonical.getHappiestWhen(),
         Person.Field.HAPPIEST_WHEN);
     assertBooleanField(result, canonical.getHasApp(), Person.Field.HAS_APP);

Modified: incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/sampledata/canonicaldb.json?rev=688896&r1=688895&r2=688896&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/sampledata/canonicaldb.json (original)
+++ incubator/shindig/trunk/javascript/sampledata/canonicaldb.json Mon Aug 25 15:01:33 2008
@@ -64,10 +64,7 @@
 "ethnicity" : "developer",
 "fashion" : "t-shirts",
 "food" : ["sushi","burgers"],
-"gender" : {
-"key" : "MALE",
-"displayValue" : "Male"
-},
+"gender" : "male",
 "happiestWhen" : "coding",
 "hasApp" : true,
 "heroes" : ["Doug Crockford", "Charles Babbage"],
@@ -187,10 +184,7 @@
 },
 {
 "id" : "john.doe",
-"gender" : {
-"key" : "MALE",
-"displayValue" : "Male"
-},
+"gender" : "male",
 "hasApp" : true,
 "name" : {
 "familyName" : "Doe",
@@ -200,10 +194,7 @@
 },
 {
 "id" : "jane.doe",
-"gender" : {
-"key" : "FEMALE",
-"displayValue" : "Female"
-},
+"gender" : "female",
 "hasApp" : true,
 "name" : {
 "familyName" : "Doe",
@@ -213,10 +204,7 @@
 },
 {
 "id" : "george.doe",
-"gender" : {
-"key" : "MALE",
-"displayValue" : "Female"
-},
+"gender" : "male",
 "hasApp" : true,
 "name" : {
 "familyName" : "Doe",
@@ -226,10 +214,7 @@
 },
 {
 "id" : "mario.rossi",
-"gender" : {
-"key" : "MALE",
-"displayValue" : "Male"
-},
+"gender" : "male",
 "hasApp" : true,
 "name" : {
 "familyName" : "Rossi",
@@ -239,10 +224,7 @@
 },
 {
 "id" : "maija.m",
-"gender" : {
-"key" : "FEMALE",
-"displayValue" : "Female"
-},
+"gender" : "female",
 "hasApp" : true,
 "name" : {
 "familyName" : "Meikäläinen",