From 98a5df3565beaa1999020a16fcb5338d13d5b50f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 26 Aug 2014 08:11:29 +0000
Subject: [PATCH] Removed useless getChangeNumber() and setChangeNumber methods from *Operation interfaces. These methods are useless because setChangeNumber() is never set inside production code, so changeNumber is always equal to -1 for all the update operations. In addition it is very unlikely the ChangeNumberIndexer could have computed the changeNumber before a results are sent to a persistent search.
---
opends/src/server/org/opends/server/core/ModifyOperationBasis.java | 107 ++++++++++++-----------------------------------------
1 files changed, 25 insertions(+), 82 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ModifyOperationBasis.java b/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
index 53cb579..f20372c 100644
--- a/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
@@ -22,14 +22,10 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.core;
-import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.AccessLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +40,11 @@
import org.opends.server.types.*;
import org.opends.server.types.operation.PostResponseModifyOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
-import org.opends.server.workflowelement.localbackend.*;
+import org.opends.server.workflowelement.localbackend.LocalBackendModifyOperation;
+
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.server.loggers.AccessLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
/**
* This class defines an operation that may be used to modify an entry in the
@@ -82,9 +82,6 @@
/** The set of modifications for this modify operation. */
private List<Modification> modifications;
- /** The change number that has been assigned to this operation. */
- private long changeNumber;
-
/**
* Creates a new modify operation with the provided information.
*
@@ -155,18 +152,14 @@
cancelRequest = null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final ByteString getRawEntryDN()
{
return rawEntryDN;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void setRawEntryDN(ByteString rawEntryDN)
{
@@ -175,9 +168,7 @@
entryDN = null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final DN getEntryDN()
{
@@ -198,18 +189,14 @@
return entryDN;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final List<RawModification> getRawModifications()
{
return rawModifications;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void addRawModification(RawModification rawModification)
{
@@ -218,9 +205,7 @@
modifications = null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void setRawModifications(List<RawModification> rawModifications)
{
@@ -229,9 +214,7 @@
modifications = null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final List<Modification> getModifications()
{
@@ -256,16 +239,11 @@
mod.setAttribute(attr);
}
}
- else
+ else if (attr.hasOption("binary"))
{
// binary option is not honored for non-BER-encodable attributes.
- if(attr.hasOption("binary"))
- {
- throw new LDAPException(LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE,
- ERR_ADD_ATTR_IS_INVALID_OPTION.get(
- String.valueOf(entryDN),
- attr.getName()));
- }
+ throw new LDAPException(LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE,
+ ERR_ADD_ATTR_IS_INVALID_OPTION.get(String.valueOf(entryDN), attr.getName()));
}
modifications.add(mod);
@@ -285,9 +263,7 @@
return modifications;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void addModification(Modification modification)
throws DirectoryException
@@ -295,9 +271,7 @@
modifications.add(modification);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final OperationType getOperationType()
{
@@ -307,45 +281,35 @@
return OperationType.MODIFY;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DN getProxiedAuthorizationDN()
{
return proxiedAuthorizationDN;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final List<Control> getResponseControls()
{
return responseControls;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void addResponseControl(Control control)
{
responseControls.add(control);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void removeResponseControl(Control control)
{
responseControls.remove(control);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
@@ -358,35 +322,14 @@
buffer.append(")");
}
- /**
- * {@inheritDoc}
- */
- @Override
- public final long getChangeNumber(){
- return changeNumber;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setChangeNumber(long changeNumber)
- {
- this.changeNumber = changeNumber;
- }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN)
{
this.proxiedAuthorizationDN = proxiedAuthorizationDN;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void run()
{
--
Gitblit v1.10.0