You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/02 09:58:16 UTC

svn commit: r950410 - in /shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social: core/model/PersonImpl.java opensocial/model/Person.java opensocial/service/PersonHandler.java opensocial/spi/PersonService.java

Author: lindner
Date: Wed Jun  2 07:58:16 2010
New Revision: 950410

URL: http://svn.apache.org/viewvc?rev=950410&view=rev
Log:
extends/instanceof simplifications

Modified:
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java?rev=950410&r1=950409&r2=950410&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java Wed Jun  2 07:58:16 2010
@@ -46,7 +46,7 @@ public class PersonImpl implements Perso
   private List<String> activities;
   private List<Address> addresses;
   private Integer age;
-  private Map<String, ? extends Object> appData;
+  private Map<String, ?> appData;
   private Date birthday;
   private BodyType bodyType;
   private List<String> books;
@@ -160,11 +160,11 @@ public class PersonImpl implements Perso
     this.age = age;
   }
 
-  public Map<String, ? extends Object> getAppData() {
+  public Map<String, ?> getAppData() {
     return this.appData;
   }
 
-  public void setAppData(Map<String, ? extends Object> appData) {
+  public void setAppData(Map<String, ?> appData) {
     this.appData = appData;
   }
 

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=950410&r1=950409&r2=950410&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Wed Jun  2 07:58:16 2010
@@ -342,14 +342,14 @@ public interface Person {
    * 
    * @return the app data, possibly a subset.
    */
-  Map<String, ? extends Object> getAppData();
+  Map<String, ?> getAppData();
   
   /**
    * Sets app data for the person.
    * 
    * @param appData the app data, possibly a subset 
    */
-  void setAppData(Map<String, ? extends Object> appData);
+  void setAppData(Map<String, ?> appData);
 
   /**
    * Get the person's date of birth, specified as a {@link Date} object. Container support for this

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=950410&r1=950409&r2=950410&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java Wed Jun  2 07:58:16 2010
@@ -74,7 +74,7 @@ public class PersonHandler {
       if (optionalPersonId.isEmpty()) {
         if (groupId.getType() == GroupId.Type.self) {
             // If a filter is set then we have to call getPeople(), otherwise use the simpler getPerson()
-          if (options != null && options.getFilter() != null) {
+          if (options.getFilter() != null) {
             Future<RestfulCollection<Person>> people = personService.getPeople(
                 userIds, groupId, options, fields, request.getToken());
             return FutureUtil.getFirstFromCollection(people);

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java?rev=950410&r1=950409&r2=950410&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java Wed Jun  2 07:58:16 2010
@@ -61,6 +61,7 @@ public interface PersonService {
    * @param collectionOptions How to filter, sort and paginate the collection being fetched
    * @param fields The profile details to fetch. Empty set implies all
    * @param token The gadget token @return a list of people.
+   * @return Future that returns a RestfulCollection of Person
    */
   Future<RestfulCollection<Person>> getPeople(Set<UserId> userIds, GroupId groupId,
       CollectionOptions collectionOptions, Set<String> fields, SecurityToken token)