You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/09/24 07:37:37 UTC
[directory-server] branch master updated: Fixed some compilation
errors following the abstract classes renaming in LDAP API
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 1ea037f Fixed some compilation errors following the abstract classes renaming in LDAP API
1ea037f is described below
commit 1ea037f9045bba83dd4f705aade636f5a9ee0a20
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Mon Sep 24 09:37:32 2018 +0200
Fixed some compilation errors following the abstract classes renaming in LDAP API
---
.../java/org/apache/directory/server/ldap/LdapProtocolHandler.java | 4 ++--
.../org/apache/directory/server/operations/bind/SaslBindIT.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
index 3f7a3f0..1e438b7 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
@@ -20,9 +20,9 @@
package org.apache.directory.server.ldap;
+import org.apache.directory.api.ldap.codec.api.AbstractMessageDecorator;
import org.apache.directory.api.ldap.codec.api.LdapDecoder;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
-import org.apache.directory.api.ldap.codec.api.MessageDecorator;
import org.apache.directory.api.ldap.codec.api.SchemaBinaryAttributeDetector;
import org.apache.directory.api.ldap.codec.decorators.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.model.exception.ResponseCarryingMessageException;
@@ -89,7 +89,7 @@ class LdapProtocolHandler extends DemuxingIoHandler
session.setAttribute( LdapDecoder.MAX_PDU_SIZE_ATTR, ldapServer.getDirectoryService().getMaxPDUSize() );
// Last, store the message container
- LdapMessageContainer<? extends MessageDecorator<Message>> ldapMessageContainer =
+ LdapMessageContainer<? extends AbstractMessageDecorator<Message>> ldapMessageContainer =
new LdapMessageContainer<>(
ldapServer.getDirectoryService().getLdapCodecService(),
new SchemaBinaryAttributeDetector(
diff --git a/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java b/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
index bffe62f..946cf21 100644
--- a/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
@@ -38,7 +38,7 @@ import org.apache.commons.net.SocketClient;
import org.apache.directory.api.ldap.codec.api.LdapDecoder;
import org.apache.directory.api.ldap.codec.api.LdapEncoder;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
-import org.apache.directory.api.ldap.codec.api.MessageDecorator;
+import org.apache.directory.api.ldap.codec.api.AbstractMessageDecorator;
import org.apache.directory.api.ldap.model.constants.SaslQoP;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms;
@@ -727,7 +727,7 @@ public class SaslBindIT extends AbstractLdapTestUnit
}
// Retrieve the response back from server to my last request.
- LdapMessageContainer<MessageDecorator<? extends Message>> container = new LdapMessageContainer(
+ LdapMessageContainer<AbstractMessageDecorator<? extends Message>> container = new LdapMessageContainer(
ldapServer.getDirectoryService().getLdapCodecService() );
return ( BindResponse ) decoder.decode( _input_, container );
}
@@ -766,7 +766,7 @@ public class SaslBindIT extends AbstractLdapTestUnit
}
// Retrieve the response back from server to my last request.
- LdapMessageContainer<MessageDecorator<? extends Message>> container = new LdapMessageContainer(
+ LdapMessageContainer<AbstractMessageDecorator<? extends Message>> container = new LdapMessageContainer(
ldapServer.getDirectoryService().getLdapCodecService() );
return ( BindResponse ) decoder.decode( _input_, container );
}