From 3c47c41e9ebd977095879ade126e348ee0b2d5d9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 09:05:10 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java | 27
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java | 53 -
opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java | 29
opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java | 29
opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java | 31
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java | 23
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java | 31
opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java | 29
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java | 27
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java | 30
opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java | 9
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java | 33
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 55 -
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java | 23
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java | 35
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java | 23
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 14
opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java | 29
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java | 37 -
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 47
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java | 22
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java | 31
opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java | 29
opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java | 27
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java | 29
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java | 23
opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java | 24
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java | 27
opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java | 14
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java | 29
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java | 31
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java | 33
opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java | 29
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java | 12
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java | 86 --
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java | 27
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java | 31
opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java | 31
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 47 -
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java | 24
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java | 29
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java | 40
opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java | 23
opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java | 29
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java | 25
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java | 21
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java | 25
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java | 25
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java | 27
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java | 25
59 files changed, 425 insertions(+), 1,243 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
index 098ef23..08c63b9 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -1576,7 +1576,7 @@
String oid = matchingRule.getOID();
values.add(oid);
- String name = matchingRule.getName();
+ String name = matchingRule.getNameOrOID();
if (name != null)
{
values.add(name);
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
index 2899dde..7367acd 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
@@ -209,7 +209,7 @@
*/
public void update(MatchingRule matchingRule, Schema schema)
{
- String n = matchingRule.getName();
+ String n = matchingRule.getNameOrOID();
if (n == null)
{
n = NOT_APPLICABLE.toString();
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index 3775723..ecb2457 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -26,59 +26,40 @@
*/
package org.opends.guitools.controlpanel.ui;
-import static org.opends.messages.AdminToolMessages.*;
-
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
-import org.opends.guitools.controlpanel.event.
- ConfigurationElementCreatedListener;
+import org.opends.guitools.controlpanel.event.ConfigurationElementCreatedListener;
import org.opends.guitools.controlpanel.task.NewSchemaElementsTask;
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.ui.components.BasicExpander;
-import
-org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.api.ApproximateMatchingRule;
-import org.opends.server.api.AttributeSyntax;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.api.MatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.api.SubstringMatchingRule;
+import org.opends.server.api.*;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.AttributeType;
-import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
+import static org.opends.messages.AdminToolMessages.*;
+
/**
* The panel displayed when the user wants to define a new attribute in the
* schema.
@@ -164,6 +145,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public LocalizableMessage getTitle()
{
return INFO_CTRL_PANEL_NEW_ATTRIBUTE_PANEL_TITLE.get();
@@ -172,6 +154,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Component getPreferredFocusComponent()
{
return name;
@@ -180,6 +163,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void configurationChanged(ConfigurationChangeEvent ev)
{
ArrayList<AttributeSyntax<?>> newSyntaxes =
@@ -328,6 +312,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void run()
{
setEnabledOK(!error[0]);
@@ -374,6 +359,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void okClicked()
{
ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
@@ -545,13 +531,10 @@
for (MatchingRule rule : schema.getMatchingRules().values())
{
- String n = rule.getName();
- if (n != null)
+ String n = rule.getNameOrOID();
+ if (n != null && n.equalsIgnoreCase(name))
{
- if (n.equalsIgnoreCase(name))
- {
- return INFO_CTRL_PANEL_TYPE_MATCHING_RULE.get();
- }
+ return INFO_CTRL_PANEL_TYPE_MATCHING_RULE.get();
}
}
@@ -671,6 +654,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void stateChanged(ChangeEvent e)
{
p.setVisible(expander.isSelected());
@@ -687,6 +671,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void itemStateChanged(ItemEvent ev)
{
if (ev.getStateChange() == ItemEvent.SELECTED)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index 2fc56f0..0d799df 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2350,18 +2350,14 @@
*/
public static String getMatchingRuleText(MatchingRule matchingRule)
{
- String returnValue;
- String name = matchingRule.getName();
+ String nameOrOID = matchingRule.getNameOrOID();
String oid = matchingRule.getOID();
- if (name == null)
+ if (!nameOrOID.equals(oid))
{
- returnValue = oid;
+ // This is the name only
+ return nameOrOID + " - " + oid;
}
- else
- {
- returnValue = name+" - "+oid;
- }
- return returnValue;
+ return oid;
}
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
index 2560e56..ac542d2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
@@ -49,16 +49,11 @@
mayInvoke = false)
public abstract class AbstractMatchingRule implements MatchingRule
{
- /**
- * {@inheritDoc}
- */
- public abstract String getName();
-
-
/**
* {@inheritDoc}
*/
+ @Override
public abstract Collection<String> getNames();
@@ -66,6 +61,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public abstract String getOID();
@@ -73,6 +69,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ByteString normalizeAssertionValue(ByteSequence value)
throws DirectoryException
{
@@ -85,17 +82,15 @@
/**
* {@inheritDoc}
*/
+ @Override
public final String getNameOrOID()
{
- String name = getName();
- if ((name == null) || (name.length() == 0))
+ Collection<String> names = getNames();
+ if (names != null && !names.isEmpty())
{
- return getOID();
+ return names.iterator().next();
}
- else
- {
- return name;
- }
+ return getOID();
}
@@ -103,6 +98,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public abstract String getDescription();
@@ -110,6 +106,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public abstract String getSyntaxOID();
@@ -117,6 +114,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isObsolete()
{
return false;
@@ -127,6 +125,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public abstract ByteString normalizeValue(ByteSequence value)
throws DirectoryException;
@@ -135,6 +134,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ConditionResult valuesMatch(
ByteSequence attributeValue, ByteSequence assertionValue)
{
@@ -220,6 +220,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void toString(StringBuilder buffer)
{
buffer.append("( ");
@@ -237,10 +238,10 @@
}
buffer.append(" )");
}
- else
+ else if (names.size() == 1)
{
buffer.append('\'');
- buffer.append(getName());
+ buffer.append(names.iterator().next());
buffer.append('\'');
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
index a937883..7e13154 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
@@ -48,15 +48,6 @@
mayInvoke = false)
public interface MatchingRule
{
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or {@code null}
- * if it does not have a name.
- */
- String getName();
-
-
/**
* Retrieves all names for this matching rule.
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index c85b585..6fb376b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -26,34 +26,26 @@
* Portions Copyright 2014 Manuel Gaupp
*/
package org.opends.server.backends.jeb;
-import org.forgerock.i18n.LocalizableMessage;
-
import java.util.*;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
+import org.opends.server.admin.std.server.LocalDBIndexCfg;
+import org.opends.server.api.*;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.monitors.DatabaseEnvironmentMonitor;
+import org.opends.server.types.*;
+import org.opends.server.util.StaticUtils;
+
import com.sleepycat.je.*;
-import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.api.ApproximateMatchingRule;
-
-import org.opends.server.monitors.DatabaseEnvironmentMonitor;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.admin.std.server.LocalDBIndexCfg;
-import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.api.ExtensibleIndexer;
-import org.opends.server.api.ExtensibleMatchingRule;
-import org.opends.server.api.IndexQueryFactory;
-import org.opends.server.config.ConfigException;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.toLowerCase;
-
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.StaticUtils;
+import static org.opends.server.util.StaticUtils.*;
/**
* Class representing an attribute index.
@@ -1479,6 +1471,7 @@
* first argument is less than, equal to, or greater than the
* second.
*/
+ @Override
public int compare(byte[] a, byte[] b)
{
int i;
@@ -1729,6 +1722,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized boolean isConfigurationChangeAcceptable(
LocalDBIndexCfg cfg,
List<LocalizableMessage> unacceptableReasons)
@@ -1788,6 +1782,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized ConfigChangeResult applyConfigurationChange(
LocalDBIndexCfg cfg)
{
@@ -2591,8 +2586,9 @@
*/
EqualityMatchingRule eqRule =
indexConfig.getAttribute().getEqualityMatchingRule();
- if(nOID ==null || nOID.equals(eqRule.getOID()) ||
- nOID.equalsIgnoreCase(eqRule.getName()))
+ if (nOID == null
+ || nOID.equals(eqRule.getOID())
+ || nOID.equalsIgnoreCase(eqRule.getNameOrOID()))
{
//No matching rule is defined; use the default equality matching rule.
if(equalityIndex == null)
@@ -2980,7 +2976,8 @@
* Returns the length of the substring.
* @return the length of the substring.
*/
- public int getSubstringLength()
+ @Override
+ public int getSubstringLength()
{
return substringLength;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
index 2fe19a8..c11048f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
@@ -270,7 +270,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DELETE_MR_IN_USE_BY_AT.get(
- matchingRule.getName(),
+ matchingRule.getNameOrOID(),
at.getNameOrOID());
unacceptableReasons.add(message);
@@ -283,8 +283,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DELETE_MR_IN_USE_BY_AT.get(
- matchingRule.getName(),
- at.getNameOrOID());
+ matchingRule.getNameOrOID(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -296,8 +295,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DELETE_MR_IN_USE_BY_AT.get(
- matchingRule.getName(),
- at.getNameOrOID());
+ matchingRule.getNameOrOID(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -309,8 +307,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DELETE_MR_IN_USE_BY_AT.get(
- matchingRule.getName(),
- at.getNameOrOID());
+ matchingRule.getNameOrOID(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -325,8 +322,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DELETE_MR_IN_USE_BY_MRU.get(
- matchingRule.getName(),
- mru.getName());
+ matchingRule.getNameOrOID(), mru.getName());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -412,8 +408,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DISABLE_MR_IN_USE_BY_AT.get(
- matchingRule.getName(),
- at.getNameOrOID());
+ matchingRule.getNameOrOID(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -425,8 +420,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DISABLE_MR_IN_USE_BY_AT.get(
- matchingRule.getName(),
- at.getNameOrOID());
+ matchingRule.getNameOrOID(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -438,8 +432,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DISABLE_MR_IN_USE_BY_AT.get(
- matchingRule.getName(),
- at.getNameOrOID());
+ matchingRule.getNameOrOID(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -451,7 +444,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DISABLE_MR_IN_USE_BY_AT
- .get(matchingRule.getName(), at.getNameOrOID());
+ .get(matchingRule.getNameOrOID(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -466,7 +459,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DISABLE_MR_IN_USE_BY_MRU.get(
- matchingRule.getName(), mru.getName());
+ matchingRule.getNameOrOID(), mru.getName());
unacceptableReasons.add(message);
configAcceptable = false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
index 78c6810..406f422 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
@@ -82,19 +82,7 @@
*/
public Collection<String> getNames()
{
- return Collections.singleton(getName());
- }
-
-
-
- /**
- * Get the name of this class.
- * @return name of the class in String form
- */
- @Override
- public String getName()
- {
- return "historicalCsnOrderingMatch";
+ return Collections.singleton("historicalCsnOrderingMatch");
}
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
index b94134c..949dabd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
@@ -28,20 +28,20 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.api.PasswordStorageScheme;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.api.PasswordStorageScheme;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -72,25 +72,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_AUTH_PASSWORD_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_AUTH_PASSWORD_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index 917c97c..afe4576 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
@@ -28,18 +28,17 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
/**
@@ -70,25 +69,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_AUTH_PASSWORD_EXACT_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_AUTH_PASSWORD_EXACT_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index 1813741..0b7557d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
@@ -28,21 +28,21 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
* This class defines the bitStringMatch matching rule defined in X.520 and
@@ -70,25 +70,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_BIT_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_BIT_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
index d0b0977..d8abea8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
@@ -28,22 +28,22 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
* This class defines the booleanMatch matching rule defined in X.520 and
@@ -71,25 +71,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_BOOLEAN_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_BOOLEAN_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
index 97e7e49..ca700fc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
* This class defines the caseExactMatch matching rule defined in X.520 and
@@ -57,25 +57,13 @@
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName()
- {
- return EMR_CASE_EXACT_NAME;
- }
-
-
-
/**
* {@inheritDoc}
*/
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_CASE_EXACT_NAME);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
index e26863d..480c770 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
@@ -28,23 +28,23 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -68,26 +68,12 @@
/**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_CASE_EXACT_IA5_NAME;
- }
-
-
-
- /**
* {@inheritDoc}
*/
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_CASE_EXACT_IA5_NAME);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
index 29e15cf..7307853 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
@@ -28,22 +28,22 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -74,25 +74,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_CASE_EXACT_IA5_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_CASE_EXACT_IA5_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
index 634a1c1..492dc52 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
@@ -28,20 +28,20 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.AbstractMatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -78,25 +78,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_CASE_EXACT_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_CASE_EXACT_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -204,6 +189,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
@@ -224,6 +210,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
return StaticUtils.compare(b1, b2);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
index dca4629..be0710e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.SubstringMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -65,25 +65,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_CASE_EXACT_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_CASE_EXACT_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
index 5f90215..c398f90 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -65,25 +65,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_CASE_IGNORE_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_CASE_IGNORE_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
index 92e80b3..40acc26 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
@@ -28,23 +28,23 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -73,25 +73,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_CASE_IGNORE_IA5_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_CASE_IGNORE_IA5_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
index 84af237..ed7a0e9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
@@ -28,23 +28,23 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -73,25 +73,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_CASE_IGNORE_IA5_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_CASE_IGNORE_IA5_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
index 0a2657e..d2c3a7a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -65,25 +65,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_CASE_IGNORE_LIST_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_CASE_IGNORE_LIST_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
index 89ac067..b4f0035 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.SubstringMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -65,25 +65,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_CASE_IGNORE_LIST_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_CASE_IGNORE_LIST_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
index 0769ef1..b49f002 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
@@ -28,20 +28,20 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.AbstractMatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -78,25 +78,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_CASE_IGNORE_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_CASE_IGNORE_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -204,6 +189,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
@@ -224,6 +210,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
return StaticUtils.compare(b1, b2);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
index ba20e00..4fef932 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.SubstringMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -65,25 +65,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_CASE_IGNORE_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_CASE_IGNORE_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
index ead9ffb..a37c58d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
@@ -35,28 +35,29 @@
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import javax.security.auth.x500.X500Principal;
-import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
+import javax.security.auth.x500.X500Principal;
+
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.protocols.asn1.GSERException;
-import org.opends.server.protocols.asn1.GSERParser;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.protocols.asn1.GSERException;
+import org.opends.server.protocols.asn1.GSERParser;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -101,22 +102,10 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
- }
-
-
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- public String getName()
- {
- return EMR_CERTIFICATE_EXACT_NAME;
+ return Collections.singleton(EMR_CERTIFICATE_EXACT_NAME);
}
@@ -126,6 +115,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return EMR_CERTIFICATE_EXACT_OID;
@@ -139,6 +129,7 @@
* @return The description for this matching rule, or <CODE>null</CODE> if
* there is none.
*/
+ @Override
public String getDescription()
{
return EMR_CERTIFICATE_EXACT_DESCRIPTION;
@@ -152,6 +143,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_CERTIFICATE_EXACT_ASSERTION_OID;
@@ -170,6 +162,7 @@
* @throws DirectoryException If the provided value is invalid according to
* the associated attribute syntax.
*/
+ @Override
public ByteString normalizeValue(ByteSequence value)
throws DirectoryException
{
@@ -241,6 +234,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ByteString normalizeAssertionValue(ByteSequence value)
throws DirectoryException
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index 1f327f9..08f6eb7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -29,45 +29,32 @@
-import static org.opends.messages.ConfigMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.messages.CoreMessages.*;
-import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.nio.CharBuffer;
import java.text.CollationKey;
import java.text.Collator;
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.
- CollationMatchingRuleCfgDefn.MatchingRuleType;
+import org.opends.server.admin.std.meta.CollationMatchingRuleCfgDefn.MatchingRuleType;
import org.opends.server.admin.std.server.CollationMatchingRuleCfg;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.ExtensibleIndexer;
-import org.opends.server.api.ExtensibleMatchingRule;
-import org.opends.server.api.IndexQueryFactory;
-import org.opends.server.api.MatchingRule;
-import org.opends.server.api.MatchingRuleFactory;
-import org.opends.server.api.OrderingMatchingRule;
+import org.opends.server.api.*;
import org.opends.server.backends.jeb.AttributeIndex;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.AttributeValue;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.ConditionResult;
-import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.IndexConfig;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -746,19 +733,6 @@
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName()
- {
- //This is called when there is only 1 name.
- return names.iterator().next();
- }
-
-
-
/**
* {@inheritDoc}
*/
@@ -945,6 +919,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
index bcdaef2..2546eac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -70,25 +70,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_DIRECTORY_STRING_FIRST_COMPONENT_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_DIRECTORY_STRING_FIRST_COMPONENT_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
index 3e9bb99..ebf7280 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
@@ -26,23 +26,23 @@
*/
package org.opends.server.schema;
-import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.AcceptRejectWarn;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
* This class defines the distinguishedNameMatch matching rule defined in X.520
* and referenced in RFC 2252.
@@ -71,25 +71,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_DN_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_DN_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
index 3c71ee5..12acd8a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
@@ -28,17 +28,17 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.ApproximateMatchingRule;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -83,25 +83,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(AMR_DOUBLE_METAPHONE_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return AMR_DOUBLE_METAPHONE_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index 154bf79..db8bfc1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -69,25 +69,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_GENERALIZED_TIME_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_GENERALIZED_TIME_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index 50ea0c7..8e0031d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -28,19 +28,19 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.AbstractMatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -81,25 +81,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_GENERALIZED_TIME_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_GENERALIZED_TIME_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -196,6 +181,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
try
@@ -239,6 +225,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
return compareValues(ByteString.wrap(b1), ByteString.wrap(b2));
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
index 810b55e..b0eb0d8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
@@ -28,21 +28,21 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -71,25 +71,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_INTEGER_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_INTEGER_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
index 0ca385f..4c3fb8a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
@@ -26,25 +26,21 @@
*/
package org.opends.server.schema;
-
-
-import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
-
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
/**
* This class implements the integerFirstComponentMatch matching rule defined in
@@ -78,25 +74,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_INTEGER_FIRST_COMPONENT_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_INTEGER_FIRST_COMPONENT_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
index a95f358..5762764 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
@@ -28,22 +28,22 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -83,25 +83,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_INTEGER_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_INTEGER_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -369,6 +354,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
int b1Length = value1.length();
@@ -487,6 +473,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
int b1Length = b1.length;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
index b5e76ec..9d4af6b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
@@ -22,17 +22,15 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import java.util.Collection;
import java.util.Collections;
+
import static org.opends.server.schema.SchemaConstants.*;
-
-
/**
* This class implements the keywordMatch matching rule defined in X.520. That
* document defines "keyword" as implementation-specific, but in this case we
@@ -54,27 +52,13 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_KEYWORD_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_KEYWORD_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 692645b..d64bd11 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -29,38 +29,25 @@
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.LinkedHashMap;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
+import java.util.*;
import java.util.regex.Pattern;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
-import org.opends.server.api.ApproximateMatchingRule;
-import org.opends.server.api.AttributeSyntax;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
-import org.opends.server.types.CommonSchemaElements;
-import org.opends.server.types.DirectoryException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.*;
+import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.messages.SchemaMessages.*;
/**
* This class defines the LDAP syntax description syntax, which is used to
@@ -920,6 +907,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isHumanReadable()
{
return true;
@@ -1549,6 +1537,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int compare(byte[] arg0, byte[] arg1)
{
return compareValues(ByteString.wrap(arg0),ByteString.wrap(arg1));
@@ -1559,6 +1548,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
LinkedList<ByteSequence> enumValues = syntax.getEnumValues();
@@ -1571,20 +1561,9 @@
* {@inheritDoc}
*/
@Override
- public String getName()
- {
- return name;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(name);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
index 77aeac3..5bee12a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
@@ -28,23 +28,23 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -74,25 +74,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_NUMERIC_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_NUMERIC_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index fa584cd..52e08fc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -28,25 +28,25 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -86,25 +86,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_NUMERIC_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_NUMERIC_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -219,6 +204,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
@@ -239,6 +225,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
return StaticUtils.compare(b1, b2);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
index 92e47c7..a229be2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
@@ -28,23 +28,23 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -73,25 +73,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_NUMERIC_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_NUMERIC_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index d5bb068..f473d9d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
@@ -26,25 +26,21 @@
*/
package org.opends.server.schema;
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.AttributeType;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.NameForm;
-import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ResultCode;
+import org.opends.server.types.*;
+
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
/**
* This class defines the objectIdentifierMatch matching rule defined in X.520
@@ -73,25 +69,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_OID_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_OID_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
index 5597894..3fbd815 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
@@ -28,24 +28,24 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeType;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.NameForm;
import org.opends.server.types.ObjectClass;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -75,25 +75,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_OID_FIRST_COMPONENT_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_OID_FIRST_COMPONENT_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
index 935e3c5..1cf22f8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
@@ -28,16 +28,16 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -64,25 +64,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_OCTET_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_OCTET_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index 6bcad3d..113417c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.AbstractMatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.StaticUtils;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -77,25 +77,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_OCTET_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_OCTET_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -171,6 +156,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
@@ -191,6 +177,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
return StaticUtils.compare(b1, b2);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
index 43f8f9e..7678d8d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
@@ -28,16 +28,16 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.SubstringMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -64,25 +64,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_OCTET_STRING_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_OCTET_STRING_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
index 8d0e46b..cd3ab09 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -67,25 +67,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_PRESENTATION_ADDRESS_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_PRESENTATION_ADDRESS_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
index 82676f4..4e42123 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -67,25 +67,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_PROTOCOL_INFORMATION_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_PROTOCOL_INFORMATION_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
index 321a3b3..8440945 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
@@ -28,17 +28,17 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -66,25 +66,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_TELEPHONE_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_TELEPHONE_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
index 877c293..cb28dd2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
@@ -28,19 +28,19 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.SubstringMatchingRule;
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -69,25 +69,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(SMR_TELEPHONE_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return SMR_TELEPHONE_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
index 6d6b02f..214c24c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
@@ -28,46 +28,27 @@
package org.opends.server.schema;
-import org.opends.server.util.StaticUtils;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
+import java.util.*;
+
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.ExtensibleIndexer;
-import org.opends.server.api.IndexQueryFactory;
-import org.opends.server.api.MatchingRule;
-import org.opends.server.api.MatchingRuleFactory;
-import org.opends.server.admin.std.server.MatchingRuleCfg;
-import org.opends.server.api.AbstractMatchingRule;
-import org.opends.server.api.ExtensibleMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.config.ConfigException;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.AttributeValue;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.opends.server.types.ConditionResult;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.IndexConfig;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
-import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.util.TimeThread.*;
+import org.opends.server.admin.std.server.MatchingRuleCfg;
+import org.opends.server.api.*;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.*;
+import org.opends.server.util.StaticUtils;
import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.GeneralizedTimeSyntax.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.schema.GeneralizedTimeSyntax.*;
+import static org.opends.server.util.StaticUtils.*;
+import static org.opends.server.util.TimeThread.*;
@@ -397,6 +378,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
@@ -407,6 +389,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int compare(byte[] arg0, byte[] arg1)
{
return StaticUtils.compare(arg0, arg1);
@@ -417,6 +400,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<ExtensibleIndexer> getIndexers(IndexConfig config)
{
if(indexer == null)
@@ -458,17 +442,6 @@
}
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName()
- {
- return EXT_OMR_RELATIVE_TIME_GT_NAME;
- }
-
-
-
/**
* {@inheritDoc}
*/
@@ -515,6 +488,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public <T> T createIndexQuery(ByteSequence assertionValue,
IndexQueryFactory<T> factory) throws DirectoryException
{
@@ -556,18 +530,6 @@
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName()
- {
- return EXT_OMR_RELATIVE_TIME_LT_NAME;
- }
-
-
-
/**
* {@inheritDoc}
*/
@@ -613,6 +575,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public <T> T createIndexQuery(ByteSequence assertionValue,
IndexQueryFactory<T> factory) throws DirectoryException
{
@@ -739,17 +702,6 @@
* {@inheritDoc}
*/
@Override
- public String getName()
- {
- return EXT_PARTIAL_DATE_TIME_NAME;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
public String getOID()
{
return EXT_PARTIAL_DATE_TIME_OID;
@@ -763,7 +715,7 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EXT_PARTIAL_DATE_TIME_NAME);
}
@@ -1134,6 +1086,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<ExtensibleIndexer> getIndexers(IndexConfig config)
{
if(indexer == null)
@@ -1148,6 +1101,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public <T> T createIndexQuery(ByteSequence assertionValue,
IndexQueryFactory<T> factory) throws DirectoryException
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index 2b830de..795254e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -28,21 +28,21 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -71,25 +71,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_UUID_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_UUID_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
index 955779e..d1dcf8f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
@@ -28,23 +28,23 @@
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -84,25 +84,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(OMR_UUID_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return OMR_UUID_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
@@ -281,6 +266,7 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
+ @Override
public int compareValues(ByteSequence value1, ByteSequence value2)
{
return value1.compareTo(value2);
@@ -301,6 +287,7 @@
* order, or zero if there is no difference between the values with
* regard to ordering.
*/
+ @Override
public int compare(byte[] b1, byte[] b2)
{
return StaticUtils.compare(b1, b2);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index 65cc86e..609a125 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
@@ -28,23 +28,23 @@
-import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
@@ -76,25 +76,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_UNIQUE_MEMBER_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_UNIQUE_MEMBER_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index 006847e..a324e84 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -28,20 +28,20 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.api.PasswordStorageScheme;
-import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.api.PasswordStorageScheme;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -71,25 +71,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_USER_PASSWORD_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_USER_PASSWORD_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
index dcdde21..7ec963a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
@@ -28,17 +28,17 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.StaticUtils;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -65,25 +65,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_USER_PASSWORD_EXACT_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_USER_PASSWORD_EXACT_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
index 2de1ec1..48e3a3d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
@@ -28,18 +28,18 @@
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.schema.StringPrepProfile.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.schema.StringPrepProfile.*;
+
/**
@@ -81,25 +81,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(EMR_WORD_NAME);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return EMR_WORD_NAME;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
index 9f80d61..80a932c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
@@ -31,10 +31,10 @@
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.schema.CaseIgnoreEqualityMatchingRuleFactory;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.schema.CaseIgnoreEqualityMatchingRuleFactory;
import org.opends.server.types.DirectoryException;
@@ -121,25 +121,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton(name);
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return name;
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
index 8d58229..3bce731 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
@@ -28,16 +28,16 @@
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.util.Collection;
import java.util.Collections;
-import org.opends.server.api.ApproximateMatchingRule;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.types.DirectoryException;
+import static org.opends.server.schema.SchemaConstants.*;
+
/**
@@ -64,25 +64,10 @@
@Override
public Collection<String> getNames()
{
- return Collections.singleton(getName());
+ return Collections.singleton("equalLengthApproximateMatch");
}
-
- /**
- * Retrieves the common name for this matching rule.
- *
- * @return The common name for this matching rule, or <CODE>null</CODE> if
- * it does not have a name.
- */
- @Override
- public String getName()
- {
- return "equalLengthApproximateMatch";
- }
-
-
-
/**
* Retrieves the OID for this matching rule.
*
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
index ad317ca..1faf7f4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
@@ -26,10 +26,10 @@
*/
package org.opends.server.schema;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AcceptRejectWarn;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
@@ -127,18 +127,14 @@
EqualityMatchingRule rule = getRule();
// normalize the 2 provided values
- boolean success = false;
try
{
rule.normalizeValue(ByteString.valueOf(value));
- } catch (DirectoryException e) {
- success = true;
+ fail("The matching rule : " + rule.getNameOrOID()
+ + " should detect that value \"" + value + "\" is invalid");
}
-
- if (!success)
+ catch (DirectoryException ignored)
{
- fail("The matching rule : " + rule.getName() +
- " should detect that value \"" + value + "\" is invalid");
}
}
--
Gitblit v1.10.0