Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
5c05c7e0
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5c05c7e0
编写于
6月 18, 2017
作者:
A
aefimov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8172297: In java 8, the marshalling with JAX-WS does not escape carriage return
Reviewed-by: lancea
上级
00d79fa4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
235 addition
and
0 deletion
+235
-0
test/javax/xml/ws/8172297/Main.java
test/javax/xml/ws/8172297/Main.java
+157
-0
test/javax/xml/ws/8172297/ws/HelloWorld.java
test/javax/xml/ws/8172297/ws/HelloWorld.java
+39
-0
test/javax/xml/ws/8172297/ws/HelloWorldImpl.java
test/javax/xml/ws/8172297/ws/HelloWorldImpl.java
+39
-0
未找到文件。
test/javax/xml/ws/8172297/Main.java
0 → 100644
浏览文件 @
5c05c7e0
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8172297
* @summary Test that carriage-return and new-line characters
* are preserved in webservice parameters
* @compile ws/HelloWorld.java ws/HelloWorldImpl.java Main.java
* @run testng/othervm Main
*/
import
java.io.IOException
;
import
java.net.ServerSocket
;
import
java.net.URL
;
import
java.util.concurrent.CountDownLatch
;
import
javax.xml.namespace.QName
;
import
javax.xml.ws.Endpoint
;
import
javax.xml.ws.Service
;
import
org.testng.Assert
;
import
org.testng.annotations.Test
;
import
ws.HelloWorld
;
import
ws.HelloWorldImpl
;
public
class
Main
{
@Test
public
void
runTest
()
throws
Exception
{
//
CountDownLatch
serverInitSignal
=
new
CountDownLatch
(
1
);
CountDownLatch
testDoneSignal
=
new
CountDownLatch
(
1
);
WebserviceRunner
serverThread
=
new
WebserviceRunner
(
serverInitSignal
,
testDoneSignal
);
(
new
Thread
(
serverThread
)).
start
();
serverInitSignal
.
await
();
boolean
paramModified
=
runClientCode
(
serverThread
.
getPort
());
testDoneSignal
.
countDown
();
Assert
.
assertFalse
(
paramModified
,
"WS parameter was modified during round trip."
);
}
/*
* Connects to launched web service endpoint, sends message with CR/NL symbols and
* checks if it was modified during the round trip client/server communication.
*/
private
boolean
runClientCode
(
int
port
)
throws
Exception
{
System
.
out
.
println
(
"Launching WS client connection on "
+
port
+
" port"
);
URL
url
=
new
URL
(
"http://localhost:"
+
port
+
"/ws/hello?wsdl"
);
QName
qname
=
new
QName
(
"http://ws/"
,
"HelloWorldImplService"
);
Service
service
=
Service
.
create
(
url
,
qname
);
HelloWorld
hello
=
(
HelloWorld
)
service
.
getPort
(
HelloWorld
.
class
);
logStringContent
(
"Client input parameter"
,
WS_PARAM_VALUE
);
String
response
=
hello
.
getHelloWorldAsString
(
WS_PARAM_VALUE
);
logStringContent
(
"Client response parameter"
,
response
);
return
!
WS_PARAM_VALUE
.
equals
(
response
);
}
/*
* Outputs the parameter value with newline and carriage-return symbols
* replaced with #CR and #NL text abbreviations.
*/
private
static
void
logStringContent
(
String
description
,
String
parameter
)
{
String
readableContent
=
parameter
.
replaceAll
(
"\r"
,
"#CR"
)
.
replaceAll
(
"\n"
,
"#NL"
);
System
.
out
.
println
(
description
+
": '"
+
readableContent
+
"'"
);
}
/* Web service parameter value with newline and carriage-return symbols */
private
final
static
String
WS_PARAM_VALUE
=
"\r\r\n\r\r CarriageReturn and "
+
"NewLine \r\n\n Test \r\r\r\r"
;
/*
* Web service server thread that publishes WS on vacant port and waits
* for client to finalize testing
*/
class
WebserviceRunner
implements
Runnable
{
// Latch used to signalize when WS endpoint is initialized
private
final
CountDownLatch
initSignal
;
// Latch used to signalize when client completed testing
private
final
CountDownLatch
doneSignal
;
// Port where WS endpoint is published
private
volatile
int
port
=
0
;
// Constructor
WebserviceRunner
(
CountDownLatch
initSignal
,
CountDownLatch
doneSignal
)
{
this
.
initSignal
=
initSignal
;
this
.
doneSignal
=
doneSignal
;
}
// Returns port of the published endpoint
public
int
getPort
()
{
return
port
;
}
/*
* Publish web service on vacant port and waits for the client to
* complete testing.
*/
public
void
run
()
{
try
{
// Find vacant port number
ServerSocket
ss
=
new
ServerSocket
(
0
);
port
=
ss
.
getLocalPort
();
ss
.
close
();
// Publish WebService
System
.
out
.
println
(
"Publishing WebService on "
+
port
+
" port"
);
Endpoint
ep
=
Endpoint
.
publish
(
"http://localhost:"
+
port
+
"/ws/hello"
,
new
HelloWorldImpl
());
// Notify main thread that WS endpoint is published
initSignal
.
countDown
();
// Wait for main thread to complete testing
System
.
out
.
println
(
"Waiting for done signal from test client."
);
doneSignal
.
await
();
// Terminate WS endpoint
System
.
out
.
println
(
"Got done signal from the client. Stopping WS endpoint."
);
ep
.
stop
();
}
catch
(
IOException
ioe
)
{
System
.
out
.
println
(
"Failed to get vacant port number:"
+
ioe
);
}
catch
(
InterruptedException
ie
)
{
System
.
out
.
println
(
"Failed to wait for test completion:"
+
ie
);
}
}
}
}
test/javax/xml/ws/8172297/ws/HelloWorld.java
0 → 100644
浏览文件 @
5c05c7e0
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package
ws
;
import
javax.jws.WebMethod
;
import
javax.jws.WebService
;
import
javax.jws.soap.SOAPBinding
;
import
javax.jws.soap.SOAPBinding.Style
;
import
javax.jws.soap.SOAPBinding.Use
;
//Web service endpoint interface
@WebService
@SOAPBinding
(
style
=
Style
.
DOCUMENT
,
use
=
Use
.
LITERAL
)
public
interface
HelloWorld
{
@WebMethod
String
getHelloWorldAsString
(
String
name
);
}
test/javax/xml/ws/8172297/ws/HelloWorldImpl.java
0 → 100644
浏览文件 @
5c05c7e0
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package
ws
;
import
javax.jws.WebService
;
// Simple web service implementation that echoes its parameter
@WebService
(
endpointInterface
=
"ws.HelloWorld"
)
public
class
HelloWorldImpl
implements
HelloWorld
{
@Override
public
String
getHelloWorldAsString
(
String
name
)
{
System
.
out
.
println
(
"Server-side parameter value: '"
+
name
.
replaceAll
(
"\r"
,
"#CR"
)
.
replaceAll
(
"\n"
,
"#NL"
)
+
"'"
);
return
name
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录