Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
thythm
ribbon
提交
6492d707
R
ribbon
项目概览
thythm
/
ribbon
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
ribbon
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
6492d707
编写于
7月 09, 2014
作者:
A
allenxwang
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #125 from allenxwang/2.x-ssl
Dependency changes.
上级
6e5171ab
5f0c0031
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
15 deletion
+20
-15
build.gradle
build.gradle
+5
-5
ribbon/src/main/java/com/netflix/ribbon/http/HttpRequest.java
...on/src/main/java/com/netflix/ribbon/http/HttpRequest.java
+3
-0
ribbon/src/test/java/com/netflix/ribbon/http/TemplateBuilderTest.java
...est/java/com/netflix/ribbon/http/TemplateBuilderTest.java
+12
-10
未找到文件。
build.gradle
浏览文件 @
6492d707
...
...
@@ -30,7 +30,6 @@ subprojects {
compile
'com.google.guava:guava:14.0.1'
compile
'com.netflix.archaius:archaius-core:0.5.12'
compile
'com.netflix.netflix-commons:netflix-commons-util:0.1.1'
compile
'commons-collections:commons-collections:3.2.1'
testCompile
'org.powermock:powermock-easymock-release-full:1.4.10'
testCompile
'org.easymock:easymock:3.1'
testCompile
'org.slf4j:slf4j-log4j12:1.7.2'
...
...
@@ -55,6 +54,7 @@ project(':ribbon-httpclient') {
dependencies
{
compile
project
(
':ribbon-core'
)
compile
project
(
':ribbon-loadbalancer'
)
compile
'commons-collections:commons-collections:3.2.1'
compile
'org.apache.httpcomponents:httpclient:4.2.1'
compile
'com.sun.jersey:jersey-client:1.11'
compile
'com.sun.jersey:jersey-core:1.11'
...
...
@@ -71,9 +71,9 @@ project(':ribbon-transport') {
dependencies
{
compile
project
(
':ribbon-core'
)
compile
project
(
':ribbon-loadbalancer'
)
compile
'com.netflix.rxnetty:rx-netty:0.3.
8
'
compile
'com.netflix.rxnetty:rx-netty-contexts:0.3.
8
'
compile
'com.netflix.rxnetty:rx-netty-servo:0.3.
8
'
compile
'com.netflix.rxnetty:rx-netty:0.3.
9
'
compile
'com.netflix.rxnetty:rx-netty-contexts:0.3.
9
'
compile
'com.netflix.rxnetty:rx-netty-servo:0.3.
9
'
testCompile
'com.google.mockwebserver:mockwebserver:20130706'
testCompile
project
(
':ribbon-test'
)
}
...
...
@@ -84,7 +84,7 @@ project(':ribbon-eureka') {
dependencies
{
compile
project
(
':ribbon-core'
)
compile
project
(
':ribbon-loadbalancer'
)
compile
'com.netflix.eureka:eureka-client:1.1.1
2
6'
compile
'com.netflix.eureka:eureka-client:1.1.1
3
6'
}
}
...
...
ribbon/src/main/java/com/netflix/ribbon/http/HttpRequest.java
浏览文件 @
6492d707
...
...
@@ -73,6 +73,9 @@ class HttpRequest<T> implements RibbonRequest<T> {
this
.
cacheProvider
=
null
;
}
this
.
template
=
requestBuilder
.
template
();
if
(!
ByteBuf
.
class
.
isAssignableFrom
(
template
.
getClassType
()))
{
throw
new
IllegalArgumentException
(
"Return type other than ByteBuf is not currently supported as serialization functionality is still work in progress"
);
}
}
RibbonHystrixObservableCommand
<
T
>
createHystrixCommand
()
{
...
...
ribbon/src/test/java/com/netflix/ribbon/http/TemplateBuilderTest.java
浏览文件 @
6492d707
...
...
@@ -17,9 +17,11 @@ package com.netflix.ribbon.http;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
io.netty.buffer.ByteBuf
;
import
io.netty.buffer.Unpooled
;
import
io.reactivex.netty.protocol.http.client.HttpClientRequest
;
import
io.reactivex.netty.protocol.http.client.HttpRequestHeaders
;
import
java.nio.charset.Charset
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -39,7 +41,7 @@ import com.netflix.ribbon.http.HttpResourceGroup;
public
class
TemplateBuilderTest
{
private
static
class
FakeCacheProvider
implements
CacheProvider
<
String
>
{
private
static
class
FakeCacheProvider
implements
CacheProvider
<
ByteBuf
>
{
String
id
;
FakeCacheProvider
(
String
id
)
{
...
...
@@ -47,10 +49,10 @@ public class TemplateBuilderTest {
}
@Override
public
Observable
<
String
>
get
(
final
String
key
,
public
Observable
<
ByteBuf
>
get
(
final
String
key
,
Map
<
String
,
Object
>
requestProperties
)
{
if
(
key
.
equals
(
id
))
{
return
Observable
.
just
(
id
);
return
Observable
.
just
(
Unpooled
.
buffer
().
writeBytes
(
id
.
getBytes
(
Charset
.
defaultCharset
()))
);
}
else
{
return
Observable
.
error
(
new
IllegalArgumentException
());
...
...
@@ -77,14 +79,14 @@ public class TemplateBuilderTest {
public
void
testCacheKeyTemplates
()
{
HttpResourceGroup
group
=
Ribbon
.
createHttpResourceGroup
(
"test"
);
HttpRequestTemplate
<
String
>
template
=
group
.
newRequestTemplate
(
"testCacheKeyTemplates"
,
String
.
class
);
HttpRequestTemplate
<
ByteBuf
>
template
=
group
.
newRequestTemplate
(
"testCacheKeyTemplates"
,
ByteBuf
.
class
);
template
.
withUriTemplate
(
"/foo/{id}"
)
.
withMethod
(
"GET"
)
.
withCacheProvider
(
"/cache/{id}"
,
new
FakeCacheProvider
(
"/cache/5"
));
RibbonRequest
<
String
>
request
=
template
.
requestBuilder
().
withRequestProperty
(
"id"
,
5
).
build
();
String
result
=
request
.
execute
();
assertEquals
(
"/cache/5"
,
result
);
RibbonRequest
<
ByteBuf
>
request
=
template
.
requestBuilder
().
withRequestProperty
(
"id"
,
5
).
build
();
ByteBuf
result
=
request
.
execute
();
assertEquals
(
"/cache/5"
,
result
.
toString
(
Charset
.
defaultCharset
())
);
}
@Test
...
...
@@ -118,12 +120,12 @@ public class TemplateBuilderTest {
.
withMaxTotalConnections
(
400
)
.
withReadTimeout
(
2000
);
HttpResourceGroup
group
=
Ribbon
.
createHttpResourceGroup
(
"test"
,
clientOptions
);
HttpRequestTemplate
<
String
>
template
=
group
.
newRequestTemplate
(
"testHystrixProperties"
,
String
.
class
);
HttpRequest
<
String
>
request
=
(
HttpRequest
<
String
>)
template
.
withMethod
(
"GET"
)
HttpRequestTemplate
<
ByteBuf
>
template
=
group
.
newRequestTemplate
(
"testHystrixProperties"
,
ByteBuf
.
class
);
HttpRequest
<
ByteBuf
>
request
=
(
HttpRequest
<
ByteBuf
>)
template
.
withMethod
(
"GET"
)
.
withMethod
(
"GET"
)
.
withUriTemplate
(
"/foo/bar"
)
.
requestBuilder
().
build
();
HystrixObservableCommand
<
String
>
command
=
request
.
createHystrixCommand
();
HystrixObservableCommand
<
ByteBuf
>
command
=
request
.
createHystrixCommand
();
HystrixCommandProperties
props
=
command
.
getProperties
();
assertEquals
(
400
,
props
.
executionIsolationSemaphoreMaxConcurrentRequests
().
get
().
intValue
());
assertEquals
(
12000
,
props
.
executionIsolationThreadTimeoutInMilliseconds
().
get
().
intValue
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录