This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new 13e8f55 [CXF-7587] use Jetty context path when setting HTTP handler
name
13e8f55 is described below
commit 13e8f55c31db1fb9737145cf984e050df7bdc5c6
Author: jpoth <[email protected]>
AuthorDate: Tue Dec 12 15:32:37 2017 +0100
[CXF-7587] use Jetty context path when setting HTTP handler name
(cherry picked from commit 7c2fef57b7d59448308e2cebe5b77a2f561b5bd7)
Conflicts:
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
---
.../http_jetty/JettyHTTPServerEngine.java | 19 ++-
.../JAXRSClientServerUserResourceAsteriskTest.java | 186 +++++++++++++++++++++
2 files changed, 202 insertions(+), 3 deletions(-)
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 4afcaf5..65cb953 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -536,8 +536,8 @@ public class JettyHTTPServerEngine implements ServerEngine {
ServletContext sc = context.getServletContext();
handler.setServletContext(sc);
-
- final String smap = HttpUriMapper.getResourceBase(url.getPath());
+
+ final String smap = getHandlerName(url, context);
handler.setName(smap);
if (contexts.isStarted()) {
@@ -551,7 +551,20 @@ public class JettyHTTPServerEngine implements ServerEngine
{
registedPaths.add(url.getPath());
++servantCount;
}
-
+
+ private String getHandlerName(URL url, ContextHandler context) {
+ String contextPath = context.getContextPath();
+ String path = url.getPath();
+ if (path.startsWith(contextPath)) {
+ if ("/".equals(contextPath)) {
+ return path;
+ }
+ return path.substring(contextPath.length());
+ } else {
+ return HttpUriMapper.getResourceBase(url.getPath());
+ }
+ }
+
private void initializeContexts() {
if (contexts == null) {
contexts = new ContextHandlerCollection();
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
new file mode 100644
index 0000000..ee93443
--- /dev/null
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
@@ -0,0 +1,186 @@
+/**
+ * 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.cxf.systest.jaxrs;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+
+import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
+import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.jaxrs.model.Parameter;
+import org.apache.cxf.jaxrs.model.ParameterType;
+import org.apache.cxf.jaxrs.model.UserOperation;
+import org.apache.cxf.jaxrs.model.UserResource;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class JAXRSClientServerUserResourceAsteriskTest extends
AbstractBusClientServerTestBase {
+ public static final String PORT = allocatePort(Server.class);
+ public static final String CONTEXT = "/jetty/*/asterisk";
+
+ @Ignore
+ public static class Server extends AbstractBusTestServerBase {
+ org.apache.cxf.endpoint.Server server;
+ protected void run() {
+ JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
+ sf.setAddress("http://localhost:"; + PORT + CONTEXT);
+
+ UserResource ur = new UserResource();
+ ur.setName(BookStoreNoAnnotations.class.getName());
+ ur.setPath("/bookstoreNoAnnotations");
+ UserOperation op = new UserOperation();
+ op.setPath("/books/{id}");
+ op.setName("getBook");
+ op.setVerb("GET");
+ op.setParameters(Collections.singletonList(new
Parameter(ParameterType.PATH, "id")));
+
+ UserOperation op2 = new UserOperation();
+ op2.setPath("/books/{id}/chapter");
+ op2.setName("getBookChapter");
+ op2.setParameters(Collections.singletonList(new
Parameter(ParameterType.PATH, "id")));
+
+ List<UserOperation> ops = new ArrayList<>();
+ ops.add(op);
+ ops.add(op2);
+
+ ur.setOperations(ops);
+
+ UserResource ur2 = new UserResource();
+ ur2.setName(ChapterNoAnnotations.class.getName());
+ UserOperation op3 = new UserOperation();
+ op3.setPath("/");
+ op3.setName("getItself");
+ op3.setVerb("GET");
+ ur2.setOperations(Collections.singletonList(op3));
+
+ sf.setModelBeans(ur, ur2);
+
+ String modelRef =
"classpath:/org/apache/cxf/systest/jaxrs/resources/resources2.xml";
+ sf.setModelRefWithServiceClass(modelRef,
BookStoreNoAnnotationsInterface.class);
+ sf.setServiceBean(new BookStoreNoAnnotationsImpl());
+ server = sf.create();
+ }
+
+ @Override
+ public void tearDown() {
+ server.stop();
+ server.destroy();
+ server = null;
+ }
+ public static void main(String[] args) {
+ try {
+ Server s = new Server();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+ }
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ AbstractResourceInfo.clearAllMaps();
+ assertTrue("server did not launch correctly",
+ launchServer(Server.class, true));
+ createStaticBus();
+ }
+
+ @Test
+ public void testGetBook123() throws Exception {
+ getAndCompare("http://localhost:"; + PORT + CONTEXT +
"/bookstoreNoAnnotations/books/123",
+ "application/xml", 200);
+ }
+
+ @Test
+ public void testGetBookInterface123() throws Exception {
+ getAndCompare("http://localhost:"; + PORT + CONTEXT +
"/bookstore2/books/123",
+ "application/xml", 200);
+ }
+
+ @Test
+ public void testGetChapter() throws Exception {
+
+ getAndCompareChapter("http://localhost:"; + PORT + CONTEXT +
"/bookstoreNoAnnotations/books/123/chapter",
+ "application/xml", 200);
+ }
+
+ private void getAndCompare(String address,
+ String acceptType,
+ int expectedStatus) throws Exception {
+ CloseableHttpClient client = HttpClientBuilder.create().build();
+ HttpGet get = new HttpGet(address);
+ get.addHeader("Accept", acceptType);
+ try {
+ CloseableHttpResponse response = client.execute(get);
+ assertEquals(expectedStatus,
response.getStatusLine().getStatusCode());
+ Book book = readBook(response.getEntity().getContent());
+ assertEquals(123, book.getId());
+ assertEquals("CXF in Action", book.getName());
+ } finally {
+ get.releaseConnection();
+ }
+ }
+
+ private void getAndCompareChapter(String address,
+ String acceptType,
+ int expectedStatus) throws Exception {
+ CloseableHttpClient client = HttpClientBuilder.create().build();
+ HttpGet get = new HttpGet(address);
+ get.addHeader("Accept", acceptType);
+ try {
+ CloseableHttpResponse response = client.execute(get);
+ assertEquals(expectedStatus,
response.getStatusLine().getStatusCode());
+ Chapter c = readChapter(response.getEntity().getContent());
+ assertEquals(1, c.getId());
+ assertEquals("chapter 1", c.getTitle());
+ } finally {
+ get.releaseConnection();
+ }
+ }
+
+
+
+ private Book readBook(InputStream is) throws Exception {
+ JAXBContext c = JAXBContext.newInstance(new Class[]{Book.class});
+ Unmarshaller u = c.createUnmarshaller();
+ return (Book)u.unmarshal(is);
+ }
+
+ private Chapter readChapter(InputStream is) throws Exception {
+ JAXBContext c = JAXBContext.newInstance(new Class[]{Chapter.class});
+ Unmarshaller u = c.createUnmarshaller();
+ return (Chapter)u.unmarshal(is);
+ }
+}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
