Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -25,6 +25,8 @@
import java.util.Map;

import java.util.Set;



import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletResponse;



import com.gitblit.Constants.FederationRequest;

@@ -43,14 +45,13 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;



import dagger.ObjectGraph;



/**

 * Handles federation requests.

 *

 * @author James Moger

 *

 */

@Singleton

public class FederationServlet extends JsonServlet {



   private static final long serialVersionUID = 1L;

@@ -63,12 +64,17 @@


   private IFederationManager federationManager;



   @Override

   protected void inject(ObjectGraph dagger) {

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

      this.userManager = dagger.get(IUserManager.class);

      this.repositoryManager = dagger.get(IRepositoryManager.class);

      this.federationManager = dagger.get(IFederationManager.class);

   @Inject

   public FederationServlet(

         IStoredSettings settings,

         IUserManager userManager,

         IRepositoryManager repositoryManager,

         IFederationManager federationManager) {



      this.settings = settings;

      this.userManager = userManager;

      this.repositoryManager = repositoryManager;

      this.federationManager = federationManager;

   }



   /**