From 83697b286a7a84fb9a91866b2c6f81f5584f39c4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Feb 2014 16:11:34 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java | 17 --------
opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 29 --------------
opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java | 19 ++++-----
3 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
index 2ffd000..f6abb09 100644
--- a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
+++ b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
@@ -226,10 +226,9 @@
final InternalSearchOperation internalSO =
icc.processSearch(valueOf(request.getName()), request.getScope(),
- to(request.getDereferenceAliasesPolicy()), request.getSizeLimit(),
- request.getTimeLimit(), request.isTypesOnly(), to(request
- .getFilter()), new LinkedHashSet<String>(request
- .getAttributes()), to(request.getControls()),
+ request.getDereferenceAliasesPolicy(), request.getSizeLimit(),
+ request.getTimeLimit(), request.isTypesOnly(), to(request.getFilter()),
+ new LinkedHashSet<String>(request.getAttributes()), to(request.getControls()),
internalSearchListener);
return getResponseResult(internalSO);
@@ -294,7 +293,7 @@
} catch (DecodeException e) {
return request.getResultDecoder().newExtendedErrorResult(
- ResultCode.valueOf(extendedOperation.getResultCode().getIntValue()),
+ extendedOperation.getResultCode(),
(extendedOperation.getMatchedDN() != null ? extendedOperation
.getMatchedDN().toString() : null),
extendedOperation.getErrorMessage().toString());
@@ -313,10 +312,9 @@
final CompareOperation compareOperation =
icc.processCompare(valueOf(request.getName()),
request.getAttributeDescription().toString(),
- valueOf(request.getAssertionValueAsString()), to(request.getControls()));
+ request.getAssertionValue(), to(request.getControls()));
- CompareResult result =
- Responses.newCompareResult(getResultCode(compareOperation));
+ CompareResult result = Responses.newCompareResult(compareOperation.getResultCode());
result = getResponseResult(compareOperation, result);
return result;
}
@@ -350,7 +348,7 @@
((SASLBindRequest) request).getSASLMechanism(),
getCredentials(genericBindRequest.getAuthenticationValue()),
to(request.getControls()));
- } while (bindOperation.getResultCode() == org.opends.server.types.ResultCode.SASL_BIND_IN_PROGRESS);
+ } while (bindOperation.getResultCode() == ResultCode.SASL_BIND_IN_PROGRESS);
bindClient.dispose();
@@ -358,8 +356,7 @@
throw ErrorResultException.newErrorResult(Responses
.newResult(ResultCode.AUTH_METHOD_NOT_SUPPORTED));
}
- BindResult result =
- Responses.newBindResult(getResultCode(bindOperation));
+ BindResult result = Responses.newBindResult(bindOperation.getResultCode());
result.setServerSASLCredentials(bindOperation.getSASLCredentials());
if (result.isSuccess()) {
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index 6f021e1..74effd1 100644
--- a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -39,7 +39,6 @@
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.DecodeException;
-import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.LinkedAttribute;
import org.forgerock.opendj.ldap.RDN;
@@ -58,7 +57,6 @@
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.LDAPException;
import org.opends.server.types.Operation;
@@ -97,19 +95,6 @@
}
/**
- * Converts from OpenDJ LDAP SDK {@link DereferenceAliasesPolicy} to OpenDJ
- * server {@link DereferencePolicy}.
- *
- * @param dereferenceAliasesPolicy
- * value to convert
- * @return the converted value
- */
- public static org.opends.server.types.DereferencePolicy to(
- final DereferenceAliasesPolicy dereferenceAliasesPolicy) {
- return DereferencePolicy.values()[dereferenceAliasesPolicy.intValue()];
- }
-
- /**
* Converts from OpenDJ LDAP SDK {@link DN} to OpenDJ server
* {@link org.opends.server.types.DN}.
*
@@ -562,7 +547,7 @@
}
private static Result newSDKResult(final Operation operation) {
- ResultCode rc = getResultCode(operation);
+ ResultCode rc = operation.getResultCode();
if (operation instanceof BindOperation) {
return Responses.newBindResult(rc);
} else if (operation instanceof CompareOperation) {
@@ -574,18 +559,6 @@
}
/**
- * Returns the OpenDJ LDAP SDK {@link ResultCode} extracted out of the OpenDJ
- * server {@link Operation}.
- *
- * @param operation
- * value to convert
- * @return the converted value
- */
- public static ResultCode getResultCode(final Operation operation) {
- return ResultCode.valueOf(operation.getResultCode().getIntValue());
- }
-
- /**
* Converts from <code>byte[]</code> to OpenDJ server {@link ByteString}.
*
* @param authenticationValue
diff --git a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
index dd4a6e0..cf7987e 100644
--- a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
+++ b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
@@ -39,6 +39,7 @@
import org.forgerock.opendj.ldap.LinkedAttribute;
import org.forgerock.opendj.ldap.Modification;
import org.forgerock.opendj.ldap.ModificationType;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.controls.Control;
import org.forgerock.opendj.ldap.controls.GenericControl;
import org.forgerock.opendj.ldap.controls.PersistentSearchChangeType;
@@ -71,7 +72,6 @@
import org.opends.server.types.FilterType;
import org.opends.server.types.LDAPException;
import org.opends.server.types.Operation;
-import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchResultReference;
import org.testng.annotations.AfterGroups;
@@ -161,21 +161,6 @@
}
/**
- * Converts a SDK DereferenceAliasesPolicy to an LDAP dereferencePolicy.
- *
- * @throws DirectoryException
- */
- @Test()
- public final void testToDeferencePolicy() {
- org.forgerock.opendj.ldap.DereferenceAliasesPolicy sdkDeferenceAliasesPolicy =
- org.forgerock.opendj.ldap.DereferenceAliasesPolicy.ALWAYS;
-
- org.opends.server.types.DereferencePolicy dereferencePolicy = to(sdkDeferenceAliasesPolicy);
- assertThat(dereferencePolicy).isEqualTo(
- org.opends.server.types.DereferencePolicy.DEREF_ALWAYS);
- }
-
- /**
* Converts a SDK control to a LDAP server control.
*
* @throws DirectoryException
--
Gitblit v1.10.0