From c937c97cbb8bdec28712a2c96c96ca2a4e271163 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Wed, 18 Jul 2007 22:27:36 +0000 Subject: [PATCH] Added ChainedOptions to the person sample, and made country and company into drop-down lists. --- .../0.9.0/chainedoptions-src-0.9.0.zip | Bin 0 -> 15249 bytes .../net.sf/chainedoptions-src/ivy-0.9.0.xml | 16 +++ .../0.9.0/chainedoptions-0.9.0.jar | Bin 0 -> 13038 bytes spring-ldap-person/.classpath | 1 + ...org.springframework.ide.eclipse.core.prefs | 5 + spring-ldap-person/.springBeans | 12 +-- spring-ldap-person/ivy.xml | 87 ++++++++-------- .../person/dao/CompanyContextMapper.java | 39 +++++++ .../ldap/samples/person/dao/CompanyDao.java | 27 +++++ .../samples/person/dao/CompanyDaoImpl.java | 57 ++++++++++ .../person/dao/CountryContextMapper.java | 41 ++++++++ .../ldap/samples/person/dao/CountryDao.java | 27 +++++ .../samples/person/dao/CountryDaoImpl.java | 58 +++++++++++ .../ldap/samples/person/domain/Company.java | 53 ++++++++++ .../ldap/samples/person/domain/Country.java | 63 ++++++++++++ .../person/options/CompanyConverter.java | 38 +++++++ .../samples/person/options/CompanyOption.java | 68 ++++++++++++ .../person/options/CountryConverter.java | 38 +++++++ .../samples/person/options/CountryOption.java | 60 +++++++++++ .../person/web/EditPersonFormAction.java | 34 +++++- .../webapp/WEB-INF/applicationContext.xml | 20 +++- .../WEB-INF/flows/detail-flow-beans.xml | 3 +- .../main/webapp/WEB-INF/flows/detail-flow.xml | 48 +++++---- .../main/webapp/WEB-INF/jsp/editDetails.jsp | 17 ++- .../webapp/WEB-INF/jsp/showAddCandidates.jsp | 2 +- .../main/webapp/WEB-INF/jsp/showDetails.jsp | 18 +--- .../main/webapp/WEB-INF/optionsContext.xml | 61 +++++++++++ .../src/main/webapp/WEB-INF/web.xml | 2 +- .../person/dao/CompanyDaoImplTest.java | 97 ++++++++++++++++++ .../person/dao/CountryDaoImplTest.java | 97 ++++++++++++++++++ .../person/web/DetailFlowExecutionTest.java | 25 +++++ 31 files changed, 1010 insertions(+), 104 deletions(-) create mode 100644 repository/net.sf/chainedoptions-src/0.9.0/chainedoptions-src-0.9.0.zip create mode 100644 repository/net.sf/chainedoptions-src/ivy-0.9.0.xml create mode 100644 repository/net.sf/chainedoptions/0.9.0/chainedoptions-0.9.0.jar create mode 100644 spring-ldap-person/.settings/org.springframework.ide.eclipse.core.prefs create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyContextMapper.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDao.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDaoImpl.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryContextMapper.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDao.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDaoImpl.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Company.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Country.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyConverter.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyOption.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryConverter.java create mode 100644 spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryOption.java create mode 100644 spring-ldap-person/src/main/webapp/WEB-INF/optionsContext.xml create mode 100644 spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CompanyDaoImplTest.java create mode 100644 spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CountryDaoImplTest.java diff --git a/repository/net.sf/chainedoptions-src/0.9.0/chainedoptions-src-0.9.0.zip b/repository/net.sf/chainedoptions-src/0.9.0/chainedoptions-src-0.9.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..ab2e19b1924503ca3bce6afabd307a96e7b8e86d GIT binary patch literal 15249 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 literal 0 HcmV?d00001 diff --git a/repository/net.sf/chainedoptions-src/ivy-0.9.0.xml b/repository/net.sf/chainedoptions-src/ivy-0.9.0.xml new file mode 100644 index 00000000..b4440e67 --- /dev/null +++ b/repository/net.sf/chainedoptions-src/ivy-0.9.0.xml @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/repository/net.sf/chainedoptions/0.9.0/chainedoptions-0.9.0.jar b/repository/net.sf/chainedoptions/0.9.0/chainedoptions-0.9.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..b4cb820b6c051c17e00c1a09964188945c4ae892 GIT binary patch literal 13038 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 W;Lo*kARv_Izq{wV)gML*=>GxL4M21N literal 0 HcmV?d00001 diff --git a/spring-ldap-person/.classpath b/spring-ldap-person/.classpath index cd5ecaa7..04443d8f 100644 --- a/spring-ldap-person/.classpath +++ b/spring-ldap-person/.classpath @@ -16,6 +16,7 @@ + diff --git a/spring-ldap-person/.settings/org.springframework.ide.eclipse.core.prefs b/spring-ldap-person/.settings/org.springframework.ide.eclipse.core.prefs new file mode 100644 index 00000000..70b0cd2d --- /dev/null +++ b/spring-ldap-person/.settings/org.springframework.ide.eclipse.core.prefs @@ -0,0 +1,5 @@ +#Tue Jul 17 23:38:33 CEST 2007 +eclipse.preferences.version=1 +org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true +org.springframework.ide.eclipse.core.builders.enable.beansvalidator=true +org.springframework.ide.eclipse.core.builders.enable.webflowvalidator=true diff --git a/spring-ldap-person/.springBeans b/spring-ldap-person/.springBeans index 4857f5db..32e7378d 100644 --- a/spring-ldap-person/.springBeans +++ b/spring-ldap-person/.springBeans @@ -6,13 +6,11 @@ src/main/webapp/WEB-INF/flows/detail-group-flow-beans.xml src/main/webapp/WEB-INF/flows/search-group-flow-beans.xml - src/webapp/WEB-INF/apacheDsContext.xml src/main/webapp/WEB-INF/flows/search-flow-beans.xml - src/webapp/WEB-INF/applicationContext.xml - src/webapp/WEB-INF/applicationContext-acegi-security.xml - src/webapp/WEB-INF/ldaptemplate-servlet.xml src/main/webapp/WEB-INF/flows/detail-flow-beans.xml src/main/webapp/WEB-INF/ldaptemplate-webflow-config.xml + src/main/webapp/WEB-INF/optionsContext.xml + src/main/webapp/WEB-INF/applicationContext.xml @@ -20,15 +18,13 @@ false false - src/webapp/WEB-INF/apacheDsContext.xml - src/webapp/WEB-INF/applicationContext.xml - src/webapp/WEB-INF/applicationContext-acegi-security.xml - src/webapp/WEB-INF/ldaptemplate-servlet.xml src/main/webapp/WEB-INF/flows/detail-flow-beans.xml src/main/webapp/WEB-INF/flows/detail-group-flow-beans.xml src/main/webapp/WEB-INF/flows/search-flow-beans.xml src/main/webapp/WEB-INF/flows/search-group-flow-beans.xml src/main/webapp/WEB-INF/ldaptemplate-webflow-config.xml + src/main/webapp/WEB-INF/applicationContext.xml + src/main/webapp/WEB-INF/optionsContext.xml diff --git a/spring-ldap-person/ivy.xml b/spring-ldap-person/ivy.xml index 0f3f66aa..53ddb709 100644 --- a/spring-ldap-person/ivy.xml +++ b/spring-ldap-person/ivy.xml @@ -1,9 +1,9 @@ - - @@ -16,105 +16,110 @@ - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyContextMapper.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyContextMapper.java new file mode 100644 index 00000000..3dc2b43c --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyContextMapper.java @@ -0,0 +1,39 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DirContextOperations; +import org.springframework.ldap.samples.person.domain.Company; + +/** + * Maps from DirContextOperations (DirContextAdapters, really) to Company + * objects. A DN for a company will be of the form ou=[name],c=country + * + * @author Ulrik Sandberg + */ +public class CompanyContextMapper implements ContextMapper { + + /* + * @see org.springframework.ldap.core.ContextMapper#mapFromContext(java.lang.Object) + */ + public Object mapFromContext(Object ctx) { + DirContextOperations dirContext = (DirContextOperations) ctx; + Company company = new Company(); + company.setName(dirContext.getStringAttribute("ou")); + return company; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDao.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDao.java new file mode 100644 index 00000000..dbab51a8 --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDao.java @@ -0,0 +1,27 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import java.util.List; + +/** + * Data Access Object interface for the Company entity. + * + * @author Ulrik Sandberg + */ +public interface CompanyDao { + public List findByCountry(String country); +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDaoImpl.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDaoImpl.java new file mode 100644 index 00000000..be22cbff --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CompanyDaoImpl.java @@ -0,0 +1,57 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import java.util.List; + +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DistinguishedName; +import org.springframework.ldap.core.LdapOperations; +import org.springframework.ldap.filter.EqualsFilter; + +/** + * Default implementation of CompanyDao. This implementation uses + * DirContextOperations (DirContextAdapter really, but for mock testing purposes + * we use the interface) for managing attribute values. It has been specified in + * the Spring Context that the DirObjectFactory should be used when creating + * objects from contexts, which defaults to creating DirContextAdapter objects. + * This means that we can use a ContextMapper to map from the found contexts to + * our domain objects. + * + * @author Ulrik Sandberg + */ +public class CompanyDaoImpl implements CompanyDao { + /** + * The template object that performs all data access work. + */ + LdapOperations ldapOperations; + + public List findByCountry(String country) { + EqualsFilter filter = new EqualsFilter("objectclass", "organizationalUnit"); + DistinguishedName base = new DistinguishedName(); + base.add("c", country); + return ldapOperations.search(base, filter.toString(), + getContextMapper()); + } + + ContextMapper getContextMapper() { + return new CompanyContextMapper(); + } + + public void setLdapOperations(LdapOperations ldapOperations) { + this.ldapOperations = ldapOperations; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryContextMapper.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryContextMapper.java new file mode 100644 index 00000000..425f6902 --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryContextMapper.java @@ -0,0 +1,41 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DirContextOperations; +import org.springframework.ldap.samples.person.domain.Country; + +/** + * Maps from DirContextOperations (DirContextAdapters, really) to Country + * objects. A DN for a country will be of the form c=[name] + * + * @author Ulrik Sandberg + */ +public class CountryContextMapper implements ContextMapper { + + /* + * @see org.springframework.ldap.core.ContextMapper#mapFromContext(java.lang.Object) + */ + public Object mapFromContext(Object ctx) { + DirContextOperations dirContext = (DirContextOperations) ctx; + Country country = new Country(); + country.setName(dirContext.getStringAttribute("c")); + // we don't use country codes, so just use the country name as code + country.setCode(country.getName()); + return country; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDao.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDao.java new file mode 100644 index 00000000..77d7b0d3 --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDao.java @@ -0,0 +1,27 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import java.util.List; + +/** + * Data Access Object interface for the Country entity. + * + * @author Ulrik Sandberg + */ +public interface CountryDao { + public List findAll(); +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDaoImpl.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDaoImpl.java new file mode 100644 index 00000000..9cbc56df --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/CountryDaoImpl.java @@ -0,0 +1,58 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import java.util.List; + +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DistinguishedName; +import org.springframework.ldap.core.LdapOperations; +import org.springframework.ldap.filter.EqualsFilter; + +/** + * Default implementation of CountryDao. This implementation uses + * DirContextOperations (DirContextAdapter really, but for mock testing purposes + * we use the interface) for managing attribute values. It has been specified in + * the Spring Context that the DirObjectFactory should be used when creating + * objects from contexts, which defaults to creating DirContextAdapter objects. + * This means that we can use a ContextMapper to map from the found contexts to + * our domain objects. + * + * @author Ulrik Sandberg + */ +public class CountryDaoImpl implements CountryDao { + /** + * The template object that performs all data access work. + */ + LdapOperations ldapOperations; + + /* + * @see org.springframework.ldap.samples.person.dao.CountryDao#findAll() + */ + public List findAll() { + EqualsFilter filter = new EqualsFilter("objectclass", "country"); + return ldapOperations.search(DistinguishedName.EMPTY_PATH, filter + .encode(), getContextMapper()); + } + + ContextMapper getContextMapper() { + return new CountryContextMapper(); + } + + public void setLdapOperations(LdapOperations ldapOperations) { + this.ldapOperations = ldapOperations; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Company.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Company.java new file mode 100644 index 00000000..dc3e3f31 --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Company.java @@ -0,0 +1,53 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.domain; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.springframework.core.style.ToStringCreator; + +/** + * Simple class representing a company. + * + * @author Ulrik Sandberg + */ +public class Company { + + private String name; + + public boolean equals(Object obj) { + if (obj == null || getClass() != obj.getClass()) { + return false; + } + return EqualsBuilder.reflectionEquals(this, obj); + } + + public int hashCode() { + return HashCodeBuilder.reflectionHashCode(this); + } + + public String toString() { + return new ToStringCreator(this).toString(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Country.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Country.java new file mode 100644 index 00000000..80edeccd --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/domain/Country.java @@ -0,0 +1,63 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.domain; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.springframework.core.style.ToStringCreator; + +/** + * Simple class representing a country. + * + * @author Ulrik Sandberg + */ +public class Country { + + private String code; + + private String name; + + public boolean equals(Object obj) { + if (obj == null || getClass() != obj.getClass()) { + return false; + } + return EqualsBuilder.reflectionEquals(this, obj); + } + + public int hashCode() { + return HashCodeBuilder.reflectionHashCode(this); + } + + public String toString() { + return new ToStringCreator(this).toString(); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyConverter.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyConverter.java new file mode 100644 index 00000000..914068f4 --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyConverter.java @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.options; + +import net.sf.chainedoptions.AbstractBeanConverter; +import net.sf.chainedoptions.LabelValueBean; + +import org.springframework.ldap.samples.person.domain.Company; + +/** + * Responsible for converting the properties of a Company domain object into a + * LabelValueBean. + * + * @author Ulrik Sandberg + */ +public class CompanyConverter extends AbstractBeanConverter { + + /* + * @see net.sf.chainedoptions.AbstractBeanConverter#convertBean(java.lang.Object) + */ + protected LabelValueBean convertBean(Object bean) { + Company company = (Company) bean; + return new LabelValueBean(company.getName(), company.getName()); + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyOption.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyOption.java new file mode 100644 index 00000000..a62fa49e --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CompanyOption.java @@ -0,0 +1,68 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.options; + +import java.util.List; + +import net.sf.chainedoptions.AbstractChainedOption; +import net.sf.chainedoptions.BeanConverter; +import net.sf.chainedoptions.ChainedOptionStrategy; + +import org.springframework.ldap.samples.person.dao.CompanyDao; +import org.springframework.util.Assert; + +/** + * Responsible for retrieving available companies for a given country, sorting + * them, and adjusting the command object if necessary. Collaborates with + * {@link ChainedOptionStrategy}, {@link BeanConverter}, {@link CompanyDao}. + * + * @author Ulrik Sandberg + */ +public class CompanyOption extends AbstractChainedOption { + + private String countryProperty; + + private CompanyDao companyDao; + + /* + * @see net.sf.chainedoptions.AbstractChainedOption#retrieveOptions(java.lang.Object, + * java.lang.Object) + */ + public List retrieveOptions(Object command, Object context) { + String country = (String) getProperty(command, countryProperty); + List companyBeans = companyDao.findByCountry(country); + List companies = getConverter().convert(companyBeans); + return getStrategy(command).adjustAndSort(companies, context); + } + + /* + * @see net.sf.chainedoptions.AbstractChainedOption#initChainedOption() + */ + protected void initChainedOption() { + super.initChainedOption(); + Assert.notNull(companyDao, "Property ÕcompanyDaoÕ must be set"); + Assert.notNull(countryProperty, "Property ÕcountryPropertyÕ must be set"); + Assert.notNull(getConverter(), "Property ÕconverterÕ must be set"); + } + + public void setCompanyDao(CompanyDao companyDao) { + this.companyDao = companyDao; + } + + public void setCountryProperty(String countryProperty) { + this.countryProperty = countryProperty; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryConverter.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryConverter.java new file mode 100644 index 00000000..abd7ea05 --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryConverter.java @@ -0,0 +1,38 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.options; + +import org.springframework.ldap.samples.person.domain.Country; + +import net.sf.chainedoptions.AbstractBeanConverter; +import net.sf.chainedoptions.LabelValueBean; + +/** + * Responsible for converting the properties of a Country domain object into a + * LabelValueBean. + * + * @author Ulrik Sandberg + */ +public class CountryConverter extends AbstractBeanConverter { + + /* + * @see net.sf.chainedoptions.AbstractBeanConverter#convertBean(java.lang.Object) + */ + protected LabelValueBean convertBean(Object bean) { + Country country = (Country) bean; + return new LabelValueBean(country.getName(), country.getCode()); + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryOption.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryOption.java new file mode 100644 index 00000000..350c017b --- /dev/null +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/options/CountryOption.java @@ -0,0 +1,60 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.options; + +import java.util.List; + +import net.sf.chainedoptions.AbstractChainedOption; +import net.sf.chainedoptions.BeanConverter; +import net.sf.chainedoptions.ChainedOptionStrategy; + +import org.springframework.ldap.samples.person.dao.CountryDao; +import org.springframework.util.Assert; + +/** + * Responsible for retrieving available countries, sorting them, and adjusting + * the command object if necessary. Collaborates with + * {@link ChainedOptionStrategy}, {@link BeanConverter}, {@link CountryDao}. + * + * @author Ulrik Sandberg + */ +public class CountryOption extends AbstractChainedOption { + + private CountryDao countryDao; + + /* + * @see net.sf.chainedoptions.AbstractChainedOption#retrieveOptions(java.lang.Object, + * java.lang.Object) + */ + public List retrieveOptions(Object command, Object context) { + List countryBeans = countryDao.findAll(); + List countries = getConverter().convert(countryBeans); + return getStrategy(command).adjustAndSort(countries, context); + } + + /* + * @see net.sf.chainedoptions.AbstractChainedOption#initChainedOption() + */ + protected void initChainedOption() { + super.initChainedOption(); + Assert.notNull(countryDao, "Property ÕcountryDaoÕ must be set"); + Assert.notNull(getConverter(), "Property ÕconverterÕ must be set"); + } + + public void setCountryDao(CountryDao countryDao) { + this.countryDao = countryDao; + } +} diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/web/EditPersonFormAction.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/web/EditPersonFormAction.java index c7797d0a..99f9bdfc 100644 --- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/web/EditPersonFormAction.java +++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/web/EditPersonFormAction.java @@ -16,23 +16,28 @@ package org.springframework.ldap.samples.person.web; +import net.sf.chainedoptions.ChainedOptionManager; + import org.springframework.beans.PropertyEditorRegistry; import org.springframework.beans.propertyeditors.StringArrayPropertyEditor; +import org.springframework.util.Assert; import org.springframework.webflow.action.FormAction; +import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; /** * Action implementation that handles edit of a person. Registers appropriate - * property editors. + * property editors, and provides an action method for setting up reference + * data. * * @author Mattias Arthursson - * + * @author Ulrik Sandberg */ public class EditPersonFormAction extends FormAction { + private ChainedOptionManager chainedOptionManager; + /* - * (non-Javadoc) - * * @see org.springframework.webflow.action.FormAction#registerPropertyEditors(org.springframework.webflow.execution.RequestContext, * org.springframework.beans.PropertyEditorRegistry) */ @@ -41,4 +46,25 @@ public class EditPersonFormAction extends FormAction { registry.registerCustomEditor(String[].class, new StringArrayPropertyEditor()); } + + public Event referenceData(RequestContext context) throws Exception { + if (logger.isDebugEnabled()) { + logger.debug("Executing referenceData"); + } + + Object formObject = getFormObject(context); + chainedOptionManager.referenceData(context.getRequestScope().asMap(), + formObject, null); + return success(); + } + + protected void initAction() { + Assert.notNull(chainedOptionManager, + "The property 'chainedOptionManager' must not be null"); + } + + public void setChainedOptionManager( + ChainedOptionManager chainedOptionManager) { + this.chainedOptionManager = chainedOptionManager; + } } diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml index 92d006d6..429e288e 100644 --- a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml +++ b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml @@ -73,11 +73,21 @@ - - - - + + + + + + + + + + + + diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow-beans.xml b/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow-beans.xml index e10ecb70..ed8022db 100644 --- a/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow-beans.xml +++ b/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow-beans.xml @@ -9,7 +9,8 @@ - + + \ No newline at end of file diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow.xml b/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow.xml index 1d8c5c1c..9ec184cb 100644 --- a/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow.xml +++ b/spring-ldap-person/src/main/webapp/WEB-INF/flows/detail-flow.xml @@ -28,28 +28,36 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/editDetails.jsp b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/editDetails.jsp index 2da82db7..5d7850bc 100644 --- a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/editDetails.jsp +++ b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/editDetails.jsp @@ -24,26 +24,23 @@ - Company - + Country + - Country - + Company + Phone - - Description - - - - + + + diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showAddCandidates.jsp b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showAddCandidates.jsp index 58f6f3f3..79790f56 100644 --- a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showAddCandidates.jsp +++ b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showAddCandidates.jsp @@ -37,8 +37,8 @@ ${person.fullName} - ${person.company} ${person.country} + ${person.company} ${person.phone} diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showDetails.jsp b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showDetails.jsp index 91a772ad..7d6641ce 100644 --- a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showDetails.jsp +++ b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/showDetails.jsp @@ -10,31 +10,23 @@ Person Details -
+
Name ${person.fullName} - - Company - ${person.company} - Country ${person.country} - Phone - ${person.phone} + Company + ${person.company} - Description - - - ${description}
- - + Phone + ${person.phone} diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/optionsContext.xml b/spring-ldap-person/src/main/webapp/WEB-INF/optionsContext.xml new file mode 100644 index 00000000..34ca51ce --- /dev/null +++ b/spring-ldap-person/src/main/webapp/WEB-INF/optionsContext.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + country + + + countries + + + + + + + + + + + + + + + company + + + companies + + + country + + + + + + + + + diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/web.xml b/spring-ldap-person/src/main/webapp/WEB-INF/web.xml index 3c3ccb4d..fd27f77c 100644 --- a/spring-ldap-person/src/main/webapp/WEB-INF/web.xml +++ b/spring-ldap-person/src/main/webapp/WEB-INF/web.xml @@ -8,7 +8,7 @@ version="2.4"> LdapTemplate Example contextConfigLocation - /WEB-INF/applicationContext.xml /WEB-INF/applicationContext-acegi-security.xml + /WEB-INF/applicationContext.xml /WEB-INF/applicationContext-acegi-security.xml /WEB-INF/optionsContext.xml diff --git a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CompanyDaoImplTest.java b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CompanyDaoImplTest.java new file mode 100644 index 00000000..83d0dc36 --- /dev/null +++ b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CompanyDaoImplTest.java @@ -0,0 +1,97 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import java.util.Collections; +import java.util.List; + +import junit.framework.TestCase; + +import org.easymock.MockControl; +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DistinguishedName; +import org.springframework.ldap.core.LdapOperations; + +/** + * Unit tests for the CompanyDaoImpl class. + * + * @author Ulrik Sandberg + */ +public class CompanyDaoImplTest extends TestCase { + + private MockControl ldapOperationsControl; + + private LdapOperations ldapOperationsMock; + + private MockControl contextMapperControl; + + private ContextMapper contextMapperMock; + + private CompanyDaoImpl tested; + + protected void setUp() throws Exception { + super.setUp(); + ldapOperationsControl = MockControl.createControl(LdapOperations.class); + ldapOperationsMock = (LdapOperations) ldapOperationsControl.getMock(); + + contextMapperControl = MockControl.createControl(ContextMapper.class); + contextMapperMock = (ContextMapper) contextMapperControl.getMock(); + + tested = new CompanyDaoImpl() { + ContextMapper getContextMapper() { + return contextMapperMock; + } + }; + tested.setLdapOperations(ldapOperationsMock); + } + + protected void tearDown() throws Exception { + super.tearDown(); + + ldapOperationsControl = null; + ldapOperationsMock = null; + + contextMapperControl = null; + contextMapperMock = null; + + tested = null; + } + + protected void replay() { + ldapOperationsControl.replay(); + contextMapperControl.replay(); + } + + protected void verify() { + ldapOperationsControl.verify(); + contextMapperControl.verify(); + } + + public void testFindByCountry() { + List expectedList = Collections.singletonList(null); + ldapOperationsControl.expectAndReturn(ldapOperationsMock.search( + new DistinguishedName("c=Sweden"), "(objectclass=organizationalUnit)", + contextMapperMock), expectedList); + + replay(); + + List result = tested.findByCountry("Sweden"); + + verify(); + + assertSame(expectedList, result); + } +} diff --git a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CountryDaoImplTest.java b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CountryDaoImplTest.java new file mode 100644 index 00000000..49d9f2bd --- /dev/null +++ b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/CountryDaoImplTest.java @@ -0,0 +1,97 @@ +/* + * Copyright 2005-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.ldap.samples.person.dao; + +import java.util.Collections; +import java.util.List; + +import junit.framework.TestCase; + +import org.easymock.MockControl; +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DistinguishedName; +import org.springframework.ldap.core.LdapOperations; + +/** + * Unit tests for the CountryDaoImpl class. + * + * @author Ulrik Sandberg + */ +public class CountryDaoImplTest extends TestCase { + + private MockControl ldapOperationsControl; + + private LdapOperations ldapOperationsMock; + + private MockControl contextMapperControl; + + private ContextMapper contextMapperMock; + + private CountryDaoImpl tested; + + protected void setUp() throws Exception { + super.setUp(); + ldapOperationsControl = MockControl.createControl(LdapOperations.class); + ldapOperationsMock = (LdapOperations) ldapOperationsControl.getMock(); + + contextMapperControl = MockControl.createControl(ContextMapper.class); + contextMapperMock = (ContextMapper) contextMapperControl.getMock(); + + tested = new CountryDaoImpl() { + ContextMapper getContextMapper() { + return contextMapperMock; + } + }; + tested.setLdapOperations(ldapOperationsMock); + } + + protected void tearDown() throws Exception { + super.tearDown(); + + ldapOperationsControl = null; + ldapOperationsMock = null; + + contextMapperControl = null; + contextMapperMock = null; + + tested = null; + } + + protected void replay() { + ldapOperationsControl.replay(); + contextMapperControl.replay(); + } + + protected void verify() { + ldapOperationsControl.verify(); + contextMapperControl.verify(); + } + + public void testFindAll() { + List expectedList = Collections.singletonList(null); + ldapOperationsControl.expectAndReturn(ldapOperationsMock.search( + DistinguishedName.EMPTY_PATH, "(objectclass=country)", + contextMapperMock), expectedList); + + replay(); + + List result = tested.findAll(); + + verify(); + + assertSame(expectedList, result); + } +} diff --git a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/web/DetailFlowExecutionTest.java b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/web/DetailFlowExecutionTest.java index fc1ad40b..9ad6e7a2 100644 --- a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/web/DetailFlowExecutionTest.java +++ b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/web/DetailFlowExecutionTest.java @@ -15,6 +15,10 @@ */ package org.springframework.ldap.samples.person.web; +import java.util.HashMap; + +import net.sf.chainedoptions.ChainedOptionManager; + import org.easymock.MockControl; import org.springframework.ldap.samples.person.domain.Person; import org.springframework.ldap.samples.person.service.PersonService; @@ -31,6 +35,10 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { private PersonService personServiceMock; + private MockControl chainedOptionManagerControl; + + private ChainedOptionManager chainedOptionManagerMock; + private MutableAttributeMap attributeMap; protected void setUp() throws Exception { @@ -39,6 +47,9 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { personServiceControl = MockControl.createControl(PersonService.class); personServiceMock = (PersonService) personServiceControl.getMock(); + chainedOptionManagerControl = MockControl.createControl(ChainedOptionManager.class); + chainedOptionManagerMock = (ChainedOptionManager) chainedOptionManagerControl.getMock(); + attributeMap = new LocalAttributeMap(); attributeMap.put("country", "Sweden"); attributeMap.put("company", "company1"); @@ -49,14 +60,18 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { super.tearDown(); personServiceControl = null; personServiceMock = null; + chainedOptionManagerControl = null; + chainedOptionManagerMock = null; } protected void replay() { personServiceControl.replay(); + chainedOptionManagerControl.replay(); } protected void verify() { personServiceControl.verify(); + chainedOptionManagerControl.verify(); } public void testStartFlow() { @@ -84,6 +99,7 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { public void testEdit() { expectFindByPrimaryKey(); + expectReferenceData(); replay(); startFlow(attributeMap); @@ -97,6 +113,7 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { public void testCancel() { expectFindByPrimaryKey(); + expectReferenceData(); replay(); startFlow(attributeMap); @@ -111,6 +128,7 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { public void testSubmit() { expectFindByPrimaryKey(); + expectReferenceData(); expectUpdate(); replay(); @@ -124,6 +142,12 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { assertModelAttributeNotNull("person", view); } + private void expectReferenceData() { + Person person = setupPerson(); + HashMap map = new HashMap(); + chainedOptionManagerMock.referenceData(map, person, null); + } + private void expectFindByPrimaryKey() { expectFindByPrimaryKey(1); } @@ -163,5 +187,6 @@ public class DetailFlowExecutionTest extends AbstractXmlFlowExecutionTests { */ protected void registerMockServices(MockFlowServiceLocator serviceRegistry) { serviceRegistry.registerBean("personService", personServiceMock); + serviceRegistry.registerBean("editPersonChainedOptionManager", chainedOptionManagerMock); } } \ No newline at end of file