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/06/19 19:44:13 UTC
svn commit: r1351785 - in
/rave/branches/model_interfaces/rave-components/rave-jpa/src:
main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
Author: mfranklin
Date: Tue Jun 19 17:44:13 2012
New Revision: 1351785
URL: http://svn.apache.org/viewvc?rev=1351785&view=rev
Log:
Fixed person property conversion TODO (RAVE-652)
Modified:
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java?rev=1351785&r1=1351784&r2=1351785&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java Tue Jun 19 17:44:13 2012
@@ -5,18 +5,12 @@ import org.apache.rave.portal.model.JpaP
import org.apache.rave.portal.model.PersonProperty;
import org.springframework.stereotype.Component;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
/**
* Converts an Address to a JpaAddress
*/
@Component
public class JpaPersonPropertyConverter implements ModelConverter<PersonProperty, JpaPersonProperty> {
- @PersistenceContext
- private EntityManager manager;
-
@Override
public Class<PersonProperty> getSourceType() {
return PersonProperty.class;
@@ -30,18 +24,18 @@ public class JpaPersonPropertyConverter
private JpaPersonProperty createEntity(PersonProperty source) {
JpaPersonProperty converted = null;
if (source != null) {
- converted = manager.find(JpaPersonProperty.class, source.getId());
-
- if (converted == null) {
- converted = new JpaPersonProperty();
- }
+ converted = new JpaPersonProperty();
updateProperties(source, converted);
}
return converted;
}
private void updateProperties(PersonProperty source, JpaPersonProperty converted) {
+ converted.setId(source.getId());
converted.setQualifier(source.getQualifier());
converted.setPrimary(source.getPrimary());
+ converted.setType(source.getType());
+ converted.setValue(source.getValue());
+ converted.setExtendedValue(source.getExtendedValue());
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java?rev=1351785&r1=1351784&r2=1351785&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java Tue Jun 19 17:44:13 2012
@@ -41,12 +41,24 @@ public class JpaPersonPropertyConverterT
@Test
public void convertValid() {
PersonProperty template = new PersonPropertyImpl();
+ template.setId(42L);
+ template.setType("TEST_A");
+ template.setValue("TEST_B");
+ template.setQualifier("TEST_C");
+ template.setExtendedValue("TEST_D");
+ template.setPrimary(true);
JpaPersonProperty jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
assertThat(jpaTemplate, is(instanceOf(JpaPersonProperty.class)));
- //TODO: Add coverage for all methods
+ assertThat(jpaTemplate.getId(), is(equalTo(template.getId())));
+ assertThat(jpaTemplate.getType(), is(equalTo(template.getType())));
+ assertThat(jpaTemplate.getValue(), is(equalTo(template.getValue())));
+ assertThat(jpaTemplate.getQualifier(), is(equalTo(template.getQualifier())));
+ assertThat(jpaTemplate.getExtendedValue(), is(equalTo(template.getExtendedValue())));
+ assertThat(jpaTemplate.getPrimary(), is(equalTo(template.getPrimary())));
+
}
}