directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1771553 [1/2] - in /directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras: ./ controls/ad_impl/ controls/changeNotifications_impl/ controls/ppolicy_impl/ controls/syncrepl_impl/ control...
Date Sun, 27 Nov 2016 10:27:53 GMT
Author: elecharny
Date: Sun Nov 27 10:27:52 2016
New Revision: 1771553

URL: http://svn.apache.org/viewvc?rev=1771553&view=rev
Log:
Fixed Sonarlint warnings

Modified:
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestStates.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseStates.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/startTls/StartTlsFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureStatesEnum.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseContainer.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java
    directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseStatesEnum.java

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java Sun Nov 27 10:27:52 2016
@@ -113,134 +113,135 @@ public class ExtrasBundleActivator imple
             unregisterExtrasExtendedOps( ldapApiService );
         }
 
-    }
-
 
-    /**
-     * {@inheritDoc}
-     */
-    public void start( BundleContext context ) throws Exception
-    {
-        LdapApiServiceTracker ldapApiServiceTracker = new LdapApiServiceTracker( context );
-        serviceTracker = new ServiceTracker<LdapApiService, LdapApiService>(
-            context, LdapApiService.class, ldapApiServiceTracker );
-        serviceTracker.open();
-    }
+        /**
+         * Registers all the extras extended operations present in this control pack.
+         *
+         * @param codec The codec service.
+         */
+        private void registerExtrasExtendedOps( LdapApiService codec )
+        {
+            // --------------------------------------------------------------------
+            // Register Extended Request Factories
+            // --------------------------------------------------------------------
+
+            CancelFactory cancelFactory = new CancelFactory( codec );
+            codec.registerExtendedRequest( cancelFactory );
+
+            CertGenerationFactory certGenerationFactory = new CertGenerationFactory( codec );
+            codec.registerExtendedRequest( certGenerationFactory );
+
+            GracefulShutdownFactory gracefulShutdownFactory = new GracefulShutdownFactory( codec );
+            codec.registerExtendedRequest( gracefulShutdownFactory );
+
+            StoredProcedureFactory storedProcedureFactory = new StoredProcedureFactory( codec );
+            codec.registerExtendedRequest( storedProcedureFactory );
+
+            PasswordModifyFactory passwordModifyFactory = new PasswordModifyFactory( codec );
+            codec.registerExtendedRequest( passwordModifyFactory );
 
+            GracefulDisconnectFactory gracefulDisconnectFactory = new GracefulDisconnectFactory( codec );
+            codec.registerExtendedRequest( gracefulDisconnectFactory );
 
-    /**
-     * Registers all the extras controls present in this control pack.
-     *
-     * @param codec The codec service.
-     */
-    private void registerExtrasControls( LdapApiService codec )
-    {
-        ControlFactory<AdDirSync> adDirSyncFactory = new AdDirSyncFactory( codec );
-        codec.registerControl( adDirSyncFactory );
-        
-        ControlFactory<AdShowDeleted> adDeletedFactory = new AdShowDeletedFactory( codec );
-        codec.registerControl( adDeletedFactory );
-        
-        ControlFactory<ChangeNotifications> changeNotificationsFactory = new ChangeNotificationsFactory( codec );
-        codec.registerControl( changeNotificationsFactory );
-
-        ControlFactory<PasswordPolicy> passwordPolicyFactory = new PasswordPolicyFactory( codec );
-        codec.registerControl( passwordPolicyFactory );
-
-        ControlFactory<PermissiveModify> permissiveModifyFactory = new PermissiveModifyFactory( codec );
-        codec.registerControl( permissiveModifyFactory );
-
-        ControlFactory<SyncDoneValue> syncDoneValuefactory = new SyncDoneValueFactory( codec );
-        codec.registerControl( syncDoneValuefactory );
-
-        ControlFactory<SyncInfoValue> syncInfoValueFactory = new SyncInfoValueFactory( codec );
-        codec.registerControl( syncInfoValueFactory );
-
-        ControlFactory<SyncRequestValue> syncRequestValueFactory = new SyncRequestValueFactory( codec );
-        codec.registerControl( syncRequestValueFactory );
-
-        ControlFactory<SyncStateValue> syncStateValuefactory = new SyncStateValueFactory( codec );
-        codec.registerControl( syncStateValuefactory );
-
-        ControlFactory<VirtualListViewRequest> virtualListViewRequestFactory = new VirtualListViewRequestFactory( codec );
-        codec.registerControl( virtualListViewRequestFactory );
-
-        ControlFactory<VirtualListViewResponse> virtualListViewResponseFactory = new VirtualListViewResponseFactory(
-            codec );
-        codec.registerControl( virtualListViewResponseFactory );
-    }
-
-
-    /**
-     * Registers all the extras extended operations present in this control pack.
-     *
-     * @param codec The codec service.
-     */
-    private void registerExtrasExtendedOps( LdapApiService codec )
-    {
-        // --------------------------------------------------------------------
-        // Register Extended Request Factories
-        // --------------------------------------------------------------------
-
-        CancelFactory cancelFactory = new CancelFactory( codec );
-        codec.registerExtendedRequest( cancelFactory );
+            WhoAmIFactory whoAmIFactory = new WhoAmIFactory( codec );
+            codec.registerExtendedRequest( whoAmIFactory );
 
-        CertGenerationFactory certGenerationFactory = new CertGenerationFactory( codec );
-        codec.registerExtendedRequest( certGenerationFactory );
+            StartTlsFactory startTlsFactory = new StartTlsFactory( codec );
+            codec.registerExtendedRequest( startTlsFactory );
+        }
 
-        GracefulShutdownFactory gracefulShutdownFactory = new GracefulShutdownFactory( codec );
-        codec.registerExtendedRequest( gracefulShutdownFactory );
 
-        StoredProcedureFactory storedProcedureFactory = new StoredProcedureFactory( codec );
-        codec.registerExtendedRequest( storedProcedureFactory );
+        private void unregisterExtrasControls( LdapApiService codec )
+        {
+            codec.unregisterControl( AdDirSync.OID );
+            codec.unregisterControl( AdShowDeleted.OID );
+            codec.unregisterControl( ChangeNotifications.OID );
+            codec.unregisterControl( PasswordPolicy.OID );
+            codec.unregisterControl( SyncDoneValue.OID );
+            codec.unregisterControl( SyncInfoValue.OID );
+            codec.unregisterControl( SyncRequestValue.OID );
+            codec.unregisterControl( SyncStateValue.OID );
+            codec.unregisterControl( VirtualListViewRequest.OID );
+            codec.unregisterControl( VirtualListViewResponse.OID );
+        }
 
-        PasswordModifyFactory passwordModifyFactory = new PasswordModifyFactory( codec );
-        codec.registerExtendedRequest( passwordModifyFactory );
 
-        GracefulDisconnectFactory gracefulDisconnectFactory = new GracefulDisconnectFactory( codec );
-        codec.registerExtendedRequest( gracefulDisconnectFactory );
+        private void unregisterExtrasExtendedOps( LdapApiService codec )
+        {
+            codec.unregisterExtendedRequest( CancelRequest.EXTENSION_OID );
+            codec.unregisterExtendedRequest( CertGenerationRequest.EXTENSION_OID );
+            codec.unregisterExtendedRequest( GracefulShutdownRequest.EXTENSION_OID );
+            codec.unregisterExtendedRequest( StoredProcedureRequest.EXTENSION_OID );
+            codec.unregisterExtendedRequest( GracefulDisconnectResponse.EXTENSION_OID );
+            codec.unregisterExtendedRequest( PasswordModifyRequest.EXTENSION_OID );
+            codec.unregisterExtendedRequest( WhoAmIRequest.EXTENSION_OID );
+            codec.unregisterExtendedRequest( StartTlsRequest.EXTENSION_OID );
+        }
 
-        WhoAmIFactory whoAmIFactory = new WhoAmIFactory( codec );
-        codec.registerExtendedRequest( whoAmIFactory );
 
-        StartTlsFactory startTlsFactory = new StartTlsFactory( codec );
-        codec.registerExtendedRequest( startTlsFactory );
+        /**
+         * Registers all the extras controls present in this control pack.
+         *
+         * @param codec The codec service.
+         */
+        private void registerExtrasControls( LdapApiService codec )
+        {
+            ControlFactory<AdDirSync> adDirSyncFactory = new AdDirSyncFactory( codec );
+            codec.registerControl( adDirSyncFactory );
+            
+            ControlFactory<AdShowDeleted> adDeletedFactory = new AdShowDeletedFactory( codec );
+            codec.registerControl( adDeletedFactory );
+            
+            ControlFactory<ChangeNotifications> changeNotificationsFactory = new ChangeNotificationsFactory( codec );
+            codec.registerControl( changeNotificationsFactory );
+
+            ControlFactory<PasswordPolicy> passwordPolicyFactory = new PasswordPolicyFactory( codec );
+            codec.registerControl( passwordPolicyFactory );
+
+            ControlFactory<PermissiveModify> permissiveModifyFactory = new PermissiveModifyFactory( codec );
+            codec.registerControl( permissiveModifyFactory );
+
+            ControlFactory<SyncDoneValue> syncDoneValuefactory = new SyncDoneValueFactory( codec );
+            codec.registerControl( syncDoneValuefactory );
+
+            ControlFactory<SyncInfoValue> syncInfoValueFactory = new SyncInfoValueFactory( codec );
+            codec.registerControl( syncInfoValueFactory );
+
+            ControlFactory<SyncRequestValue> syncRequestValueFactory = new SyncRequestValueFactory( codec );
+            codec.registerControl( syncRequestValueFactory );
+
+            ControlFactory<SyncStateValue> syncStateValuefactory = new SyncStateValueFactory( codec );
+            codec.registerControl( syncStateValuefactory );
+
+            ControlFactory<VirtualListViewRequest> virtualListViewRequestFactory = new VirtualListViewRequestFactory( codec );
+            codec.registerControl( virtualListViewRequestFactory );
+
+            ControlFactory<VirtualListViewResponse> virtualListViewResponseFactory = new VirtualListViewResponseFactory(
+                codec );
+            codec.registerControl( virtualListViewResponseFactory );
+        }
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public void stop( BundleContext context ) throws Exception
-    {
-        serviceTracker.close();
-    }
-
-
-    private void unregisterExtrasControls( LdapApiService codec )
+    @Override
+    public void start( BundleContext context ) throws Exception
     {
-        codec.unregisterControl( AdDirSync.OID );
-        codec.unregisterControl( AdShowDeleted.OID );
-        codec.unregisterControl( ChangeNotifications.OID );
-        codec.unregisterControl( PasswordPolicy.OID );
-        codec.unregisterControl( SyncDoneValue.OID );
-        codec.unregisterControl( SyncInfoValue.OID );
-        codec.unregisterControl( SyncRequestValue.OID );
-        codec.unregisterControl( SyncStateValue.OID );
-        codec.unregisterControl( VirtualListViewRequest.OID );
-        codec.unregisterControl( VirtualListViewResponse.OID );
+        LdapApiServiceTracker ldapApiServiceTracker = new LdapApiServiceTracker( context );
+        serviceTracker = new ServiceTracker<>(
+            context, LdapApiService.class, ldapApiServiceTracker );
+        serviceTracker.open();
     }
-
-
-    private void unregisterExtrasExtendedOps( LdapApiService codec )
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void stop( BundleContext context ) throws Exception
     {
-        codec.unregisterExtendedRequest( CancelRequest.EXTENSION_OID );
-        codec.unregisterExtendedRequest( CertGenerationRequest.EXTENSION_OID );
-        codec.unregisterExtendedRequest( GracefulShutdownRequest.EXTENSION_OID );
-        codec.unregisterExtendedRequest( StoredProcedureRequest.EXTENSION_OID );
-        codec.unregisterExtendedRequest( GracefulDisconnectResponse.EXTENSION_OID );
-        codec.unregisterExtendedRequest( PasswordModifyRequest.EXTENSION_OID );
-        codec.unregisterExtendedRequest( WhoAmIRequest.EXTENSION_OID );
-        codec.unregisterExtendedRequest( StartTlsRequest.EXTENSION_OID );
+        serviceTracker.close();
     }
 }

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncDecorator.java Sun Nov 27 10:27:52 2016
@@ -76,6 +76,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getParentFirst()
     {
         return getDecorated().getParentFirst();
@@ -85,6 +86,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setParentFirst( int parentFirst )
     {
         getDecorated().setParentFirst( parentFirst );
@@ -94,6 +96,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public AdDirSyncFlag getFlag()
     {
         return getDecorated().getFlag();
@@ -103,6 +106,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setFlag( AdDirSyncFlag flag )
     {
         getDecorated().setFlag( flag );
@@ -112,6 +116,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getMaxReturnLength()
     {
         return getDecorated().getMaxReturnLength();
@@ -121,6 +126,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setMaxReturnLength( int maxReturnLength )
     {
         getDecorated().setMaxReturnLength( maxReturnLength );
@@ -130,6 +136,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getCookie()
     {
         return getDecorated().getCookie();
@@ -139,6 +146,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setCookie( byte[] cookie )
     {
         // Copy the bytes
@@ -266,6 +274,7 @@ public class AdDirSyncDecorator extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncFactory.java Sun Nov 27 10:27:52 2016
@@ -52,6 +52,7 @@ public class AdDirSyncFactory implements
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return AdDirSync.OID;
@@ -61,6 +62,7 @@ public class AdDirSyncFactory implements
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<AdDirSync> newCodecControl()
     {
         return new AdDirSyncDecorator( codec );
@@ -70,6 +72,7 @@ public class AdDirSyncFactory implements
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<AdDirSync> newCodecControl( AdDirSync control )
     {
         return new AdDirSyncDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncStatesEnum.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncStatesEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncStatesEnum.java Sun Nov 27 10:27:52 2016
@@ -20,7 +20,6 @@
 package org.apache.directory.api.ldap.extras.controls.ad_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -56,33 +55,15 @@ public enum AdDirSyncStatesEnum implemen
     /**
      * Get the grammar name
      * 
-     * @param grammar The grammar code
      * @return The grammar name
      */
-    public String getGrammarName( int grammar )
+    public String getGrammarName()
     {
         return "AD_DIR_SYNC_GRAMMAR";
     }
 
 
     /**
-     * Get the grammar name
-     * 
-     * @param grammar The grammar class
-     * @return The grammar name
-     */
-    public String getGrammarName( Grammar<AdDirSyncContainer> grammar )
-    {
-        if ( grammar instanceof AdDirSyncGrammar )
-        {
-            return "AD_DIR_SYNC_GRAMMAR";
-        }
-
-        return "UNKNOWN GRAMMAR";
-    }
-
-
-    /**
      * Get the string representing the state
      * 
      * @param state The state number
@@ -90,13 +71,14 @@ public enum AdDirSyncStatesEnum implemen
      */
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "AD_DIR_SYNC_GRAMMAR" : this.name() );
+        return ( state == END_STATE.ordinal() ) ? "AD_DIR_SYNC_GRAMMAR" : name();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isEndState()
     {
         return this == END_STATE;
@@ -106,6 +88,7 @@ public enum AdDirSyncStatesEnum implemen
     /**
      * {@inheritDoc}
      */
+    @Override
     public AdDirSyncStatesEnum getStartState()
     {
         return START_STATE;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedDecorator.java Sun Nov 27 10:27:52 2016
@@ -53,6 +53,7 @@ public class AdShowDeletedDecorator exte
     /**
      * Returns the default control length.
      */
+    @Override
     public int computeLength()
     {
         return 0;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdShowDeletedFactory.java Sun Nov 27 10:27:52 2016
@@ -53,6 +53,7 @@ public class AdShowDeletedFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return AdShowDeleted.OID;
@@ -62,6 +63,7 @@ public class AdShowDeletedFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<AdShowDeleted> newCodecControl()
     {
         return new AdShowDeletedDecorator( codec, new AdShowDeletedImpl() );
@@ -71,6 +73,7 @@ public class AdShowDeletedFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<AdShowDeleted> newCodecControl( AdShowDeleted control )
     {
         return new AdShowDeletedDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsDecorator.java Sun Nov 27 10:27:52 2016
@@ -53,6 +53,7 @@ public class ChangeNotificationsDecorato
     /**
      * Returns 0 every time.
      */
+    @Override
     public int computeLength()
     {
         return 0;
@@ -62,6 +63,7 @@ public class ChangeNotificationsDecorato
     /**
      * {@inheritDoc}
      */
+    @Override
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
         return this;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/changeNotifications_impl/ChangeNotificationsFactory.java Sun Nov 27 10:27:52 2016
@@ -53,6 +53,7 @@ public class ChangeNotificationsFactory
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return ChangeNotifications.OID;
@@ -62,6 +63,7 @@ public class ChangeNotificationsFactory
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<ChangeNotifications> newCodecControl()
     {
         return new ChangeNotificationsDecorator( codec, new ChangeNotificationsImpl() );
@@ -71,6 +73,7 @@ public class ChangeNotificationsFactory
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<ChangeNotifications> newCodecControl( ChangeNotifications control )
     {
         return new ChangeNotificationsDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java Sun Nov 27 10:27:52 2016
@@ -220,6 +220,7 @@ public class PasswordPolicyDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
         if ( !hasResponse() )
@@ -238,6 +239,7 @@ public class PasswordPolicyDecorator ext
      *
      * {@inheritDoc}
      */
+    @Override
     public boolean hasResponse()
     {
         return getDecorated().hasResponse();
@@ -248,6 +250,7 @@ public class PasswordPolicyDecorator ext
      *
      * {@inheritDoc}
      */
+    @Override
     public void setResponse( PasswordPolicyResponse response )
     {
         getDecorated().setResponse( response );
@@ -258,6 +261,7 @@ public class PasswordPolicyDecorator ext
      *
      * {@inheritDoc}
      */
+    @Override
     public PasswordPolicyResponse setResponse( boolean hasResponse )
     {
         return getDecorated().setResponse( hasResponse );
@@ -268,6 +272,7 @@ public class PasswordPolicyDecorator ext
      *
      * {@inheritDoc}
      */
+    @Override
     public PasswordPolicyResponse getResponse()
     {
         return getDecorated().getResponse();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java Sun Nov 27 10:27:52 2016
@@ -53,6 +53,7 @@ public class PasswordPolicyFactory imple
      * 
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return PasswordPolicy.OID;
@@ -63,6 +64,7 @@ public class PasswordPolicyFactory imple
      * 
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<PasswordPolicy> newCodecControl()
     {
         return new PasswordPolicyDecorator( codec );
@@ -73,6 +75,7 @@ public class PasswordPolicyFactory imple
      * 
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<PasswordPolicy> newCodecControl( PasswordPolicy control )
     {
         return new PasswordPolicyDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java Sun Nov 27 10:27:52 2016
@@ -21,7 +21,6 @@
 package org.apache.directory.api.ldap.extras.controls.ppolicy_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -40,24 +39,13 @@ public enum PasswordPolicyStates impleme
     PPOLICY_ERROR_TAG_STATE,
     END_STATE;
 
-    /**
-     * {@inheritDoc}
-     */
-    public String getGrammarName( Grammar<?> grammar )
-    {
-        if ( grammar instanceof PasswordPolicyGrammar )
-        {
-            return "PASSWORD_POLICY_RESPONSE_CONTROL_GRAMMAR";
-        }
-
-        return "UNKNOWN_GRAMMAR";
-    }
-
 
     /**
-     * {@inheritDoc}
+     * Get the grammar name
+     * 
+     * @return The grammar name
      */
-    public String getGrammarName( int grammar )
+    public String getGrammarName()
     {
         return "PASSWORD_POLICY_RESPONSE_CONTROL_GRAMMAR";
     }
@@ -68,13 +56,14 @@ public enum PasswordPolicyStates impleme
      */
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "PASSWORD_POLICY_RESPONSE_CONTROL_GRAMMAR" : name() );
+        return ( state == END_STATE.ordinal() ) ? "PASSWORD_POLICY_RESPONSE_CONTROL_GRAMMAR" : name();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isEndState()
     {
         return this == END_STATE;
@@ -84,6 +73,7 @@ public enum PasswordPolicyStates impleme
     /**
      * {@inheritDoc}
      */
+    @Override
     public PasswordPolicyStates getStartState()
     {
         return START_STATE;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java Sun Nov 27 10:27:52 2016
@@ -182,6 +182,7 @@ public class SyncDoneValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getCookie()
     {
         return getDecorated().getCookie();
@@ -191,6 +192,7 @@ public class SyncDoneValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setCookie( byte[] cookie )
     {
         // Copy the bytes
@@ -210,6 +212,7 @@ public class SyncDoneValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isRefreshDeletes()
     {
         return getDecorated().isRefreshDeletes();
@@ -219,6 +222,7 @@ public class SyncDoneValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setRefreshDeletes( boolean refreshDeletes )
     {
         getDecorated().setRefreshDeletes( refreshDeletes );
@@ -228,6 +232,7 @@ public class SyncDoneValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java Sun Nov 27 10:27:52 2016
@@ -52,6 +52,7 @@ public class SyncDoneValueFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return SyncDoneValue.OID;
@@ -61,6 +62,7 @@ public class SyncDoneValueFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncDoneValue> newCodecControl()
     {
         return new SyncDoneValueDecorator( codec );
@@ -70,6 +72,7 @@ public class SyncDoneValueFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncDoneValue> newCodecControl( SyncDoneValue control )
     {
         return new SyncDoneValueDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java Sun Nov 27 10:27:52 2016
@@ -20,7 +20,6 @@
 package org.apache.directory.api.ldap.extras.controls.syncrepl_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -53,33 +52,15 @@ public enum SyncDoneValueStatesEnum impl
     /**
      * Get the grammar name
      * 
-     * @param grammar The grammar code
      * @return The grammar name
      */
-    public String getGrammarName( int grammar )
+    public String getGrammarName()
     {
         return "SYNC_DONE_VALUE_GRAMMAR";
     }
 
 
     /**
-     * Get the grammar name
-     * 
-     * @param grammar The grammar class
-     * @return The grammar name
-     */
-    public String getGrammarName( Grammar<SyncDoneValueContainer> grammar )
-    {
-        if ( grammar instanceof SyncDoneValueGrammar )
-        {
-            return "SYNC_DONE_VALUE_GRAMMAR";
-        }
-
-        return "UNKNOWN GRAMMAR";
-    }
-
-
-    /**
      * Get the string representing the state
      * 
      * @param state The state number
@@ -87,13 +68,14 @@ public enum SyncDoneValueStatesEnum impl
      */
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "SYNC_DONE_VALUE_GRAMMAR" : this.name() );
+        return ( state == END_STATE.ordinal() ) ? "SYNC_DONE_VALUE_GRAMMAR" : name();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isEndState()
     {
         return this == END_STATE;
@@ -103,6 +85,7 @@ public enum SyncDoneValueStatesEnum impl
     /**
      * {@inheritDoc}
      */
+    @Override
     public SyncDoneValueStatesEnum getStartState()
     {
         return START_STATE;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java Sun Nov 27 10:27:52 2016
@@ -101,6 +101,7 @@ public class SyncInfoValueContainer exte
     /**
      * Clean the container
      */
+    @Override
     public void clean()
     {
         super.clean();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java Sun Nov 27 10:27:52 2016
@@ -53,6 +53,9 @@ public class SyncInfoValueDecorator exte
     /** An instance of this decoder */
     private static final Asn1Decoder DECODER = new Asn1Decoder();
 
+    /** The global length for this control */
+    private int syncInfoValueLength;
+
 
     /**
      * The constructor for this codec. Dont't forget to set the type.
@@ -91,13 +94,11 @@ public class SyncInfoValueDecorator exte
         setType( type );
     }
 
-    /** The global length for this control */
-    private int syncInfoValueLength;
-
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public SynchronizationInfoEnum getType()
     {
         return getDecorated().getType();
@@ -107,6 +108,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setType( SynchronizationInfoEnum type )
     {
         this.getDecorated().setType( type );
@@ -122,6 +124,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getCookie()
     {
         return getDecorated().getCookie();
@@ -131,6 +134,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setCookie( byte[] cookie )
     {
         // Copy the bytes
@@ -150,6 +154,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isRefreshDone()
     {
         return getDecorated().isRefreshDone();
@@ -159,6 +164,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setRefreshDone( boolean refreshDone )
     {
         getDecorated().setRefreshDone( refreshDone );
@@ -168,6 +174,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isRefreshDeletes()
     {
         return getDecorated().isRefreshDeletes();
@@ -177,6 +184,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setRefreshDeletes( boolean refreshDeletes )
     {
         getDecorated().setRefreshDeletes( refreshDeletes );
@@ -186,6 +194,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<byte[]> getSyncUUIDs()
     {
         return getDecorated().getSyncUUIDs();
@@ -195,6 +204,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setSyncUUIDs( List<byte[]> syncUUIDs )
     {
         getDecorated().setSyncUUIDs( syncUUIDs );
@@ -204,6 +214,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addSyncUUID( byte[] syncUUID )
     {
         getDecorated().addSyncUUID( syncUUID );
@@ -291,7 +302,7 @@ public class SyncInfoValueDecorator exte
                 // The syncUUIDs if any
                 syncUUIDsLength = 0;
 
-                if ( getSyncUUIDs().size() != 0 )
+                if ( !getSyncUUIDs().isEmpty() )
                 {
                     for ( byte[] syncUUID : getSyncUUIDs() )
                     {
@@ -410,7 +421,7 @@ public class SyncInfoValueDecorator exte
                 buffer.put( TLV.getBytes( syncUUIDsLength ) );
 
                 // Loop on the UUIDs if any
-                if ( getSyncUUIDs().size() != 0 )
+                if ( !getSyncUUIDs().isEmpty() )
                 {
                     for ( byte[] syncUUID : getSyncUUIDs() )
                     {
@@ -521,7 +532,7 @@ public class SyncInfoValueDecorator exte
                         buffer.put( TLV.getBytes( syncUUIDsLength ) );
 
                         // Loop on the UUIDs if any
-                        if ( getSyncUUIDs().size() != 0 )
+                        if ( !getSyncUUIDs().isEmpty() )
                         {
                             for ( byte[] syncUUID : getSyncUUIDs() )
                             {
@@ -550,6 +561,7 @@ public class SyncInfoValueDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
@@ -562,6 +574,7 @@ public class SyncInfoValueDecorator exte
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         return getDecorated().toString();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java Sun Nov 27 10:27:52 2016
@@ -52,6 +52,7 @@ public class SyncInfoValueFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return SyncInfoValue.OID;
@@ -61,6 +62,7 @@ public class SyncInfoValueFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncInfoValue> newCodecControl()
     {
         return new SyncInfoValueDecorator( codec );
@@ -70,6 +72,7 @@ public class SyncInfoValueFactory implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncInfoValue> newCodecControl( SyncInfoValue control )
     {
         return new SyncInfoValueDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueStatesEnum.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueStatesEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueStatesEnum.java Sun Nov 27 10:27:52 2016
@@ -20,7 +20,6 @@
 package org.apache.directory.api.ldap.extras.controls.syncrepl_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -86,33 +85,15 @@ public enum SyncInfoValueStatesEnum impl
     /**
      * Get the grammar name
      * 
-     * @param grammar The grammar code
      * @return The grammar name
      */
-    public String getGrammarName( int grammar )
+    public String getGrammarName()
     {
         return "SYNC_INFO_VALUE_GRAMMAR";
     }
 
 
     /**
-     * Get the grammar name
-     * 
-     * @param grammar The grammar class
-     * @return The grammar name
-     */
-    public String getGrammarName( Grammar<SyncInfoValueContainer> grammar )
-    {
-        if ( grammar instanceof SyncInfoValueGrammar )
-        {
-            return "SYNC_INFO_VALUE_GRAMMAR";
-        }
-
-        return "UNKNOWN GRAMMAR";
-    }
-
-
-    /**
      * Get the string representing the state
      * 
      * @param state The state number
@@ -120,13 +101,14 @@ public enum SyncInfoValueStatesEnum impl
      */
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "SYNC_INFO_VALUE_END_STATE" : this.name() );
+        return ( state == END_STATE.ordinal() ) ? "SYNC_INFO_VALUE_END_STATE" : name();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isEndState()
     {
         return this == END_STATE;
@@ -136,6 +118,7 @@ public enum SyncInfoValueStatesEnum impl
     /**
      * {@inheritDoc}
      */
+    @Override
     public SyncInfoValueStatesEnum getStartState()
     {
         return START_STATE;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueContainer.java Sun Nov 27 10:27:52 2016
@@ -86,6 +86,7 @@ public class SyncRequestValueContainer e
     /**
      * Clean the container
      */
+    @Override
     public void clean()
     {
         super.clean();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java Sun Nov 27 10:27:52 2016
@@ -67,6 +67,7 @@ public class SyncRequestValueDecorator e
     /**
      * {@inheritDoc}
      */
+    @Override
     public SynchronizationModeEnum getMode()
     {
         return getDecorated().getMode();
@@ -76,6 +77,7 @@ public class SyncRequestValueDecorator e
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setMode( SynchronizationModeEnum mode )
     {
         getDecorated().setMode( mode );
@@ -85,6 +87,7 @@ public class SyncRequestValueDecorator e
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getCookie()
     {
         return getDecorated().getCookie();
@@ -94,6 +97,7 @@ public class SyncRequestValueDecorator e
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setCookie( byte[] cookie )
     {
         // Copy the bytes
@@ -113,6 +117,7 @@ public class SyncRequestValueDecorator e
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isReloadHint()
     {
         return getDecorated().isReloadHint();
@@ -122,6 +127,7 @@ public class SyncRequestValueDecorator e
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setReloadHint( boolean reloadHint )
     {
         getDecorated().setReloadHint( reloadHint );
@@ -256,11 +262,13 @@ public class SyncRequestValueDecorator e
     /**
      * {@inheritDoc}
      */
+    @Override
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         SyncRequestValueContainer container = new SyncRequestValueContainer( this );
         DECODER.decode( bb, container );
+        
         return this;
     }
 }

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java Sun Nov 27 10:27:52 2016
@@ -52,6 +52,7 @@ public class SyncRequestValueFactory imp
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return SyncRequestValue.OID;
@@ -61,6 +62,7 @@ public class SyncRequestValueFactory imp
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncRequestValue> newCodecControl()
     {
         return new SyncRequestValueDecorator( codec );
@@ -70,6 +72,7 @@ public class SyncRequestValueFactory imp
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncRequestValue> newCodecControl( SyncRequestValue control )
     {
         return new SyncRequestValueDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueStatesEnum.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueStatesEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueStatesEnum.java Sun Nov 27 10:27:52 2016
@@ -20,7 +20,6 @@
 package org.apache.directory.api.ldap.extras.controls.syncrepl_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -62,33 +61,15 @@ public enum SyncRequestValueStatesEnum i
     /**
      * Get the grammar name
      * 
-     * @param grammar The grammar code
      * @return The grammar name
      */
-    public String getGrammarName( int grammar )
+    public String getGrammarName()
     {
         return "SYNC_REQUEST_VALUE_GRAMMAR";
     }
 
 
     /**
-     * Get the grammar name
-     * 
-     * @param grammar The grammar class
-     * @return The grammar name
-     */
-    public String getGrammarName( Grammar<SyncRequestValueContainer> grammar )
-    {
-        if ( grammar instanceof SyncRequestValueGrammar )
-        {
-            return "SYNC_REQUEST_VALUE_GRAMMAR";
-        }
-
-        return "UNKNOWN GRAMMAR";
-    }
-
-
-    /**
      * Get the string representing the state
      * 
      * @param state The state number
@@ -96,13 +77,14 @@ public enum SyncRequestValueStatesEnum i
      */
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "SYNC_REQUEST_VALUE_END_STATE" : this.name() );
+        return ( state == END_STATE.ordinal() ) ? "SYNC_REQUEST_VALUE_END_STATE" : name();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isEndState()
     {
         return this == END_STATE;
@@ -112,6 +94,7 @@ public enum SyncRequestValueStatesEnum i
     /**
      * {@inheritDoc}
      */
+    @Override
     public SyncRequestValueStatesEnum getStartState()
     {
         return START_STATE;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueContainer.java Sun Nov 27 10:27:52 2016
@@ -86,6 +86,7 @@ public class SyncStateValueContainer ext
     /**
      * Clean the container
      */
+    @Override
     public void clean()
     {
         super.clean();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java Sun Nov 27 10:27:52 2016
@@ -66,6 +66,7 @@ public class SyncStateValueDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getCookie()
     {
         return getDecorated().getCookie();
@@ -75,6 +76,7 @@ public class SyncStateValueDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setCookie( byte[] cookie )
     {
         getDecorated().setCookie( cookie );
@@ -84,6 +86,7 @@ public class SyncStateValueDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public SyncStateTypeEnum getSyncStateType()
     {
         return getDecorated().getSyncStateType();
@@ -93,6 +96,7 @@ public class SyncStateValueDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setSyncStateType( SyncStateTypeEnum syncStateType )
     {
         getDecorated().setSyncStateType( syncStateType );
@@ -102,6 +106,7 @@ public class SyncStateValueDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getEntryUUID()
     {
         return getDecorated().getEntryUUID();
@@ -111,6 +116,7 @@ public class SyncStateValueDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setEntryUUID( byte[] entryUUID )
     {
         getDecorated().setEntryUUID( entryUUID );
@@ -234,6 +240,7 @@ public class SyncStateValueDecorator ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java Sun Nov 27 10:27:52 2016
@@ -52,6 +52,7 @@ public class SyncStateValueFactory imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return SyncStateValue.OID;
@@ -61,6 +62,7 @@ public class SyncStateValueFactory imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncStateValue> newCodecControl()
     {
         return new SyncStateValueDecorator( codec );
@@ -70,6 +72,7 @@ public class SyncStateValueFactory imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public CodecControl<SyncStateValue> newCodecControl( SyncStateValue control )
     {
         return new SyncStateValueDecorator( codec, control );

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueStatesEnum.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueStatesEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueStatesEnum.java Sun Nov 27 10:27:52 2016
@@ -20,7 +20,6 @@
 package org.apache.directory.api.ldap.extras.controls.syncrepl_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -59,33 +58,15 @@ public enum SyncStateValueStatesEnum imp
     /**
      * Get the grammar name
      * 
-     * @param grammar The grammar code
      * @return The grammar name
      */
-    public String getGrammarName( int grammar )
+    public String getGrammarName()
     {
         return "SYNC_REQUEST_VALUE_GRAMMAR";
     }
 
 
     /**
-     * Get the grammar name
-     * 
-     * @param grammar The grammar class
-     * @return The grammar name
-     */
-    public String getGrammarName( Grammar<SyncStateValueContainer> grammar )
-    {
-        if ( grammar instanceof SyncStateValueGrammar )
-        {
-            return "SYNC_STATE_VALUE_GRAMMAR";
-        }
-
-        return "UNKNOWN GRAMMAR";
-    }
-
-
-    /**
      * Get the string representing the state
      * 
      * @param state The state number
@@ -93,13 +74,14 @@ public enum SyncStateValueStatesEnum imp
      */
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "SYNC_STATE_VALUE_END_STATE" : this.name() );
+        return ( state == END_STATE.ordinal() ) ? "SYNC_STATE_VALUE_END_STATE" : name();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isEndState()
     {
         return this == END_STATE;
@@ -109,6 +91,7 @@ public enum SyncStateValueStatesEnum imp
     /**
      * {@inheritDoc}
      */
+    @Override
     public SyncStateValueStatesEnum getStartState()
     {
         return START_STATE;

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestContainer.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestContainer.java Sun Nov 27 10:27:52 2016
@@ -79,6 +79,10 @@ public class VirtualListViewRequestConta
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void clean()
     {
         super.clean();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestDecorator.java Sun Nov 27 10:27:52 2016
@@ -66,6 +66,7 @@ public class VirtualListViewRequestDecor
     /**
      * {@inheritDoc}
      */
+    @Override
     public int computeLength()
     {
         vlvSeqLength = 1 + 1 + BerValue.getNbBytes( getBeforeCount() );
@@ -108,6 +109,7 @@ public class VirtualListViewRequestDecor
     /**
      * {@inheritDoc}
      */
+    @Override
     public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
     {
         if ( buffer == null )
@@ -161,6 +163,7 @@ public class VirtualListViewRequestDecor
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getValue()
     {
         if ( value == null )

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java Sun Nov 27 10:27:52 2016
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 
 
 /**
- * TODO VirtualListViewRequestGrammar.
+ * The VLV grammar
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestStates.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestStates.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestStates.java Sun Nov 27 10:27:52 2016
@@ -21,7 +21,6 @@
 package org.apache.directory.api.ldap.extras.controls.vlv_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -44,26 +43,20 @@ public enum VirtualListViewRequestStates
     VLV_ASSERTION_VALUE_STATE,
     END_STATE;
 
-    public String getGrammarName( int grammar )
+    /**
+     * Get the grammar name
+     * 
+     * @return The grammar name
+     */
+    public String getGrammarName()
     {
         return "VLV_REQUEST_GRAMMAR";
     }
 
 
-    public String getGrammarName( Grammar<?> grammar )
-    {
-        if ( grammar instanceof VirtualListViewRequestGrammar )
-        {
-            return "VLV_REQUEST_GRAMMAR";
-        }
-
-        return "UNKNOWN GRAMMAR";
-    }
-
-
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "VLV_REQUEST_END_STATE" : name() );
+        return ( state == END_STATE.ordinal() ) ? "VLV_REQUEST_END_STATE" : name();
     }
 
 

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseContainer.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseContainer.java Sun Nov 27 10:27:52 2016
@@ -79,6 +79,10 @@ public class VirtualListViewResponseCont
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void clean()
     {
         super.clean();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseDecorator.java Sun Nov 27 10:27:52 2016
@@ -66,6 +66,7 @@ public class VirtualListViewResponseDeco
     /**
      * {@inheritDoc}
      */
+    @Override
     public int computeLength()
     {
         vlvSeqLength = 1 + 1 + BerValue.getNbBytes( getTargetPosition() );
@@ -88,6 +89,7 @@ public class VirtualListViewResponseDeco
     /**
      * {@inheritDoc}
      */
+    @Override
     public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
     {
         if ( buffer == null )
@@ -115,6 +117,7 @@ public class VirtualListViewResponseDeco
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getValue()
     {
         if ( value == null )

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseStates.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseStates.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseStates.java Sun Nov 27 10:27:52 2016
@@ -21,7 +21,6 @@
 package org.apache.directory.api.ldap.extras.controls.vlv_impl;
 
 
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
 import org.apache.directory.api.asn1.ber.grammar.States;
 
 
@@ -41,26 +40,20 @@ public enum VirtualListViewResponseState
     VLV_CONTEXT_ID_STATE,
     END_STATE;
 
-    public String getGrammarName( int grammar )
+    /**
+     * Get the grammar name
+     * 
+     * @return The grammar name
+     */
+    public String getGrammarName()
     {
         return "VLV_RESPONSE_GRAMMAR";
     }
 
 
-    public String getGrammarName( Grammar<?> grammar )
-    {
-        if ( grammar instanceof VirtualListViewResponseGrammar )
-        {
-            return "VLV_RESPONSE_GRAMMAR";
-        }
-
-        return "UNKNOWN GRAMMAR";
-    }
-
-
     public String getState( int state )
     {
-        return ( ( state == END_STATE.ordinal() ) ? "VLV_RESPONSE_END_STATE" : name() );
+        return ( state == END_STATE.ordinal() ) ? "VLV_RESPONSE_END_STATE" : name();
     }
 
 

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.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/cancel/CancelContainer.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java Sun Nov 27 10:27:52 2016
@@ -70,6 +70,7 @@ public class CancelContainer extends Abs
     /**
      * Clean the container for the next decoding.
      */
+    @Override
     public void clean()
     {
         super.clean();

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.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/cancel/CancelFactory.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java Sun Nov 27 10:27:52 2016
@@ -51,6 +51,7 @@ public class CancelFactory implements Ex
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOid()
     {
         return CancelRequest.EXTENSION_OID;
@@ -60,6 +61,7 @@ public class CancelFactory implements Ex
     /**
      * {@inheritDoc}
      */
+    @Override
     public CancelResponse newResponse( byte[] encodedValue ) throws DecoderException
     {
         CancelResponseDecorator response = new CancelResponseDecorator( codec, new CancelResponseImpl() );
@@ -72,6 +74,7 @@ public class CancelFactory implements Ex
     /**
      * {@inheritDoc}
      */
+    @Override
     public CancelRequest newRequest( byte[] value )
     {
         CancelRequestDecorator req = new CancelRequestDecorator( codec, new CancelRequestImpl() );
@@ -84,6 +87,7 @@ public class CancelFactory implements Ex
     /**
      * {@inheritDoc}
      */
+    @Override
     public CancelRequestDecorator decorate( ExtendedRequest modelRequest )
     {
         if ( modelRequest instanceof CancelRequestDecorator )
@@ -98,6 +102,7 @@ public class CancelFactory implements Ex
     /**
      * {@inheritDoc}
      */
+    @Override
     public CancelResponseDecorator decorate( ExtendedResponse decoratedMessage )
     {
         if ( decoratedMessage instanceof CancelResponseDecorator )

Modified: directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.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/cancel/CancelRequestDecorator.java?rev=1771553&r1=1771552&r2=1771553&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java Sun Nov 27 10:27:52 2016
@@ -63,6 +63,7 @@ public class CancelRequestDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getCancelId()
     {
         return cancelRequest.getCancelId();
@@ -72,6 +73,7 @@ public class CancelRequestDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setCancelId( int cancelId )
     {
         if ( cancelId == cancelRequest.getCancelId() )
@@ -87,6 +89,7 @@ public class CancelRequestDecorator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getRequestValue()
     {
         if ( requestValue == null )




Mime
View raw message