Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
ad4c4153
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ad4c4153
编写于
9月 05, 2017
作者:
Z
zentol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-7583] [REST] Use static constant for CONTENT_TYPE header
This closes #4646.
上级
06d8e830
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
32 addition
and
2 deletion
+32
-2
flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestClient.java
...c/main/java/org/apache/flink/runtime/rest/RestClient.java
+2
-1
flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractRestHandler.java
...pache/flink/runtime/rest/handler/AbstractRestHandler.java
+2
-1
flink-runtime/src/main/java/org/apache/flink/runtime/rest/util/RestConstants.java
...ava/org/apache/flink/runtime/rest/util/RestConstants.java
+28
-0
未找到文件。
flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestClient.java
浏览文件 @
ad4c4153
...
@@ -27,6 +27,7 @@ import org.apache.flink.runtime.rest.messages.MessageParameters;
...
@@ -27,6 +27,7 @@ import org.apache.flink.runtime.rest.messages.MessageParameters;
import
org.apache.flink.runtime.rest.messages.RequestBody
;
import
org.apache.flink.runtime.rest.messages.RequestBody
;
import
org.apache.flink.runtime.rest.messages.ResponseBody
;
import
org.apache.flink.runtime.rest.messages.ResponseBody
;
import
org.apache.flink.runtime.rest.util.RestClientException
;
import
org.apache.flink.runtime.rest.util.RestClientException
;
import
org.apache.flink.runtime.rest.util.RestConstants
;
import
org.apache.flink.runtime.rest.util.RestMapperUtils
;
import
org.apache.flink.runtime.rest.util.RestMapperUtils
;
import
org.apache.flink.util.FlinkRuntimeException
;
import
org.apache.flink.util.FlinkRuntimeException
;
import
org.apache.flink.util.Preconditions
;
import
org.apache.flink.util.Preconditions
;
...
@@ -152,7 +153,7 @@ public class RestClient {
...
@@ -152,7 +153,7 @@ public class RestClient {
FullHttpRequest
httpRequest
=
new
DefaultFullHttpRequest
(
HttpVersion
.
HTTP_1_1
,
messageHeaders
.
getHttpMethod
().
getNettyHttpMethod
(),
targetUrl
,
payload
);
FullHttpRequest
httpRequest
=
new
DefaultFullHttpRequest
(
HttpVersion
.
HTTP_1_1
,
messageHeaders
.
getHttpMethod
().
getNettyHttpMethod
(),
targetUrl
,
payload
);
httpRequest
.
headers
()
httpRequest
.
headers
()
.
add
(
HttpHeaders
.
Names
.
CONTENT_LENGTH
,
payload
.
capacity
())
.
add
(
HttpHeaders
.
Names
.
CONTENT_LENGTH
,
payload
.
capacity
())
.
add
(
HttpHeaders
.
Names
.
CONTENT_TYPE
,
"application/json; charset="
+
ConfigConstants
.
DEFAULT_CHARSET
.
name
()
)
.
add
(
HttpHeaders
.
Names
.
CONTENT_TYPE
,
RestConstants
.
REST_CONTENT_TYPE
)
.
set
(
HttpHeaders
.
Names
.
HOST
,
targetAddress
+
':'
+
targetPort
)
.
set
(
HttpHeaders
.
Names
.
HOST
,
targetAddress
+
':'
+
targetPort
)
.
set
(
HttpHeaders
.
Names
.
CONNECTION
,
HttpHeaders
.
Values
.
CLOSE
);
.
set
(
HttpHeaders
.
Names
.
CONNECTION
,
HttpHeaders
.
Values
.
CLOSE
);
...
...
flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractRestHandler.java
浏览文件 @
ad4c4153
...
@@ -25,6 +25,7 @@ import org.apache.flink.runtime.rest.messages.MessageHeaders;
...
@@ -25,6 +25,7 @@ import org.apache.flink.runtime.rest.messages.MessageHeaders;
import
org.apache.flink.runtime.rest.messages.MessageParameters
;
import
org.apache.flink.runtime.rest.messages.MessageParameters
;
import
org.apache.flink.runtime.rest.messages.RequestBody
;
import
org.apache.flink.runtime.rest.messages.RequestBody
;
import
org.apache.flink.runtime.rest.messages.ResponseBody
;
import
org.apache.flink.runtime.rest.messages.ResponseBody
;
import
org.apache.flink.runtime.rest.util.RestConstants
;
import
org.apache.flink.runtime.rest.util.RestMapperUtils
;
import
org.apache.flink.runtime.rest.util.RestMapperUtils
;
import
org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf
;
import
org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf
;
...
@@ -192,7 +193,7 @@ public abstract class AbstractRestHandler<R extends RequestBody, P extends Respo
...
@@ -192,7 +193,7 @@ public abstract class AbstractRestHandler<R extends RequestBody, P extends Respo
private
static
void
sendResponse
(
@Nonnull
ChannelHandlerContext
ctx
,
@Nonnull
HttpRequest
httpRequest
,
@Nonnull
HttpResponseStatus
statusCode
,
@Nonnull
String
message
)
{
private
static
void
sendResponse
(
@Nonnull
ChannelHandlerContext
ctx
,
@Nonnull
HttpRequest
httpRequest
,
@Nonnull
HttpResponseStatus
statusCode
,
@Nonnull
String
message
)
{
HttpResponse
response
=
new
DefaultHttpResponse
(
HTTP_1_1
,
statusCode
);
HttpResponse
response
=
new
DefaultHttpResponse
(
HTTP_1_1
,
statusCode
);
response
.
headers
().
set
(
CONTENT_TYPE
,
"application/json"
);
response
.
headers
().
set
(
CONTENT_TYPE
,
RestConstants
.
REST_CONTENT_TYPE
);
if
(
HttpHeaders
.
isKeepAlive
(
httpRequest
))
{
if
(
HttpHeaders
.
isKeepAlive
(
httpRequest
))
{
response
.
headers
().
set
(
CONNECTION
,
HttpHeaders
.
Values
.
KEEP_ALIVE
);
response
.
headers
().
set
(
CONNECTION
,
HttpHeaders
.
Values
.
KEEP_ALIVE
);
...
...
flink-runtime/src/main/java/org/apache/flink/runtime/rest/util/RestConstants.java
0 → 100644
浏览文件 @
ad4c4153
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF 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
org.apache.flink.runtime.rest.util
;
import
org.apache.flink.configuration.ConfigConstants
;
/**
* This class contains constants to be used by rest components.
*/
public
class
RestConstants
{
public
static
final
String
REST_CONTENT_TYPE
=
"application/json; charset="
+
ConfigConstants
.
DEFAULT_CHARSET
.
name
();
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录