You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2020/08/30 15:54:37 UTC

[GitHub] [bookkeeper] eolivelli commented on a change in pull request #2403: Issue 2388: Bookie Http Service Servlet for Embedded Bookie

eolivelli commented on a change in pull request #2403:
URL: https://github.com/apache/bookkeeper/pull/2403#discussion_r479785722



##########
File path: bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/JettyHttpServer.java
##########
@@ -0,0 +1,59 @@
+package org.apache.bookkeeper.http.servlet;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.file.Files;
+import java.util.List;
+import javax.servlet.Servlet;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+/**
+ * Jetty based http server
+ **/
+
+public class JettyHttpServer {

Review comment:
       Please move this class to the tests sources.
   This is not intended to be used

##########
File path: bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java
##########
@@ -0,0 +1,117 @@
+package org.apache.bookkeeper.http.servlet;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.bookkeeper.http.AbstractHttpHandlerFactory;
+import org.apache.bookkeeper.http.HttpRouter;
+import org.apache.bookkeeper.http.HttpServer;
+import org.apache.bookkeeper.http.HttpServer.ApiType;
+import org.apache.bookkeeper.http.HttpServiceProvider;
+import org.apache.bookkeeper.http.service.ErrorHttpService;
+import org.apache.bookkeeper.http.service.HttpEndpointService;
+import org.apache.bookkeeper.http.service.HttpServiceRequest;
+import org.apache.bookkeeper.http.service.HttpServiceResponse;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Bookie http service servlet
+ *
+ **/
+public class BookieHttpServiceServlet extends HttpServlet {
+  static final Logger LOG = LoggerFactory.getLogger(BookieHttpServiceServlet.class);
+
+  // url to api
+  private final Map<String/*url*/, ApiType/*api*/> mappings = new ConcurrentHashMap<>();
+
+  public BookieHttpServiceServlet(){
+    HttpRouter<ApiType> router = new HttpRouter<HttpServer.ApiType>(
+      new AbstractHttpHandlerFactory<ApiType>(BookieServletHttpServer.getBookieHttpServiceProvider()) {
+        @Override
+        public HttpServer.ApiType newHandler(HttpServer.ApiType apiType) {
+          return apiType;
+        }
+      }) {
+      @Override
+      public void bindHandler(String endpoint, HttpServer.ApiType mapping) {
+        mappings.put(endpoint, mapping);
+      }
+    };
+    router.bindAll();
+  }
+
+  @Override
+  protected void service(HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws ServletException, IOException {
+    HttpServiceRequest request = new HttpServiceRequest()
+                                .setMethod(httpServerMethod(httpRequest))
+                                .setParams(httpServletParams(httpRequest))
+                                .setBody(IOUtils.toString(httpRequest.getInputStream(), "UTF-8"));
+    String uri = httpRequest.getRequestURI();
+    HttpServiceResponse response;
+    try {
+      HttpServer.ApiType apiType = mappings.get(uri);
+      HttpServiceProvider bookie = BookieServletHttpServer.getBookieHttpServiceProvider();
+      if (bookie == null) {
+        httpResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        return;
+      }
+      HttpEndpointService httpEndpointService = bookie.provideHttpEndpointService(apiType);
+      if (httpEndpointService == null) {
+        httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND);
+        return;
+      }
+      response = httpEndpointService.handle(request);
+    } catch (Throwable e) {
+      LOG.error( "Error while service Bookie API request " + uri, e);
+      response = new ErrorHttpService().handle(request);
+    }
+    if (response != null) {
+      httpResponse.setStatus(response.getStatusCode());
+      try (Writer out = httpResponse.getWriter()) {
+        out.write(response.getBody());
+      }
+    } else {
+      httpResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+    }
+  }
+
+
+  /**
+   * Convert http request parameters to a map.
+   */
+  @SuppressWarnings("unchecked")
+  Map<String, String> httpServletParams(HttpServletRequest request) {
+    Map<String, String> map = new HashMap<>();
+    for (Enumeration<String> param = request.getParameterNames();
+         param.hasMoreElements();) {
+      String pName = param.nextElement();
+      map.put(pName, request.getParameter(pName));
+    }
+    return map;
+  }
+
+  /**
+   * Get servlet request method and convert to the method that can be recognized by HttpServer.
+   */
+  HttpServer.Method httpServerMethod(HttpServletRequest request) {
+    switch (request.getMethod()) {
+      case "POST":
+        return HttpServer.Method.POST;
+      case "DELETE":
+        return HttpServer.Method.DELETE;
+      case "PUT":
+        return HttpServer.Method.PUT;
+      default:

Review comment:
       Please implement explicitly GET and throw for other cases 




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org