Embrace @Inject for Managers, Servlets, and Filters

James Moger

2014-05-16 1b34b05f5b8d2d0fd51819b286e22d7ddd27cb27

 src/main/java/com/gitblit/wicket/GitBlitWebApp.java

@@ -21,10 +21,14 @@
import java.util.Map;
import java.util.TimeZone;

import javax.inject.Inject;
import javax.inject.Singleton;

import org.apache.wicket.Application;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.application.IClassResolver;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;

@@ -56,6 +60,7 @@
import com.gitblit.wicket.pages.DocPage;
import com.gitblit.wicket.pages.DocsPage;
import com.gitblit.wicket.pages.EditMilestonePage;
import com.gitblit.wicket.pages.EditRepositoryPage;
import com.gitblit.wicket.pages.EditTicketPage;
import com.gitblit.wicket.pages.ExportTicketPage;
import com.gitblit.wicket.pages.FederationRegistrationPage;
@@ -70,6 +75,7 @@
import com.gitblit.wicket.pages.MyDashboardPage;
import com.gitblit.wicket.pages.MyTicketsPage;
import com.gitblit.wicket.pages.NewMilestonePage;
import com.gitblit.wicket.pages.NewRepositoryPage;
import com.gitblit.wicket.pages.NewTicketPage;
import com.gitblit.wicket.pages.OverviewPage;
import com.gitblit.wicket.pages.PatchPage;
@@ -87,9 +93,12 @@
import com.gitblit.wicket.pages.UserPage;
import com.gitblit.wicket.pages.UsersPage;

@Singleton
public class GitBlitWebApp extends WebApplication implements GitblitWicketApp {

   private final Class<? extends WebPage> homePageClass = MyDashboardPage.class;

   private final Class<? extends WebPage> newRepositoryPageClass = NewRepositoryPage.class;

   private final Map<String, CacheControl> cacheablePages = new HashMap<String, CacheControl>();

@@ -115,6 +124,7 @@

   private final IGitblit gitblit;

   @Inject
   public GitBlitWebApp(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
@@ -206,6 +216,8 @@
      mount("/proposal", ReviewProposalPage.class, "t");
      mount("/registration", FederationRegistrationPage.class, "u", "n");

      mount("/new", NewRepositoryPage.class);
      mount("/edit", EditRepositoryPage.class, "r");
      mount("/activity", ActivityPage.class, "r", "h");
      mount("/lucene", LuceneSearchPage.class);
      mount("/project", ProjectPage.class, "p");
@@ -226,7 +238,8 @@
      }

       // customize the Wicket class resolver to load from plugins
        PluginClassResolver classResolver = new PluginClassResolver(pluginManager);
      IClassResolver coreResolver = getApplicationSettings().getClassResolver();
        PluginClassResolver classResolver = new PluginClassResolver(coreResolver, pluginManager);
        getApplicationSettings().setClassResolver(classResolver);

      getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
@@ -260,6 +273,10 @@
      return homePageClass;
   }

   public Class<? extends WebPage> getNewRepositoryPage() {
      return newRepositoryPageClass;
   }

   /* (non-Javadoc)
    * @see com.gitblit.wicket.Webapp#isCacheablePage(java.lang.String)
    */