Embrace @Inject for Managers, Servlets, and Filters

James Moger

2014-05-16 1b34b05f5b8d2d0fd51819b286e22d7ddd27cb27

 src/main/java/com/gitblit/servlet/RpcServlet.java

@@ -23,6 +23,8 @@
import java.util.List;

import java.util.Map;



import javax.inject.Inject;

import javax.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

@@ -47,28 +49,26 @@
import com.gitblit.utils.RpcUtils;

import com.gitblit.utils.StringUtils;



import dagger.ObjectGraph;



/**

 * Handles remote procedure calls.

 *

 * @author James Moger

 *

 */

@Singleton

public class RpcServlet extends JsonServlet {



   private static final long serialVersionUID = 1L;



   public static final int PROTOCOL_VERSION = 6;

   public static final int PROTOCOL_VERSION = 8;



   private IStoredSettings settings;



   private IGitblit gitblit;



   @Override

   protected void inject(ObjectGraph dagger) {

      this.settings = dagger.get(IStoredSettings.class);

      this.gitblit = dagger.get(IGitblit.class);

   @Inject

   public RpcServlet(IStoredSettings settings, IGitblit gitblit) {

      this.settings = settings;

      this.gitblit = gitblit;

   }



   /**

@@ -80,12 +80,11 @@
    * @throws java.io.IOException

    */

   @Override

   protected void processRequest(HttpServletRequest request, HttpServletResponse response)

         throws ServletException, IOException {

   protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException,

         IOException {

      RpcRequest reqType = RpcRequest.fromName(request.getParameter("req"));

      String objectName = request.getParameter("name");

      logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType,

            request.getRemoteAddr()));

      logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType, request.getRemoteAddr()));



      UserModel user = (UserModel) request.getUserPrincipal();



@@ -130,7 +129,8 @@
            }

            if (model.isCollectingGarbage) {

               // skip garbage collecting repository

               logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage", model.name));

               logger.warn(MessageFormat.format("Temporarily excluding {0} from RPC, busy collecting garbage",

                     model.name));

               continue;

            }

            // get local branches

@@ -195,6 +195,33 @@
            gitblit.updateRepositoryModel(model.name, model, true);

         } catch (GitBlitException e) {

            response.setStatus(failureCode);

         }

      } else if (RpcRequest.FORK_REPOSITORY.equals(reqType)) {

         // fork repository

         RepositoryModel origin = gitblit.getRepositoryModel(objectName);

         if (origin == null) {

            // failed to find repository, error is logged by the repository

            // manager

            response.setStatus(failureCode);

         } else {

            if (user == null || !user.canFork(origin)) {

               logger.error("User {} is not permitted to fork '{}'!", user == null ? "anonymous" : user.username,

                     objectName);

               response.setStatus(failureCode);

            } else {

               try {

                  // fork the origin

                  RepositoryModel fork = gitblit.fork(origin, user);

                  if (fork == null) {

                     logger.error("Failed to fork repository '{}'!", objectName);

                     response.setStatus(failureCode);

                  } else {

                     logger.info("User {} has forked '{}'!", user.username, objectName);

                  }

               } catch (GitBlitException e) {

                  response.setStatus(failureCode);

               }

            }

         }

      } else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) {

         // edit repository

@@ -281,7 +308,8 @@
      } else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) {

         // set the repository permissions for the specified users

         RepositoryModel model = gitblit.getRepositoryModel(objectName);

         Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

         Collection<RegistrantAccessPermission> permissions = deserialize(request, response,

               RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

         result = gitblit.setUserAccessPermissions(model, permissions);

      } else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) {

         // get repository teams

@@ -297,7 +325,8 @@
      } else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) {

         // set the repository permissions for the specified teams

         RepositoryModel model = gitblit.getRepositoryModel(objectName);

         Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

         Collection<RegistrantAccessPermission> permissions = deserialize(request, response,

               RpcUtils.REGISTRANT_PERMISSIONS_TYPE);

         result = gitblit.setTeamAccessPermissions(model, permissions);

      } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) {

         // return the list of federation registrations

@@ -363,8 +392,7 @@
      } else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) {

         // update settings on the server

         if (allowAdmin) {

            Map<String, String> map = deserialize(request, response,

                  RpcUtils.SETTINGS_TYPE);

            Map<String, String> map = deserialize(request, response, RpcUtils.SETTINGS_TYPE);

            gitblit.updateSettings(map);

         } else {

            response.sendError(notAllowedCode);

@@ -383,6 +411,19 @@
         } else {

            response.sendError(notAllowedCode);

         }

      } else if (RpcRequest.REINDEX_TICKETS.equals(reqType)) {

         if (allowManagement) {

            if (StringUtils.isEmpty(objectName)) {

               // reindex all tickets

               gitblit.getTicketService().reindex();

            } else {

               // reindex tickets in a specific repository

               RepositoryModel model = gitblit.getRepositoryModel(objectName);

               gitblit.getTicketService().reindex(model);

            }

         } else {

            response.sendError(notAllowedCode);

         }

      }



      // send the result of the request