You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/10 17:09:36 UTC
svn commit: r1630920 [2/2] - in
/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client:
api/ template/ template/exception/
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactory.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactory.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactory.java Fri Oct 10 15:09:35 2014
@@ -1,85 +1,85 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-
-import org.apache.directory.api.ldap.model.entry.Attribute;
-import org.apache.directory.api.ldap.model.entry.Entry;
-import org.apache.directory.api.ldap.model.entry.Value;
-import org.apache.directory.api.ldap.model.message.AddRequest;
-import org.apache.directory.api.ldap.model.message.DeleteRequest;
-import org.apache.directory.api.ldap.model.message.ModifyRequest;
-import org.apache.directory.api.ldap.model.message.SearchRequest;
-import org.apache.directory.api.ldap.model.message.SearchScope;
-import org.apache.directory.api.ldap.model.name.Dn;
-
-
-/**
- * A factory for creating {@link org.apache.directory.api.ldap.model} objects.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface ModelFactory
-{
- public AddRequest newAddRequest( Entry entry );
-
-
- public Attribute newAttribute( String name, byte[]... values );
-
-
- public Attribute newAttribute( String name, String... values );
-
-
- public Attribute newAttribute( String name, Value<?>... values );
-
-
- public DeleteRequest newDeleteRequest( Dn dn );
-
-
- public Dn newDn( String dn );
-
-
- public Entry newEntry( String dn );
-
-
- public Entry newEntry( Dn dn );
-
-
- public ModifyRequest newModifyRequest( String dn );
-
-
- public ModifyRequest newModifyRequest( Dn dn );
-
-
- public SearchRequest newSearchRequest( String baseDn, String filter,
- SearchScope scope );
-
-
- public SearchRequest newSearchRequest( Dn baseDn, String filter,
- SearchScope scope );
-
-
- public SearchRequest newSearchRequest( String baseDn, String filter,
- SearchScope scope, String... attributes );
-
-
- public SearchRequest newSearchRequest( Dn baseDn, String filter,
- SearchScope scope, String... attributes );
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.message.AddRequest;
+import org.apache.directory.api.ldap.model.message.DeleteRequest;
+import org.apache.directory.api.ldap.model.message.ModifyRequest;
+import org.apache.directory.api.ldap.model.message.SearchRequest;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.name.Dn;
+
+
+/**
+ * A factory for creating {@link org.apache.directory.api.ldap.model} objects.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface ModelFactory
+{
+ public AddRequest newAddRequest( Entry entry );
+
+
+ public Attribute newAttribute( String name, byte[]... values );
+
+
+ public Attribute newAttribute( String name, String... values );
+
+
+ public Attribute newAttribute( String name, Value<?>... values );
+
+
+ public DeleteRequest newDeleteRequest( Dn dn );
+
+
+ public Dn newDn( String dn );
+
+
+ public Entry newEntry( String dn );
+
+
+ public Entry newEntry( Dn dn );
+
+
+ public ModifyRequest newModifyRequest( String dn );
+
+
+ public ModifyRequest newModifyRequest( Dn dn );
+
+
+ public SearchRequest newSearchRequest( String baseDn, String filter,
+ SearchScope scope );
+
+
+ public SearchRequest newSearchRequest( Dn baseDn, String filter,
+ SearchScope scope );
+
+
+ public SearchRequest newSearchRequest( String baseDn, String filter,
+ SearchScope scope, String... attributes );
+
+
+ public SearchRequest newSearchRequest( Dn baseDn, String filter,
+ SearchScope scope, String... attributes );
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactoryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactoryImpl.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactoryImpl.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactoryImpl.java Fri Oct 10 15:09:35 2014
@@ -1,173 +1,173 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-import org.apache.directory.api.ldap.model.entry.Attribute;
-import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
-import org.apache.directory.api.ldap.model.entry.DefaultEntry;
-import org.apache.directory.api.ldap.model.entry.Entry;
-import org.apache.directory.api.ldap.model.entry.Value;
-import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.api.ldap.model.message.AddRequest;
-import org.apache.directory.api.ldap.model.message.AddRequestImpl;
-import org.apache.directory.api.ldap.model.message.DeleteRequest;
-import org.apache.directory.api.ldap.model.message.DeleteRequestImpl;
-import org.apache.directory.api.ldap.model.message.ModifyRequest;
-import org.apache.directory.api.ldap.model.message.ModifyRequestImpl;
-import org.apache.directory.api.ldap.model.message.SearchRequest;
-import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
-import org.apache.directory.api.ldap.model.message.SearchScope;
-import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.ldap.client.template.exception.LdapRuntimeException;
-
-
-/**
- * The default implementation of {@link ModelFactory}.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-class ModelFactoryImpl implements ModelFactory
-{
- @Override
- public AddRequest newAddRequest( Entry entry )
- {
- return new AddRequestImpl().setEntry( entry );
- }
-
-
- @Override
- public Attribute newAttribute( String name, byte[]... values )
- {
- return new DefaultAttribute( name, values );
- }
-
-
- @Override
- public Attribute newAttribute( String name, String... values )
- {
- return new DefaultAttribute( name, values );
- }
-
-
- @Override
- public Attribute newAttribute( String name, Value<?>... values )
- {
- return new DefaultAttribute( name, values );
- }
-
-
- @Override
- public DeleteRequest newDeleteRequest( Dn dn )
- {
- return new DeleteRequestImpl()
- .setName( dn );
- }
-
-
- @Override
- public Dn newDn( String dn )
- {
- try
- {
- return new Dn( dn );
- }
- catch ( LdapInvalidDnException e )
- {
- throw new LdapRuntimeException( e );
- }
- }
-
-
- @Override
- public Entry newEntry( String dn )
- {
- return newEntry( newDn( dn ) );
- }
-
-
- @Override
- public Entry newEntry( Dn dn )
- {
- return new DefaultEntry( dn );
- }
-
-
- @Override
- public ModifyRequest newModifyRequest( String dn )
- {
- return newModifyRequest( newDn( dn ) );
- }
-
-
- @Override
- public ModifyRequest newModifyRequest( Dn dn )
- {
- return new ModifyRequestImpl().setName( dn );
- }
-
-
- @Override
- public SearchRequest newSearchRequest( String baseDn, String filter,
- SearchScope scope )
- {
- return newSearchRequest( newDn( baseDn ), filter, scope );
- }
-
-
- @Override
- public SearchRequest newSearchRequest( Dn baseDn, String filter,
- SearchScope scope )
- {
- return newSearchRequest( baseDn, filter, scope, ( String[] ) null );
- }
-
-
- @Override
- public SearchRequest newSearchRequest( String baseDn, String filter,
- SearchScope scope, String... attributes )
- {
- return newSearchRequest( newDn( baseDn ), filter, scope, attributes );
- }
-
-
- @Override
- public SearchRequest newSearchRequest( Dn baseDn, String filter,
- SearchScope scope, String... attributes )
- {
- SearchRequest searchRequest = null;
- try
- {
- searchRequest = new SearchRequestImpl()
- .setBase( baseDn )
- .setFilter( filter )
- .setScope( scope == null ? SearchScope.OBJECT : scope );
- if ( attributes != null && attributes.length > 0 )
- {
- searchRequest.addAttributes( attributes );
- }
- }
- catch ( LdapException e )
- {
- throw new LdapRuntimeException( e );
- }
- return searchRequest;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.message.AddRequest;
+import org.apache.directory.api.ldap.model.message.AddRequestImpl;
+import org.apache.directory.api.ldap.model.message.DeleteRequest;
+import org.apache.directory.api.ldap.model.message.DeleteRequestImpl;
+import org.apache.directory.api.ldap.model.message.ModifyRequest;
+import org.apache.directory.api.ldap.model.message.ModifyRequestImpl;
+import org.apache.directory.api.ldap.model.message.SearchRequest;
+import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.ldap.client.template.exception.LdapRuntimeException;
+
+
+/**
+ * The default implementation of {@link ModelFactory}.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+class ModelFactoryImpl implements ModelFactory
+{
+ @Override
+ public AddRequest newAddRequest( Entry entry )
+ {
+ return new AddRequestImpl().setEntry( entry );
+ }
+
+
+ @Override
+ public Attribute newAttribute( String name, byte[]... values )
+ {
+ return new DefaultAttribute( name, values );
+ }
+
+
+ @Override
+ public Attribute newAttribute( String name, String... values )
+ {
+ return new DefaultAttribute( name, values );
+ }
+
+
+ @Override
+ public Attribute newAttribute( String name, Value<?>... values )
+ {
+ return new DefaultAttribute( name, values );
+ }
+
+
+ @Override
+ public DeleteRequest newDeleteRequest( Dn dn )
+ {
+ return new DeleteRequestImpl()
+ .setName( dn );
+ }
+
+
+ @Override
+ public Dn newDn( String dn )
+ {
+ try
+ {
+ return new Dn( dn );
+ }
+ catch ( LdapInvalidDnException e )
+ {
+ throw new LdapRuntimeException( e );
+ }
+ }
+
+
+ @Override
+ public Entry newEntry( String dn )
+ {
+ return newEntry( newDn( dn ) );
+ }
+
+
+ @Override
+ public Entry newEntry( Dn dn )
+ {
+ return new DefaultEntry( dn );
+ }
+
+
+ @Override
+ public ModifyRequest newModifyRequest( String dn )
+ {
+ return newModifyRequest( newDn( dn ) );
+ }
+
+
+ @Override
+ public ModifyRequest newModifyRequest( Dn dn )
+ {
+ return new ModifyRequestImpl().setName( dn );
+ }
+
+
+ @Override
+ public SearchRequest newSearchRequest( String baseDn, String filter,
+ SearchScope scope )
+ {
+ return newSearchRequest( newDn( baseDn ), filter, scope );
+ }
+
+
+ @Override
+ public SearchRequest newSearchRequest( Dn baseDn, String filter,
+ SearchScope scope )
+ {
+ return newSearchRequest( baseDn, filter, scope, ( String[] ) null );
+ }
+
+
+ @Override
+ public SearchRequest newSearchRequest( String baseDn, String filter,
+ SearchScope scope, String... attributes )
+ {
+ return newSearchRequest( newDn( baseDn ), filter, scope, attributes );
+ }
+
+
+ @Override
+ public SearchRequest newSearchRequest( Dn baseDn, String filter,
+ SearchScope scope, String... attributes )
+ {
+ SearchRequest searchRequest = null;
+ try
+ {
+ searchRequest = new SearchRequestImpl()
+ .setBase( baseDn )
+ .setFilter( filter )
+ .setScope( scope == null ? SearchScope.OBJECT : scope );
+ if ( attributes != null && attributes.length > 0 )
+ {
+ searchRequest.addAttributes( attributes );
+ }
+ }
+ catch ( LdapException e )
+ {
+ throw new LdapRuntimeException( e );
+ }
+ return searchRequest;
+ }
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyOperation.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyOperation.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyOperation.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyOperation.java Fri Oct 10 15:09:35 2014
@@ -1,46 +1,46 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-
-import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.message.ResultResponse;
-import org.apache.directory.ldap.client.template.exception.PasswordException;
-
-
-/**
- * An callback for processing requests whose success/failure imply some sort
- * of password policy information.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface PasswordPolicyOperation
-{
- /**
- * Execute operations whose results imply somme sort of password policy
- * information.
- *
- * @return The final response of the operation
- * @throws PasswordException If there was a failure for a password policy
- * reason
- * @throws LdapException If there was an general ldap failure
- */
- public ResultResponse process() throws PasswordException, LdapException;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.message.ResultResponse;
+import org.apache.directory.ldap.client.template.exception.PasswordException;
+
+
+/**
+ * An callback for processing requests whose success/failure imply some sort
+ * of password policy information.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface PasswordPolicyOperation
+{
+ /**
+ * Execute operations whose results imply somme sort of password policy
+ * information.
+ *
+ * @return The final response of the operation
+ * @throws PasswordException If there was a failure for a password policy
+ * reason
+ * @throws LdapException If there was an general ldap failure
+ */
+ public ResultResponse process() throws PasswordException, LdapException;
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponder.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponder.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponder.java Fri Oct 10 15:09:35 2014
@@ -1,49 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-
-import org.apache.directory.ldap.client.template.exception.PasswordException;
-
-
-/**
- * A class for translating the outcome of a {@link PasswordPolicyOperation}.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface PasswordPolicyResponder
-{
- /**
- * Execute the <code>operation</code> and translate the outcome as follows:
- *
- * <ul>
- * <li>SUCCESS: return null</li>
- * <li>WARNING: return {@link PasswordWarning}</li>
- * <li>FAILURE: throw {@link PasswordException}</li>
- * </ul>
- *
- * @param operation An operation whose outcome implies password policy
- * information
- * @return A <code>PasswordWarning</code> if warnings are present, or null
- * if completely successful.
- * @throws PasswordException If the <code>operation</code> was a failure.
- */
- public PasswordWarning process( PasswordPolicyOperation operation ) throws PasswordException;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+
+import org.apache.directory.ldap.client.template.exception.PasswordException;
+
+
+/**
+ * A class for translating the outcome of a {@link PasswordPolicyOperation}.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface PasswordPolicyResponder
+{
+ /**
+ * Execute the <code>operation</code> and translate the outcome as follows:
+ *
+ * <ul>
+ * <li>SUCCESS: return null</li>
+ * <li>WARNING: return {@link PasswordWarning}</li>
+ * <li>FAILURE: throw {@link PasswordException}</li>
+ * </ul>
+ *
+ * @param operation An operation whose outcome implies password policy
+ * information
+ * @return A <code>PasswordWarning</code> if warnings are present, or null
+ * if completely successful.
+ * @throws PasswordException If the <code>operation</code> was a failure.
+ */
+ public PasswordWarning process( PasswordPolicyOperation operation ) throws PasswordException;
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponderImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponderImpl.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponderImpl.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordPolicyResponderImpl.java Fri Oct 10 15:09:35 2014
@@ -1,38 +1,38 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-
-import org.apache.directory.api.ldap.codec.api.LdapApiService;
-
-
-/**
- * The default implementation of {@link PasswordPolicyResponder}.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-final class PasswordPolicyResponderImpl extends AbstractPasswordPolicyResponder
- implements PasswordPolicyResponder
-{
- PasswordPolicyResponderImpl( LdapApiService ldapApiService )
- {
- super( ldapApiService );
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+
+import org.apache.directory.api.ldap.codec.api.LdapApiService;
+
+
+/**
+ * The default implementation of {@link PasswordPolicyResponder}.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+final class PasswordPolicyResponderImpl extends AbstractPasswordPolicyResponder
+ implements PasswordPolicyResponder
+{
+ PasswordPolicyResponderImpl( LdapApiService ldapApiService )
+ {
+ super( ldapApiService );
+ }
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarning.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarning.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarning.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarning.java Fri Oct 10 15:09:35 2014
@@ -1,56 +1,56 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-
-import java.io.Serializable;
-
-
-/**
- * A container for password warning information.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface PasswordWarning extends Serializable
-{
- /**
- * Returns the number of seconds before the password will expire.
- *
- * @return The number of seconds before the password will expire
- */
- public int getTimeBeforeExpiration();
-
-
- /**
- * Returns the number of remaining authentications before the account will
- * be locked.
- *
- * @return The number of authentications before lockout
- */
- public int getGraceAuthNsRemaining();
-
-
- /**
- * Returns true, if a password reset is required.
- *
- * @return True, if a password reset is required
- */
- public boolean isChangeAfterReset();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+
+import java.io.Serializable;
+
+
+/**
+ * A container for password warning information.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface PasswordWarning extends Serializable
+{
+ /**
+ * Returns the number of seconds before the password will expire.
+ *
+ * @return The number of seconds before the password will expire
+ */
+ public int getTimeBeforeExpiration();
+
+
+ /**
+ * Returns the number of remaining authentications before the account will
+ * be locked.
+ *
+ * @return The number of authentications before lockout
+ */
+ public int getGraceAuthNsRemaining();
+
+
+ /**
+ * Returns true, if a password reset is required.
+ *
+ * @return True, if a password reset is required
+ */
+ public boolean isChangeAfterReset();
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarningImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarningImpl.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarningImpl.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/PasswordWarningImpl.java Fri Oct 10 15:09:35 2014
@@ -1,89 +1,89 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-
-import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
-import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
-
-
-/**
- * The default implementation of {@link PasswordWarning}.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-class PasswordWarningImpl implements PasswordWarning
-{
- private static final long serialVersionUID = -8952246313604352357L;
-
- private int timeBeforeExpiration = -1;
- private int graceAuthNsRemaining = -1;
- private boolean changeAfterReset = false;
-
-
- private PasswordWarningImpl()
- {
- }
-
-
- static PasswordWarning newWarning( PasswordPolicy policy )
- {
- PasswordPolicyResponse response = policy.getResponse();
- if ( response != null )
- {
- PasswordWarningImpl policyWarning = new PasswordWarningImpl();
- policyWarning.timeBeforeExpiration = response.getTimeBeforeExpiration();
- policyWarning.graceAuthNsRemaining = response.getGraceAuthNRemaining();
- policyWarning.changeAfterReset = response.getPasswordPolicyError() ==
- PasswordPolicyErrorEnum.CHANGE_AFTER_RESET;
-
- if ( policyWarning.timeBeforeExpiration >= 0 || policyWarning.graceAuthNsRemaining >= 0
- || policyWarning.changeAfterReset )
- {
- // it actually is a warning!
- return policyWarning;
- }
- }
- return null;
- }
-
-
- @Override
- public int getTimeBeforeExpiration()
- {
- return timeBeforeExpiration;
- }
-
-
- @Override
- public int getGraceAuthNsRemaining()
- {
- return graceAuthNsRemaining;
- }
-
-
- @Override
- public boolean isChangeAfterReset()
- {
- return changeAfterReset;
- }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
+
+
+/**
+ * The default implementation of {@link PasswordWarning}.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+class PasswordWarningImpl implements PasswordWarning
+{
+ private static final long serialVersionUID = -8952246313604352357L;
+
+ private int timeBeforeExpiration = -1;
+ private int graceAuthNsRemaining = -1;
+ private boolean changeAfterReset = false;
+
+
+ private PasswordWarningImpl()
+ {
+ }
+
+
+ static PasswordWarning newWarning( PasswordPolicy policy )
+ {
+ PasswordPolicyResponse response = policy.getResponse();
+ if ( response != null )
+ {
+ PasswordWarningImpl policyWarning = new PasswordWarningImpl();
+ policyWarning.timeBeforeExpiration = response.getTimeBeforeExpiration();
+ policyWarning.graceAuthNsRemaining = response.getGraceAuthNRemaining();
+ policyWarning.changeAfterReset = response.getPasswordPolicyError() ==
+ PasswordPolicyErrorEnum.CHANGE_AFTER_RESET;
+
+ if ( policyWarning.timeBeforeExpiration >= 0 || policyWarning.graceAuthNsRemaining >= 0
+ || policyWarning.changeAfterReset )
+ {
+ // it actually is a warning!
+ return policyWarning;
+ }
+ }
+ return null;
+ }
+
+
+ @Override
+ public int getTimeBeforeExpiration()
+ {
+ return timeBeforeExpiration;
+ }
+
+
+ @Override
+ public int getGraceAuthNsRemaining()
+ {
+ return graceAuthNsRemaining;
+ }
+
+
+ @Override
+ public boolean isChangeAfterReset()
+ {
+ return changeAfterReset;
+ }
}
\ No newline at end of file
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/RequestBuilder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/RequestBuilder.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/RequestBuilder.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/RequestBuilder.java Fri Oct 10 15:09:35 2014
@@ -1,44 +1,44 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template;
-
-
-import org.apache.directory.api.ldap.model.exception.LdapException;
-
-
-/**
- * Edits a supplied request adding specifics.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface RequestBuilder<T>
-{
- /**
- * Modifies the provided request adding specific information to it.
- * The supplied request is typically a factory built request with just
- * its Dn set. It is the responsibility of this method to fill in all
- * of the details. The request will be sent to the LDAP server upon
- * upon returning from this method.
- *
- * @param request The request to be modified
- * @throws LdapException If something goes wrong
- */
- public void buildRequest( T request ) throws LdapException;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template;
+
+
+import org.apache.directory.api.ldap.model.exception.LdapException;
+
+
+/**
+ * Edits a supplied request adding specifics.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface RequestBuilder<T>
+{
+ /**
+ * Modifies the provided request adding specific information to it.
+ * The supplied request is typically a factory built request with just
+ * its Dn set. It is the responsibility of this method to fill in all
+ * of the details. The request will be sent to the LDAP server upon
+ * upon returning from this method.
+ *
+ * @param request The request to be modified
+ * @throws LdapException If something goes wrong
+ */
+ public void buildRequest( T request ) throws LdapException;
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRequestUnsuccessfulException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRequestUnsuccessfulException.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRequestUnsuccessfulException.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRequestUnsuccessfulException.java Fri Oct 10 15:09:35 2014
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template.exception;
-
-
-import org.apache.directory.api.ldap.model.message.ResultResponse;
-
-
-/**
- * An RuntimeException wrapper class that allows the user to choose to have
- * unsuccessful responses thrown as exceptions rather than checking the
- * response itself for process flow.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class LdapRequestUnsuccessfulException extends RuntimeException
-{
- private static final long serialVersionUID = 1982294624076306127L;
-
- private ResultResponse response;
-
-
- public LdapRequestUnsuccessfulException( ResultResponse response )
- {
- super();
- }
-
-
- public ResultResponse getResponse()
- {
- return response;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template.exception;
+
+
+import org.apache.directory.api.ldap.model.message.ResultResponse;
+
+
+/**
+ * An RuntimeException wrapper class that allows the user to choose to have
+ * unsuccessful responses thrown as exceptions rather than checking the
+ * response itself for process flow.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LdapRequestUnsuccessfulException extends RuntimeException
+{
+ private static final long serialVersionUID = 1982294624076306127L;
+
+ private ResultResponse response;
+
+
+ public LdapRequestUnsuccessfulException( ResultResponse response )
+ {
+ super();
+ }
+
+
+ public ResultResponse getResponse()
+ {
+ return response;
+ }
+
+}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRuntimeException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRuntimeException.java?rev=1630920&r1=1630919&r2=1630920&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRuntimeException.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/exception/LdapRuntimeException.java Fri Oct 10 15:09:35 2014
@@ -1,41 +1,41 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.directory.ldap.client.template.exception;
-
-
-import org.apache.directory.api.ldap.model.exception.LdapException;
-
-
-/**
- * An RuntimeException wrapper class for exceptions which add LDAP specific
- * information to Exceptions.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class LdapRuntimeException extends RuntimeException
-{
- private static final long serialVersionUID = 3618077059423567243L;
-
-
- public LdapRuntimeException( LdapException exception )
- {
- super( exception );
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.directory.ldap.client.template.exception;
+
+
+import org.apache.directory.api.ldap.model.exception.LdapException;
+
+
+/**
+ * An RuntimeException wrapper class for exceptions which add LDAP specific
+ * information to Exceptions.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LdapRuntimeException extends RuntimeException
+{
+ private static final long serialVersionUID = 3618077059423567243L;
+
+
+ public LdapRuntimeException( LdapException exception )
+ {
+ super( exception );
+ }
+}