From d9d3370f69df1df5b58b025d86c817e68cc79339 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 12 Dec 2013 14:27:12 +0000
Subject: [PATCH] Code cleanup in the virtual attributes.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 48 -
opendj-sdk/opends/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java | 74 ---
opendj-sdk/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java | 68 ---
opendj-sdk/opends/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java | 114 +----
opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java | 87 ---
opendj-sdk/opends/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java | 48 --
opendj-sdk/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java | 95 ----
opendj-sdk/opends/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java | 82 ---
opendj-sdk/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java | 91 ----
opendj-sdk/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java | 61 --
opendj-sdk/opends/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 88 ---
opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java | 24
opendj-sdk/opends/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java | 81 ---
opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 41 -
opendj-sdk/opends/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java | 65 ---
opendj-sdk/opends/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java | 65 ---
16 files changed, 182 insertions(+), 950 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java
index 8e9fbfe..9c124ca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java
@@ -23,27 +23,23 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.api;
-import org.opends.messages.Message;
-
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
+import org.opends.messages.Message;
import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
+import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-
-
/**
* This class defines the set of methods and structures that must be
@@ -82,9 +78,11 @@
* related to the server
* configuration.
*/
- public abstract void initializeVirtualAttributeProvider(
- T configuration)
- throws ConfigException, InitializationException;
+ public void initializeVirtualAttributeProvider(T configuration)
+ throws ConfigException, InitializationException
+ {
+ // No initialization required
+ }
@@ -186,7 +184,7 @@
* @param value The value for which to make the determination.
*
* @return {@code true} if this virtual attribute provider will
- * generate the specified vaule for the provided entry, or
+ * generate the specified value for the provided entry, or
* {@code false} if not.
*/
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
@@ -222,7 +220,7 @@
/**
- * Indicates whether this virutal attribute provider will generate
+ * Indicates whether this virtual attribute provider will generate
* any of the values in the provided collection.
*
* @param entry The entry for which to make the determination.
@@ -566,7 +564,7 @@
* @param value The value for which to make the determination.
*
* @return {@code UNDEFINED} if the associated attribute type does
- * not have an aproximate matching rule, {@code TRUE} if at
+ * not have an approximate matching rule, {@code TRUE} if at
* least one of the generated values will be approximately
* equal to the specified value, or {@code FALSE} if none
* of the generated values will be approximately equal to
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
index cfc7b55..0313050 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
@@ -23,9 +23,8 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
-
package org.opends.server.extensions;
import java.util.Collections;
@@ -39,7 +38,6 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
-import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
import static org.opends.messages.ExtensionMessages.*;
@@ -65,35 +63,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- CollectiveAttributeSubentriesVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -135,21 +112,14 @@
}
}
- if (values == null)
- {
- return Collections.emptySet();
- }
- else
+ if (values != null)
{
return Collections.unmodifiableSet(values);
}
+ return Collections.emptySet();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -158,11 +128,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index dd48c3e..8006433 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -23,21 +23,14 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import org.opends.server.admin.std.server.EntryDNVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
@@ -46,8 +39,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* This class implements a virtual attribute provider that is meant to serve the
* entryDN operational attribute as described in draft-zeilenga-ldap-entrydn.
@@ -71,35 +62,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- EntryDNVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -111,11 +81,7 @@
return Collections.singleton(value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -123,11 +89,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
AttributeValue value)
@@ -149,11 +111,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasAnyValue(Entry entry, VirtualAttributeRule rule,
Collection<AttributeValue> values)
@@ -165,11 +123,7 @@
return values.contains(v);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -181,11 +135,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -195,11 +145,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -209,11 +155,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -306,11 +248,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -336,7 +274,7 @@
try
{
Entry entry = DirectoryServer.getEntry(dn);
- if ((entry != null) && filter.matchesEntry(entry))
+ if (entry != null && filter.matchesEntry(entry))
{
searchOperation.returnEntry(entry, null);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
index bb9c924..0e4c1bf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
@@ -23,12 +23,10 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -37,7 +35,6 @@
import org.opends.messages.Message;
import org.opends.server.admin.std.server.EntryUUIDVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
@@ -46,12 +43,10 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements a virtual attribute provider that is meant to serve the
* entryUUID operational attribute as described in RFC 4530. Note that this
- * should only be used for entries used in conjuntion with data in private
+ * should only be used for entries used in conjunction with data in private
* backends (e.g., those holding the configuration, schema, monitor, and root
* DSE entries). Real user data should have entry UUID values generated at the
* time the entries are added or imported.
@@ -75,35 +70,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- EntryUUIDVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -117,11 +91,7 @@
return Collections.singleton(value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -129,11 +99,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
AttributeValue value)
@@ -158,11 +124,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -174,11 +136,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -188,11 +146,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -202,11 +156,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -216,11 +166,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -229,11 +175,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
index 64e579a..9400a78 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
@@ -23,12 +23,10 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -37,15 +35,12 @@
import org.opends.server.admin.std.server.
GoverningStructureRuleVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import static org.opends.messages.ExtensionMessages.*;
-
-
/**
* This class implements a virtual attribute provider that is meant to serve
* the governingStructuralRule operational attribute as described in RFC 4512.
@@ -65,35 +60,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- GoverningStructureRuleVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -110,22 +84,14 @@
return Collections.<AttributeValue>emptySet();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
return getDITStructureRule(entry)!=null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -137,11 +103,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -151,11 +113,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -165,11 +123,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -179,11 +133,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -193,11 +143,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -209,9 +155,7 @@
searchOperation.appendErrorMessage(message);
}
-
-
- //Checks if the entry matches the nameform.
+ /** Checks if the entry matches the nameform. */
private boolean matchesNameForm(NameForm nameForm,
AcceptRejectWarn structuralPolicy,
Entry entry)
@@ -222,12 +166,10 @@
// Make sure that all the required attributes are present.
for (AttributeType t : nameForm.getRequiredAttributes())
{
- if (! rdn.hasAttributeType(t))
+ if (!rdn.hasAttributeType(t)
+ && structuralPolicy == AcceptRejectWarn.REJECT)
{
- if (structuralPolicy == AcceptRejectWarn.REJECT)
- {
- return false;
- }
+ return false;
}
}
@@ -236,21 +178,17 @@
for (int i = 0; i < numAVAs; i++)
{
AttributeType t = rdn.getAttributeType(i);
- if (! nameForm.isRequiredOrOptional(t))
+ if (!nameForm.isRequiredOrOptional(t)
+ && structuralPolicy == AcceptRejectWarn.REJECT)
{
- if (structuralPolicy == AcceptRejectWarn.REJECT)
- {
- return false;
- }
+ return false;
}
}
}
return true;
}
-
-
- //Finds the appropriate DIT structure rule for an entry.
+ /** Finds the appropriate DIT structure rule for an entry. */
private DITStructureRule getDITStructureRule(Entry entry)
{
ObjectClass oc = entry.getStructuralObjectClass();
@@ -261,28 +199,26 @@
//select the first one that matches. Since the entry exists, the same
//algorithm should work fine to retrieve the nameform which was
//applied while creating the entry.
- if(listForms != null)
+ if (listForms != null)
{
boolean obsolete = true;
AcceptRejectWarn structuralPolicy =
- DirectoryServer.getSingleStructuralObjectClassPolicy();
- for(NameForm nf : listForms)
+ DirectoryServer.getSingleStructuralObjectClassPolicy();
+ for (NameForm nf : listForms)
{
- if(!nf.isObsolete())
+ if (!nf.isObsolete())
{
obsolete = false;
- if(matchesNameForm(nf,
- structuralPolicy, entry))
+ if (matchesNameForm(nf, structuralPolicy, entry))
{
nameForm = nf;
break;
}
}
}
- if( nameForm != null && !obsolete)
+ if (nameForm != null && !obsolete)
{
- ditRule =
- DirectoryServer.getDITStructureRule(nameForm);
+ ditRule = DirectoryServer.getDITStructureRule(nameForm);
}
}
return ditRule;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
index 548e3b1..cb5eaae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
@@ -23,31 +23,25 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.opends.messages.Message;
import org.opends.server.admin.std.server.HasSubordinatesVirtualAttributeCfg;
-import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.api.Backend;
+import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
-import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.loggers.debug.DebugLogger.getTracer;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-
-
+import static org.opends.server.loggers.debug.DebugLogger.*;
/**
* This class implements a virtual attribute provider that is meant to serve the
@@ -72,35 +66,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- HasSubordinatesVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -129,11 +102,7 @@
return Collections.emptySet();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -155,11 +124,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
AttributeValue value)
@@ -169,12 +134,10 @@
try
{
ConditionResult ret = backend.hasSubordinates(entry.getDN());
- if(ret != null && ret != ConditionResult.UNDEFINED)
- {
- return ConditionResult.valueOf(
- value.getNormalizedValue().toString()).equals(ret);
- }
- return false;
+ return ret != null
+ && ret != ConditionResult.UNDEFINED
+ && ConditionResult.valueOf(value.getNormalizedValue().toString())
+ .equals(ret);
}
catch(DirectoryException de)
{
@@ -187,11 +150,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -203,11 +162,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -217,11 +172,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -231,11 +182,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -245,11 +192,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -258,11 +201,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
index 08fe7fd..dc7bc4e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -27,18 +27,11 @@
*/
package org.opends.server.extensions;
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import org.opends.server.admin.std.server.IsMemberOfVirtualAttributeCfg;
import org.opends.server.api.Group;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
@@ -47,8 +40,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* This class implements a virtual attribute provider that is meant to serve the
* isMemberOf operational attribute. This attribute will be used to provide a
@@ -73,35 +64,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- IsMemberOfVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -142,21 +112,14 @@
}
}
- if (values == null)
- {
- return Collections.emptySet();
- }
- else
+ if (values != null)
{
return Collections.unmodifiableSet(values);
}
+ return Collections.emptySet();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -182,11 +145,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
AttributeValue value)
@@ -208,11 +167,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasAnyValue(Entry entry, VirtualAttributeRule rule,
Collection<AttributeValue> values)
@@ -228,11 +183,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -244,11 +195,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -258,11 +205,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -272,11 +215,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -353,11 +292,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
index a4d0f4e..6fd5d2c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
@@ -23,31 +23,25 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.opends.messages.Message;
import org.opends.server.admin.std.server.NumSubordinatesVirtualAttributeCfg;
-import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.api.Backend;
-import org.opends.server.config.ConfigException;
+import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.loggers.debug.DebugLogger.getTracer;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-
-
+import static org.opends.server.loggers.debug.DebugLogger.*;
/**
* This class implements a virtual attribute provider that is meant to serve the
@@ -73,35 +67,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- NumSubordinatesVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -130,11 +103,7 @@
return Collections.emptySet();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -155,11 +124,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
AttributeValue value)
@@ -169,12 +134,8 @@
try
{
long count = backend.numSubordinates(entry.getDN(), false);
- if(count >= 0)
- {
- return Long.parseLong(value.getNormalizedValue().toString())
- == count;
- }
- return false;
+ return count >= 0
+ && Long.parseLong(value.getNormalizedValue().toString()) == count;
}
catch(DirectoryException de)
{
@@ -187,11 +148,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -203,11 +160,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -217,11 +170,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -230,11 +179,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index 027446b..483a103 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -23,20 +23,20 @@
*
*
* Copyright 2012 profiq s.r.o.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
import java.util.Collections;
-import org.opends.server.core.PasswordPolicyState;
import java.util.Set;
+
import org.opends.messages.Message;
import
org.opends.server.admin.std.server.PasswordExpirationTimeVirtualAttributeCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.VirtualAttributeProvider;
+import org.opends.server.core.PasswordPolicyState;
import org.opends.server.core.SearchOperation;
-import org.opends.server.config.ConfigException;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.schema.GeneralizedTimeSyntax;
@@ -66,30 +66,14 @@
super();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void
- initializeVirtualAttributeProvider(
- PasswordExpirationTimeVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization needed
- }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -114,9 +98,7 @@
return Collections.emptySet();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -125,9 +107,7 @@
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -140,20 +120,14 @@
searchOperation.appendErrorMessage(message);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
// Do not process LDAP operational entries.
- if (entry.isSubentry() || entry.isLDAPSubentry()
- || (getPasswordExpirationTime(entry) == -1))
- {
- return false;
- }
-
- return true;
+ return !entry.isSubentry()
+ && !entry.isLDAPSubentry()
+ && getPasswordExpirationTime(entry) != -1;
}
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index f12f66e..3d30ca5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -23,9 +23,8 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
-
package org.opends.server.extensions;
import java.util.Collections;
@@ -38,7 +37,6 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
-import org.opends.server.config.ConfigException;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
@@ -73,35 +71,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- PasswordPolicySubentryVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -163,11 +140,7 @@
return Collections.emptySet();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -176,11 +149,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
index 04b0948..f03a06a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
@@ -23,12 +23,10 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -37,14 +35,11 @@
import org.opends.server.admin.std.server.
StructuralObjectClassVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import static org.opends.messages.ExtensionMessages.*;
-
-
/**
* This class implements a virtual attribute provider that is meant to serve
* the structuralObjectClass operational attribute as described in RFC 4512.
@@ -64,35 +59,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- StructuralObjectClassVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -103,11 +77,7 @@
return Collections.singleton(value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -115,11 +85,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -131,11 +97,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -145,11 +107,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -159,11 +117,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -173,11 +127,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -188,11 +138,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
index 1318873..3d2e77e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
@@ -23,12 +23,10 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -36,15 +34,12 @@
import org.opends.messages.Message;
import org.opends.server.admin.std.server.SubschemaSubentryVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import static org.opends.messages.ExtensionMessages.*;
-
-
/**
* This class implements a virtual attribute provider that is meant to serve the
* subschemaSubentry operational attribute as described in RFC 4512.
@@ -64,35 +59,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- SubschemaSubentryVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization is required.
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
@@ -108,11 +82,7 @@
return Collections.singleton(value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -124,11 +94,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -138,11 +104,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -152,11 +114,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -166,11 +124,7 @@
return ConditionResult.UNDEFINED;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -181,11 +135,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java
index 3e52f48..23a6cfe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -31,24 +31,15 @@
import java.util.List;
import java.util.Set;
-import static org.opends.messages.ExtensionMessages.*;
import org.opends.messages.Message;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.AttributeValues;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.Entry;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.VirtualAttributeRule;
+import org.opends.server.types.*;
import org.opends.server.util.ServerConstants;
-
+import static org.opends.messages.ExtensionMessages.*;
/**
* This class implements a virtual attribute provider that specifies the
@@ -59,7 +50,7 @@
implements ConfigurationChangeListener<UserDefinedVirtualAttributeCfg>
{
- /*
+ /**
* The base DN of the changelog is a constant.
* TODO: This shouldn't be a virtual attribute, but directly
* registered in the RootDSE.
@@ -74,64 +65,26 @@
{
super();
- AttributeValue value =
- AttributeValues.create(
- ByteString.valueOf(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT),
- ByteString.valueOf(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT));
- values=Collections.singleton(value);
+ ByteString dn =
+ ByteString.valueOf(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT);
+ values = Collections.singleton(AttributeValues.create(dn, dn));
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- UserDefinedVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization required
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void finalizeVirtualAttributeProvider()
- {
- //
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,VirtualAttributeRule rule)
{
return values;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -141,11 +94,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -156,11 +105,8 @@
searchOperation.appendErrorMessage(message);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
UserDefinedVirtualAttributeCfg configuration,
List<Message> unacceptableReasons)
@@ -168,11 +114,8 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
UserDefinedVirtualAttributeCfg configuration)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java
index 25bf29c..dc33476 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java
@@ -35,7 +35,6 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
@@ -69,45 +68,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- UserDefinedVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization required
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void finalizeVirtualAttributeProvider()
- {
- // nothing to finalize
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -115,10 +83,7 @@
return entry.getDN().isNullDN();
}
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,VirtualAttributeRule rule)
{
@@ -152,11 +117,7 @@
return Collections.singleton(AttributeValues.create(valueBS, valueBS));
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -167,11 +128,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -182,11 +139,7 @@
searchOperation.appendErrorMessage(message);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
UserDefinedVirtualAttributeCfg configuration,
@@ -195,11 +148,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
UserDefinedVirtualAttributeCfg configuration)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java
index 0ffc03d..fae90a6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java
@@ -35,7 +35,6 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
@@ -69,45 +68,14 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- UserDefinedVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization required
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void finalizeVirtualAttributeProvider()
- {
- // nothing to finalize
- }
-
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -115,10 +83,7 @@
return entry.getDN().isNullDN();
}
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,VirtualAttributeRule rule)
{
@@ -152,11 +117,7 @@
return Collections.singleton(AttributeValues.create(valueBS, valueBS));
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -167,11 +128,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -182,11 +139,7 @@
searchOperation.appendErrorMessage(message);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
UserDefinedVirtualAttributeCfg configuration,
@@ -195,11 +148,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
UserDefinedVirtualAttributeCfg configuration)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
index ce91b48..252d9fa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
@@ -35,7 +35,6 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
-import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
@@ -74,33 +73,7 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeVirtualAttributeProvider(
- UserDefinedVirtualAttributeCfg configuration)
- throws ConfigException, InitializationException
- {
- // No initialization required
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void finalizeVirtualAttributeProvider()
- {
- // nothing to finalize
- }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -109,20 +82,14 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isMultiValued()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public Set<AttributeValue> getValues(Entry entry,VirtualAttributeRule rule)
{
@@ -150,9 +117,7 @@
return Collections.emptySet();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -163,11 +128,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override()
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -178,11 +139,7 @@
searchOperation.appendErrorMessage(message);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
UserDefinedVirtualAttributeCfg configuration,
@@ -191,11 +148,7 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
UserDefinedVirtualAttributeCfg configuration)
--
Gitblit v1.10.0