You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/05/31 04:23:46 UTC
svn commit: r1344539 - in /rave/branches/model_interfaces:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave-providers/rave-opensocial-provider/ra...
Author: mfranklin
Date: Thu May 31 02:23:45 2012
New Revision: 1344539
URL: http://svn.apache.org/viewvc?rev=1344539&view=rev
Log:
Refactored PersonProperty (RAVE-630)
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
- copied, changed from r1344358, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
- copied, changed from r1344522, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.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/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java?rev=1344539&r1=1344538&r2=1344539&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java Thu May 31 02:23:45 2012
@@ -25,8 +25,6 @@ import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
-import static org.apache.rave.persistence.jpa.util.JpaUtil.clearAndAdd;
-
/**
* Represents a person in the persistence context
*/
@@ -106,9 +104,9 @@ public class JpaPerson implements BasicE
@JoinColumn(name="person_id", referencedColumnName = "entity_id")
protected List<JpaOrganization> organizations;
- @OneToMany(targetEntity = PersonProperty.class)
+ @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "person_id", referencedColumnName = "entity_id")
- protected List<PersonProperty> properties;
+ protected List<JpaPersonProperty> properties;
@ManyToMany(fetch = FetchType.LAZY)
@JoinTable(name = "person_association",
@@ -251,13 +249,18 @@ public class JpaPerson implements BasicE
}
@Override
+ @SuppressWarnings("unchecked")
public List<PersonProperty> getProperties() {
- return properties;
+ return ConvertingListProxyFactory.createProxyList(PersonProperty.class, this.properties);
}
@Override
public void setProperties(List<PersonProperty> properties) {
- this.properties = properties;
+ if(this.properties == null) {
+ this.properties = new ArrayList<JpaPersonProperty>();
+ }
+ this.getProperties().clear();
+ this.getProperties().addAll(properties);
}
@Override
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java (from r1344358, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java&r1=1344358&r2=1344539&rev=1344539&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java Thu May 31 02:23:45 2012
@@ -27,8 +27,15 @@ import javax.persistence.*;
* add fields to the Person not initially envisioned
*/
@Entity
+@NamedQueries(value = {
+ @NamedQuery(name = JpaPersonProperty.FIND_BY_TYPE_AND_VALUE, query = "select p from JpaPersonProperty p where p.type=:type and p.value=:value")
+})
@Table(name = "person_property")
-public class PersonProperty implements BasicEntity {
+public class JpaPersonProperty implements BasicEntity, PersonProperty {
+
+ public static final String FIND_BY_TYPE_AND_VALUE = "findByTypeAndValue";
+ public static final String TYPE_PARAM = "type";
+ public static final String VALUE_PARAM = "value";
@Id
@Column(name = "entity_id")
@@ -72,10 +79,10 @@ public class PersonProperty implements B
@Column(name = "primary_value")
private Boolean primary;
- public PersonProperty() {
+ public JpaPersonProperty() {
}
- public PersonProperty(Long entityId, String type, String value, String extendedValue, String qualifier, Boolean primary) {
+ public JpaPersonProperty(Long entityId, String type, String value, String extendedValue, String qualifier, Boolean primary) {
this.entityId = entityId;
this.type = type;
this.value = value;
@@ -92,42 +99,52 @@ public class PersonProperty implements B
this.entityId = entityId;
}
+ @Override
public String getType() {
return type;
}
+ @Override
public void setType(String type) {
this.type = type;
}
+ @Override
public String getValue() {
return value;
}
+ @Override
public void setValue(String value) {
this.value = value;
}
+ @Override
public String getQualifier() {
return qualifier;
}
+ @Override
public void setQualifier(String qualifier) {
this.qualifier = qualifier;
}
+ @Override
public Boolean getPrimary() {
return primary;
}
+ @Override
public void setPrimary(Boolean primary) {
this.primary = primary;
}
+ @Override
public String getExtendedValue() {
return extendedValue;
}
+ @Override
public void setExtendedValue(String extendedValue) {
this.extendedValue = extendedValue;
}
@@ -137,7 +154,7 @@ public class PersonProperty implements B
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- PersonProperty that = (PersonProperty) o;
+ JpaPersonProperty that = (JpaPersonProperty) o;
if (entityId != null ? !entityId.equals(that.entityId) : that.entityId != null) return false;
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java?rev=1344539&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java Thu May 31 02:23:45 2012
@@ -0,0 +1,26 @@
+package org.apache.rave.portal.model;
+
+/**
+ *
+ */
+public interface PersonProperty {
+ String getType();
+
+ void setType(String type);
+
+ String getValue();
+
+ void setValue(String value);
+
+ String getQualifier();
+
+ void setQualifier(String qualifier);
+
+ Boolean getPrimary();
+
+ void setPrimary(Boolean primary);
+
+ String getExtendedValue();
+
+ void setExtendedValue(String extendedValue);
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1344539&r1=1344538&r2=1344539&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Thu May 31 02:23:45 2012
@@ -367,7 +367,7 @@ public class User extends JpaPerson impl
p.setHonorificSuffix(this.getHonorificSuffix());
//p.setOrganizations(this.getOrganizations());
p.setPreferredName(this.getPreferredName());
- p.setProperties(this.getProperties());
+ //p.setProperties(this.getProperties());
p.setStatus(this.getStatus());
p.setUsername(this.getUsername());
return p;
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java (from r1344522, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java&r1=1344522&r2=1344539&rev=1344539&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java Thu May 31 02:23:45 2012
@@ -2,7 +2,9 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.JpaOrganization;
+import org.apache.rave.portal.model.JpaPersonProperty;
import org.apache.rave.portal.model.Organization;
+import org.apache.rave.portal.model.PersonProperty;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
@@ -15,44 +17,36 @@ import static org.apache.rave.persistenc
* Converts an Address to a JpaAddress
*/
@Component
-public class JpaOrganizationConverter implements ModelConverter<Organization, JpaOrganization> {
+public class JpaPersonPropertyConverter implements ModelConverter<PersonProperty, JpaPersonProperty> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<Organization> getSourceType() {
- return Organization.class;
+ public Class<PersonProperty> getSourceType() {
+ return PersonProperty.class;
}
@Override
- public JpaOrganization convert(Organization source) {
- return source instanceof JpaOrganization ? (JpaOrganization)source : createEntity(source);
+ public JpaPersonProperty convert(PersonProperty source) {
+ return source instanceof JpaPersonProperty ? (JpaPersonProperty)source : createEntity(source);
}
- private JpaOrganization createEntity(Organization source) {
- JpaOrganization converted;
- TypedQuery<JpaOrganization> query = manager.createNamedQuery(JpaOrganization.FIND_BY_NAME, JpaOrganization.class);
- query.setParameter(JpaOrganization.NAME_PARAM, source.getName());
+ private JpaPersonProperty createEntity(PersonProperty source) {
+ JpaPersonProperty converted;
+ TypedQuery<JpaPersonProperty> query = manager.createNamedQuery(JpaPersonProperty.FIND_BY_TYPE_AND_VALUE, JpaPersonProperty.class);
+ query.setParameter(JpaPersonProperty.TYPE_PARAM, source.getType());
+ query.setParameter(JpaPersonProperty.VALUE_PARAM, source.getValue());
converted = getSingleResult(query.getResultList());
if(converted == null) {
- converted = new JpaOrganization();
+ converted = new JpaPersonProperty();
}
updateProperties(source, converted);
return converted;
}
- private void updateProperties(Organization source, JpaOrganization converted) {
- converted.setAddress(source.getAddress());
- converted.setDescription(source.getDescription());
- converted.setEndDate(source.getEndDate());
- converted.setField(source.getField());
- converted.setName(source.getName());
- converted.setStartDate(source.getStartDate());
- converted.setSubField(source.getSubField());
- converted.setTitle(source.getTitle());
- converted.setWebpage(source.getWebpage());
+ private void updateProperties(PersonProperty source, JpaPersonProperty converted) {
converted.setQualifier(source.getQualifier());
converted.setPrimary(source.getPrimary());
}
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.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/DefaultPersonService.java?rev=1344539&r1=1344538&r2=1344539&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java Thu May 31 02:23:45 2012
@@ -22,7 +22,6 @@ package org.apache.rave.opensocial.servi
import com.google.common.collect.Lists;
import org.apache.rave.opensocial.repository.PersonRepository;
import org.apache.rave.opensocial.service.SimplePersonService;
-import org.apache.rave.portal.model.JpaPerson;
import org.apache.rave.util.CollectionUtils;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
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=1344539&r1=1344538&r2=1344539&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 Thu May 31 02:23:45 2012
@@ -21,7 +21,6 @@ package org.apache.rave.opensocial.servi
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.Person;
import org.apache.rave.portal.model.util.ModelUtils;
import org.apache.rave.util.CollectionUtils;
import org.apache.shindig.protocol.model.Enum;
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml?rev=1344539&r1=1344538&r2=1344539&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml Thu May 31 02:23:45 2012
@@ -26,7 +26,7 @@
<class>org.apache.rave.portal.model.JpaPerson</class>
<class>org.apache.rave.portal.model.Group</class>
<class>org.apache.rave.portal.model.PersonAssociation</class>
- <class>org.apache.rave.portal.model.PersonProperty</class>
+ <class>org.apache.rave.portal.model.JpaPersonProperty</class>
<class>org.apache.rave.portal.model.JpaAddress</class>
<class>org.apache.rave.portal.model.JpaOrganization</class>
<class>org.apache.rave.opensocial.model.ApplicationData</class>
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=1344539&r1=1344538&r2=1344539&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 Thu May 31 02:23:45 2012
@@ -635,23 +635,23 @@ public class FieldRestrictingPersonTest
person.setPreferredName(PREFERRED_NAME);
person.setStatus(STATUS);
List<PersonProperty> properties = new ArrayList<PersonProperty>();
- properties.add(new PersonProperty(1L, "gender", Person.Gender.female.toString(), null, "", false));
- properties.add(new PersonProperty(1L, "drinker", Drinker.HEAVILY.toString(), null, "", false));
- properties.add(new PersonProperty(1L, "age", AGE.toString(), null, "", false));
- properties.add(new PersonProperty(1L, "birthday", BIRTHDAY_STRING, null, "", false));
- properties.add(new PersonProperty(1L, "bodyType", BODY_BUILD, null, "build", false));
- properties.add(new PersonProperty(1L, "bodyType", BODY_EYE_COLOR, null, "eyeColor", false));
- properties.add(new PersonProperty(1L, "bodyType", "25.24", null, "height", false));
- properties.add(new PersonProperty(1L, "ims", IM_1, null, IM_PROVIDER_1, true));
- properties.add(new PersonProperty(1L, "ims", IM_2, null, IM_PROVIDER_2, false));
- properties.add(new PersonProperty(1L, "emails", E_MAIL_ADDRESS_2, null, "personal", false));
- properties.add(new PersonProperty(1L, "emails", E_MAIL_ADDRESS_3, null, "junk", true));
- properties.add(new PersonProperty(1L, "activities", ACTIVITY_1, null, "", false));
- properties.add(new PersonProperty(1L, "activities", ACTIVITY_2, null, "", false));
- properties.add(new PersonProperty(1L, "profileSong", LINK_VALUE, LINK_TEXT, null, false));
- properties.add(new PersonProperty(1L, "lookingFor", LookingFor.FRIENDS.toString(), null, null, false));
- properties.add(new PersonProperty(1L, "currentLocation", QUALIFIER, null, null, null));
- properties.add(new PersonProperty(1L, "account", IM_1, "1", IM_PROVIDER_1, false));
+ 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));
person.setProperties(properties);
org.apache.rave.portal.model.Address address = new JpaAddress();
address.setCountry(COUNTRY);
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.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/PersonServiceTest.java?rev=1344539&r1=1344538&r2=1344539&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java Thu May 31 02:23:45 2012
@@ -23,7 +23,7 @@ import com.google.common.collect.Lists;
import org.apache.rave.opensocial.repository.PersonRepository;
import org.apache.rave.opensocial.service.impl.DefaultPersonService;
import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson;
-import org.apache.rave.portal.model.JpaPerson;
+import org.apache.rave.portal.model.PersonImpl;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.ProtocolException;
import org.apache.shindig.protocol.RestfulCollection;
@@ -508,16 +508,14 @@ public class PersonServiceTest {
}
private org.apache.rave.portal.model.Person getDbPerson() {
- JpaPerson dbPerson = new JpaPerson();
- dbPerson.setEntityId(Long.parseLong(ID_1));
+ PersonImpl dbPerson = new PersonImpl();
dbPerson.setUsername(ID_1);
dbPerson.setDisplayName(DISPLAY_NAME);
return dbPerson;
}
private org.apache.rave.portal.model.Person getDbPerson(Long id) {
- JpaPerson dbPerson = new JpaPerson();
- dbPerson.setEntityId(id);
+ PersonImpl dbPerson = new PersonImpl();
dbPerson.setUsername(id.toString());
dbPerson.setDisplayName(DISPLAY_NAME);
return dbPerson;