-
Notifications
You must be signed in to change notification settings - Fork 926
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #220 from trustin/fix_context_propagation
Fix RequestContext propagation and callback invocation
- Loading branch information
Showing
16 changed files
with
674 additions
and
183 deletions.
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
src/main/java/com/linecorp/armeria/client/ClientRequestContextWrapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright 2016 LINE Corporation | ||
| * | ||
| * LINE Corporation licenses this file to you under the Apache License, | ||
| * version 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package com.linecorp.armeria.client; | ||
|
|
||
| import java.time.Duration; | ||
|
|
||
| import com.linecorp.armeria.common.RequestContextWrapper; | ||
|
|
||
| public class ClientRequestContextWrapper | ||
| extends RequestContextWrapper<ClientRequestContext> implements ClientRequestContext { | ||
|
|
||
| protected ClientRequestContextWrapper(ClientRequestContext delegate) { | ||
| super(delegate); | ||
| } | ||
|
|
||
| @Override | ||
| public Endpoint endpoint() { | ||
| return delegate().endpoint(); | ||
| } | ||
|
|
||
| @Override | ||
| public ClientOptions options() { | ||
| return delegate().options(); | ||
| } | ||
|
|
||
| @Override | ||
| public long writeTimeoutMillis() { | ||
| return delegate().writeTimeoutMillis(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setWriteTimeoutMillis(long writeTimeoutMillis) { | ||
| delegate().setWriteTimeoutMillis(writeTimeoutMillis); | ||
| } | ||
|
|
||
| @Override | ||
| public void setWriteTimeout(Duration writeTimeout) { | ||
| delegate().setWriteTimeout(writeTimeout); | ||
| } | ||
|
|
||
| @Override | ||
| public long responseTimeoutMillis() { | ||
| return delegate().responseTimeoutMillis(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setResponseTimeoutMillis(long responseTimeoutMillis) { | ||
| delegate().setResponseTimeoutMillis(responseTimeoutMillis); | ||
| } | ||
|
|
||
| @Override | ||
| public void setResponseTimeout(Duration responseTimeout) { | ||
| delegate().setResponseTimeout(responseTimeout); | ||
| } | ||
|
|
||
| @Override | ||
| public long maxResponseLength() { | ||
| return delegate().maxResponseLength(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setMaxResponseLength(long maxResponseLength) { | ||
| delegate().setMaxResponseLength(maxResponseLength); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
src/main/java/com/linecorp/armeria/common/NonWrappingRequestContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright 2016 LINE Corporation | ||
| * | ||
| * LINE Corporation licenses this file to you under the Apache License, | ||
| * version 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package com.linecorp.armeria.common; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
|
|
||
| import com.linecorp.armeria.internal.DefaultAttributeMap; | ||
|
|
||
| import io.netty.util.Attribute; | ||
| import io.netty.util.AttributeKey; | ||
|
|
||
| /** | ||
| * Default {@link RequestContext} implementation. | ||
| */ | ||
| public abstract class NonWrappingRequestContext extends AbstractRequestContext { | ||
|
|
||
| private final DefaultAttributeMap attrs = new DefaultAttributeMap(); | ||
| private final SessionProtocol sessionProtocol; | ||
| private final String method; | ||
| private final String path; | ||
| private final Object request; | ||
| private List<Runnable> onEnterCallbacks; | ||
| private List<Runnable> onExitCallbacks; | ||
|
|
||
| /** | ||
| * Creates a new instance. | ||
| * | ||
| * @param sessionProtocol the {@link SessionProtocol} of the invocation | ||
| * @param request the request associated with this context | ||
| */ | ||
| protected NonWrappingRequestContext( | ||
| SessionProtocol sessionProtocol, String method, String path, Object request) { | ||
| this.sessionProtocol = sessionProtocol; | ||
| this.method = method; | ||
| this.path = path; | ||
| this.request = request; | ||
| } | ||
|
|
||
| @Override | ||
| public final SessionProtocol sessionProtocol() { | ||
| return sessionProtocol; | ||
| } | ||
|
|
||
| @Override | ||
| public final String method() { | ||
| return method; | ||
| } | ||
|
|
||
| @Override | ||
| public final String path() { | ||
| return path; | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| public final <T> T request() { | ||
| return (T) request; | ||
| } | ||
|
|
||
| @Override | ||
| public <T> Attribute<T> attr(AttributeKey<T> key) { | ||
| return attrs.attr(key); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> boolean hasAttr(AttributeKey<T> key) { | ||
| return attrs.hasAttr(key); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<Attribute<?>> attrs() { | ||
| return attrs.attrs(); | ||
| } | ||
|
|
||
| @Override | ||
| public final void onEnter(Runnable callback) { | ||
| if (onEnterCallbacks == null) { | ||
| onEnterCallbacks = new ArrayList<>(4); | ||
| } | ||
| onEnterCallbacks.add(callback); | ||
| } | ||
|
|
||
| @Override | ||
| public final void onExit(Runnable callback) { | ||
| if (onExitCallbacks == null) { | ||
| onExitCallbacks = new ArrayList<>(4); | ||
| } | ||
| onExitCallbacks.add(callback); | ||
| } | ||
|
|
||
| @Override | ||
| public void invokeOnEnterCallbacks() { | ||
| final List<Runnable> onEnterCallbacks = this.onEnterCallbacks; | ||
| if (onEnterCallbacks != null) { | ||
| onEnterCallbacks.forEach(Runnable::run); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void invokeOnExitCallbacks() { | ||
| final List<Runnable> onExitCallbacks = this.onExitCallbacks; | ||
| if (onExitCallbacks != null) { | ||
| onExitCallbacks.forEach(Runnable::run); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.