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 2016/12/17 15:18:17 UTC
svn commit: r1774774 [9/10] - in /directory/shared/branches/shared-value: ./
asn1/ber/src/main/java/org/apache/directory/api/asn1/actions/
asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/
asn1/ber/src/main/java/org/apache/directory/api/asn1/be...
Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java Sat Dec 17 15:18:15 2016
@@ -31,16 +31,13 @@ import org.apache.directory.api.asn1.ber
*/
public class StoredProcedureContainer extends AbstractContainer
{
- // ~ Instance fields
- // ----------------------------------------------------------------------------
-
/** StoredProcedure */
private StoredProcedureRequestDecorator storedProcedure;
- // ~ Constructors
- // -------------------------------------------------------------------------------
-
+ /**
+ * Creates a new StoredProcedureContainer instance
+ */
public StoredProcedureContainer()
{
super();
@@ -49,8 +46,6 @@ public class StoredProcedureContainer ex
}
- // ~ Methods
- // ------------------------------------------------------------------------------------
/**
* @return Returns the ldapMessage.
*/
Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureDecoder.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureDecoder.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureDecoder.java Sat Dec 17 15:18:15 2016
@@ -31,9 +31,10 @@ import org.apache.directory.api.asn1.ber
*/
public class StoredProcedureDecoder extends Asn1Decoder
{
-
+ /**
+ * Creates a new StoredProcedureDecoder instance
+ */
public StoredProcedureDecoder()
{
}
-
}
Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java Sat Dec 17 15:18:15 2016
@@ -62,12 +62,21 @@ public class StoredProcedureRequestDecor
private List<Integer> parameterLength;
+ /**
+ * Create a new StoredProcedureRequestDecorator instance
+ * @param codec The LDAP API service to use
+ */
public StoredProcedureRequestDecorator( LdapApiService codec )
{
super( codec, new StoredProcedureRequestImpl() );
}
+ /**
+ * Create a new StoredProcedureRequestDecorator instance
+ * @param codec The LDAP API service to use
+ * @param decoratedRequest The decorated request
+ */
public StoredProcedureRequestDecorator( LdapApiService codec, StoredProcedureRequest decoratedRequest )
{
super( codec, decoratedRequest );
@@ -78,12 +87,20 @@ public class StoredProcedureRequestDecor
}
+ /**
+ * @return The current parameter
+ */
public StoredProcedureParameter getCurrentParameter()
{
return currentParameter;
}
+ /**
+ * Sets the current parameter
+ *
+ * @param currentParameter The current parameter
+ */
public void setCurrentParameter( StoredProcedureParameter currentParameter )
{
this.currentParameter = currentParameter;
Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java Sat Dec 17 15:18:15 2016
@@ -49,6 +49,11 @@ public class WhoAmIFactory implements Ex
private LdapApiService codec;
+ /**
+ * Creates a new instance of WhoAmIFactory.
+ *
+ * @param codec The codec for this factory.
+ */
public WhoAmIFactory( LdapApiService codec )
{
this.codec = codec;
Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseGrammar.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseGrammar.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseGrammar.java Sat Dec 17 15:18:15 2016
@@ -59,6 +59,9 @@ public class WhoAmIResponseGrammar exten
private static Grammar<WhoAmIResponseContainer> instance = new WhoAmIResponseGrammar();
+ /**
+ * Creates a new WhoAmIResponseGrammar object.
+ */
@SuppressWarnings("unchecked")
public WhoAmIResponseGrammar()
{
Modified: directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java Sat Dec 17 15:18:15 2016
@@ -148,6 +148,15 @@ public final class JavaStoredProcUtils
}
+ /**
+ * Invoke a Stored Procedure
+ *
+ * @param ctx The execution context
+ * @param procedureName The procedure to execute
+ * @param arguments The proc�dure's arguments
+ * @return The execution resut
+ * @throws NamingException If we have had an error whil executing the stored procedure
+ */
public static Object callStoredProcedure( LdapContext ctx, String procedureName, Object[] arguments )
throws NamingException
{
Modified: directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/LdapContextParameter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/LdapContextParameter.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/LdapContextParameter.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/LdapContextParameter.java Sat Dec 17 15:18:15 2016
@@ -33,15 +33,24 @@ public class LdapContextParameter implem
{
private static final long serialVersionUID = -8703671542595407603L;
+ /** The parameter name */
private String name;
+ /**
+ * Creates a new LdapContextParameter instance
+ *
+ * @param name The parameter name
+ */
public LdapContextParameter( String name )
{
this.name = name;
}
+ /**
+ * @return The parameter's name
+ */
public String getValue()
{
return name;
Modified: directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/LdapOperation.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/LdapOperation.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/LdapOperation.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/LdapOperation.java Sat Dec 17 15:18:15 2016
@@ -28,18 +28,25 @@ package org.apache.directory.api.ldap.tr
*/
public enum LdapOperation
{
+ /** The Modify operation */
MODIFY("Modify"),
+ /** The Add operation */
ADD("Add"),
+ /** The Delete operation */
DELETE("Delete"),
+ /** The ModDN operation */
MODIFYDN("ModifyDN"),
+ /** The Rename operation */
MODIFYDN_RENAME("ModifyDN.Rename"),
+ /** The Export operation */
MODIFYDN_EXPORT("ModifyDN.Export"),
+ /** The Import operation */
MODIFYDN_IMPORT("ModifyDN.Import");
private final String name;
Modified: directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/StoredProcedureParameter.java Sat Dec 17 15:18:15 2016
@@ -31,6 +31,9 @@ import org.apache.directory.api.ldap.mod
*/
public abstract class StoredProcedureParameter
{
+ /**
+ * The generic LdapContext factory
+ */
public static final class Generic_LDAP_CONTEXT extends StoredProcedureParameter
{
private Dn ctxName;
@@ -43,18 +46,30 @@ public abstract class StoredProcedurePar
}
+ /**
+ * Creates a new instance of StoredProcedureParameter
+ *
+ * @param ctxName The context name
+ * @return A new instance of StoredProcedureParameter
+ */
public static StoredProcedureParameter instance( Dn ctxName )
{
return new Generic_LDAP_CONTEXT( ctxName );
}
+ /**
+ * @return The context name
+ */
public Dn getCtxName()
{
return ctxName;
}
+ /**
+ * @see Object#toString()
+ */
@Override
public String toString()
{
@@ -62,6 +77,10 @@ public abstract class StoredProcedurePar
}
}
+
+ /**
+ * The generic Operation Principal factory
+ */
public static final class Generic_OPERATION_PRINCIPAL extends StoredProcedureParameter
{
private static Generic_OPERATION_PRINCIPAL instance = new Generic_OPERATION_PRINCIPAL( "$operationPrincipal" );
@@ -73,6 +92,9 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The generic Operation Principal instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
@@ -129,15 +151,19 @@ public abstract class StoredProcedurePar
{
return true;
}
+
if ( obj == null )
{
return false;
}
+
if ( getClass() != obj.getClass() )
{
return false;
}
- final StoredProcedureParameter other = ( StoredProcedureParameter ) obj;
+
+ StoredProcedureParameter other = ( StoredProcedureParameter ) obj;
+
if ( name == null )
{
if ( other.name != null )
@@ -149,9 +175,14 @@ public abstract class StoredProcedurePar
{
return false;
}
+
return true;
}
+
+ /**
+ * The Modify Object factory
+ */
public static final class Modify_OBJECT extends StoredProcedureParameter
{
private static Modify_OBJECT instance = new Modify_OBJECT( "$object" );
@@ -163,12 +194,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify Object instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify Modification factory
+ */
public static final class Modify_MODIFICATION extends StoredProcedureParameter
{
private static Modify_MODIFICATION instance = new Modify_MODIFICATION( "$modification" );
@@ -180,12 +218,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify Modification instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify Old Entry factory
+ */
public static final class Modify_OLD_ENTRY extends StoredProcedureParameter
{
private static Modify_OLD_ENTRY instance = new Modify_OLD_ENTRY( "$oldEntry" );
@@ -197,12 +242,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify Old Entry instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify New Entry factory
+ */
public static final class Modify_NEW_ENTRY extends StoredProcedureParameter
{
private static Modify_NEW_ENTRY instance = new Modify_NEW_ENTRY( "$newEntry" );
@@ -214,12 +266,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify New Entry instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Add Entry factory
+ */
public static final class Add_ENTRY extends StoredProcedureParameter
{
private static Add_ENTRY instance = new Add_ENTRY( "$entry" );
@@ -231,12 +290,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Add Entry instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Add Attributes factory
+ */
public static final class Add_ATTRIBUTES extends StoredProcedureParameter
{
private static Add_ATTRIBUTES instance = new Add_ATTRIBUTES( "$attributes" );
@@ -248,12 +314,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Add Attributes instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Delete Name factory
+ */
public static final class Delete_NAME extends StoredProcedureParameter
{
private static Delete_NAME instance = new Delete_NAME( "$name" );
@@ -265,12 +338,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Delete Name instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Delete Deleted factory
+ */
public static final class Delete_DELETED_ENTRY extends StoredProcedureParameter
{
private static Delete_DELETED_ENTRY instance = new Delete_DELETED_ENTRY( "$deletedEntry" );
@@ -282,12 +362,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Delete Deleted instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify DN Entry factory
+ */
public static final class ModifyDN_ENTRY extends StoredProcedureParameter
{
private static ModifyDN_ENTRY instance = new ModifyDN_ENTRY( "$entry" );
@@ -299,12 +386,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify DN Entry instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify New Rdn factory
+ */
public static final class ModifyDN_NEW_RDN extends StoredProcedureParameter
{
private static ModifyDN_NEW_RDN instance = new ModifyDN_NEW_RDN( "$newrdn" );
@@ -316,12 +410,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify New Rdn instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify DN Delete Old RDN factory
+ */
public static final class ModifyDN_DELETE_OLD_RDN extends StoredProcedureParameter
{
private static ModifyDN_DELETE_OLD_RDN instance = new ModifyDN_DELETE_OLD_RDN( "$deleteoldrdn" );
@@ -333,12 +434,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify DN Delete Old RDN instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify DN New Superior factory
+ */
public static final class ModifyDN_NEW_SUPERIOR extends StoredProcedureParameter
{
private static ModifyDN_NEW_SUPERIOR instance = new ModifyDN_NEW_SUPERIOR( "$newSuperior" );
@@ -350,12 +458,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify DN New Superior instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify DN Old RDN factory
+ */
public static final class ModifyDN_OLD_RDN extends StoredProcedureParameter
{
private static ModifyDN_OLD_RDN instance = new ModifyDN_OLD_RDN( "$oldRDN" );
@@ -367,12 +482,19 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify DN Old RDN instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
+ /**
+ * The Modify DN Old Superior DN factory
+ */
public static final class ModifyDN_OLD_SUPERIOR_DN extends StoredProcedureParameter
{
private static ModifyDN_OLD_SUPERIOR_DN instance = new ModifyDN_OLD_SUPERIOR_DN( "$oldRDN" );
@@ -384,16 +506,18 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify DN Old Superior DN instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
}
}
+
/**
- *
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * The Modify DN New DN factory
*/
public static final class ModifyDN_NEW_DN extends StoredProcedureParameter
{
@@ -406,6 +530,9 @@ public abstract class StoredProcedurePar
}
+ /**
+ * @return The Modify DN New DN instance
+ */
public static StoredProcedureParameter instance()
{
return instance;
Modified: directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerUtils.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerUtils.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerUtils.java Sat Dec 17 15:18:15 2016
@@ -41,12 +41,6 @@ import org.apache.directory.api.ldap.mod
*/
public final class TriggerUtils
{
- public static final String TRIGGER_EXECUTION_SPECIFIC_AREA_VALUE = SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA;
- public static final String TRIGGER_EXECUTION_SUBENTRY_OC = "triggerExecutionSubentry";
- public static final String ENTRY_TRIGGER_SPECIFICATION_ATTR = "entryTriggerSpecification";
- public static final String PRESCRIPTIVE_TRIGGER_SPECIFICATION_ATTR = "prescriptiveTriggerSpecification";
-
-
/**
* Private constructor.
*/
@@ -55,21 +49,35 @@ public final class TriggerUtils
}
+ /**
+ * Defines the Administration point and administrative role for the TriggerExecution specific point
+ * @param apCtx The administrative point context
+ * @throws NamingException If the operation failed
+ */
public static void defineTriggerExecutionSpecificPoint( LdapContext apCtx ) throws NamingException
{
- Attributes ap = apCtx.getAttributes( "", new String[]
- { SchemaConstants.ADMINISTRATIVE_ROLE_AT } );
+ Attributes ap = apCtx.getAttributes( "", new String[] { SchemaConstants.ADMINISTRATIVE_ROLE_AT } );
Attribute administrativeRole = ap.get( SchemaConstants.ADMINISTRATIVE_ROLE_AT );
+
if ( administrativeRole == null
- || !AttributeUtils.containsValueCaseIgnore( administrativeRole, TRIGGER_EXECUTION_SPECIFIC_AREA_VALUE ) )
+ || !AttributeUtils.containsValueCaseIgnore( administrativeRole, SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA ) )
{
Attributes changes = new BasicAttributes( SchemaConstants.ADMINISTRATIVE_ROLE_AT,
- TRIGGER_EXECUTION_SPECIFIC_AREA_VALUE, true );
+ SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA, true );
apCtx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
}
}
+ /**
+ * Create the Trigger execution subentry
+ *
+ * @param apCtx The administration point context
+ * @param subentryCN The CN used by the suentry
+ * @param subtreeSpec The subtree specification
+ * @param prescriptiveTriggerSpec The prescriptive trigger specification
+ * @throws NamingException If the operation failed
+ */
public static void createTriggerExecutionSubentry(
LdapContext apCtx,
String subentryCN,
@@ -81,28 +89,43 @@ public final class TriggerUtils
subentry.put( objectClass );
objectClass.add( SchemaConstants.TOP_OC );
objectClass.add( SchemaConstants.SUBENTRY_OC );
- objectClass.add( TRIGGER_EXECUTION_SUBENTRY_OC );
+ objectClass.add( SchemaConstants.TRIGGER_EXECUTION_SUBENTRY_OC );
subentry.put( SchemaConstants.SUBTREE_SPECIFICATION_AT, subtreeSpec );
- subentry.put( PRESCRIPTIVE_TRIGGER_SPECIFICATION_ATTR, prescriptiveTriggerSpec );
+ subentry.put( SchemaConstants.PRESCRIPTIVE_TRIGGER_SPECIFICATION_AT, prescriptiveTriggerSpec );
apCtx.createSubcontext( "cn=" + subentryCN, subentry );
}
+ /**
+ * Load an prescriptive trigger specification
+ *
+ * @param apCtx The administrative point context
+ * @param subentryCN The subentry CN
+ * @param triggerSpec The trigger specification
+ * @throws NamingException If the operation failed
+ */
public static void loadPrescriptiveTriggerSpecification(
LdapContext apCtx,
String subentryCN,
String triggerSpec ) throws NamingException
{
- Attributes changes = new BasicAttributes( PRESCRIPTIVE_TRIGGER_SPECIFICATION_ATTR, triggerSpec, true );
+ Attributes changes = new BasicAttributes( SchemaConstants.PRESCRIPTIVE_TRIGGER_SPECIFICATION_AT, triggerSpec, true );
apCtx.modifyAttributes( "cn=" + subentryCN, DirContext.ADD_ATTRIBUTE, changes );
}
- public static void loadEntryTriggerSpecification(
+ /**
+ * Load the trigger specification entry
+ *
+ * @param ctx The context
+ * @param triggerSpec The trigger specification
+ * @throws NamingException If the operation failed
+ */
+public static void loadEntryTriggerSpecification(
LdapContext ctx,
String triggerSpec ) throws NamingException
{
- Attributes changes = new BasicAttributes( ENTRY_TRIGGER_SPECIFICATION_ATTR, triggerSpec, true );
+ Attributes changes = new BasicAttributes( SchemaConstants.ENTRY_TRIGGER_SPECIFICATION_AT, triggerSpec, true );
ctx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
}
}
Modified: directory/shared/branches/shared-value/ldap/extras/util/src/main/java/org/apache/directory/api/ldap/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/util/src/main/java/org/apache/directory/api/ldap/util/JndiUtils.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/util/src/main/java/org/apache/directory/api/ldap/util/JndiUtils.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/util/src/main/java/org/apache/directory/api/ldap/util/JndiUtils.java Sat Dec 17 15:18:15 2016
@@ -93,7 +93,15 @@ public final class JndiUtils
}
- // @TODO not really needed and can be moved out
+ /**
+ * Convert a LDAP API control to a JNDI control
+ * @param codec The LDAP API service to use
+ * @param control The control to convert
+ * @return A JNDI control
+ * @throws EncoderException If the conversion failed
+ * @deprecated We don't use JNDI anymore
+ */
+ @Deprecated
public static javax.naming.ldap.Control toJndiControl( LdapApiService codec, Control control )
throws EncoderException
{
@@ -101,7 +109,15 @@ public final class JndiUtils
}
- // @TODO not really needed and can be moved out
+ /**
+ * Convert some LDAP API controls to JNDI controls
+ * @param codec The LDAP API service to use
+ * @param controls The controls to convert
+ * @return Array of JNDI control
+ * @throws EncoderException If the conversion failed
+ * @deprecated We don't use JNDI anymore
+ */
+ @Deprecated
public static javax.naming.ldap.Control[] toJndiControls( LdapApiService codec, Control... controls )
throws EncoderException
{
@@ -124,7 +140,15 @@ public final class JndiUtils
}
- // @TODO not really needed and can be moved out
+ /**
+ * Convert a JNDI control to a LDAP API control
+ * @param codec The LDAP API service to use
+ * @param jndiControl The control to convert
+ * @return A LDAP API control
+ * @throws DecoderException If the conversion failed
+ * @deprecated We don't use JNDI anymore
+ */
+ @Deprecated
public static Control fromJndiControl( LdapApiService codec, javax.naming.ldap.Control jndiControl )
throws DecoderException
{
@@ -132,7 +156,15 @@ public final class JndiUtils
}
- // @TODO not really needed and can be moved out
+ /**
+ * Convert some JNDI controls to LDAP API controls
+ * @param codec The LDAP API service to use
+ * @param jndiControls The controls to convert
+ * @return An array of LDAP API control
+ * @throws DecoderException If the conversion failed
+ * @deprecated We don't use JNDI anymore
+ */
+ @Deprecated
public static Control[] fromJndiControls( LdapApiService codec, javax.naming.ldap.Control... jndiControls )
throws DecoderException
{
@@ -155,6 +187,12 @@ public final class JndiUtils
}
+ /**
+ * Wraps a LDAP exception into a NaingException
+ *
+ * @param t The original exception
+ * @throws NamingException The wrapping JNDI exception
+ */
public static void wrap( Throwable t ) throws NamingException
{
if ( t instanceof NamingException )
@@ -316,6 +354,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean skipReferral()
{
@@ -323,6 +364,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void retryReferral()
{
@@ -330,6 +374,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object getReferralInfo()
{
@@ -337,6 +384,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Context getReferralContext( Hashtable<?, ?> env ) throws NamingException
{
@@ -344,6 +394,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Context getReferralContext() throws NamingException
{
@@ -351,6 +404,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Name getRemainingName()
{
@@ -358,6 +414,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object getResolvedObj()
{
@@ -365,6 +424,9 @@ class WrappedReferralException extends R
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Name getResolvedName()
{
@@ -386,6 +448,9 @@ class WrappedPartialResultException exte
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Name getRemainingName()
{
@@ -393,6 +458,9 @@ class WrappedPartialResultException exte
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Object getResolvedObj()
{
@@ -400,6 +468,9 @@ class WrappedPartialResultException exte
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Name getResolvedName()
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java Sat Dec 17 15:18:15 2016
@@ -469,6 +469,10 @@ public final class SchemaConstants
// AccessControlSubentry
public static final String ACCESS_CONTROL_SUBENTRY_OC = "accessControlSubentry";
public static final String ACCESS_CONTROL_SUBENTRY_OC_OID = "2.5.17.1";
+
+ // TriggerExecutionSubentry
+ public static final String TRIGGER_EXECUTION_SUBENTRY_OC = "triggerExecutionSubentry";
+ public static final String TRIGGER_EXECUTION_SUBENTRY_OC_OID = "1.3.6.1.4.1.18060.0.4.1.2.28";
//-------------------------------------------------------------------------
// AttributeTypes for standard schemas are listed below. We cover the
@@ -1577,6 +1581,14 @@ public final class SchemaConstants
public static final String SUBENTRY_ACI_AT = "subentryACI";
public static final String SUBENTRY_ACI_AT_OID = "2.5.24.6";
+ // PrescriptiveTriggerSpecification
+ public static final String PRESCRIPTIVE_TRIGGER_SPECIFICATION_AT = "prescriptiveTriggerSpecification";
+ public static final String PRESCRIPTIVE_TRIGGER_SPECIFICATION_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.25";
+
+ // EntryTriggerSpecification
+ public static final String ENTRY_TRIGGER_SPECIFICATION_AT = "entryTriggerSpecification";
+ public static final String ENTRY_TRIGGER_SPECIFICATION_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.26";
+
// Comparators
public static final String COMPARATORS_AT = "comparators";
public static final String COMPARATORS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.32";
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java Sat Dec 17 15:18:15 2016
@@ -43,6 +43,10 @@ public class CsnFactory
private Object lock = new Object();
+ /**
+ * Creates a new CsnFactory instance
+ * @param replicaId The replica ID
+ */
public CsnFactory( int replicaId )
{
changeCount = 0;
@@ -111,6 +115,10 @@ public class CsnFactory
}
+ /**
+ * Sets the replica ID
+ * @param replicaId The replica ID
+ */
public void setReplicaId( int replicaId )
{
this.replicaId = replicaId;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java Sat Dec 17 15:18:15 2016
@@ -42,7 +42,9 @@ public class EmptyCursor<E> extends Abst
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
-
+ /**
+ * Creates a new EmptyCursor instance
+ */
public EmptyCursor()
{
if ( IS_DEBUG )
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java Sat Dec 17 15:18:15 2016
@@ -549,7 +549,9 @@ public class DefaultAttribute implements
/**
- * {@inheritDoc}
+ * Sets the User Provided ID as a byte[]
+ *
+ * @param upId The User Provided ID
*/
public void setUpId( byte[] upId )
{
@@ -605,7 +607,10 @@ public class DefaultAttribute implements
/**
- * {@inheritDoc}
+ * Sets the User Provided ID as a byte[]
+ *
+ * @param upId The User Provided ID
+ * @param attributeType The asscoiated AttributeType
*/
public void setUpId( byte[] upId, AttributeType attributeType )
{
@@ -622,9 +627,6 @@ public class DefaultAttribute implements
}
- /**
- * {@inheritDoc}
- */
private void setUpIdInternal( String upId, String newId, AttributeType attributeType )
{
if ( attributeType == null )
@@ -2049,9 +2051,6 @@ public class DefaultAttribute implements
// Read the id
id = in.readUTF();
- // We could have computed it, but it costs more than reading it from the disk...
- //setUpIdInternal( upId );
-
// Read the HR flag, if not null
if ( in.readBoolean() )
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java Sat Dec 17 15:18:15 2016
@@ -164,8 +164,7 @@ public final class DefaultEntry implemen
}
else
{
- this.dn = new Dn( dn );
- normalizeDN( this.dn );
+ this.dn = new Dn( schemaManager, dn );
}
// Initialize the ObjectClass object
@@ -194,8 +193,7 @@ public final class DefaultEntry implemen
}
else
{
- this.dn = dn;
- normalizeDN( this.dn );
+ this.dn = normalizeDn( dn );
}
// Initialize the ObjectClass object
@@ -299,8 +297,7 @@ public final class DefaultEntry implemen
// We will clone the existing entry, because it may be normalized
if ( entry.getDn() != null )
{
- dn = entry.getDn();
- normalizeDN( dn );
+ dn = normalizeDn( entry.getDn() );
}
else
{
@@ -508,20 +505,26 @@ public final class DefaultEntry implemen
*
* @param dn the Dn to be normalized
*/
- private void normalizeDN( Dn dn )
+ private Dn normalizeDn( Dn dn )
{
if ( !dn.isSchemaAware() )
{
try
{
// The dn must be normalized
- dn = new Dn( schemaManager, dn );
+ return new Dn( schemaManager, dn );
}
catch ( LdapException ne )
{
LOG.warn( "The Dn '{}' cannot be normalized", dn );
+
+ return dn;
}
}
+ else
+ {
+ return dn;
+ }
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultModification.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultModification.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultModification.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultModification.java Sat Dec 17 15:18:15 2016
@@ -291,7 +291,7 @@ public class DefaultModification impleme
/**
- * {@inheritDoc}
+ * @return The associated AttributeType
*/
public AttributeType getAttributeType()
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ModificationOperation.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ModificationOperation.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ModificationOperation.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ModificationOperation.java Sat Dec 17 15:18:15 2016
@@ -29,8 +29,13 @@ package org.apache.directory.api.ldap.mo
*/
public enum ModificationOperation
{
+ /** Added attribute value */
ADD_ATTRIBUTE(0),
+
+ /** Removed attribute value */
REMOVE_ATTRIBUTE(1),
+
+ /** Replaced attribute value */
REPLACE_ATTRIBUTE(2);
/** Internal value */
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java Sat Dec 17 15:18:15 2016
@@ -543,7 +543,8 @@ public class Value implements Cloneable,
/**
- * @return The normalized String
+ * Compute the normalized value
+ *
* @throws LdapException If we were'nt able to normalize the value
*/
private void computeNormValue() throws LdapException
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/AbstractLdapReferralException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/AbstractLdapReferralException.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/AbstractLdapReferralException.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/AbstractLdapReferralException.java Sat Dec 17 15:18:15 2016
@@ -72,18 +72,34 @@ public class AbstractLdapReferralExcepti
}
+ /**
+ * Not yet implemented
+ *
+ * @return The Referral Context
+ * @throws NamingException If the operation failed
+ */
public Context getReferralContext() throws NamingException
{
throw new NotImplementedException();
}
+ /**
+ * Not yet implemented
+ *
+ * @param arg The arguments
+ * @return The referral context
+ * @throws NamingException If the operation failed
+ */
public Context getReferralContext( Map<?, ?> arg ) throws NamingException
{
throw new NotImplementedException();
}
+ /**
+ * Retry. Not yet implemented
+ */
public void retryReferral()
{
throw new NotImplementedException();
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AbstractExprNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AbstractExprNode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AbstractExprNode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AbstractExprNode.java Sat Dec 17 15:18:15 2016
@@ -200,15 +200,6 @@ public abstract class AbstractExprNode i
/**
- * Tells if this Node is Schema aware.
- *
- * @return true if the Node is SchemaAware
- */
- @Override
- public abstract boolean isSchemaAware();
-
-
- /**
* Default implementation for this method : just throw an exception.
*
* @param buf the buffer to append to.
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ApproximateNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ApproximateNode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ApproximateNode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ApproximateNode.java Sat Dec 17 15:18:15 2016
@@ -27,6 +27,8 @@ import org.apache.directory.api.ldap.mod
/**
* A simple assertion value node.
*
+ * @param <T> The Value type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ApproximateNode<T> extends SimpleNode<T>
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/EqualityNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/EqualityNode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/EqualityNode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/EqualityNode.java Sat Dec 17 15:18:15 2016
@@ -27,6 +27,8 @@ import org.apache.directory.api.ldap.mod
/**
* A assertion value node for Equality.
*
+ * @param <T> The Value type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class EqualityNode<T> extends SimpleNode<T>
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExprNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExprNode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExprNode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExprNode.java Sat Dec 17 15:18:15 2016
@@ -74,8 +74,6 @@ public interface ExprNode extends Clonea
/**
* Recursively appends the refinement string representation of this node and its
* descendants in prefix notation to a buffer.
- *
- * TODO - Why is this here? Why not put it in some utility class?
*
* @param buf the buffer to append to.
* @return The buffer in which the refinement has been appended
@@ -88,7 +86,6 @@ public interface ExprNode extends Clonea
* Element/node accept method for visitor pattern.
*
* @param visitor the filter expression tree structure visitor
- * TODO - what is this modified element ?
* @return the modified element
*/
Object accept( FilterVisitor visitor );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/GreaterEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/GreaterEqNode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/GreaterEqNode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/GreaterEqNode.java Sat Dec 17 15:18:15 2016
@@ -28,6 +28,8 @@ import org.apache.directory.api.ldap.mod
/**
* A assertion value node for GreaterOrEqual.
*
+ * @param <T> The Value type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GreaterEqNode<T> extends SimpleNode<T>
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LessEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LessEqNode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LessEqNode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LessEqNode.java Sat Dec 17 15:18:15 2016
@@ -28,6 +28,8 @@ import org.apache.directory.api.ldap.mod
/**
* A assertion value node for LessOrEqual.
*
+ * @param <T> The Value type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LessEqNode<T> extends SimpleNode<T>
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SimpleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SimpleNode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SimpleNode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SimpleNode.java Sat Dec 17 15:18:15 2016
@@ -33,6 +33,8 @@ import org.apache.directory.api.util.Str
/**
* A simple assertion value node.
*
+ * @param <T> The Value type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public abstract class SimpleNode<T> extends LeafNode
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifControl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifControl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifControl.java Sat Dec 17 15:18:15 2016
@@ -107,7 +107,9 @@ public class LdifControl implements Cont
/**
- * {@inheritDoc}
+ * Get back the control value
+ *
+ * @return The control's value
*/
public byte[] getValue()
{
@@ -116,7 +118,9 @@ public class LdifControl implements Cont
/**
- * {@inheritDoc}
+ * Store the control value
+ *
+ * @param value The value to store
*/
public void setValue( byte[] value )
{
@@ -125,7 +129,7 @@ public class LdifControl implements Cont
/**
- * {@inheritDoc}
+ * @return <t>TRUE</t> if the control has a value
*/
public boolean hasValue()
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/AbstractAnonymizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/AbstractAnonymizer.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/AbstractAnonymizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/AbstractAnonymizer.java Sat Dec 17 15:18:15 2016
@@ -28,6 +28,8 @@ import org.apache.directory.api.ldap.mod
/**
* An abstract class implementing the default behavior of an Aninymizer instance
+ *
+ * @param <K> The type of object being anonymized
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/Anonymizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/Anonymizer.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/Anonymizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/Anonymizer.java Sat Dec 17 15:18:15 2016
@@ -31,6 +31,8 @@ import org.apache.directory.api.ldap.mod
/**
* An interface for Anonymizers.
+ *
+ * @param <K> The type of object that will be anonymized
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/BinaryAnonymizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/BinaryAnonymizer.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/BinaryAnonymizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/BinaryAnonymizer.java Sat Dec 17 15:18:15 2016
@@ -110,7 +110,8 @@ public class BinaryAnonymizer extends Ab
/**
* {@inheritDoc}
*/
- public void setLatestBytesgMap( Map<Integer, byte[]> latestBytesMap )
+ @Override
+ public void setLatestBytesMap( Map<Integer, byte[]> latestBytesMap )
{
this.latestBytesMap = latestBytesMap;
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/IntegerAnonymizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/IntegerAnonymizer.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/IntegerAnonymizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/IntegerAnonymizer.java Sat Dec 17 15:18:15 2016
@@ -118,7 +118,7 @@ public class IntegerAnonymizer extends A
/**
- * {@inheritDoc}
+ * @return The Map containing the latest anonymized value for each integer
*/
public Map<Integer, String> getLatestIntegerMap()
{
@@ -127,7 +127,8 @@ public class IntegerAnonymizer extends A
/**
- * {@inheritDoc}
+ * Set the Map containing anonymized integers
+ * @param latestIntegerMap The Map containing the latest anonymized value for each integer
*/
public void setLatestIntegerMap( Map<Integer, String> latestIntegerMap )
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java Sat Dec 17 15:18:15 2016
@@ -231,7 +231,7 @@ public enum AliasDerefMode
/**
- * get the AliasDerefMode corresponding to the string value {@link #jndiValue} passed
+ * get the AliasDerefMode corresponding to the string value jndiValue passed
*
* @param val the AliasDerefMode's string value
* @return the AliasDerefMode whose value is equivalent to the given string value
@@ -265,6 +265,9 @@ public enum AliasDerefMode
}
+ /**
+ * @return The JNDI value
+ */
public String getJndiValue()
{
return jndiValue;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java Sat Dec 17 15:18:15 2016
@@ -29,7 +29,6 @@ package org.apache.directory.api.ldap.mo
public interface CompareResponse extends ResultResponse
{
/**
- * @return True if the compared response is a success
* @return <tt>true</tt> if the compare response is TRUE, <tt>false</tt> otherwise
*/
boolean isTrue();
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java Sat Dec 17 15:18:15 2016
@@ -41,6 +41,10 @@ public class IntermediateResponseImpl ex
protected byte[] responseValue;
+ /**
+ * Creates a new IntermediateResponseImpl instance
+ * @param id The request ID
+ */
public IntermediateResponseImpl( int id )
{
super( id, TYPE );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/MessageTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/MessageTypeEnum.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/MessageTypeEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/MessageTypeEnum.java Sat Dec 17 15:18:15 2016
@@ -27,25 +27,66 @@ package org.apache.directory.api.ldap.mo
*/
public enum MessageTypeEnum
{
+ /** The AbandonRequest message */
ABANDON_REQUEST,
+
+ /** The AddResquest message */
ADD_REQUEST,
+
+ /** The Response message */
ADD_RESPONSE,
+
+ /** The BindRequest message */
BIND_REQUEST,
+
+ /** The BindResponse message */
BIND_RESPONSE,
+
+ /** The ompareRequest message */
COMPARE_REQUEST,
+
+ /** The CompareResponse message */
COMPARE_RESPONSE,
+
+ /** The DelRequest message */
DEL_REQUEST,
+
+ /** The DelResponse message */
DEL_RESPONSE,
+
+ /** The ExtendedRequest message */
EXTENDED_REQUEST,
+
+ /** The ExtendedResponse message */
EXTENDED_RESPONSE,
+
+ /** The ModifyDNRequest message */
MODIFYDN_REQUEST,
+
+ /** The ModifyDNResponse message */
MODIFYDN_RESPONSE,
+
+ /** The ModifyRequest message */
MODIFY_REQUEST,
+
+ /** The ModifyResponse message */
MODIFY_RESPONSE,
+
+ /** The SearchRequest message */
SEARCH_REQUEST,
+
+ /** The SeaechResultDone response message */
SEARCH_RESULT_DONE,
+
+ /** The SearchResultEntry Response message */
SEARCH_RESULT_ENTRY,
+
+ /** The earchResultReference Response message */
SEARCH_RESULT_REFERENCE,
+
+ /** The UnbindRequest message */
UNBIND_REQUEST,
+
+ /** The IntermediateResponse message */
INTERMEDIATE_RESPONSE;
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralsPolicyEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralsPolicyEnum.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralsPolicyEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralsPolicyEnum.java Sat Dec 17 15:18:15 2016
@@ -30,7 +30,12 @@ package org.apache.directory.api.ldap.mo
*/
public enum ReferralsPolicyEnum
{
+ /** Ignore referral */
IGNORE,
+
+ /** Floow referral */
FOLLOW,
+
+ /** Throw an exception */
THROW
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchScope.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchScope.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchScope.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchScope.java Sat Dec 17 15:18:15 2016
@@ -30,8 +30,13 @@ import org.apache.directory.api.i18n.I18
*/
public enum SearchScope
{
+ /** Base scope */
OBJECT(0, "base"),
+
+ /** One Level scope */
ONELEVEL(1, "one"),
+
+ /** Subtree scope */
SUBTREE(2, "sub");
/**
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ChangeType.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ChangeType.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ChangeType.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ChangeType.java Sat Dec 17 15:18:15 2016
@@ -42,12 +42,16 @@ import org.apache.directory.api.i18n.I18
*/
public enum ChangeType
{
+ /** An ADD */
ADD(1),
+ /** A Delete */
DELETE(2),
+ /** A Modify */
MODIFY(4),
+ /** A MODDN */
MODDN(8);
private int value;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChange.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChange.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChange.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChange.java Sat Dec 17 15:18:15 2016
@@ -73,6 +73,7 @@ import org.apache.directory.api.ldap.mod
*/
public interface EntryChange extends Control
{
+ /** No defined change number */
int UNDEFINED_CHANGE_NUMBER = -1;
/** The EntryChange control */
@@ -93,14 +94,30 @@ public interface EntryChange extends Con
void setChangeType( ChangeType changeType );
+ /**
+ * @return The previous DN
+ */
Dn getPreviousDn();
+ /**
+ * Sets the previous DN
+ *
+ * @param previousDn The previous DN
+ */
void setPreviousDn( Dn previousDn );
+ /**
+ * @return The change number
+ */
long getChangeNumber();
+ /**
+ * Sets the ChangeNumber
+ *
+ * @param changeNumber The ChanegNumber
+ */
void setChangeNumber( long changeNumber );
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChangeImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChangeImpl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChangeImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/EntryChangeImpl.java Sat Dec 17 15:18:15 2016
@@ -50,6 +50,9 @@ public class EntryChangeImpl extends Abs
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ChangeType getChangeType()
{
@@ -57,6 +60,9 @@ public class EntryChangeImpl extends Abs
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setChangeType( ChangeType changeType )
{
@@ -64,6 +70,9 @@ public class EntryChangeImpl extends Abs
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Dn getPreviousDn()
{
@@ -71,6 +80,9 @@ public class EntryChangeImpl extends Abs
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setPreviousDn( Dn previousDn )
{
@@ -78,6 +90,9 @@ public class EntryChangeImpl extends Abs
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public long getChangeNumber()
{
@@ -85,6 +100,9 @@ public class EntryChangeImpl extends Abs
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setChangeNumber( long changeNumber )
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java Sat Dec 17 15:18:15 2016
@@ -74,6 +74,9 @@ public class PagedResultsImpl extends Ab
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public int getSize()
{
@@ -81,6 +84,9 @@ public class PagedResultsImpl extends Ab
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setSize( int size )
{
@@ -88,6 +94,9 @@ public class PagedResultsImpl extends Ab
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public byte[] getCookie()
{
@@ -95,6 +104,9 @@ public class PagedResultsImpl extends Ab
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setCookie( byte[] cookie )
{
@@ -102,6 +114,9 @@ public class PagedResultsImpl extends Ab
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public int getCookieValue()
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearch.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearch.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearch.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearch.java Sat Dec 17 15:18:15 2016
@@ -35,32 +35,75 @@ public interface PersistentSearch extend
/** Min and Max values for the possible combined change types */
int CHANGE_TYPES_MIN = ChangeType.ADD.getValue();
+ /** The maximum value for the possible combined changes type */
int CHANGE_TYPES_MAX = ChangeType.ADD.getValue()
| ChangeType.DELETE.getValue()
| ChangeType.MODIFY.getValue()
| ChangeType.MODDN.getValue();
+ /**
+ * Sets the ChangesOnly flag
+ *
+ * @param changesOnly The ChangesOnly flag
+ */
void setChangesOnly( boolean changesOnly );
+ /**
+ * @return <TT>TRUE</TT> if the changesOnly flag is set
+ */
boolean isChangesOnly();
+ /**
+ * Sets the return entry changes flag
+ *
+ * @param returnECs the return entry changes flag
+ */
void setReturnECs( boolean returnECs );
+ /**
+ * @return <TT>TRUE</TT> if the return entry changes flag is set
+ */
boolean isReturnECs();
+ /**
+ * Set the changeType value we want to get back ( a combinaison of Add, Delete,
+ * Modify and ModifyDN)
+ *
+ * @param changeTypes The changeType values (Add, Modify, Delete and ModifyDn)
+ */
void setChangeTypes( int changeTypes );
+ /**
+ * @return The changeTypes value
+ */
int getChangeTypes();
+ /**
+ * For each changeType, tells if the notification is enabled
+ *
+ * @param changeType The ChnageType we are interested in
+ * @return <T>TRUE<T> if the notification is set for this ChangeType
+ */
boolean isNotificationEnabled( ChangeType changeType );
+ /**
+ * Sets the notification for a given changeType
+ * @param changeType The chnageType we want some notification to be set
+ */
void enableNotification( ChangeType changeType );
+
+
+ /**
+ * Unsets the notification for a given changeType
+ * @param changeType The chnageType we want some notification to be unset
+ */
+ void disableNotification( ChangeType changeType );
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearchImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearchImpl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearchImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PersistentSearchImpl.java Sat Dec 17 15:18:15 2016
@@ -64,13 +64,19 @@ public class PersistentSearchImpl extend
}
+ /**
+ * {@inheritDoc}
+ */
@Override
-public void setChangesOnly( boolean changesOnly )
+ public void setChangesOnly( boolean changesOnly )
{
this.changesOnly = changesOnly;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isChangesOnly()
{
@@ -78,6 +84,9 @@ public void setChangesOnly( boolean chan
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setReturnECs( boolean returnECs )
{
@@ -85,6 +94,9 @@ public void setChangesOnly( boolean chan
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isReturnECs()
{
@@ -92,6 +104,9 @@ public void setChangesOnly( boolean chan
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setChangeTypes( int changeTypes )
{
@@ -99,6 +114,9 @@ public void setChangesOnly( boolean chan
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public int getChangeTypes()
{
@@ -106,6 +124,9 @@ public void setChangesOnly( boolean chan
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isNotificationEnabled( ChangeType changeType )
{
@@ -113,6 +134,9 @@ public void setChangesOnly( boolean chan
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void enableNotification( ChangeType changeType )
{
@@ -120,6 +144,16 @@ public void setChangesOnly( boolean chan
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void disableNotification( ChangeType changeType )
+ {
+ changeTypes &= ~changeType.getValue();
+ }
+
+
/**
* Return a String representing this PSearchControl.
*/
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ProxiedAuthzImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ProxiedAuthzImpl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ProxiedAuthzImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/ProxiedAuthzImpl.java Sat Dec 17 15:18:15 2016
@@ -53,7 +53,7 @@ public class ProxiedAuthzImpl extends Ab
* @return the authzId
*/
@Override
-public String getAuthzId()
+ public String getAuthzId()
{
return authzId;
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortRequestControlImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortRequestControlImpl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortRequestControlImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortRequestControlImpl.java Sat Dec 17 15:18:15 2016
@@ -37,6 +37,9 @@ public class SortRequestControlImpl exte
private List<SortKey> sortKeys;
+ /**
+ * Creates a new SortRequestControlImpl instance
+ */
public SortRequestControlImpl()
{
super( OID );
@@ -63,6 +66,9 @@ public class SortRequestControlImpl exte
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void addSortKey( SortKey skey )
{
@@ -75,6 +81,9 @@ public class SortRequestControlImpl exte
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String toString()
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResponseControlImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResponseControlImpl.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResponseControlImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResponseControlImpl.java Sat Dec 17 15:18:15 2016
@@ -32,35 +32,58 @@ public class SortResponseControlImpl ext
/** name of the first offending attribute */
private String attributeName;
+ /**
+ * Creates a new SortResponseControlImpl instance
+ */
public SortResponseControlImpl()
{
super( OID );
}
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setSortResult( SortResultCode result )
{
this.result = result;
}
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public SortResultCode getSortResult()
{
return result;
}
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setAttributeName( String attributeName )
{
this.attributeName = attributeName;
}
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public String getAttributeName()
{
return attributeName;
}
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public int hashCode()
{
@@ -72,6 +95,10 @@ public class SortResponseControlImpl ext
return hash;
}
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean equals( Object o )
{
@@ -99,6 +126,10 @@ public class SortResponseControlImpl ext
return false;
}
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public String toString()
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResultCode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResultCode.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResultCode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/SortResultCode.java Sat Dec 17 15:18:15 2016
@@ -58,11 +58,15 @@ public enum SortResultCode
this.desc = desc;
}
+ /**
+ * @return The internet value
+ */
public int getVal()
{
return val;
}
+
/**
* returns the enum value representing the given code.
*
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java Sat Dec 17 15:18:15 2016
@@ -1945,7 +1945,7 @@ public class Ava implements Externalizab
}
}
- boolean isHR = in.readBoolean();
+ in.readBoolean();
value = Value.deserialize( attributeType, in );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java Sat Dec 17 15:18:15 2016
@@ -908,7 +908,13 @@ public class Dn implements Iterable<Rdn>
/**
- * {@inheritDoc}
+ * Add a suffix to the Dn. For instance, if the current Dn is "ou=people",
+ * and the suffix "dc=example,dc=com", then the resulting Dn will be
+ * "ou=people,dc=example,dc=com"
+ *
+ * @param suffix the suffix to add
+ * @return The resulting Dn with the additional suffix
+ * @throws LdapInvalidDnException If the resulting Dn is not valid
*/
public Dn add( Dn suffix ) throws LdapInvalidDnException
{
@@ -940,7 +946,13 @@ public class Dn implements Iterable<Rdn>
/**
- * {@inheritDoc}
+ * Add a suffix to the Dn. For instance, if the current Dn is "ou=people",
+ * and the suffix "dc=example,dc=com", then the resulting Dn will be
+ * "ou=people,dc=example,dc=com"
+ *
+ * @param comp the suffix to add
+ * @return The resulting Dn with the additional suffix
+ * @throws LdapInvalidDnException If the resulting Dn is not valid
*/
public Dn add( String comp ) throws LdapInvalidDnException
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordDetails.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordDetails.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordDetails.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordDetails.java Sat Dec 17 15:18:15 2016
@@ -41,6 +41,13 @@ public class PasswordDetails
private final byte[] password;
+ /**
+ * Creates a new PasswordDetails instance
+ *
+ * @param algorithm The algorithm to use
+ * @param salt The Salt to use
+ * @param password The password
+ */
public PasswordDetails( LdapSecurityConstants algorithm, byte[] salt, byte[] password )
{
this.algorithm = algorithm;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AbstractSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AbstractSchemaObject.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AbstractSchemaObject.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AbstractSchemaObject.java Sat Dec 17 15:18:15 2016
@@ -852,15 +852,6 @@ public abstract class AbstractSchemaObje
/**
- * Copy the current SchemaObject on place
- *
- * @return The copied SchemaObject
- */
- @Override
- public abstract SchemaObject copy();
-
-
- /**
* Compare two oids, and return true if they are both null or equal.
*
* @param oid1 the first OID
@@ -951,6 +942,9 @@ public abstract class AbstractSchemaObje
}
+ /**
+ * Unlock the Schema Object and make it modifiable again.
+ */
public void unlock()
{
locked = false;