X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2Fnature%2FCoworkerUserNatureMapper.java;h=d7448f91412d80da55047c6adfb157ea841cd32e;hb=490d9907457c43acfa965e7979ce5974bc1ba6ca;hp=0ea573ccbbac5549fa10924096687d1d3ced111f;hpb=54ca073308e726107a5e59b50ce875ebeb43b965;p=lgpl%2Fargeo-commons.git diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java index 0ea573ccb..d7448f914 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * 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.argeo.security.ldap.nature; import org.argeo.security.UserNature; @@ -10,11 +26,10 @@ public class CoworkerUserNatureMapper implements UserNatureMapper { public UserNature mapUserInfoFromContext(DirContextOperations ctx) { CoworkerNature nature = new CoworkerNature(); - nature.setDescription(ctx.getStringAttribute("description")); nature.setMobile(ctx.getStringAttribute("mobile")); nature.setTelephoneNumber(ctx.getStringAttribute("telephoneNumber")); - if (nature.getDescription() == null && nature.getMobile() == null + if (nature.getMobile() == null && nature.getTelephoneNumber() == null) return null; else @@ -24,9 +39,6 @@ public class CoworkerUserNatureMapper implements UserNatureMapper { public void mapUserInfoToContext(UserNature userInfoArg, DirContextAdapter ctx) { CoworkerNature nature = (CoworkerNature) userInfoArg; - if (nature.getDescription() != null) { - ctx.setAttributeValue("description", nature.getDescription()); - } if (nature.getMobile() == null || !nature.getMobile().equals("")) { ctx.setAttributeValue("mobile", nature.getMobile()); }