#10 Remove duplicate logging, don't log query string if null

Author: dka23

src/main/java/com/dkaedv/glghproxy/LoggingFilter.java

@@ -28,7 +28,9 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
 		HttpServletResponse response = (HttpServletResponse) res;
 		HttpServletRequest request = (HttpServletRequest) req;
 
-		LOG.info("Request to " + request.getRequestURI() + "?" + request.getQueryString());
+		String query = (request.getQueryString() == null) ? "" : "?" + request.getQueryString();
+		LOG.info("Request to " + request.getRequestURI() + query);
+		
 		chain.doFilter(req, res);
 
 		request.getPathInfo();

src/main/java/com/dkaedv/glghproxy/controller/LoginController.java

@@ -6,8 +6,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,8 +19,6 @@
 @Controller
 @RequestMapping("/login/oauth")
 public class LoginController {
-	private final static Log LOG = LogFactory.getLog(LoginController.class);
-	
 	@Value("${gitlabUrl}")
 	private String gitlabUrl;
 
@@ -42,8 +38,6 @@ public String authorize(
 			@RequestParam String redirect_uri,
 			HttpServletRequest request) throws UnsupportedEncodingException, MalformedURLException {
 
-		LOG.info("Received request: scope=" + scope + ", client_id=" + client_id + ", redirect_uri=" + redirect_uri);
-		
 		// Save redirect uri
 		this.redirectUri = redirect_uri;
 
@@ -82,8 +76,6 @@ public String accessToken(
 			HttpServletRequest request
 			) throws MalformedURLException {
 
-		LOG.info("Received request: client_id=" + client_id + ", client_secret=" + client_secret + ", code=" + code);
-
 		return oauthClient.requestAccessToken(client_id, client_secret, code, buildCallbackUrl(request)).toString();
 	}
 }

src/main/java/com/dkaedv/glghproxy/controller/UserController.java

@@ -4,8 +4,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.egit.github.core.Repository;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -16,17 +14,14 @@
 @Controller
 @RequestMapping("/api/v3/user")
 public class UserController {
-	private final static Log LOG = LogFactory.getLog(UserController.class);
-	
+
 	@RequestMapping("/repos")
 	@ResponseBody
 	public List<Repository> getReposForCurrentUser(
 			@RequestParam String per_page,
 			@RequestParam String page,
 			@RequestHeader("Authorization") String authorization) throws IOException {
 
-		LOG.info("Received request: per_page=" + per_page + ", page=" + page);
-
 		return Collections.emptyList();
 	}
 

src/main/java/com/dkaedv/glghproxy/controller/UsersController.java

@@ -3,8 +3,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.egit.github.core.Repository;
 import org.eclipse.egit.github.core.User;
 import org.gitlab.api.GitlabAPI;
@@ -26,8 +24,6 @@
 @Controller
 @RequestMapping("/api/v3/users")
 public class UsersController {
-	private final static Log LOG = LogFactory.getLog(UsersController.class);
-
 	@Autowired
 	private GitlabSessionProvider gitlab;
 
@@ -39,8 +35,6 @@ public List<Repository> getReposForUser(
 			@RequestParam String page,
 			@RequestHeader("Authorization") String authorization) throws IOException {
 
-		LOG.info("Received request: username=" + username + ", per_page=" + per_page + ", page=" + page);
-
 		GitlabAPI api = gitlab.connect(authorization);
 		List<GitlabProject> projects = api.getProjects();
 

src/main/java/com/dkaedv/glghproxy/converter/GitlabToGithubConverter.java

@@ -1,14 +1,10 @@
 package com.dkaedv.glghproxy.converter;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.egit.github.core.Comment;
 import org.eclipse.egit.github.core.Commit;
 import org.eclipse.egit.github.core.CommitFile;
@@ -23,7 +19,6 @@
 import org.eclipse.egit.github.core.TypedResource;
 import org.eclipse.egit.github.core.User;
 import org.eclipse.egit.github.core.event.Event;
-import org.eclipse.egit.github.core.event.EventRepository;
 import org.eclipse.egit.github.core.event.PullRequestPayload;
 import org.gitlab.api.models.GitlabBranch;
 import org.gitlab.api.models.GitlabCommit;
@@ -39,8 +34,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class GitlabToGithubConverter {
-	private final static Log LOG = LogFactory.getLog(GitlabToGithubConverter.class);
-	
 	public static RepositoryBranch convertBranch(GitlabBranch glbranch) {
 		RepositoryBranch branch = new RepositoryBranch();
 		branch.setName(glbranch.getName());