From 250c9bdd3c13d06682fd9f06f11ff2e426ac353a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 29 Mar 2016 10:16:14 +0000
Subject: [PATCH] Prep work for OPENDJ-2803 Migrate Attribute

---
 opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java |   43 +------------------------------------------
 1 files changed, 1 insertions(+), 42 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
index 59a9c24..9bab045 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -77,9 +77,6 @@
     super();
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      SevenBitCleanPluginCfg configuration)
@@ -106,18 +103,12 @@
     }
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
     currentConfig.removeSevenBitCleanChangeListener(this);
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public final PluginResult.ImportLDIF
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
@@ -125,7 +116,6 @@
     // Get the current configuration for this plugin.
     SevenBitCleanPluginCfg config = currentConfig;
 
-
     // Make sure that the entry is within the scope of this plugin.  While
     // processing an LDIF import, we don't have access to the set of public
     // naming contexts defined in the server, so if no explicit set of base DNs
@@ -136,7 +126,6 @@
       return PluginResult.ImportLDIF.continueEntryProcessing();
     }
 
-
     // Make sure all configured attributes have clean values.
     for (AttributeType t : config.getAttributeType())
     {
@@ -147,21 +136,17 @@
           if (!is7BitClean(v))
           {
             LocalizableMessage rejectMessage =
-                 ERR_PLUGIN_7BIT_IMPORT_ATTR_NOT_CLEAN.get(a.getNameWithOptions());
+                 ERR_PLUGIN_7BIT_IMPORT_ATTR_NOT_CLEAN.get(a.getAttributeDescription());
             return PluginResult.ImportLDIF.stopEntryProcessing(rejectMessage);
           }
         }
       }
     }
 
-
     // If we've gotten here, then everything is acceptable.
     return PluginResult.ImportLDIF.continueEntryProcessing();
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreParse
                doPreParse(PreParseAddOperation addOperation)
@@ -169,7 +154,6 @@
     // Get the current configuration for this plugin.
     SevenBitCleanPluginCfg config = currentConfig;
 
-
     // If the entry is within the scope of this plugin, then make sure all
     // configured attributes have clean values.
     DN entryDN;
@@ -218,14 +202,10 @@
       }
     }
 
-
     // If we've gotten here, then everything is acceptable.
     return PluginResult.PreParse.continueOperationProcessing();
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreParse
                     doPreParse(PreParseModifyOperation modifyOperation)
@@ -233,7 +213,6 @@
     // Get the current configuration for this plugin.
     SevenBitCleanPluginCfg config = currentConfig;
 
-
     // If the target entry is within the scope of this plugin, then make sure
     // all values that will be added during the modification will be acceptable.
     DN entryDN;
@@ -294,14 +273,10 @@
       }
     }
 
-
     // If we've gotten here, then everything is acceptable.
     return PluginResult.PreParse.continueOperationProcessing();
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreParse
                     doPreParse(PreParseModifyDNOperation modifyDNOperation)
@@ -309,7 +284,6 @@
     // Get the current configuration for this plugin.
     SevenBitCleanPluginCfg config = currentConfig;
 
-
     // If the target entry is within the scope of this plugin, then make sure
     // all values that will be added during the modification will be acceptable.
     DN entryDN;
@@ -354,13 +328,10 @@
       }
     }
 
-
     // If we've gotten here, then everything is acceptable.
     return PluginResult.PreParse.continueOperationProcessing();
   }
 
-
-
   /**
    * Indicates whether the provided DN is within the scope of this plugin.
    *
@@ -395,8 +366,6 @@
     return false;
   }
 
-
-
   /**
    * Indicates whether the provided value is 7-bit clean.
    *
@@ -418,9 +387,6 @@
     return true;
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -429,9 +395,6 @@
     return isConfigurationChangeAcceptable(cfg, unacceptableReasons);
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       SevenBitCleanPluginCfg configuration,
@@ -451,7 +414,6 @@
           // These are acceptable.
           break;
 
-
         default:
           unacceptableReasons.add(ERR_PLUGIN_7BIT_INVALID_PLUGIN_TYPE.get(pluginType));
           configAcceptable = false;
@@ -461,9 +423,6 @@
     return configAcceptable;
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  SevenBitCleanPluginCfg configuration)

--
Gitblit v1.10.0