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:04:40 UTC
svn commit: r1346132 - in
/rave/branches/model_interfaces/rave-components/rave-core/src:
main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java
test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java
Author: mfranklin
Date: Mon Jun 4 20:04:40 2012
New Revision: 1346132
URL: http://svn.apache.org/viewvc?rev=1346132&view=rev
Log:
Fixed failing Person NPE conversion test (RAVE-625)
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java?rev=1346132&r1=1346131&r2=1346132&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java Mon Jun 4 20:04:40 2012
@@ -3,15 +3,11 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.JpaPerson;
import org.apache.rave.portal.model.Person;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import java.util.ArrayList;
-import java.util.List;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
@@ -25,7 +21,7 @@ public class JpaPersonConverter implemen
@Override
public JpaPerson convert(Person source) {
- return source instanceof JpaPerson ? (JpaPerson)source : createEntity(source);
+ return source instanceof JpaPerson ? (JpaPerson) source : createEntity(source);
}
@Override
@@ -34,15 +30,17 @@ public class JpaPersonConverter implemen
}
private JpaPerson createEntity(Person source) {
- JpaPerson converted;
- TypedQuery<JpaPerson> query = manager.createNamedQuery(JpaPerson.FIND_BY_USERNAME, JpaPerson.class);
- query.setParameter(JpaPerson.USERNAME_PARAM, source.getUsername());
- converted = getSingleResult(query.getResultList());
-
- if(converted == null) {
- converted = new JpaPerson();
+ JpaPerson converted = null;
+ if (source != null) {
+ TypedQuery<JpaPerson> query = manager.createNamedQuery(JpaPerson.FIND_BY_USERNAME, JpaPerson.class);
+ query.setParameter(JpaPerson.USERNAME_PARAM, source.getUsername());
+ converted = getSingleResult(query.getResultList());
+
+ if (converted == null) {
+ converted = new JpaPerson();
+ }
+ 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/JpaPersonConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java?rev=1346132&r1=1346131&r2=1346132&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java Mon Jun 4 20:04:40 2012
@@ -32,6 +32,13 @@ public class JpaPersonConverterTest {
}
@Test
+ public void nullConversion() {
+ Person template = null;
+ assertThat(converter.convert(template), is(nullValue()));
+ }
+
+
+ @Test
public void convertValid() {
Person template = new PersonImpl();