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 2015/09/10 17:14:11 UTC
svn commit: r1702274 - in /directory/shared/trunk:
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/
ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/
ldap/extras/trigger/src/main/java/org/apache/directory/a...
Author: elecharny
Date: Thu Sep 10 15:14:10 2015
New Revision: 1702274
URL: http://svn.apache.org/r1702274
Log:
o Added the remove( String ) operation on the ModifyRequest to be able to remove an attributeType by its name
o Fixed the ModifyRequest javadoc for the remove operation
Modified:
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java
directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ModifyRequestImplTest.java
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java?rev=1702274&r1=1702273&r2=1702274&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java Thu Sep 10 15:14:10 2015
@@ -306,6 +306,17 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ public ModifyRequest remove( String attributeName )
+ {
+ getDecorated().remove( attributeName );
+
+ return this;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
public ModifyRequest addModification( Attribute attr, ModificationOperation modOp )
{
getDecorated().addModification( attr, modOp );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1702274&r1=1702273&r2=1702274&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java Thu Sep 10 15:14:10 2015
@@ -233,6 +233,17 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ public ModifyRequest remove( String attributeName )
+ {
+ getDecorated().remove( attributeName );
+
+ return this;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
public ModifyRequest addModification( Attribute attr, ModificationOperation modOp )
{
getDecorated().addModification( attr, modOp );
Modified: directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java?rev=1702274&r1=1702273&r2=1702274&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java (original)
+++ directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java Thu Sep 10 15:14:10 2015
@@ -386,6 +386,11 @@ public abstract class StoredProcedurePar
}
}
+ /**
+ *
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public static final class ModifyDN_NEW_DN extends StoredProcedureParameter
{
private static ModifyDN_NEW_DN instance = new ModifyDN_NEW_DN( "$oldRDN" );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java?rev=1702274&r1=1702273&r2=1702274&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java Thu Sep 10 15:14:10 2015
@@ -151,7 +151,7 @@ public interface ModifyRequest extends S
* marks a given attribute for removal with the given
* values from the target entry.
*
- * @param attributeName name of the attribute to be added
+ * @param attributeName name of the attribute to be removed
* @param attributeValue values of the attribute
* @return The ModifyRequest instance
*/
@@ -168,13 +168,23 @@ public interface ModifyRequest extends S
*
* marks a given attribute for removal from the target entry.
*
- * @param attr the attribute to be added
+ * @param attr the attribute to be removed
* @return The ModifyRequest instance
*/
ModifyRequest remove( Attribute attr );
/**
+ *
+ * marks a given attribute name for removal from the target entry.
+ *
+ * @param attributeName the attribute to be removed
+ * @return The ModifyRequest instance
+ */
+ ModifyRequest remove( String attributeName );
+
+
+ /**
* Add a modification
* @param attr The attribute to be modified
* @param modOp The operation
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java?rev=1702274&r1=1702273&r2=1702274&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java Thu Sep 10 15:14:10 2015
@@ -259,6 +259,17 @@ public class ModifyRequestImpl extends A
/**
* {@inheritDoc}
*/
+ public ModifyRequest remove( String attributerName )
+ {
+ addModification( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attributerName ) );
+
+ return this;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
public ModifyRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ModifyRequestImplTest.java?rev=1702274&r1=1702273&r2=1702274&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ModifyRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ModifyRequestImplTest.java Thu Sep 10 15:14:10 2015
@@ -521,6 +521,12 @@ public class ModifyRequestImplTest
{
return this;
}
+
+
+ public ModifyRequest remove( String attributerName )
+ {
+ return this;
+ }
};
ModifyRequestImpl req1 = getRequest();