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 21:53:06 UTC
svn commit: r1344882 - in
/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model:
JpaPersonProperty.java PersonProperty.java
conversion/JpaPersonPropertyConverter.java
Author: mfranklin
Date: Thu May 31 19:53:06 2012
New Revision: 1344882
URL: http://svn.apache.org/viewvc?rev=1344882&view=rev
Log:
Refactored PersonProperty (RAVE-630)
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.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
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.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?rev=1344882&r1=1344881&r2=1344882&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java Thu May 31 19:53:06 2012
@@ -28,16 +28,9 @@ import javax.persistence.*;
*/
@Entity
@Access(AccessType.FIELD)
-@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 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")
@GeneratedValue(strategy = GenerationType.TABLE, generator = "personPropertyIdGenerator")
@@ -101,6 +94,16 @@ public class JpaPersonProperty implement
}
@Override
+ public Long getId() {
+ return this.getEntityId();
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.setEntityId(id);
+ }
+
+ @Override
public String getType() {
return type;
}
Modified: 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=1344882&r1=1344881&r2=1344882&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/PersonProperty.java Thu May 31 19:53:06 2012
@@ -4,6 +4,10 @@ package org.apache.rave.portal.model;
*
*/
public interface PersonProperty {
+ Long getId();
+
+ void setId(Long id);
+
String getType();
void setType(String type);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.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?rev=1344882&r1=1344881&r2=1344882&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java Thu May 31 19:53:06 2012
@@ -34,10 +34,7 @@ public class JpaPersonPropertyConverter
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());
+ converted = manager.find(JpaPersonProperty.class, source.getId());
if(converted == null) {
converted = new JpaPersonProperty();