Use Guice annotations, not javax.inject annotations

James Moger

2014-06-12 cdb2fe64280a517cf1d13013614bb8ab73cd0ac0

Use Guice annotations, not javax.inject annotations

 src/main/java/com/gitblit/GitBlit.java

@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Set;

import javax.inject.Inject;
import com.google.inject.Inject;
import javax.servlet.http.HttpServletRequest;

import com.gitblit.Constants.AccessPermission;

 src/main/java/com/gitblit/guice/CoreModule.java

@@ -15,7 +15,7 @@
 */
package com.gitblit.guice;

import javax.inject.Singleton;
import com.google.inject.Singleton;

import com.gitblit.FileSettings;
import com.gitblit.GitBlit;

 src/main/java/com/gitblit/guice/WebModule.java

@@ -32,6 +32,7 @@
import com.gitblit.servlet.RobotsTxtServlet;
import com.gitblit.servlet.RpcServlet;
import com.gitblit.servlet.SparkleShareInviteServlet;
import com.gitblit.servlet.SyndicationFilter;
import com.gitblit.servlet.SyndicationServlet;
import com.gitblit.wicket.GitblitWicketFilter;
import com.google.common.base.Joiner;
@@ -74,7 +75,7 @@
//        filter(fuzzy(Constants.PAGES)).through(PagesFilter.class);
//        filter(fuzzy(Constants.RPC_PATH)).through(RpcFilter.class);
//        filter(fuzzy(Constants.ZIP_PATH)).through(DownloadZipFilter.class);
//        filter(fuzzy(Constants.SYNDICATION_PATH)).through(SyndicationFilter.class);
        filter(fuzzy(Constants.SYNDICATION_PATH)).through(SyndicationFilter.class);

        // Wicket
        String toIgnore = Joiner.on(",").join(Constants.R_PATH, Constants.GIT_PATH, Constants.RAW_PATH,

 src/main/java/com/gitblit/manager/AuthenticationManager.java

@@ -24,7 +24,7 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;

import javax.inject.Inject;
import com.google.inject.Inject;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

 src/main/java/com/gitblit/manager/FederationManager.java

@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import javax.inject.Inject;
import com.google.inject.Inject;
import javax.servlet.http.HttpServletRequest;

import org.slf4j.Logger;

 src/main/java/com/gitblit/manager/NotificationManager.java

@@ -20,7 +20,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

import javax.inject.Inject;
import com.google.inject.Inject;
import javax.mail.Message;

import org.slf4j.Logger;

 src/main/java/com/gitblit/manager/PluginManager.java

@@ -34,7 +34,7 @@
import java.util.Map;
import java.util.TreeMap;

import javax.inject.Inject;
import com.google.inject.Inject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

 src/main/java/com/gitblit/manager/ProjectManager.java

@@ -27,7 +27,7 @@
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;

import javax.inject.Inject;
import com.google.inject.Inject;

import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;

 src/main/java/com/gitblit/manager/RepositoryManager.java

@@ -44,7 +44,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

import javax.inject.Inject;
import com.google.inject.Inject;

import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache;

 src/main/java/com/gitblit/manager/RuntimeManager.java

@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.TimeZone;

import javax.inject.Inject;
import com.google.inject.Inject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

 src/main/java/com/gitblit/manager/UserManager.java

@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import com.google.inject.Inject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@@ -36,8 +36,8 @@
import java.util.TreeSet;



import javax.imageio.ImageIO;

import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;


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

@@ -15,8 +15,8 @@
 */

package com.gitblit.servlet;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.manager.IAuthenticationManager;


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

@@ -20,8 +20,8 @@
import java.text.ParseException;

import java.util.Date;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletResponse;


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

@@ -18,8 +18,8 @@
import java.io.IOException;
import java.text.MessageFormat;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;

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

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

import java.util.Set;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletResponse;



import com.gitblit.Constants.FederationRequest;


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

@@ -17,8 +17,8 @@


import java.text.MessageFormat;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletRequest;



import com.gitblit.Constants.AccessRestrictionType;


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

@@ -20,8 +20,8 @@
import java.io.IOException;

import java.util.Enumeration;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.FilterConfig;

import javax.servlet.ServletConfig;


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

@@ -21,8 +21,8 @@
import java.io.InputStream;

import java.io.OutputStream;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletContext;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;


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

@@ -15,8 +15,8 @@
 */

package com.gitblit.servlet;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;



import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.manager.IRepositoryManager;


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

@@ -15,8 +15,8 @@
 */

package com.gitblit.servlet;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;




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

@@ -20,8 +20,8 @@
import java.util.Iterator;
import java.util.List;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;

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

@@ -21,8 +21,8 @@
import java.io.InputStream;

import java.io.OutputStream;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;


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

@@ -15,8 +15,8 @@
 */

package com.gitblit.servlet;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;



import org.eclipse.jgit.lib.Repository;




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

@@ -28,8 +28,8 @@
import java.util.Map;
import java.util.TreeMap;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;

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

@@ -18,8 +18,8 @@
import java.io.File;

import java.io.IOException;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;


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

@@ -18,8 +18,8 @@
import java.io.IOException;

import java.text.MessageFormat;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.ServletException;

import javax.servlet.ServletRequest;


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

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

import java.util.Map;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;


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

@@ -19,8 +19,8 @@
import java.net.URL;

import java.text.MessageFormat;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;


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

@@ -18,8 +18,8 @@
import java.io.IOException;

import java.text.MessageFormat;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.ServletException;

import javax.servlet.ServletRequest;


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

@@ -22,8 +22,8 @@
import java.util.List;

import java.util.Map;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServlet;



import org.eclipse.jgit.lib.ObjectId;


 src/main/java/com/gitblit/tickets/BranchTicketService.java

@@ -30,8 +30,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;

import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
import org.eclipse.jgit.api.errors.JGitInternalException;

 src/main/java/com/gitblit/tickets/FileTicketService.java

@@ -27,8 +27,8 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;

import org.eclipse.jgit.lib.Repository;


 src/main/java/com/gitblit/tickets/NullTicketService.java

@@ -19,8 +19,8 @@
import java.util.List;
import java.util.Set;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;

import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IPluginManager;

 src/main/java/com/gitblit/tickets/RedisTicketService.java

@@ -22,8 +22,8 @@
import java.util.Set;
import java.util.TreeSet;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;

import org.apache.commons.pool2.impl.GenericObjectPoolConfig;


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

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

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;

import org.apache.wicket.Application;
import org.apache.wicket.Request;

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

@@ -17,8 +17,8 @@


import java.util.Date;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletRequest;



import org.apache.wicket.protocol.http.IWebApplicationFactory;