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/19 21:02:18 UTC
svn commit: r1351801 - in /rave/branches/model_interfaces/rave-components:
rave-core/src/main/java/org/apache/rave/portal/model/impl/
rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/
rave-jpa/src/test/java/org/apache/rave/portal/model/co...
Author: mfranklin
Date: Tue Jun 19 19:02:18 2012
New Revision: 1351801
URL: http://svn.apache.org/viewvc?rev=1351801&view=rev
Log:
Updated User conversion RAVE-652
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java?rev=1351801&r1=1351800&r2=1351801&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java Tue Jun 19 19:02:18 2012
@@ -2,6 +2,7 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.Authority;
import org.apache.rave.portal.model.User;
+import org.springframework.security.core.GrantedAuthority;
import java.util.ArrayList;
import java.util.Collection;
@@ -16,6 +17,11 @@ public class AuthorityImpl implements Au
this.users = new ArrayList<User>();
}
+ public AuthorityImpl(GrantedAuthority grantedAuthority) {
+ this();
+ this.authority = grantedAuthority.getAuthority();
+ }
+
@Override
public String getAuthority() {
return authority;
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java?rev=1351801&r1=1351800&r2=1351801&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java Tue Jun 19 19:02:18 2012
@@ -9,6 +9,12 @@ public class PageLayoutImpl implements P
private Long renderSequence;
private boolean userSelectable;
+ public PageLayoutImpl() { }
+
+ public PageLayoutImpl(String code) {
+ this.code = code;
+ }
+
public String getCode() {
return code;
}
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java?rev=1351801&r1=1351800&r2=1351801&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java Tue Jun 19 19:02:18 2012
@@ -1,8 +1,11 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
+import org.apache.rave.portal.model.Authority;
import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.AuthorityImpl;
+import org.springframework.security.core.GrantedAuthority;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
@@ -37,7 +40,38 @@ public class JpaUserConverter implements
private void updateProperties(User source, JpaUser converted) {
converted.setEntityId(source.getId());
+ converted.setUsername(source.getUsername());
+ converted.setEmail(source.getEmail());
+ converted.setDisplayName(source.getDisplayName());
+ converted.setAdditionalName(source.getUsername());
+ converted.setFamilyName(source.getFamilyName());
+ converted.setGivenName(source.getGivenName());
+ converted.setHonorificPrefix(source.getHonorificPrefix());
+ converted.setHonorificSuffix(source.getHonorificSuffix());
+ converted.setPreferredName(source.getPreferredName());
+ converted.setAboutMe(source.getAboutMe());
+ converted.setStatus(source.getStatus());
+ converted.setAddresses(source.getAddresses());
+ converted.setOrganizations(source.getOrganizations());
+ converted.setProperties(source.getProperties());
+ converted.setFriends(source.getFriends());
+ converted.setPassword(source.getPassword());
+ converted.setConfirmPassword(source.getConfirmPassword());
+ converted.setDefaultPageLayout(source.getDefaultPageLayout());
+ converted.setDefaultPageLayoutCode(source.getDefaultPageLayoutCode());
+ converted.setEnabled(source.isEnabled());
+ converted.setExpired(source.isExpired());
+ converted.setLocked(source.isLocked());
+ converted.setOpenId(source.getOpenId());
+ converted.setForgotPasswordHash(source.getForgotPasswordHash());
+ converted.setForgotPasswordTime(source.getForgotPasswordTime());
+ updateAuthorities(source, converted);
+ }
- //TODO: Finish all properties
+ private void updateAuthorities(User source, JpaUser converted) {
+ converted.getAuthorities().clear();
+ for(GrantedAuthority grantedAuthority : source.getAuthorities()) {
+ converted.addAuthority(grantedAuthority instanceof Authority ? (Authority)grantedAuthority : new AuthorityImpl(grantedAuthority));
+ }
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java?rev=1351801&r1=1351800&r2=1351801&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java Tue Jun 19 19:02:18 2012
@@ -1,15 +1,20 @@
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.portal.model.JpaUser;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.AuthorityImpl;
+import org.apache.rave.portal.model.impl.PageLayoutImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import java.util.ArrayList;
+import java.util.Date;
+
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@@ -41,12 +46,65 @@ public class JpaUserConverterTest {
@Test
public void convertValid() {
User template = new UserImpl();
+ template.setUsername("TEST_A");
+ template.setEmail("TEST_B");
+ template.setDisplayName("TEST_C");
+ template.setAdditionalName("TEST_D");
+ template.setFamilyName("TEST_E");
+ template.setGivenName("TEST_F");
+ template.setHonorificPrefix("TEST_G");
+ template.setHonorificSuffix("TEST_H");
+ template.setPreferredName("TEST_I");
+ template.setAboutMe("TEST_J");
+ template.setStatus("TEST_K");
+ template.setAddresses(new ArrayList<Address>());
+ template.setOrganizations(new ArrayList<Organization>());
+ template.setProperties(new ArrayList<PersonProperty>());
+ template.setFriends(new ArrayList<Person>());
+ template.setPassword("TEST_L");
+ template.setConfirmPassword("TEST_M");
+ template.setDefaultPageLayout(new PageLayoutImpl("CODE"));
+ template.setDefaultPageLayoutCode("TEST_N");
+ template.setEnabled(true);
+ template.setExpired(true);
+ template.setLocked(true);
+ template.setOpenId("TEST_O");
+ template.setForgotPasswordHash("TEST_P");
+ template.setForgotPasswordTime(new Date());
+ template.addAuthority(new AuthorityImpl(new SimpleGrantedAuthority("HOO")));
+
JpaUser jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
assertThat(jpaTemplate, is(instanceOf(JpaUser.class)));
- //TODO: Add coverage for all methods
+ assertThat(jpaTemplate.getId(), is(equalTo(template.getId())));
+ assertThat(jpaTemplate.getUsername(), is(equalTo(template.getUsername())));
+ assertThat(jpaTemplate.getEmail(), is(equalTo(template.getEmail())));
+ assertThat(jpaTemplate.getDisplayName(), is(equalTo(template.getDisplayName())));
+ assertThat(jpaTemplate.getUsername(), is(equalTo(template.getUsername())));
+ assertThat(jpaTemplate.getFamilyName(), is(equalTo(template.getFamilyName())));
+ assertThat(jpaTemplate.getGivenName(), is(equalTo(template.getGivenName())));
+ assertThat(jpaTemplate.getHonorificPrefix(), is(equalTo(template.getHonorificPrefix())));
+ assertThat(jpaTemplate.getHonorificSuffix(), is(equalTo(template.getHonorificSuffix())));
+ assertThat(jpaTemplate.getPreferredName(), is(equalTo(template.getPreferredName())));
+ assertThat(jpaTemplate.getAboutMe(), is(equalTo(template.getAboutMe())));
+ assertThat(jpaTemplate.getStatus(), is(equalTo(template.getStatus())));
+ assertThat(jpaTemplate.getAddresses(), is(equalTo(template.getAddresses())));
+ assertThat(jpaTemplate.getOrganizations(), is(equalTo(template.getOrganizations())));
+ assertThat(jpaTemplate.getProperties(), is(equalTo(template.getProperties())));
+ assertThat(jpaTemplate.getFriends(), is(equalTo(template.getFriends())));
+ assertThat(jpaTemplate.getPassword(), is(equalTo(template.getPassword())));
+ assertThat(jpaTemplate.getConfirmPassword(), is(equalTo(template.getConfirmPassword())));
+ assertThat(jpaTemplate.getDefaultPageLayout().getCode(), is(equalTo(template.getDefaultPageLayout().getCode())));
+ assertThat(jpaTemplate.getDefaultPageLayoutCode(), is(equalTo(template.getDefaultPageLayoutCode())));
+ assertThat(jpaTemplate.isEnabled(), is(equalTo(template.isEnabled())));
+ assertThat(jpaTemplate.isExpired(), is(equalTo(template.isExpired())));
+ assertThat(jpaTemplate.isLocked(), is(equalTo(template.isLocked())));
+ assertThat(jpaTemplate.getOpenId(), is(equalTo(template.getOpenId())));
+ assertThat(jpaTemplate.getForgotPasswordHash(), is(equalTo(template.getForgotPasswordHash())));
+ assertThat(jpaTemplate.getForgotPasswordTime(), is(equalTo(template.getForgotPasswordTime())));
+ assertThat(jpaTemplate.getAuthorities().iterator().next().getAuthority(), is(equalTo(template.getAuthorities().iterator().next().getAuthority())));
}
}