OPENDJ-1368 (CR-3232) Remove AttributeValue

Jean-Noel Rouvignac

19.30.2014 377b2709c64b32fe93905b466482216c2cc0581c

 opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java

@@ -71,14 +71,10 @@

  /** {@inheritDoc} */
  @Override()
  public Set<AttributeValue> getValues(Entry entry,
                                       VirtualAttributeRule rule)
  public Attribute getValues(Entry entry, VirtualAttributeRule rule)
  {
    String normDNString = entry.getName().toNormalizedString();
    AttributeValue value = AttributeValues.create(
                                  ByteString.valueOf(normDNString),
                                  ByteString.valueOf(normDNString));
    return Collections.singleton(value);
    return Attributes.create(rule.getAttributeType(), normDNString);
  }

  /** {@inheritDoc} */
@@ -91,15 +87,14 @@

  /** {@inheritDoc} */
  @Override()
  public boolean hasValue(Entry entry, VirtualAttributeRule rule,
                          AttributeValue value)
  public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
  {
    try
    {
      MatchingRule eqRule = rule.getAttributeType().getEqualityMatchingRule();
      ByteString dn = ByteString.valueOf(entry.getName().toString());
      ByteString normalizedDN = eqRule.normalizeAttributeValue(dn);
      ByteString normalizedValue = eqRule.normalizeAttributeValue(value.getValue());
      ByteString normalizedValue = eqRule.normalizeAttributeValue(value);
      return normalizedDN.equals(normalizedValue);
    }
    catch (DecodeException e)
@@ -111,18 +106,6 @@

  /** {@inheritDoc} */
  @Override()
  public boolean hasAnyValue(Entry entry, VirtualAttributeRule rule,
                             Collection<AttributeValue> values)
  {
    String ndnString = entry.getName().toNormalizedString();

    AttributeValue v = AttributeValues.create(ByteString.valueOf(ndnString),
        ByteString.valueOf(ndnString));
    return values.contains(v);
  }

  /** {@inheritDoc} */
  @Override()
  public ConditionResult matchesSubstring(Entry entry,
                                          VirtualAttributeRule rule,
                                          ByteString subInitial,
@@ -137,7 +120,7 @@
  @Override()
  public ConditionResult greaterThanOrEqualTo(Entry entry,
                              VirtualAttributeRule rule,
                              AttributeValue value)
                              ByteString value)
  {
    // DNs cannot be used in ordering matching.
    return ConditionResult.UNDEFINED;
@@ -147,7 +130,7 @@
  @Override()
  public ConditionResult lessThanOrEqualTo(Entry entry,
                              VirtualAttributeRule rule,
                              AttributeValue value)
                              ByteString value)
  {
    // DNs cannot be used in ordering matching.
    return ConditionResult.UNDEFINED;
@@ -157,7 +140,7 @@
  @Override()
  public ConditionResult approximatelyEqualTo(Entry entry,
                              VirtualAttributeRule rule,
                              AttributeValue value)
                              ByteString value)
  {
    // DNs cannot be used in approximate matching.
    return ConditionResult.UNDEFINED;
@@ -313,7 +296,7 @@
        {
          try
          {
            dnSet.add(DN.decode(filter.getAssertionValue().getValue()));
            dnSet.add(DN.decode(filter.getAssertionValue()));
          }
          catch (Exception e)
          {