svn commit: r1346125 - in /rave/branches/model_interfaces/rave-components/rave-core/src: main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java

[mfranklin]

Author: mfranklin
Date: Mon Jun  4 19:59:45 2012
New Revision: 1346125

URL: http://svn.apache.org/viewvc?rev=1346125&view=rev
Log:
Fixed failing Group NPE conversion test (RAVE-625)

Modified:
    
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
    
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java?rev=1346125&r1=1346124&r2=1346125&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
 Mon Jun  4 19:59:45 2012
@@ -26,7 +26,6 @@ import org.springframework.stereotype.Co
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
-import java.util.List;
 
 import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
 
@@ -42,19 +41,21 @@ public class JpaGroupConverter implement
 
     @Override
     public JpaGroup convert(Group source) {
-        return source instanceof JpaGroup ? (JpaGroup)source : 
createEntity(source);
+        return source instanceof JpaGroup ? (JpaGroup) source : 
createEntity(source);
     }
 
     private JpaGroup createEntity(Group source) {
-        JpaGroup converted;
-        TypedQuery<JpaGroup> query = 
manager.createNamedQuery(JpaGroup.FIND_BY_TITLE, JpaGroup.class);
-        query.setParameter(JpaGroup.GROUP_ID_PARAM, source.getTitle());
-        converted = getSingleResult(query.getResultList());
-
-        if(converted == null) {
-            converted = new JpaGroup();
+        JpaGroup converted = null;
+        if (source != null) {
+            TypedQuery<JpaGroup> query = 
manager.createNamedQuery(JpaGroup.FIND_BY_TITLE, JpaGroup.class);
+            query.setParameter(JpaGroup.GROUP_ID_PARAM, source.getTitle());
+            converted = getSingleResult(query.getResultList());
+
+            if (converted == null) {
+                converted = new JpaGroup();
+            }
+            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/JpaGroupConverterTest.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java?rev=1346125&r1=1346124&r2=1346125&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
 Mon Jun  4 19:59:45 2012
@@ -18,10 +18,9 @@
  */
 package org.apache.rave.portal.model.conversion;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Group;
+import org.apache.rave.portal.model.JpaGroup;
+import org.apache.rave.portal.model.Person;
 import org.apache.rave.portal.model.impl.GroupImpl;
 import org.apache.rave.portal.model.impl.PersonImpl;
 import org.junit.Before;
@@ -31,11 +30,13 @@ import org.springframework.beans.factory
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 
@ContextConfiguration(locations={"classpath:test-applicationContext.xml","classpath:test-dataContext.xml"}
 )
 public class JpaGroupConverterTest {
@@ -75,6 +76,12 @@ public class JpaGroupConverterTest {
     }
 
     @Test
+    public void nullConversion() {
+        Group category = null;
+        assertThat(converter.convert(category), is(nullValue()));
+    }
+
+    @Test
     public void testConvertGroupToJpaGroup() {
         JpaGroup jpaGroup = converter.convert(group);