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/21 18:13:45 UTC
[directory-ldap-api] branch master updated: Fixed the compilation
errors
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-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new 78a0662 Fixed the compilation errors
78a0662 is described below
commit 78a0662a43e3f98096237b9593e4b0ac53ba81a9
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Fri Sep 21 20:13:39 2018 +0200
Fixed the compilation errors
---
.../api/ldap/codec/api/MessageDecorator.java | 105 ++-------------------
1 file changed, 10 insertions(+), 95 deletions(-)
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java
index 12676cd..26dd581 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/MessageDecorator.java
@@ -23,49 +23,19 @@ package org.apache.directory.api.ldap.codec.api;
import java.util.HashMap;
import java.util.Map;
-import org.apache.directory.api.ldap.codec.decorators.AbandonRequestDecorator;
-import org.apache.directory.api.ldap.codec.decorators.AddRequestDecorator;
-import org.apache.directory.api.ldap.codec.decorators.AddResponseDecorator;
-import org.apache.directory.api.ldap.codec.decorators.BindRequestDecorator;
-import org.apache.directory.api.ldap.codec.decorators.BindResponseDecorator;
-import org.apache.directory.api.ldap.codec.decorators.CompareRequestDecorator;
-import org.apache.directory.api.ldap.codec.decorators.CompareResponseDecorator;
-import org.apache.directory.api.ldap.codec.decorators.DeleteRequestDecorator;
-import org.apache.directory.api.ldap.codec.decorators.DeleteResponseDecorator;
import org.apache.directory.api.ldap.codec.decorators.IntermediateResponseDecorator;
-import org.apache.directory.api.ldap.codec.decorators.ModifyDnRequestDecorator;
-import org.apache.directory.api.ldap.codec.decorators.ModifyDnResponseDecorator;
-import org.apache.directory.api.ldap.codec.decorators.ModifyRequestDecorator;
-import org.apache.directory.api.ldap.codec.decorators.ModifyResponseDecorator;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.api.ldap.codec.decorators.SearchResultDoneDecorator;
import org.apache.directory.api.ldap.codec.decorators.SearchResultEntryDecorator;
import org.apache.directory.api.ldap.codec.decorators.SearchResultReferenceDecorator;
-import org.apache.directory.api.ldap.codec.decorators.UnbindRequestDecorator;
-import org.apache.directory.api.ldap.model.message.AbandonRequest;
-import org.apache.directory.api.ldap.model.message.AddRequest;
-import org.apache.directory.api.ldap.model.message.AddResponse;
-import org.apache.directory.api.ldap.model.message.BindRequest;
-import org.apache.directory.api.ldap.model.message.BindResponse;
-import org.apache.directory.api.ldap.model.message.CompareRequest;
-import org.apache.directory.api.ldap.model.message.CompareResponse;
import org.apache.directory.api.ldap.model.message.Control;
-import org.apache.directory.api.ldap.model.message.DeleteRequest;
-import org.apache.directory.api.ldap.model.message.DeleteResponse;
-import org.apache.directory.api.ldap.model.message.ExtendedRequest;
-import org.apache.directory.api.ldap.model.message.ExtendedResponse;
import org.apache.directory.api.ldap.model.message.IntermediateResponse;
import org.apache.directory.api.ldap.model.message.Message;
import org.apache.directory.api.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.api.ldap.model.message.ModifyDnRequest;
-import org.apache.directory.api.ldap.model.message.ModifyDnResponse;
-import org.apache.directory.api.ldap.model.message.ModifyRequest;
-import org.apache.directory.api.ldap.model.message.ModifyResponse;
import org.apache.directory.api.ldap.model.message.SearchRequest;
import org.apache.directory.api.ldap.model.message.SearchResultDone;
import org.apache.directory.api.ldap.model.message.SearchResultEntry;
import org.apache.directory.api.ldap.model.message.SearchResultReference;
-import org.apache.directory.api.ldap.model.message.UnbindRequest;
/**
@@ -107,6 +77,16 @@ public abstract class MessageDecorator<E extends Message> implements Message, De
this.codec = codec;
this.decoratedMessage = decoratedMessage;
controls = new HashMap<>();
+
+ Map<String, Control> decoratedControls = decoratedMessage.getControls();
+
+ if ( ( decoratedControls != null ) && !decoratedControls.isEmpty() )
+ {
+ for ( Control control : decoratedControls.values() )
+ {
+ addControl( control );
+ }
+ }
}
@@ -128,70 +108,9 @@ public abstract class MessageDecorator<E extends Message> implements Message, De
switch ( decoratedMessage.getType() )
{
- case ABANDON_REQUEST:
- decorator = new AbandonRequestDecorator( codec, ( AbandonRequest ) decoratedMessage );
- break;
-
- case ADD_REQUEST:
- decorator = new AddRequestDecorator( codec, ( AddRequest ) decoratedMessage );
- break;
-
- case ADD_RESPONSE:
- decorator = new AddResponseDecorator( codec, ( AddResponse ) decoratedMessage );
- break;
-
- case BIND_REQUEST:
- decorator = new BindRequestDecorator( codec, ( BindRequest ) decoratedMessage );
- break;
-
- case BIND_RESPONSE:
- decorator = new BindResponseDecorator( codec, ( BindResponse ) decoratedMessage );
- break;
-
- case COMPARE_REQUEST:
- decorator = new CompareRequestDecorator( codec, ( CompareRequest ) decoratedMessage );
- break;
-
- case COMPARE_RESPONSE:
- decorator = new CompareResponseDecorator( codec, ( CompareResponse ) decoratedMessage );
- break;
-
- case DEL_REQUEST:
- decorator = new DeleteRequestDecorator( codec, ( DeleteRequest ) decoratedMessage );
- break;
-
- case DEL_RESPONSE:
- decorator = new DeleteResponseDecorator( codec, ( DeleteResponse ) decoratedMessage );
- break;
-
- case EXTENDED_REQUEST:
- decorator = codec.decorate( ( ExtendedRequest ) decoratedMessage );
- break;
-
- case EXTENDED_RESPONSE:
- decorator = codec.decorate( ( ExtendedResponse ) decoratedMessage );
- break;
-
case INTERMEDIATE_RESPONSE:
decorator = new IntermediateResponseDecorator( codec, ( IntermediateResponse ) decoratedMessage );
break;
-
- case MODIFY_REQUEST:
- decorator = new ModifyRequestDecorator( codec, ( ModifyRequest ) decoratedMessage );
- break;
-
- case MODIFY_RESPONSE:
- decorator = new ModifyResponseDecorator( codec, ( ModifyResponse ) decoratedMessage );
- break;
-
- case MODIFYDN_REQUEST:
- decorator = new ModifyDnRequestDecorator( codec, ( ModifyDnRequest ) decoratedMessage );
- break;
-
- case MODIFYDN_RESPONSE:
- decorator = new ModifyDnResponseDecorator( codec, ( ModifyDnResponse ) decoratedMessage );
- break;
-
case SEARCH_REQUEST:
decorator = new SearchRequestDecorator( codec, ( SearchRequest ) decoratedMessage );
break;
@@ -208,10 +127,6 @@ public abstract class MessageDecorator<E extends Message> implements Message, De
decorator = new SearchResultReferenceDecorator( codec, ( SearchResultReference ) decoratedMessage );
break;
- case UNBIND_REQUEST:
- decorator = new UnbindRequestDecorator( codec, ( UnbindRequest ) decoratedMessage );
- break;
-
default:
return null;
}