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/11/05 03:26:18 UTC
svn commit: r711493 - in /incubator/shindig/trunk:
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/org/apache/shindig/social/dat...
Author: ieb
Date: Tue Nov 4 18:26:17 2008
New Revision: 711493
URL: http://svn.apache.org/viewvc?rev=711493&view=rev
Log:
SHINDIG-673
converted BodyType.height and BodyType.weight in the Java impl to floats.
the json db has been touched and may impact the php impl, I will have a check.
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.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/dataservice/integration/RestfulXmlPeopleDisabled.java
incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java?rev=711493&r1=711492&r2=711493&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java Tue Nov 4 18:26:17 2008
@@ -29,8 +29,8 @@
private String build;
private String eyeColor;
private String hairColor;
- private String height;
- private String weight;
+ private float height;
+ private float weight;
public String getBuild() {
return build;
@@ -56,19 +56,19 @@
this.hairColor = hairColor;
}
- public String getHeight() {
+ public float getHeight() {
return height;
}
- public void setHeight(String height) {
+ public void setHeight(float height) {
this.height = height;
}
- public String getWeight() {
+ public float getWeight() {
return weight;
}
- public void setWeight(String weight) {
+ public void setWeight(float weight) {
this.weight = weight;
}
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java?rev=711493&r1=711492&r2=711493&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java Tue Nov 4 18:26:17 2008
@@ -123,7 +123,7 @@
*
* @return the height of the person in meters
*/
- String getHeight();
+ float getHeight();
/**
* The height of the person in meters, specified as a number. Container support for this field is
@@ -131,7 +131,7 @@
*
* @param height the height of the person in meters
*/
- void setHeight(String height);
+ void setHeight(float height);
/**
* The weight of the person in kilograms, specified as a number. Container support for this field
@@ -139,7 +139,7 @@
*
* @return the weight of the person in kilograms
*/
- String getWeight();
+ float getWeight();
/**
* The weight of the person in kilograms, specified as a number. Container support for this field
@@ -147,5 +147,5 @@
*
* @param weight weight of the person in kilograms
*/
- void setWeight(String weight);
+ void setWeight(float weight);
}
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=711493&r1=711492&r2=711493&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 Tue Nov 4 18:26:17 2008
@@ -78,8 +78,8 @@
bodyType.setBuild("svelte");
bodyType.setEyeColor("blue");
bodyType.setHairColor("black");
- bodyType.setHeight("1.84M");
- bodyType.setWeight("184lbs");
+ bodyType.setHeight(1.84F);
+ bodyType.setWeight(74F);
canonical.setBodyType(bodyType);
canonical.setBooks(Lists.newArrayList("The Cathedral & the Bazaar", "Catch 22"));
@@ -232,8 +232,8 @@
assertStringField(jsonBody, body.getBuild(), BodyType.Field.BUILD);
assertStringField(jsonBody, body.getEyeColor(), BodyType.Field.EYE_COLOR);
assertStringField(jsonBody, body.getHairColor(), BodyType.Field.HAIR_COLOR);
- assertStringField(jsonBody, body.getHeight(), BodyType.Field.HEIGHT);
- assertStringField(jsonBody, body.getWeight(), BodyType.Field.WEIGHT);
+ assertFloatField(jsonBody, body.getHeight(), BodyType.Field.HEIGHT);
+ assertFloatField(jsonBody, body.getWeight(), BodyType.Field.WEIGHT);
assertStringListField(result, canonical.getBooks(), Person.Field.BOOKS);
assertStringListField(result, canonical.getCars(), Person.Field.CARS);
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleDisabled.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleDisabled.java?rev=711493&r1=711492&r2=711493&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleDisabled.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleDisabled.java Tue Nov 4 18:26:17 2008
@@ -88,8 +88,8 @@
bodyType.setBuild("svelte");
bodyType.setEyeColor("blue");
bodyType.setHairColor("black");
- bodyType.setHeight("1.84M");
- bodyType.setWeight("184lbs");
+ bodyType.setHeight(1.84F); // meters as per spec
+ bodyType.setWeight(74F); // kg as per spec
canonical.setBodyType(bodyType);
canonical.setBooks(Lists.newArrayList("The Cathedral & the Bazaar",
@@ -265,8 +265,8 @@
assertStringField(bodyMap, body.getBuild(), BodyType.Field.BUILD);
assertStringField(bodyMap, body.getEyeColor(), BodyType.Field.EYE_COLOR);
assertStringField(bodyMap, body.getHairColor(), BodyType.Field.HAIR_COLOR);
- assertStringField(bodyMap, body.getHeight(), BodyType.Field.HEIGHT);
- assertStringField(bodyMap, body.getWeight(), BodyType.Field.WEIGHT);
+ assertFloatField(bodyMap, body.getHeight(), BodyType.Field.HEIGHT);
+ assertFloatField(bodyMap, body.getWeight(), BodyType.Field.WEIGHT);
assertStringListField(result, canonical.getBooks(), Person.Field.BOOKS);
assertStringListField(result, canonical.getCars(), Person.Field.CARS);
Modified: incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/sampledata/canonicaldb.json?rev=711493&r1=711492&r2=711493&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/sampledata/canonicaldb.json (original)
+++ incubator/shindig/trunk/javascript/sampledata/canonicaldb.json Tue Nov 4 18:26:17 2008
@@ -42,8 +42,8 @@
"build" : "svelte",
"eyeColor" : "blue",
"hairColor" : "black",
-"height" : "1.84M",
-"weight" : "184lbs"
+"height" : 1.84,
+"weight" : 74
},
"books" : ["The Cathedral & the Bazaar","Catch 22"],
"cars" : ["beetle","prius"],