Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored handlers for non-resource request.
Introduced a generic RequestHandler interface. Refactored existing documentation handler, multiplexed request handler and debug request handler to use this interface. Collapse BaseRestServer with RestLiServer as its not used. Removed deprecated InvokeAware and related code. It's not used at LinkedIn. RB=1107522 G=si-dev R=kbalasub,nshankar,mnchen A=mnchen
- Loading branch information
Xiao Ma
committed
Sep 27, 2017
1 parent
1787328
commit bf0d8a7
Showing
18 changed files
with
546 additions
and
672 deletions.
There are no files selected for viewing
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
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
100 changes: 0 additions & 100 deletions
100
restli-server/src/main/java/com/linkedin/restli/server/BaseRestServer.java
This file was deleted.
Oops, something went wrong.
129 changes: 129 additions & 0 deletions
129
restli-server/src/main/java/com/linkedin/restli/server/DelegatingDebugRequestHandler.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,129 @@ | ||
| /* | ||
| Copyright (c) 2017 LinkedIn Corp. | ||
| Licensed 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.linkedin.restli.server; | ||
|
|
||
| import com.linkedin.common.callback.Callback; | ||
| import com.linkedin.jersey.api.uri.UriBuilder; | ||
| import com.linkedin.r2.message.Request; | ||
| import com.linkedin.r2.message.RequestContext; | ||
| import com.linkedin.r2.message.rest.RestRequest; | ||
| import com.linkedin.r2.message.rest.RestRequestBuilder; | ||
| import com.linkedin.r2.message.rest.RestResponse; | ||
| import com.linkedin.r2.util.URIUtil; | ||
| import com.linkedin.restli.common.attachments.RestLiAttachmentReader; | ||
|
|
||
|
|
||
| /** | ||
| * A handler for debug request. It delegates the handling to the underlying {@link RestLiDebugRequestHandler}. | ||
| * | ||
| * @author xma | ||
| */ | ||
| class DelegatingDebugRequestHandler implements RequestHandler | ||
| { | ||
| static final String DEBUG_PATH_SEGMENT = "__debug"; | ||
|
|
||
| private final RestLiDebugRequestHandler _delegate; | ||
| private final RestLiServer _restLiServer; | ||
|
|
||
| DelegatingDebugRequestHandler(RestLiDebugRequestHandler delegate, RestLiServer restLiServer) | ||
| { | ||
| _delegate = delegate; | ||
| _restLiServer = restLiServer; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean shouldHandle(Request request) | ||
| { | ||
| // Typically, a debug request should have the following pattern in its URI path | ||
| // <base URI>/__debug/<debug handler ID>/<Rest.li request path> | ||
| String[] pathSegments = URIUtil.tokenizePath(request.getURI().getPath()); | ||
| String debugHandlerId = null; | ||
|
|
||
| for (int i = 0; i < pathSegments.length; ++i) | ||
| { | ||
| String pathSegment = pathSegments[i]; | ||
| if (pathSegment.equals(DEBUG_PATH_SEGMENT)) | ||
| { | ||
| if (i < pathSegments.length - 1) | ||
| { | ||
| debugHandlerId = pathSegments[i + 1]; | ||
| } | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return _delegate.getHandlerId().equals(debugHandlerId); | ||
| } | ||
|
|
||
| @Override | ||
| public void handleRequest(RestRequest request, RequestContext requestContext, Callback<RestResponse> callback) | ||
| { | ||
| _delegate.handleRequest(request, | ||
| requestContext, | ||
| new ResourceDebugRequestHandlerImpl(), | ||
| null, // Attachment not supported for debugging. | ||
| new RestResponseExecutionCallbackAdapter(callback)); | ||
| } | ||
|
|
||
| private class ResourceDebugRequestHandlerImpl implements RestLiDebugRequestHandler.ResourceDebugRequestHandler | ||
| { | ||
| @Override | ||
| public void handleRequest(final RestRequest request, | ||
| final RequestContext requestContext, | ||
| final RequestExecutionCallback<RestResponse> callback) | ||
| { | ||
| // Create a new request at this point from the debug request by removing the path suffix | ||
| // starting with "__debug". | ||
| String fullPath = request.getURI().getPath(); | ||
| int debugSegmentIndex = fullPath.indexOf(DEBUG_PATH_SEGMENT); | ||
|
|
||
| RestRequestBuilder requestBuilder = new RestRequestBuilder(request); | ||
|
|
||
| UriBuilder uriBuilder = UriBuilder.fromUri(request.getURI()); | ||
| uriBuilder.replacePath(request.getURI().getPath().substring(0, debugSegmentIndex - 1)); | ||
| requestBuilder.setURI(uriBuilder.build()); | ||
|
|
||
| _restLiServer.handleResourceRequest(requestBuilder.build(), requestContext, callback, null, true); | ||
| } | ||
| } | ||
|
|
||
| private class RestResponseExecutionCallbackAdapter implements RequestExecutionCallback<RestResponse> | ||
| { | ||
| private final Callback<RestResponse> _wrappedCallback; | ||
|
|
||
| RestResponseExecutionCallbackAdapter(Callback<RestResponse> wrappedCallback) | ||
| { | ||
| _wrappedCallback = wrappedCallback; | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(final Throwable e, final RequestExecutionReport executionReport, | ||
| final RestLiAttachmentReader requestAttachmentReader, | ||
| final RestLiResponseAttachments responseAttachments) | ||
| { | ||
| _wrappedCallback.onError(e); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSuccess(final RestResponse result, final RequestExecutionReport executionReport, | ||
| final RestLiResponseAttachments responseAttachments) | ||
| { | ||
| _wrappedCallback.onSuccess(result); | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.