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 20:15:59 UTC
svn commit: r1346072 - in
/rave/branches/model_interfaces/rave-components/rave-core/src:
main/java/org/apache/rave/portal/model/
main/java/org/apache/rave/portal/model/conversion/
main/java/org/apache/rave/portal/model/impl/ test/java/org/apache/rave/p...
Author: mfranklin
Date: Mon Jun 4 18:15:58 2012
New Revision: 1346072
URL: http://svn.apache.org/viewvc?rev=1346072&view=rev
Log:
Added PageTemplateConverter
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
- copied, changed from r1346018, 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/JpaPageTemplateConverterTest.java
- copied, changed from r1346018, 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/JpaPageTemplate.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/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java?rev=1346072&r1=1346071&r2=1346072&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java Mon Jun 4 18:15:58 2012
@@ -194,5 +194,10 @@ public class JpaPageTemplate implements
if(subPageTemplates != null) {
this.getSubPageTemplates().addAll(subPageTemplates);
}
- }
+ }
+
+ @Override
+ public Long getId() {
+ return this.getEntityId();
+ }
}
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=1346072&r1=1346071&r2=1346072&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 18:15:58 2012
@@ -3,6 +3,9 @@ package org.apache.rave.portal.model;
import java.util.List;
public interface PageTemplate {
+
+ Long getId();
+
PageType getPageType();
void setPageType(PageType pageType);
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java (from r1346018, 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/JpaPageTemplateConverter.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java&r1=1346018&r2=1346072&rev=1346072&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/JpaPageTemplateConverter.java Mon Jun 4 18:15:58 2012
@@ -19,49 +19,51 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.Group;
-import org.apache.rave.portal.model.JpaGroup;
+import org.apache.rave.portal.model.JpaPageTemplate;
+import org.apache.rave.portal.model.PageTemplate;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import java.util.List;
-
-import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
@Component
-public class JpaGroupConverter implements ModelConverter<Group, JpaGroup> {
+public class JpaPageTemplateConverter implements ModelConverter<PageTemplate, JpaPageTemplate> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<Group> getSourceType() {
- return Group.class;
+ public Class<PageTemplate> getSourceType() {
+ return PageTemplate.class;
}
@Override
- public JpaGroup convert(Group source) {
- return source instanceof JpaGroup ? (JpaGroup)source : createEntity(source);
+ public JpaPageTemplate convert(PageTemplate source) {
+ return source instanceof JpaPageTemplate ? (JpaPageTemplate)source : createEntity(source);
}
- 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.getTitle());
- converted = getSingleResult(query.getResultList());
-
- if(converted == null) {
- converted = new JpaGroup();
+ 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);
}
- updateProperties(source, converted);
return converted;
}
- private void updateProperties(Group source, JpaGroup converted) {
+ private void updateProperties(PageTemplate source, JpaPageTemplate converted) {
+ converted.setEntityId(source.getId());
+ converted.setName(source.getName());
converted.setDescription(source.getDescription());
- converted.setTitle(source.getTitle());
- converted.setOwner(source.getOwner());
- converted.setMembers(source.getMembers());
+ 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());
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java?rev=1346072&r1=1346071&r2=1346072&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java Mon Jun 4 18:15:58 2012
@@ -5,6 +5,7 @@ import org.apache.rave.portal.model.*;
import java.util.List;
public class PageTemplateImpl implements PageTemplate {
+ private Long id;
private String name;
private String description;
private PageType pageType;
@@ -15,6 +16,14 @@ public class PageTemplateImpl implements
private long renderSequence;
private boolean defaultTemplate;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public String getName() {
return name;
}
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java (from r1346018, 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/JpaPageTemplateConverterTest.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java&r1=1346018&r2=1346072&rev=1346072&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/JpaPageTemplateConverterTest.java Mon Jun 4 18:15:58 2012
@@ -18,12 +18,8 @@
*/
package org.apache.rave.portal.model.conversion;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.impl.GroupImpl;
-import org.apache.rave.portal.model.impl.PersonImpl;
+import org.apache.rave.portal.model.impl.PageTemplateImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,59 +27,56 @@ import org.springframework.beans.factory
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
import java.util.ArrayList;
-import java.util.List;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={"classpath:test-applicationContext.xml","classpath:test-dataContext.xml"} )
-public class JpaGroupConverterTest {
+@ContextConfiguration(locations = {"classpath:test-applicationContext.xml", "classpath:test-dataContext.xml"})
+public class JpaPageTemplateConverterTest {
@Autowired
- JpaGroupConverter converter;
-
- private Group group;
- private String description = "Test Group";
- private Long entityId = Long.valueOf(400);
- private String title = "GroupTitle";
- private Person owner = null;
- private List<Person> members = null;
-
- private String ownerDisplayName = "Bob";
- private String ownerGivenName = "Smith";
+ JpaPageTemplateConverter converter;
@Before
public void setup() {
- members = new ArrayList<Person>();
- owner = new PersonImpl();
- owner.setDisplayName(ownerDisplayName);
- owner.setGivenName(ownerGivenName);
- members.add(owner);
-
- group = new GroupImpl();
- group.setDescription(description);
- group.setTitle(title);
- group.setOwner(owner);
- group.setMembers(members);
+
}
@Test
public void testNoConversion() {
- JpaGroup group = new JpaGroup();
- assertThat(converter.convert(group), is(sameInstance(group)));
+ JpaPageTemplate template = new JpaPageTemplate();
+ assertThat(converter.convert(template), is(sameInstance(template)));
}
@Test
public void testConvertGroupToJpaGroup() {
- JpaGroup jpaGroup = converter.convert(group);
-
- assertThat(jpaGroup, is(not(sameInstance(group))));
- assertThat(jpaGroup, is(instanceOf(JpaGroup.class)));
- assertEquals(description, jpaGroup.getDescription());
- assertEquals(title, jpaGroup.getTitle());
- assertEquals(owner.getDisplayName(), jpaGroup.getOwner().getDisplayName());
- assertEquals(members.size(), jpaGroup.getMembers().size());
+ PageTemplate template = new PageTemplateImpl();
+ template.setName("name");
+ template.setSubPageTemplates(new ArrayList<PageTemplate>());
+ template.setDefaultTemplate(true);
+ template.setRenderSequence(1);
+ template.setPageTemplateRegions(new ArrayList<PageTemplateRegion>());
+ template.setPageLayout(new PageLayout());
+ template.setParentPageTemplate(new PageTemplateImpl());
+ template.setDescription("Description");
+ template.setPageType(PageType.USER);
+
+ JpaPageTemplate 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.getRenderSequence(), is(equalTo(template.getRenderSequence())));
+ assertThat(jpaTemplate.isDefaultTemplate(), is(equalTo(template.isDefaultTemplate())));
+ assertThat(jpaTemplate.getSubPageTemplates(), is(equalTo(template.getSubPageTemplates())));
}
}