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 19:07:00 UTC
svn commit: r1346037 - in
/rave/branches/model_interfaces/rave-components/rave-core/src:
main/java/org/apache/rave/portal/model/ main/resources/META-INF/
test/java/org/apache/rave/portal/repository/impl/
Author: mfranklin
Date: Mon Jun 4 17:07:00 2012
New Revision: 1346037
URL: http://svn.apache.org/viewvc?rev=1346037&view=rev
Log:
Refactored PageTemplateRegion (RAVE-648)
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
- copied, changed from r1346032, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepositoryTest.java
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java (from r1346032, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java&r1=1346032&r2=1346037&rev=1346037&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java Mon Jun 4 17:07:00 2012
@@ -30,11 +30,11 @@ import java.util.List;
@Entity
@Table(name = "page_template_region")
@NamedQueries({
- @NamedQuery(name = "PageTemplateRegion.findAll", query = "SELECT p FROM PageTemplateRegion p"),
- @NamedQuery(name = "PageTemplateRegion.findByPageTemplateRegionId", query = "SELECT p FROM PageTemplateRegion p WHERE p.entityId = :id")
+ @NamedQuery(name = "PageTemplateRegion.findAll", query = "SELECT p FROM JpaPageTemplateRegion p"),
+ @NamedQuery(name = "PageTemplateRegion.findByPageTemplateRegionId", query = "SELECT p FROM JpaPageTemplateRegion p WHERE p.entityId = :id")
})
@Access(AccessType.FIELD)
-public class PageTemplateRegion implements BasicEntity, Serializable {
+public class JpaPageTemplateRegion implements BasicEntity, Serializable, PageTemplateRegion {
private static final long serialVersionUID = 1L;
@Id
@@ -71,26 +71,32 @@ public class PageTemplateRegion implemen
this.entityId = entityId;
}
+ @Override
public long getRenderSequence() {
return renderSequence;
}
+ @Override
public void setRenderSequence(long renderSequence) {
this.renderSequence = renderSequence;
}
+ @Override
public PageTemplate getPageTemplate() {
return pageTemplate;
}
+ @Override
public void setPageTemplate(PageTemplate pageTemplate) {
this.pageTemplate = pageTemplate;
}
+ @Override
public List<PageTemplateWidget> getPageTemplateWidgets() {
return ConvertingListProxyFactory.createProxyList(PageTemplateWidget.class, this.pageTemplateWidgets);
}
+ @Override
public void setPageTemplateWidgets(List<PageTemplateWidget> pageTemplateWidgets) {
if(this.pageTemplateWidgets == null) {
this.pageTemplateWidgets = new ArrayList<JpaPageTemplateWidget>();
@@ -101,10 +107,12 @@ public class PageTemplateRegion implemen
}
}
+ @Override
public boolean isLocked() {
return locked;
}
+ @Override
public void setLocked(boolean locked) {
this.locked = locked;
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java?rev=1346037&r1=1346036&r2=1346037&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java Mon Jun 4 17:07:00 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
+import org.apache.rave.portal.model.conversion.JpaConverter;
import javax.persistence.*;
import java.io.Serializable;
@@ -26,8 +27,8 @@ import java.io.Serializable;
@Entity
@Table(name= "page_template_widget")
@NamedQueries({
- @NamedQuery(name = "PageTemplateGadget.findAll", query = "SELECT p FROM PageTemplateWidget p"),
- @NamedQuery(name = "PageTemplateGadget.findByPageTemplateGadgetId", query = "SELECT p FROM PageTemplateWidget p WHERE p.entityId = :id")
+ @NamedQuery(name = "PageTemplateGadget.findAll", query = "SELECT p FROM JpaPageTemplateWidget p"),
+ @NamedQuery(name = "PageTemplateGadget.findByPageTemplateGadgetId", query = "SELECT p FROM JpaPageTemplateWidget p WHERE p.entityId = :id")
})
@Access(AccessType.FIELD)
public class JpaPageTemplateWidget implements BasicEntity, Serializable, PageTemplateWidget {
@@ -43,7 +44,7 @@ public class JpaPageTemplateWidget imple
@JoinColumn(name = "page_template_region_id")
@ManyToOne(optional = false)
- private PageTemplateRegion pageTemplateRegion;
+ private JpaPageTemplateRegion pageTemplateRegion;
@Basic(optional = false)
@Column(name = "render_sequence")
@@ -78,7 +79,7 @@ public class JpaPageTemplateWidget imple
@Override
public void setPageTemplateRegion(PageTemplateRegion pageTemplateRegion) {
- this.pageTemplateRegion = pageTemplateRegion;
+ this.pageTemplateRegion = JpaConverter.getInstance().convert(pageTemplateRegion, PageTemplateRegion.class);
}
@Override
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java?rev=1346037&r1=1346036&r2=1346037&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java Mon Jun 4 17:07:00 2012
@@ -20,9 +20,11 @@
package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
+import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
import javax.persistence.*;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
@Entity
@@ -71,7 +73,7 @@ public class PageTemplate implements Bas
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@OrderBy("renderSequence")
@JoinColumn(name="page_template_id")
- private List<PageTemplateRegion> pageTemplateRegions;
+ private List<JpaPageTemplateRegion> pageTemplateRegions;
@Basic(optional = false)
@Column(name = "render_sequence")
@@ -132,11 +134,17 @@ public class PageTemplate implements Bas
}
public List<PageTemplateRegion> getPageTemplateRegions() {
- return pageTemplateRegions;
+ return ConvertingListProxyFactory.createProxyList(PageTemplateRegion.class, pageTemplateRegions);
}
public void setPageTemplateRegions(List<PageTemplateRegion> pageTemplateRegions) {
- this.pageTemplateRegions = pageTemplateRegions;
+ if(this.pageTemplateRegions == null) {
+ this.pageTemplateRegions = new ArrayList<JpaPageTemplateRegion>();
+ }
+ this.getPageTemplateRegions().clear();
+ if(pageTemplateRegions != null) {
+ this.getPageTemplateRegions().addAll(pageTemplateRegions);
+ }
}
public long getRenderSequence() {
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java?rev=1346037&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java Mon Jun 4 17:07:00 2012
@@ -0,0 +1,23 @@
+package org.apache.rave.portal.model;
+
+import java.util.List;
+
+/**
+ */
+public interface PageTemplateRegion {
+ long getRenderSequence();
+
+ void setRenderSequence(long renderSequence);
+
+ PageTemplate getPageTemplate();
+
+ void setPageTemplate(PageTemplate pageTemplate);
+
+ List<PageTemplateWidget> getPageTemplateWidgets();
+
+ void setPageTemplateWidgets(List<PageTemplateWidget> pageTemplateWidgets);
+
+ boolean isLocked();
+
+ void setLocked(boolean locked);
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml?rev=1346037&r1=1346036&r2=1346037&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml Mon Jun 4 17:07:00 2012
@@ -37,7 +37,7 @@
<class>org.apache.rave.portal.model.WidgetTag</class>
<class>org.apache.rave.portal.model.PortalPreference</class>
<class>org.apache.rave.portal.model.PageTemplate</class>
- <class>org.apache.rave.portal.model.PageTemplateRegion</class>
+ <class>org.apache.rave.portal.model.JpaPageTemplateRegion</class>
<class>org.apache.rave.portal.model.JpaPageTemplateWidget</class>
<class>org.apache.rave.portal.model.PageUser</class>
<class>org.apache.rave.portal.model.JpaCategory</class>
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepositoryTest.java?rev=1346037&r1=1346036&r2=1346037&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepositoryTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepositoryTest.java Mon Jun 4 17:07:00 2012
@@ -18,10 +18,7 @@
*/
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.portal.model.PageTemplate;
-import org.apache.rave.portal.model.PageTemplateRegion;
-import org.apache.rave.portal.model.PageTemplateWidget;
-import org.apache.rave.portal.model.PageType;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.repository.PageTemplateRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -104,50 +101,50 @@ public class JpaPageTemplateRepositoryTe
assertEquals("# of widgets on sub page 2 region 1", 1, subPage2.getPageTemplateRegions().get(0).getPageTemplateWidgets().size());
assertEquals("# of sub pages for sub page 2", 0, subPage2.getSubPageTemplates().size());
// parent page region tests
- PageTemplateRegion ptRegion1 = pt.getPageTemplateRegions().get(0);
+ JpaPageTemplateRegion ptRegion1 = (JpaPageTemplateRegion)pt.getPageTemplateRegions().get(0);
assertEquals(pt.getEntityId(), ptRegion1.getPageTemplate().getEntityId());
assertEquals(0, ptRegion1.getRenderSequence());
assertEquals(2, ptRegion1.getPageTemplateWidgets().size());
assertTrue(ptRegion1.isLocked());
// parent page region 1 widget 1 tests
PageTemplateWidget ptw1 = ptRegion1.getPageTemplateWidgets().get(0);
- assertEquals(ptw1.getPageTemplateRegion().getEntityId(), ptRegion1.getEntityId());
+ assertEquals(((JpaPageTemplateRegion)ptw1.getPageTemplateRegion()).getEntityId(), ptRegion1.getEntityId());
assertEquals(0, ptw1.getRenderSeq());
assertNotNull(ptw1.getWidget());
assertTrue(ptw1.isLocked());
// parent page region widget 2 tests
PageTemplateWidget ptw2 = ptRegion1.getPageTemplateWidgets().get(1);
- assertEquals(ptw2.getPageTemplateRegion().getEntityId(), ptRegion1.getEntityId());
+ assertEquals(((JpaPageTemplateRegion)ptw2.getPageTemplateRegion()).getEntityId(), ptRegion1.getEntityId());
assertEquals(1, ptw2.getRenderSeq());
assertNotNull(ptw2.getWidget());
assertTrue(ptw2.isLocked());
// sub page 1 region 1 tests
- PageTemplateRegion sp1Region1 = subPage1.getPageTemplateRegions().get(0);
+ JpaPageTemplateRegion sp1Region1 = (JpaPageTemplateRegion)subPage1.getPageTemplateRegions().get(0);
assertEquals(subPage1.getEntityId(), sp1Region1.getPageTemplate().getEntityId());
assertEquals(0, sp1Region1.getRenderSequence());
assertEquals(2, sp1Region1.getPageTemplateWidgets().size());
assertTrue(sp1Region1.isLocked());
// sub page 1 region 1 widget 1 tests
PageTemplateWidget spw1 = sp1Region1.getPageTemplateWidgets().get(0);
- assertEquals(spw1.getPageTemplateRegion().getEntityId(), sp1Region1.getEntityId());
+ assertEquals(((JpaPageTemplateRegion)spw1.getPageTemplateRegion()).getEntityId(), sp1Region1.getEntityId());
assertEquals(0, spw1.getRenderSeq());
assertNotNull(spw1.getWidget());
assertTrue(spw1.isLocked());
// sub page 1 region 1 widget 2 tests
PageTemplateWidget spw2 = sp1Region1.getPageTemplateWidgets().get(1);
- assertEquals(spw2.getPageTemplateRegion().getEntityId(), sp1Region1.getEntityId());
+ assertEquals(((JpaPageTemplateRegion)spw2.getPageTemplateRegion()).getEntityId(), sp1Region1.getEntityId());
assertEquals(1, spw2.getRenderSeq());
assertNotNull(spw2.getWidget());
assertTrue(spw2.isLocked());
// sub page 2 region tests
- PageTemplateRegion sp2Region1 = subPage2.getPageTemplateRegions().get(0);
+ JpaPageTemplateRegion sp2Region1 = (JpaPageTemplateRegion)subPage2.getPageTemplateRegions().get(0);
assertEquals(subPage2.getEntityId(), sp2Region1.getPageTemplate().getEntityId());
assertEquals(0, sp2Region1.getRenderSequence());
assertEquals(1, sp2Region1.getPageTemplateWidgets().size());
assertTrue(sp2Region1.isLocked());
// sub page 2 region widget 1 tests
PageTemplateWidget sp2w1 = sp2Region1.getPageTemplateWidgets().get(0);
- assertEquals(sp2w1.getPageTemplateRegion().getEntityId(), sp2Region1.getEntityId());
+ assertEquals(((JpaPageTemplateRegion)sp2w1.getPageTemplateRegion()).getEntityId(), sp2Region1.getEntityId());
assertEquals(0, sp2w1.getRenderSeq());
assertNotNull(sp2w1.getWidget());
assertTrue(sp2w1.isLocked());
@@ -171,20 +168,20 @@ public class JpaPageTemplateRepositoryTe
assertEquals("# of widgets on parent page region", 2, pt.getPageTemplateRegions().get(0).getPageTemplateWidgets().size());
// parent page region tests
- PageTemplateRegion ptRegion1 = pt.getPageTemplateRegions().get(0);
+ JpaPageTemplateRegion ptRegion1 = (JpaPageTemplateRegion)pt.getPageTemplateRegions().get(0);
assertEquals(pt.getEntityId(), ptRegion1.getPageTemplate().getEntityId());
assertEquals(0, ptRegion1.getRenderSequence());
assertEquals(2, ptRegion1.getPageTemplateWidgets().size());
assertTrue(ptRegion1.isLocked());
// parent page region 1 widget 1 tests
PageTemplateWidget ptw1 = ptRegion1.getPageTemplateWidgets().get(0);
- assertEquals(ptw1.getPageTemplateRegion().getEntityId(), ptRegion1.getEntityId());
+ assertEquals(((JpaPageTemplateRegion)ptw1.getPageTemplateRegion()).getEntityId(), ptRegion1.getEntityId());
assertEquals(0, ptw1.getRenderSeq());
assertNotNull(ptw1.getWidget());
assertTrue(ptw1.isLocked());
// parent page region widget 2 tests
PageTemplateWidget ptw2 = ptRegion1.getPageTemplateWidgets().get(1);
- assertEquals(ptw2.getPageTemplateRegion().getEntityId(), ptRegion1.getEntityId());
+ assertEquals(((JpaPageTemplateRegion)ptw2.getPageTemplateRegion()).getEntityId(), ptRegion1.getEntityId());
assertEquals(1, ptw2.getRenderSeq());
assertNotNull(ptw2.getWidget());
assertTrue(ptw2.isLocked());