Author: mfranklin
Date: Thu May 31 19:51:50 2012
New Revision: 1344881
URL: http://svn.apache.org/viewvc?rev=1344881&view=rev
Log:
Fixed failing Group conversion test (RAVE-625)
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
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/JpaGroup.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java?rev=1344881&r1=1344880&r2=1344881&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java
Thu May 31 19:51:50 2012
@@ -80,8 +80,7 @@ public class JpaGroup implements BasicEn
}
public void setOwner(Person owner) {
- JpaPersonConverter converter = new JpaPersonConverter();
- this.owner = converter.convert(owner);
+ this.owner = JpaConverter.getInstance().convert(owner, Person.class);
}
public String getDescription() {
@@ -101,7 +100,9 @@ public class JpaGroup implements BasicEn
this.members = new ArrayList<JpaPerson>();
}
this.getMembers().clear();
- this.getMembers().addAll(members);
+ if(members != null) {
+ this.getMembers().addAll(members);
+ }
}
public String getTitle() {
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java?rev=1344881&r1=1344880&r2=1344881&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
Thu May 31 19:51:50 2012
@@ -246,7 +246,9 @@ public class JpaPerson implements BasicE
this.addresses = new ArrayList<JpaAddress>();
}
this.getAddresses().clear();
- this.getAddresses().addAll(addresses);
+ if(addresses != null) {
+ this.getAddresses().addAll(addresses);
+ }
}
@Override
@@ -261,7 +263,9 @@ public class JpaPerson implements BasicE
this.properties = new ArrayList<JpaPersonProperty>();
}
this.getProperties().clear();
- this.getProperties().addAll(properties);
+ if(properties != null) {
+ this.getProperties().addAll(properties);
+ }
}
@Override
@@ -277,7 +281,9 @@ public class JpaPerson implements BasicE
}
//Ensure that all operations go through the conversion proxy
this.getFriends().clear();
- this.getFriends().addAll(friends);
+ if(friends != null) {
+ this.getFriends().addAll(friends);
+ }
}
@Override
@@ -292,7 +298,9 @@ public class JpaPerson implements BasicE
this.organizations = new ArrayList<JpaOrganization>();
}
this.getOrganizations().clear();
- this.getOrganizations().addAll(organizations);
+ if(organizations != null) {
+ this.getOrganizations().addAll(organizations);
+ }
}
@Override
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java?rev=1344881&r1=1344880&r2=1344881&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
Thu May 31 19:51:50 2012
@@ -49,8 +49,8 @@ public class ConvertingListProxyFactory
@SuppressWarnings("unchecked")
private void convertAll(List<S> parameter) {
- for(int i=0; i<parameter.size(); i++) {
- parameter.set(i,
(S)JpaConverter.getInstance().convert(parameter.get(i), targetClass));
+ for (int i = 0; i < parameter.size(); i++) {
+ parameter.set(i, (S)
JpaConverter.getInstance().convert(parameter.get(i), targetClass));
}
}
}
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=1344881&r1=1344880&r2=1344881&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
Thu May 31 19:51:50 2012
@@ -48,7 +48,7 @@ public class JpaGroupConverter implement
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.getEntityId());
+ query.setParameter(JpaGroup.GROUP_ID_PARAM, source.getTitle());
converted = getSingleResult(query.getResultList());
if(converted == null) {
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=1344881&r1=1344880&r2=1344881&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
Thu May 31 19:51:50 2012
@@ -42,7 +42,6 @@ public class JpaGroupConverterTest {
JpaGroupConverter converter;
private Group group;
-
private String description = "Test Group";
private Long entityId = Long.valueOf(400);
private String title = "GroupTitle";
@@ -83,7 +82,7 @@ public class JpaGroupConverterTest {
assertEquals(description, jpaGroup.getDescription());
assertEquals(entityId, jpaGroup.getEntityId());
assertEquals(title, jpaGroup.getTitle());
- assertEquals(owner, jpaGroup.getOwner());
+ assertEquals(owner.getDisplayName(),
jpaGroup.getOwner().getDisplayName());
assertEquals(members.size(), jpaGroup.getMembers().size());
}
