Author: carlucci
Date: Mon Jun 11 21:05:22 2012
New Revision: 1349009
URL: http://svn.apache.org/viewvc?rev=1349009&view=rev
Log:
RAVE-662: Ensure no JPA model references in the Service or Controller layers
Removed:
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/AbstractJpaRepositoryTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
Mon Jun 11 21:05:22 2012
@@ -12,6 +12,17 @@ public class PersonPropertyImpl implemen
private String extendedValue;
private Boolean primary;
+ public PersonPropertyImpl() {}
+
+ public PersonPropertyImpl(Long id, String type, String value, String
extendedValue, String qualifier, Boolean primary) {
+ this.id = id;
+ this.type = type;
+ this.value = value;
+ this.qualifier = qualifier;
+ this.primary = primary;
+ this.extendedValue = extendedValue;
+ }
+
public Long getId() {
return id;
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
Mon Jun 11 21:05:22 2012
@@ -25,12 +25,12 @@ import org.apache.rave.portal.model.Auth
import java.util.List;
/**
- * Repository interface for {@link org.apache.rave.portal.model.JpaAuthority}
+ * Repository interface for {@link org.apache.rave.portal.model.Authority}
*/
public interface AuthorityRepository extends Repository<Authority> {
/**
- * Finds the {@link org.apache.rave.portal.model.JpaAuthority} by its name
+ * Finds the {@link org.apache.rave.portal.model.Authority} by its name
*
* @param authorityName (unique) name of the Authority
* @return Authority if it can be found, otherwise {@literal null}
@@ -38,12 +38,12 @@ public interface AuthorityRepository ext
Authority getByAuthority(String authorityName);
/**
- * @return a List of all {@link
org.apache.rave.portal.model.JpaAuthority}'s.
+ * @return a List of all {@link org.apache.rave.portal.model.Authority}'s.
*/
List<Authority> getAll();
-
+
/**
- * @return a List of all default {@link
org.apache.rave.portal.model.JpaAuthority}'s.
+ * @return a List of all default {@link
org.apache.rave.portal.model.Authority}'s.
*/
List<Authority> getAllDefault();
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
Mon Jun 11 21:05:22 2012
@@ -25,7 +25,7 @@ import org.apache.rave.portal.model.Port
import java.util.List;
/**
- * Provides persistence operations for the {@link
org.apache.rave.portal.model.JpaPortalPreference}
+ * Provides persistence operations for the {@link
org.apache.rave.portal.model.PortalPreference}
*/
public interface PortalPreferenceRepository extends
Repository<PortalPreference> {
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
Mon Jun 11 21:05:22 2012
@@ -25,11 +25,11 @@ import org.apache.rave.portal.model.Tag;
import java.util.List;
/**
- * Repository interface for {@link org.apache.rave.portal.model.JpaTag}
+ * Repository interface for {@link org.apache.rave.portal.model.Tag}
*/
public interface TagRepository extends Repository<Tag> {
/**
- * @return a List of all {@link org.apache.rave.portal.model.JpaTag}'s.
+ * @return a List of all {@link org.apache.rave.portal.model.Tag}'s.
*/
List<Tag> getAll();
@@ -47,7 +47,7 @@ public interface TagRepository extends R
Tag getByKeyword(String keyword);
/**
- * @return a List of all tag not link to this widget{@link
org.apache.rave.portal.model.JpaTag}'s.
+ * @return a List of all tag not link to this widget{@link
org.apache.rave.portal.model.Tag}'s.
*/
List<Tag> getAvailableTagsByWidgetId(Long widgetId);
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
Mon Jun 11 21:05:22 2012
@@ -25,11 +25,11 @@ import org.apache.rave.portal.model.Widg
public interface WidgetRatingRepository extends Repository<WidgetRating> {
/**
- * Tries to find a {@link org.apache.rave.portal.model.JpaWidgetRating} by
the id's of a Widget and USer
+ * Tries to find a {@link org.apache.rave.portal.model.WidgetRating} by
the id's of a Widget and USer
*
* @param widgetId unique identifier of a Widget
* @param userId unique identifier of a User
- * @return {@link org.apache.rave.portal.model.JpaWidgetRating} if it
exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.portal.model.WidgetRating} if it exists,
otherwise {@literal null}
*/
WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId);
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
Mon Jun 11 21:05:22 2012
@@ -124,10 +124,10 @@ public interface WidgetRepository extend
* @return {@link Widget} if it can be found, otherwise {@literal null}
*/
Widget getByUrl(String widgetUrl);
-
+
/**
* Generates the widget statistics for a gadget including the user's
specific information.
- *
+ *
* @param widget_id id of the widget
* @param user_id id of the user
* @return {@link WidgetStatistics} with the rating information
@@ -146,7 +146,7 @@ public interface WidgetRepository extend
* Generates the mapping of widget ratings for the user.
*
* @param userId id of the user
- * @return Mapping of {@link org.apache.rave.portal.model.JpaWidgetRating}
objects keyed off of the widget's entityId
+ * @return Mapping of {@link org.apache.rave.portal.model.WidgetRating}
objects keyed off of the widget's entityId
*/
Map<Long, WidgetRating> getUsersWidgetRatings(long userId);
@@ -159,7 +159,7 @@ public interface WidgetRepository extend
* @return valid list of widgets, can be empty
*/
List<Widget> getWidgetsByTag(String tagKeyWord, int offset, int pageSize);
-
+
/**
* Counts the total number of {@link Widget}'s that match tag keyword.
Useful for paging.
*
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
Mon Jun 11 21:05:22 2012
@@ -25,7 +25,7 @@ import org.apache.rave.portal.model.util
public interface AuthorityService {
/**
- * @param entityId unique identifier of the {@link
org.apache.rave.portal.model.JpaAuthority}
+ * @param entityId unique identifier of the {@link
org.apache.rave.portal.model.Authority}
* @return Authority if it can be found, otherwise {@literal null}
*/
Authority getAuthorityById(long entityId);
@@ -37,13 +37,13 @@ public interface AuthorityService {
Authority getAuthorityByName(String authorityName);
/**
- * @return a {@link SearchResult} with all {@link
org.apache.rave.portal.model.JpaAuthority}'s
+ * @return a {@link SearchResult} with all {@link
org.apache.rave.portal.model.Authority}'s
*/
SearchResult<Authority> getAllAuthorities();
-
+
/**
- * @return a {@link SearchResult} with the list of all default
- * {@link org.apache.rave.portal.model.JpaAuthority}'s
+ * @return a {@link SearchResult} with the list of all default
+ * {@link org.apache.rave.portal.model.Authority}'s
*/
SearchResult<Authority> getDefaultAuthorities();
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
Mon Jun 11 21:05:22 2012
@@ -26,7 +26,7 @@ public interface NewAccountService {
/**
* Creates a new account using several other Rave services.
*
- * @param newUser the {@link org.apache.rave.portal.model.JpaUser} from
which a new {@link org.apache.rave.portal.model.JpaUser} can be created
+ * @param newUser the {@link org.apache.rave.portal.model.User} from which
a new {@link org.apache.rave.portal.model.User} can be created
* @throws Exception in case something goes wrong
*/
public void createNewAccount(User newUser) throws Exception;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
Mon Jun 11 21:05:22 2012
@@ -58,7 +58,7 @@ public interface WidgetRatingService {
* Removes the rating of a widget
*
* @param widgetId unique identifier of a {@link
org.apache.rave.portal.model.Widget}
- * @param userId unique identifier of a {@link
org.apache.rave.portal.model.JpaUser}
+ * @param userId unique identifier of a {@link
org.apache.rave.portal.model.User}
*/
@PreAuthorize("hasPermission(new
org.apache.rave.portal.security.impl.RaveSecurityContext(#userId,
'org.apache.rave.portal.model.User'),
'org.apache.rave.portal.model.WidgetRating', 'delete')")
void removeWidgetRating(Long widgetId, Long userId);
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
Mon Jun 11 21:05:22 2012
@@ -44,12 +44,12 @@ public class PageApi {
/**
* Adds a widget to the given page
- *
+ *
* @param pageId
* the ID of the {@link org.apache.rave.portal.model.Page} to
add
* the widget to
* @param widgetId
- * the ID of the {@link org.apache.rave.portal.model.JpaWidget}
to
+ * the ID of the {@link org.apache.rave.portal.model.Widget} to
* add do the page
* @return a {@link RpcOperation} containing the new widget instance (
* {@link org.apache.rave.portal.model.RegionWidget }) or any
errors
@@ -72,7 +72,7 @@ public class PageApi {
* Moves a widget to a new location
* <p/>
* Moves can take place within a region, region to region, or between pages
- *
+ *
* @param regionWidgetId
* the ID of the
* {@link org.apache.rave.portal.model.RegionWidget} to move
@@ -110,7 +110,7 @@ public class PageApi {
* Deletes a widget
*
* @param regionWidgetId
- * the ID of the {@link org.apache.rave.portal.model.JpaWidget}
to
+ * the ID of the {@link org.apache.rave.portal.model.Widget} to
* delete
* @return an {@link RpcOperation} containing the updated region or any
* errors encountered.
@@ -125,11 +125,11 @@ public class PageApi {
}
}.getResult();
}
-
+
/**
* Adds a new page
- *
+ *
* @param pageName the new page name
* @param pageLayoutCode the layout code for this new page
* @return an {@link RpcOperation} containing the new page or any
@@ -144,7 +144,7 @@ public class PageApi {
public Page execute() {
return pageService.addNewUserPage(pageName, pageLayoutCode);
}
- }.getResult();
+ }.getResult();
}
@ResponseBody
@@ -170,10 +170,10 @@ public class PageApi {
}
}.getResult();
}
-
+
/**
* Moves a page to a new render position
- *
+ *
* @param pageId the pageId to move
* @param moveAfterPageId the pageId to move after in render order
* @return an {@link RpcOperation} containing the updated page or any
@@ -181,7 +181,7 @@ public class PageApi {
*/
@ResponseBody
@RequestMapping(method = RequestMethod.POST, value = "{pageId}/move")
- public RpcResult<Page> movePage(@PathVariable final long pageId,
+ public RpcResult<Page> movePage(@PathVariable final long pageId,
@RequestParam(required=false) final Long
moveAfterPageId) {
return new RpcOperation<Page>() {
@Override
@@ -194,7 +194,7 @@ public class PageApi {
}
return page;
}
- }.getResult();
+ }.getResult();
}
/**
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
Mon Jun 11 21:05:22 2012
@@ -20,7 +20,7 @@
package org.apache.rave.portal.web.util;
/**
- * Utility class for {@link org.apache.rave.portal.model.JpaPortalPreference}
keys
+ * Utility class for {@link org.apache.rave.portal.model.PortalPreference} keys
*/
public final class PortalPreferenceKeys {
private PortalPreferenceKeys() { }
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
Mon Jun 11 21:05:22 2012
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Co
import org.springframework.validation.Errors;
/**
- * Validator for adding a new {@link org.apache.rave.portal.model.JpaWidget}
+ * Validator for adding a new {@link org.apache.rave.portal.model.Widget}
*/
@Component
public class NewWidgetValidator extends WidgetValidator {
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java
Mon Jun 11 21:05:22 2012
@@ -26,7 +26,7 @@ import org.springframework.beans.factory
import org.springframework.stereotype.Service;
/**
- * JPA implementation for {@link OAuthConsumerStoreService}
+ * Implementation for {@link OAuthConsumerStoreService}
*/
@Service
public class DefaultOAuthConsumerStoreService implements
OAuthConsumerStoreService {
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
Mon Jun 11 21:05:22 2012
@@ -39,7 +39,7 @@ import java.util.*;
import static org.apache.rave.util.CollectionUtils.getSingleValue;
/**
- * Wraps a {@link org.apache.rave.portal.model.JpaPerson} model object and
returns values only if
+ * Wraps a {@link org.apache.rave.portal.model.Person} model object and
returns values only if
* the field set contains the requested field
* <p/>
* Usage of this wrapper is made possible by Shindig's use of a getter based
serialization model
@@ -827,7 +827,7 @@ public class FieldRestrictingPerson impl
private static Url convertToUrl(PersonProperty property) {
return new UrlImpl(property.getValue(), property.getExtendedValue(),
property.getQualifier());
}
-
+
private List<Address>
convertAddresses(List<org.apache.rave.portal.model.Address> addresses) {
List<Address> converted = new ArrayList<Address>();
if(addresses != null) {
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java
Mon Jun 11 21:05:22 2012
@@ -21,10 +21,10 @@ package org.apache.rave.opensocial.servi
import org.apache.rave.opensocial.model.ApplicationData;
import org.apache.rave.opensocial.model.impl.ApplicationDataImpl;
-import org.apache.rave.portal.model.JpaPerson;
import org.apache.rave.portal.model.Person;
import org.apache.rave.opensocial.repository.ApplicationDataRepository;
import org.apache.rave.opensocial.service.impl.DefaultAppDataService;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.rave.service.LockService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.DataCollection;
@@ -79,7 +79,7 @@ public class AppDataServiceTest {
validApplicationData = new
ApplicationDataImpl(VALID_APPLICATION_DATA_ID, VALID_VIEWER_ID,
VALID_APPLICATION_ID,
validApplicationDataMap);
- validPerson = new JpaPerson();
+ validPerson = new PersonImpl();
validPerson.setUsername(VALID_VIEWER_ID);
}
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java?rev=1349009&r1=1349008&r2=1349009&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
Mon Jun 11 21:05:22 2012
@@ -22,13 +22,12 @@ package org.apache.rave.opensocial.servi
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson;
-import org.apache.rave.portal.model.JpaAddress;
-import org.apache.rave.portal.model.JpaPersonProperty;
import org.apache.rave.portal.model.PersonProperty;
+import org.apache.rave.portal.model.impl.AddressImpl;
import org.apache.rave.portal.model.impl.PersonImpl;
+import org.apache.rave.portal.model.impl.PersonPropertyImpl;
import org.apache.rave.portal.model.util.ModelUtils;
import org.apache.shindig.protocol.model.EnumImpl;
-import org.apache.shindig.social.core.model.AddressImpl;
import org.apache.shindig.social.core.model.BodyTypeImpl;
import org.apache.shindig.social.core.model.UrlImpl;
import org.apache.shindig.social.opensocial.model.*;
@@ -582,7 +581,7 @@ public class FieldRestrictingPersonTest
@Test(expected = NotSupportedException.class)
public void setCurrentLocation() {
- new FieldRestrictingPerson(null, null).setCurrentLocation(new
AddressImpl());
+ new FieldRestrictingPerson(null, null).setCurrentLocation(new
org.apache.shindig.social.core.model.AddressImpl());
}
@Test(expected = NotSupportedException.class)
@@ -634,25 +633,25 @@ public class FieldRestrictingPersonTest
person.setPreferredName(PREFERRED_NAME);
person.setStatus(STATUS);
List<PersonProperty> properties = new ArrayList<PersonProperty>();
- properties.add(new JpaPersonProperty(1L, "gender",
Person.Gender.female.toString(), null, "", false));
- properties.add(new JpaPersonProperty(1L, "drinker",
Drinker.HEAVILY.toString(), null, "", false));
- properties.add(new JpaPersonProperty(1L, "age", AGE.toString(), null,
"", false));
- properties.add(new JpaPersonProperty(1L, "birthday", BIRTHDAY_STRING,
null, "", false));
- properties.add(new JpaPersonProperty(1L, "bodyType", BODY_BUILD, null,
"build", false));
- properties.add(new JpaPersonProperty(1L, "bodyType", BODY_EYE_COLOR,
null, "eyeColor", false));
- properties.add(new JpaPersonProperty(1L, "bodyType", "25.24", null,
"height", false));
- properties.add(new JpaPersonProperty(1L, "ims", IM_1, null,
IM_PROVIDER_1, true));
- properties.add(new JpaPersonProperty(1L, "ims", IM_2, null,
IM_PROVIDER_2, false));
- properties.add(new JpaPersonProperty(1L, "emails", E_MAIL_ADDRESS_2,
null, "personal", false));
- properties.add(new JpaPersonProperty(1L, "emails", E_MAIL_ADDRESS_3,
null, "junk", true));
- properties.add(new JpaPersonProperty(1L, "activities", ACTIVITY_1,
null, "", false));
- properties.add(new JpaPersonProperty(1L, "activities", ACTIVITY_2,
null, "", false));
- properties.add(new JpaPersonProperty(1L, "profileSong", LINK_VALUE,
LINK_TEXT, null, false));
- properties.add(new JpaPersonProperty(1L, "lookingFor",
LookingFor.FRIENDS.toString(), null, null, false));
- properties.add(new JpaPersonProperty(1L, "currentLocation", QUALIFIER,
null, null, null));
- properties.add(new JpaPersonProperty(1L, "account", IM_1, "1",
IM_PROVIDER_1, false));
+ properties.add(new PersonPropertyImpl(1L, "gender",
Person.Gender.female.toString(), null, "", false));
+ properties.add(new PersonPropertyImpl(1L, "drinker",
Drinker.HEAVILY.toString(), null, "", false));
+ properties.add(new PersonPropertyImpl(1L, "age", AGE.toString(), null,
"", false));
+ properties.add(new PersonPropertyImpl(1L, "birthday", BIRTHDAY_STRING,
null, "", false));
+ properties.add(new PersonPropertyImpl(1L, "bodyType", BODY_BUILD,
null, "build", false));
+ properties.add(new PersonPropertyImpl(1L, "bodyType", BODY_EYE_COLOR,
null, "eyeColor", false));
+ properties.add(new PersonPropertyImpl(1L, "bodyType", "25.24", null,
"height", false));
+ properties.add(new PersonPropertyImpl(1L, "ims", IM_1, null,
IM_PROVIDER_1, true));
+ properties.add(new PersonPropertyImpl(1L, "ims", IM_2, null,
IM_PROVIDER_2, false));
+ properties.add(new PersonPropertyImpl(1L, "emails", E_MAIL_ADDRESS_2,
null, "personal", false));
+ properties.add(new PersonPropertyImpl(1L, "emails", E_MAIL_ADDRESS_3,
null, "junk", true));
+ properties.add(new PersonPropertyImpl(1L, "activities", ACTIVITY_1,
null, "", false));
+ properties.add(new PersonPropertyImpl(1L, "activities", ACTIVITY_2,
null, "", false));
+ properties.add(new PersonPropertyImpl(1L, "profileSong", LINK_VALUE,
LINK_TEXT, null, false));
+ properties.add(new PersonPropertyImpl(1L, "lookingFor",
LookingFor.FRIENDS.toString(), null, null, false));
+ properties.add(new PersonPropertyImpl(1L, "currentLocation",
QUALIFIER, null, null, null));
+ properties.add(new PersonPropertyImpl(1L, "account", IM_1, "1",
IM_PROVIDER_1, false));
person.setProperties(properties);
- org.apache.rave.portal.model.Address address = new JpaAddress();
+ org.apache.rave.portal.model.Address address = new AddressImpl();
address.setCountry(COUNTRY);
address.setLatitude(LATITUDE);
address.setLongitude(LONGITUDE);
@@ -662,7 +661,7 @@ public class FieldRestrictingPersonTest
address.setStreetAddress(STREET);
address.setQualifier(QUALIFIER);
List<org.apache.rave.portal.model.Address> addresses = new
ArrayList<org.apache.rave.portal.model.Address>();
- addresses.add(new JpaAddress());
+ addresses.add(new AddressImpl());
addresses.add(address);
person.setAddresses(addresses);
