Author: mfranklin
Date: Mon Sep 9 23:33:26 2013
New Revision: 1521317
URL: http://svn.apache.org/r1521317
Log:
Added contextId to conversion classes (RAVE-1054)
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java?rev=1521317&r1=1521316&r2=1521317&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
Mon Sep 9 23:33:26 2013
@@ -66,6 +66,7 @@ public class JpaPageConverter implements
converted.setMembers(source.getMembers());
converted.setName(source.getName());
converted.setOwnerId(source.getOwnerId());
+ converted.setContextId(source.getContextId());
converted.setPageLayout(source.getPageLayout());
converted.setPageType(source.getPageType());
converted.setParentPage(source.getParentPage());
Modified:
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java?rev=1521317&r1=1521316&r2=1521317&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
Mon Sep 9 23:33:26 2013
@@ -62,6 +62,7 @@ public class JpaPageConverterTest {
page.setMembers(new ArrayList<PageUser>());
page.setName("name");
page.setOwnerId("");
+ page.setContextId("context");
page.setPageLayout(new PageLayoutImpl());
page.setPageType(PageType.USER.toString());
page.setParentPage(new PageImpl("1"));
@@ -77,6 +78,7 @@ public class JpaPageConverterTest {
assertThat(converted.getMembers(), is(equalTo(page.getMembers())));
assertThat(converted.getName(), is(equalTo(page.getName())));
assertThat(converted.getOwnerId(), is(equalTo(page.getOwnerId())));
+ assertThat(converted.getContextId(), is(equalTo(page.getContextId())));
assertThat(converted.getPageLayout().getCode(),
is(equalTo(page.getPageLayout().getCode())));
assertThat(converted.getPageType(), is(equalTo(page.getPageType())));
assertThat(converted.getSubPages(), is(equalTo(page.getSubPages())));
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java?rev=1521317&r1=1521316&r2=1521317&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
Mon Sep 9 23:33:26 2013
@@ -52,6 +52,7 @@ public class MongoDbPageConverter implem
MongoDbPage page = new MongoDbPage();
page.setId(sourcePage.getId() == null ? generateId() :
sourcePage.getId());
page.setOwnerId(sourcePage.getOwnerId());
+ page.setContextId(sourcePage.getContextId());
page.setPageLayoutCode(sourcePage.getPageLayout().getCode());
page.setName(sourcePage.getName());
page.setRegions(sourcePage.getRegions());
Modified:
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java?rev=1521317&r1=1521316&r2=1521317&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
Mon Sep 9 23:33:26 2013
@@ -98,6 +98,7 @@ public class MongoDbPageConverterTest {
sourcePage.setId(PAGEID);
sourcePage.setOwnerId(USER2ID);
+ sourcePage.setContextId(USER2ID);
sourcePage.setPageLayout(pagelayout);
sourcePage.setName("Carol");
sourcePage.setParentPage(parentPage);
@@ -107,6 +108,7 @@ public class MongoDbPageConverterTest {
assertThat(results.getName(), is(equalTo("Carol")));
assertThat(results.getPageType(), is("USER"));
+ assertThat(results.getContextId(), is(USER2ID));
assertThat(results.getRegions().size(), is(1));
assertNotNull(results.getRegions().get(0).getId());
assertNull(results.getRegions().get(0).getPage());
