Author: mfranklin
Date: Mon Jun 4 18:36:46 2012
New Revision: 1346080
URL: http://svn.apache.org/viewvc?rev=1346080&view=rev
Log:
Added PageTemplateRegionConverter
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
- copied, changed from r1346072,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
- copied, changed from r1346072,
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
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/impl/PageTemplateRegionImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.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?rev=1346080&r1=1346079&r2=1346080&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
Mon Jun 4 18:36:46 2012
@@ -73,6 +73,11 @@ public class JpaPageTemplateRegion imple
}
@Override
+ public Long getId() {
+ return this.getEntityId();
+ }
+
+ @Override
public long getRenderSequence() {
return renderSequence;
}
Modified:
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=1346080&r1=1346079&r2=1346080&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/PageTemplateRegion.java
Mon Jun 4 18:36:46 2012
@@ -5,6 +5,9 @@ import java.util.List;
/**
*/
public interface PageTemplateRegion {
+
+ Long getId();
+
long getRenderSequence();
void setRenderSequence(long renderSequence);
@@ -20,4 +23,5 @@ public interface PageTemplateRegion {
boolean isLocked();
void setLocked(boolean locked);
+
}
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
(from r1346072,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java&r1=1346072&r2=1346080&rev=1346080&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
Mon Jun 4 18:36:46 2012
@@ -19,51 +19,44 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.JpaPageTemplate;
-import org.apache.rave.portal.model.PageTemplate;
+import org.apache.rave.portal.model.JpaPageTemplateRegion;
+import org.apache.rave.portal.model.PageTemplateRegion;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@Component
-public class JpaPageTemplateConverter implements ModelConverter<PageTemplate,
JpaPageTemplate> {
+public class JpaPageTemplateRegionConverter implements
ModelConverter<PageTemplateRegion, JpaPageTemplateRegion> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<PageTemplate> getSourceType() {
- return PageTemplate.class;
+ public Class<PageTemplateRegion> getSourceType() {
+ return PageTemplateRegion.class;
}
@Override
- public JpaPageTemplate convert(PageTemplate source) {
- return source instanceof JpaPageTemplate ? (JpaPageTemplate)source :
createEntity(source);
+ public JpaPageTemplateRegion convert(PageTemplateRegion source) {
+ return source instanceof JpaPageTemplateRegion ?
(JpaPageTemplateRegion) source : createEntity(source);
}
- private JpaPageTemplate createEntity(PageTemplate source) {
- JpaPageTemplate converted = null;
- if(source != null) {
- converted = manager.find(JpaPageTemplate.class, source.getId());
-
- if(converted == null) {
- converted = new JpaPageTemplate();
- }
- updateProperties(source, converted);
+ private JpaPageTemplateRegion createEntity(PageTemplateRegion source) {
+ JpaPageTemplateRegion converted =
manager.find(JpaPageTemplateRegion.class, source.getId());
+
+ if (converted == null) {
+ converted = new JpaPageTemplateRegion();
}
+ updateProperties(source, converted);
+
return converted;
}
- private void updateProperties(PageTemplate source, JpaPageTemplate
converted) {
+ private void updateProperties(PageTemplateRegion source,
JpaPageTemplateRegion converted) {
converted.setEntityId(source.getId());
- converted.setName(source.getName());
- converted.setDescription(source.getDescription());
- converted.setPageType(source.getPageType());
- converted.setParentPageTemplate(source.getParentPageTemplate());
- converted.setSubPageTemplates(source.getSubPageTemplates());
- converted.setPageLayout(source.getPageLayout());
- converted.setPageTemplateRegions(source.getPageTemplateRegions());
converted.setRenderSequence(source.getRenderSequence());
- converted.setDefaultTemplate(source.isDefaultTemplate());
+ converted.setPageTemplateWidgets(source.getPageTemplateWidgets());
+ converted.setPageTemplate(source.getPageTemplate());
+ converted.setLocked(source.isLocked());
}
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java?rev=1346080&r1=1346079&r2=1346080&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
Mon Jun 4 18:36:46 2012
@@ -5,11 +5,20 @@ import org.apache.rave.portal.model.*;
import java.util.List;
public class PageTemplateRegionImpl implements PageTemplateRegion {
+ private Long id;
private long renderSequence;
private PageTemplate pageTemplate;
private List<PageTemplateWidget> pageTemplateWidgets;
private boolean locked;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public long getRenderSequence() {
return renderSequence;
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java?rev=1346080&r1=1346079&r2=1346080&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
Mon Jun 4 18:36:46 2012
@@ -51,7 +51,7 @@ public class JpaPageTemplateConverterTes
}
@Test
- public void testConvertGroupToJpaGroup() {
+ public void convertValid() {
PageTemplate template = new PageTemplateImpl();
template.setName("name");
template.setSubPageTemplates(new ArrayList<PageTemplate>());
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
(from r1346072,
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java&r1=1346072&r2=1346080&rev=1346080&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
Mon Jun 4 18:36:46 2012
@@ -18,8 +18,12 @@
*/
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.JpaPageTemplate;
+import org.apache.rave.portal.model.JpaPageTemplateRegion;
+import org.apache.rave.portal.model.PageTemplateRegion;
+import org.apache.rave.portal.model.PageTemplateWidget;
import org.apache.rave.portal.model.impl.PageTemplateImpl;
+import org.apache.rave.portal.model.impl.PageTemplateRegionImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,10 +38,10 @@ import static org.junit.Assert.assertTha
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-applicationContext.xml",
"classpath:test-dataContext.xml"})
-public class JpaPageTemplateConverterTest {
+public class JpaPageTemplateRegionConverterTest {
@Autowired
- JpaPageTemplateConverter converter;
+ JpaPageTemplateRegionConverter converter;
@Before
public void setup() {
@@ -46,37 +50,26 @@ public class JpaPageTemplateConverterTes
@Test
public void testNoConversion() {
- JpaPageTemplate template = new JpaPageTemplate();
+ JpaPageTemplateRegion template = new JpaPageTemplateRegion();
assertThat(converter.convert(template), is(sameInstance(template)));
}
@Test
- public void testConvertGroupToJpaGroup() {
- PageTemplate template = new PageTemplateImpl();
- template.setName("name");
- template.setSubPageTemplates(new ArrayList<PageTemplate>());
- template.setDefaultTemplate(true);
+ public void convertValid() {
+ PageTemplateRegion template = new PageTemplateRegionImpl();
template.setRenderSequence(1);
- template.setPageTemplateRegions(new ArrayList<PageTemplateRegion>());
- template.setPageLayout(new PageLayout());
- template.setParentPageTemplate(new PageTemplateImpl());
- template.setDescription("Description");
- template.setPageType(PageType.USER);
+ template.setPageTemplateWidgets(new ArrayList<PageTemplateWidget>());
+ template.setPageTemplate(new PageTemplateImpl());
+ template.setLocked(true);
- JpaPageTemplate jpaTemplate = converter.convert(template);
+ JpaPageTemplateRegion jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
- assertThat(jpaTemplate, is(instanceOf(JpaPageTemplate.class)));
- assertThat(jpaTemplate.getId(), is(equalTo(template.getId())));
- assertThat(jpaTemplate.getPageType(),
is(equalTo(template.getPageType())));
- assertThat(jpaTemplate.getName(), is(equalTo(template.getName())));
- assertThat(jpaTemplate.getDescription(),
is(equalTo(template.getDescription())));
- assertThat(jpaTemplate.getParentPageTemplate(),
is(instanceOf(JpaPageTemplate.class)));
- assertThat(jpaTemplate.getPageLayout(),
is(equalTo(template.getPageLayout())));
- assertThat(jpaTemplate.getPageTemplateRegions(),
is(equalTo(template.getPageTemplateRegions())));
+ assertThat(jpaTemplate, is(instanceOf(JpaPageTemplateRegion.class)));
assertThat(jpaTemplate.getRenderSequence(),
is(equalTo(template.getRenderSequence())));
- assertThat(jpaTemplate.isDefaultTemplate(),
is(equalTo(template.isDefaultTemplate())));
- assertThat(jpaTemplate.getSubPageTemplates(),
is(equalTo(template.getSubPageTemplates())));
+ assertThat(jpaTemplate.getPageTemplate(),
is(instanceOf(JpaPageTemplate.class)));
+ assertThat(jpaTemplate.getPageTemplateWidgets(),
is(equalTo(template.getPageTemplateWidgets())));
+ assertThat(jpaTemplate.isLocked(), is(equalTo(template.isLocked())));
}
}
