Author: cgeer
Date: Sat Jun 2 18:35:47 2012
New Revision: 1345544
URL: http://svn.apache.org/viewvc?rev=1345544&view=rev
Log:
RAVE-635 Removed EntityID from Group interface.
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Group.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.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/Group.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Group.java?rev=1345544&r1=1345543&r2=1345544&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Group.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Group.java
Sat Jun 2 18:35:47 2012
@@ -39,8 +39,4 @@ public interface Group {
String getTitle();
void setTitle(String title);
-
- Long getEntityId();
-
- void setEntityId(Long entityId);
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java?rev=1345544&r1=1345543&r2=1345544&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java
Sat Jun 2 18:35:47 2012
@@ -23,7 +23,6 @@ import java.util.List;
public class GroupImpl implements Group {
protected String description;
- protected Long entityId;
protected Person owner;
protected String title;
protected List<Person> members;
@@ -69,19 +68,8 @@ public class GroupImpl implements Group
}
@Override
- public Long getEntityId() {
- return this.entityId;
- }
-
- @Override
- public void setEntityId(Long entityId) {
- this.entityId = entityId;
- }
-
- @Override
public int hashCode() {
int result = description != null ? description.hashCode() : 0;
- result = 31 * result + (entityId != null ? entityId.hashCode() : 0);
result = 31 * result + (owner != null ? owner.hashCode() : 0);
result = 31 * result + (title != null ? title.hashCode() : 0);
result = 31 * result + (members != null ? members.hashCode() : 0);
@@ -96,7 +84,6 @@ public class GroupImpl implements Group
GroupImpl group = (GroupImpl) o;
if (description != null ? !description.equals(group.description) :
group.description != null) return false;
- if (entityId != null ? !entityId.equals(group.entityId) :
group.entityId != null) return false;
if (owner != null ? !owner.equals(group.owner) : group.owner != null)
return false;
if (members != null ? !members.equals(group.members) : group.members
!= null) return false;
if (title != null ? !title.equals(group.title) : group.title != null)
return false;
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=1345544&r1=1345543&r2=1345544&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
Sat Jun 2 18:35:47 2012
@@ -61,7 +61,6 @@ public class JpaGroupConverter implement
private void updateProperties(Group source, JpaGroup converted) {
converted.setDescription(source.getDescription());
converted.setTitle(source.getTitle());
- converted.setEntityId(source.getEntityId());
converted.setOwner(source.getOwner());
converted.setMembers(source.getMembers());
}
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=1345544&r1=1345543&r2=1345544&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
Sat Jun 2 18:35:47 2012
@@ -61,7 +61,6 @@ public class JpaGroupConverterTest {
group = new GroupImpl();
group.setDescription(description);
- group.setEntityId(entityId);
group.setTitle(title);
group.setOwner(owner);
group.setMembers(members);
@@ -80,7 +79,6 @@ public class JpaGroupConverterTest {
assertThat(jpaGroup, is(not(sameInstance(group))));
assertThat(jpaGroup, is(instanceOf(JpaGroup.class)));
assertEquals(description, jpaGroup.getDescription());
- assertEquals(entityId, jpaGroup.getEntityId());
assertEquals(title, jpaGroup.getTitle());
assertEquals(owner.getDisplayName(),
jpaGroup.getOwner().getDisplayName());
assertEquals(members.size(), jpaGroup.getMembers().size());
