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/04 22:05:46 UTC
svn commit: r1346134 - in
/rave/branches/model_interfaces/rave-components/rave-core/src:
main/java/org/apache/rave/portal/model/conversion/
test/java/org/apache/rave/portal/model/conversion/
Author: mfranklin
Date: Mon Jun 4 20:05:45 2012
New Revision: 1346134
URL: http://svn.apache.org/viewvc?rev=1346134&view=rev
Log:
Fixed failing PersonProperty NPE conversion test (RAVE-625)
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
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=1346134&r1=1346133&r2=1346134&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 Mon Jun 4 20:05:45 2012
@@ -1,17 +1,12 @@
package org.apache.rave.portal.model.conversion;
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;
import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
-import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
/**
* Converts an Address to a JpaAddress
@@ -29,17 +24,19 @@ public class JpaPersonPropertyConverter
@Override
public JpaPersonProperty convert(PersonProperty source) {
- return source instanceof JpaPersonProperty ? (JpaPersonProperty)source : createEntity(source);
+ return source instanceof JpaPersonProperty ? (JpaPersonProperty) source : createEntity(source);
}
private JpaPersonProperty createEntity(PersonProperty source) {
- JpaPersonProperty converted;
- converted = manager.find(JpaPersonProperty.class, source.getId());
-
- if(converted == null) {
- converted = new JpaPersonProperty();
+ JpaPersonProperty converted = null;
+ if (source != null) {
+ converted = manager.find(JpaPersonProperty.class, source.getId());
+
+ if (converted == null) {
+ converted = new JpaPersonProperty();
+ }
+ updateProperties(source, converted);
}
- updateProperties(source, converted);
return converted;
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java?rev=1346134&r1=1346133&r2=1346134&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java Mon Jun 4 20:05:45 2012
@@ -32,6 +32,13 @@ public class JpaPersonPropertyConverterT
}
@Test
+ public void nullConversion() {
+ PersonProperty template = null;
+ assertThat(converter.convert(template), is(nullValue()));
+ }
+
+
+ @Test
public void convertValid() {
PersonProperty template = new PersonPropertyImpl();