From 8f89e6bb22f32ce571d2c5b932deb42b4e66d1bb Mon Sep 17 00:00:00 2001 From: Jim Ma Date: Fri, 15 Mar 2024 16:22:51 +0800 Subject: [PATCH] [JBWS-4232]:Add testcase to demonstrate how to enable HTTP/2 and HTTP/1.1 support in client side --- .../test/ws/jaxws/cxf/http2/HelloWorld.java | 27 ++++++ .../ws/jaxws/cxf/http2/HelloWorldImpl.java | 35 ++++++++ .../ws/jaxws/cxf/http2/Http2EndpointTest.java | 83 +++++++++++++++++++ .../resources/jaxws/cxf/http2/WEB-INF/web.xml | 17 ++++ 4 files changed, 162 insertions(+) create mode 100644 modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorld.java create mode 100644 modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorldImpl.java create mode 100644 modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/Http2EndpointTest.java create mode 100644 modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/http2/WEB-INF/web.xml diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorld.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorld.java new file mode 100644 index 000000000..1e05cbc0a --- /dev/null +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorld.java @@ -0,0 +1,27 @@ +/* + * 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.jboss.test.ws.jaxws.cxf.http2; + +import jakarta.jws.WebService; + +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/http2") +public interface HelloWorld +{ + String echo(String input); +} diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorldImpl.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorldImpl.java new file mode 100644 index 000000000..0c425efc3 --- /dev/null +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/HelloWorldImpl.java @@ -0,0 +1,35 @@ +/* + * 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.jboss.test.ws.jaxws.cxf.http2; + +import jakarta.jws.WebService; + +@WebService +( + serviceName = "HelloWorldService", + endpointInterface = "org.jboss.test.ws.jaxws.cxf.http2.HelloWorld", + targetNamespace = "http://org.jboss.ws/jaxws/cxf/http2" +) +public class HelloWorldImpl implements HelloWorld +{ + public String echo(String input) + { + return input; + } +} diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/Http2EndpointTest.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/Http2EndpointTest.java new file mode 100644 index 000000000..6e61867a4 --- /dev/null +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/http2/Http2EndpointTest.java @@ -0,0 +1,83 @@ +/* + * 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.jboss.test.ws.jaxws.cxf.http2; + +import jakarta.xml.ws.Service; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import org.apache.cxf.BusFactory; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +public class Http2EndpointTest extends JBossWSTest { + @ArquillianResource + private URL baseURL; + + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-http2.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(HelloWorld.class) + .addClass(HelloWorldImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/http2/WEB-INF/web.xml")); + return archive; + } + @Test + @RunAsClient + public void testHttp11() throws Exception { + BusFactory.getDefaultBus().setProperty("org.apache.cxf.transport.http.forceVersion", "1"); + HelloWorld port = getPort(); + String response = port.echo("hello"); + Assert.assertEquals("hello is expected", "hello", response); + } + + @Test + @RunAsClient + public void testHttp2() throws Exception { + BusFactory.getDefaultBus().setProperty("org.apache.cxf.transport.http.forceVersion", "2"); + HelloWorld port = getPort(); + String response = port.echo("hello"); + Assert.assertEquals("hello is expected", "hello", response); + } + + private HelloWorld getPort() throws MalformedURLException + { + URL wsdlURL = new URL(baseURL.toString() + "/jaxws-cxf-http2?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/http2", "HelloWorldService"); + Service service = Service.create(wsdlURL, serviceName); + QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/http2", "HelloWorldImplPort"); + HelloWorld port = (HelloWorld) service.getPort(portQName, HelloWorld.class); + return port; + } +} \ No newline at end of file diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/http2/WEB-INF/web.xml b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/http2/WEB-INF/web.xml new file mode 100644 index 000000000..03f687940 --- /dev/null +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/http2/WEB-INF/web.xml @@ -0,0 +1,17 @@ + + + + + + HelloService + org.jboss.test.ws.jaxws.cxf.http2.HelloWorldImpl + + + + HelloService + /* + + \ No newline at end of file