Cleaning up warnings.

Oliver
oferrigni · Sep 10, 2010 · 46a422c · 46a422c · gaffo · Sep 10, 2010
1 parent 8f144bb
commit 46a422c
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 33 deletions.
diff --git a/src/exttest/java/com/asolutions/scmsshd/test/integration/FetchTest.java b/src/exttest/java/com/asolutions/scmsshd/test/integration/FetchTest.java
@@ -65,7 +65,6 @@ public void run() {
 
 			Repository db = createCloneToRepo();
 			String remoteName = "origin";
-			File gitDir = new File(".git");
 			addRemoteConfigForRemoteGitDirectory(db, remoteName, serverPort, ".git");
 			FetchResult r = cloneFromRemote(db, remoteName);
 			System.out.println("results = " + r.getTrackingRefUpdates().size());

diff --git a/src/exttest/java/com/asolutions/scmsshd/test/integration/PushTest.java b/src/exttest/java/com/asolutions/scmsshd/test/integration/PushTest.java
@@ -1,11 +1,9 @@
 package com.asolutions.scmsshd.test.integration;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
@@ -15,7 +13,6 @@
 import org.junit.Test;
 import org.spearce.jgit.lib.Ref;
 import org.spearce.jgit.lib.Repository;
-import org.spearce.jgit.lib.TextProgressMonitor;
 import org.spearce.jgit.transport.FetchResult;
 
 import com.asolutions.scmsshd.SCuMD;

diff --git a/src/main/java/com/asolutions/scmsshd/authenticators/JavaxNamingLDAPAuthLookupProvider.java b/src/main/java/com/asolutions/scmsshd/authenticators/JavaxNamingLDAPAuthLookupProvider.java
@@ -1,14 +1,13 @@
 package com.asolutions.scmsshd.authenticators;
 
 import java.util.Properties;
+
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
 import javax.naming.directory.InitialDirContext;
 import javax.naming.directory.SearchControls;
-import javax.naming.ldap.InitialLdapContext;
-import javax.security.auth.login.LoginContext;
+import javax.naming.directory.SearchResult;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +33,7 @@ public Object provide(String url, String username, String password,
 		//initialize counter to total the results
 
 		// Search for objects using the filter
-		NamingEnumeration answer = context.search(username, searchFilter, searchCtls);
+		NamingEnumeration<SearchResult> answer = context.search(username, searchFilter, searchCtls);
 		return (answer.next());
 	}
 

diff --git a/...in/java/com/asolutions/scmsshd/authenticators/PassIfAnyInCollectionPassAuthenticator.java b/...in/java/com/asolutions/scmsshd/authenticators/PassIfAnyInCollectionPassAuthenticator.java
@@ -19,7 +19,7 @@ public Object authenticate(String username, String password, ServerSession sessi
 		return null;
 	}
 
-	public void setAuthenticators(ArrayList authList) {
+	public void setAuthenticators(ArrayList<IPasswordAuthenticator> authList) {
 		this.authList = authList;
 	}
 

diff --git a/src/main/java/com/asolutions/scmsshd/authorizors/PassIfAnyInCollectionPassAuthorizor.java b/src/main/java/com/asolutions/scmsshd/authorizors/PassIfAnyInCollectionPassAuthorizor.java
@@ -20,7 +20,7 @@ public AuthorizationLevel userIsAuthorizedForProject(String username, String pro
 		return null;
 	}
 
-	public void setProjectAuthorizers(ArrayList authList) {
+	public void setProjectAuthorizers(ArrayList<IProjectAuthorizer> authList) {
 		this.authList = authList;
 	}
 

diff --git a/src/main/java/com/asolutions/scmsshd/commands/filters/BadCommandException.java b/src/main/java/com/asolutions/scmsshd/commands/filters/BadCommandException.java
@@ -2,6 +2,8 @@
 
 public class BadCommandException extends Exception {
 
+	private static final long serialVersionUID = 4904880805323643780L;
+
 	public BadCommandException(String reason) {
 		super(reason);
 	}

diff --git a/src/main/java/com/asolutions/scmsshd/commands/git/GitReceivePackSCMCommandHandler.java b/src/main/java/com/asolutions/scmsshd/commands/git/GitReceivePackSCMCommandHandler.java
@@ -53,7 +53,6 @@ protected void runCommand(FilteredCommand filteredCommand,
 			ReceivePack rp = receivePackProvider.provide(repo);
 
 			rp.receive(inputStream, outputStream, errorStream);
-			int i = 0;
 		}
 		catch (IOException e){
 			log.error("rp caught ioe: ", e);

diff --git a/src/main/java/com/asolutions/scmsshd/commands/git/GitSCMCommandHandler.java b/src/main/java/com/asolutions/scmsshd/commands/git/GitSCMCommandHandler.java
@@ -9,7 +9,6 @@
 import com.asolutions.scmsshd.authorizors.AuthorizationLevel;
 import com.asolutions.scmsshd.commands.FilteredCommand;
 import com.asolutions.scmsshd.commands.handlers.ISCMCommandHandler;
-import com.asolutions.scmsshd.exceptions.MustHaveWritePrivilagesToPushFailure;
 
 public class GitSCMCommandHandler implements ISCMCommandHandler {
 

diff --git a/src/main/java/com/asolutions/scmsshd/exceptions/Failure.java b/src/main/java/com/asolutions/scmsshd/exceptions/Failure.java
@@ -2,6 +2,7 @@
 
 public class Failure extends RuntimeException {
 
+	private static final long serialVersionUID = 5704607166844629700L;
 	private int resultCode;
 	private final String genericError;
 	private final String specifics;

diff --git a/src/main/java/com/asolutions/scmsshd/exceptions/MustHaveWritePrivilagesToPushFailure.java b/src/main/java/com/asolutions/scmsshd/exceptions/MustHaveWritePrivilagesToPushFailure.java
@@ -2,6 +2,8 @@
 
 public class MustHaveWritePrivilagesToPushFailure extends Failure{
 
+	private static final long serialVersionUID = 7650486977318806435L;
+
 	public MustHaveWritePrivilagesToPushFailure(String specifics) {
 		super(0, "You must have write privilages to be able to push", specifics);
 	}

diff --git a/src/main/java/com/asolutions/scmsshd/ldap/MustCallIsValidUserFirstException.java b/src/main/java/com/asolutions/scmsshd/ldap/MustCallIsValidUserFirstException.java
@@ -2,4 +2,6 @@
 
 public class MustCallIsValidUserFirstException extends RuntimeException {
 
+	private static final long serialVersionUID = 4644966710914857550L;
+
 }
diff --git a/src/main/java/com/asolutions/scmsshd/sshd/SCMCommand.java b/src/main/java/com/asolutions/scmsshd/sshd/SCMCommand.java
@@ -5,7 +5,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import java.util.logging.Level;
 import org.apache.sshd.server.CommandFactory.Command;
 import org.apache.sshd.server.CommandFactory.ExitCallback;
 import org.apache.sshd.server.CommandFactory.SessionAware;
@@ -20,8 +19,6 @@ public class SCMCommand implements Command, SessionAware {
 
 	private final String command;
 	private final String project;
-	private ServerSession session;
-	private final IProjectAuthorizer projectAuthorizer;
 
 	private OutputStream err;
 	private ExitCallback callback;
@@ -32,7 +29,6 @@ public SCMCommand(String command, String argument,
 			IProjectAuthorizer projectAuthorizer) {
 		this.command = "/usr/local/bin/" + command;
 		this.project = "/var/git" + argument.replaceAll("'", "");
-		this.projectAuthorizer = projectAuthorizer;
 	}
 
 	public void setErrorStream(OutputStream err) {
@@ -65,7 +61,6 @@ public void run() {
 	}
 
 	private void runImp() {
-		int rc = 0;
 		try {
 			try {
 				execute();
@@ -88,7 +83,6 @@ private void runImp() {
 	}
 
 	private void execute() throws IOException {
-		String commandAry[] = { command, project };
 		String string = command + " " + project;
 		log.debug("Creating Process: {}", string);
 		System.out.println("Creating Process: " + string);
@@ -101,7 +95,6 @@ private void execute() throws IOException {
 	}
 
 	public void setSession(ServerSession session) {
-		this.session = session;
 	}
 
 }
diff --git a/src/main/java/com/asolutions/scmsshd/sshd/UnparsableProjectException.java b/src/main/java/com/asolutions/scmsshd/sshd/UnparsableProjectException.java
@@ -2,6 +2,8 @@
 
 public class UnparsableProjectException extends Exception {
 
+	private static final long serialVersionUID = 643951700141491862L;
+
 	public UnparsableProjectException(String reason) {
 		super(reason);
 	}

diff --git a/...ava/com/asolutions/scmsshd/authenticators/PassIfAnyInCollectionPassAuthenticatorTest.java b/...ava/com/asolutions/scmsshd/authenticators/PassIfAnyInCollectionPassAuthenticatorTest.java
@@ -38,7 +38,7 @@ public void testPassIfAnyPass() throws Exception {
 		}});
 
 		PassIfAnyInCollectionPassAuthenticator auth = new PassIfAnyInCollectionPassAuthenticator();
-		ArrayList authList = new ArrayList();
+		ArrayList<IPasswordAuthenticator> authList = new ArrayList<IPasswordAuthenticator>();
 		authList.add(failsAuth);
 		authList.add(passesAuth);
 		authList.add(failsAuth);
@@ -57,7 +57,7 @@ public void testFailIfNonePass() throws Exception {
 		}});
 
 		PassIfAnyInCollectionPassAuthenticator auth = new PassIfAnyInCollectionPassAuthenticator();
-		ArrayList authList = new ArrayList();
+		ArrayList<IPasswordAuthenticator> authList = new ArrayList<IPasswordAuthenticator>();
 		authList.add(failsAuth);
 		authList.add(failsAuth);
 		auth.setAuthenticators(authList);

diff --git a/...test/java/com/asolutions/scmsshd/authorizors/PassIfAnyInCollectionPassAuthorizorTest.java b/...test/java/com/asolutions/scmsshd/authorizors/PassIfAnyInCollectionPassAuthorizorTest.java
@@ -33,7 +33,7 @@ public void testIfAnyPassItPasses() throws Exception {
 		}});
 
 		PassIfAnyInCollectionPassAuthorizor auth = new PassIfAnyInCollectionPassAuthorizor();
-		ArrayList authList = new ArrayList();
+		ArrayList<IProjectAuthorizer> authList = new ArrayList<IProjectAuthorizer>();
 		authList.add(failsAuth);
 		authList.add(passesAuth);
 		authList.add(failsAuth);
@@ -51,7 +51,7 @@ public void testIfNonePassItFails() throws Exception {
 		}});
 
 		PassIfAnyInCollectionPassAuthorizor auth = new PassIfAnyInCollectionPassAuthorizor();
-		ArrayList authList = new ArrayList();
+		ArrayList<IProjectAuthorizer> authList = new ArrayList<IProjectAuthorizer>();
 		authList.add(failsAuth);
 		authList.add(failsAuth);
 		auth.setProjectAuthorizers(authList);

diff --git a/src/test/java/com/asolutions/scmsshd/commands/git/GitReceivePackSCMCommandHandlerTest.java b/src/test/java/com/asolutions/scmsshd/commands/git/GitReceivePackSCMCommandHandlerTest.java
@@ -84,11 +84,9 @@ public void testThrowsExceptionIfWrongAccessLevel() throws Exception {
 
 		final GitSCMRepositoryProvider mockRepoProvider = context
 				.mock(GitSCMRepositoryProvider.class);
-		final Repository mockRepoistory = context.mock(Repository.class);
 		final File base = new File(pathtobasedir);
 		final GitReceivePackProvider mockReceivePackProvider = context
 				.mock(GitReceivePackProvider.class);
-		final ReceivePack mockUploadPack = context.mock(ReceivePack.class);
 
 		final Properties mockConfig = context.mock(Properties.class);
 

diff --git a/src/test/java/com/asolutions/scmsshd/commands/git/GitSCMCommandHandlerTest.java b/src/test/java/com/asolutions/scmsshd/commands/git/GitSCMCommandHandlerTest.java
@@ -12,10 +12,6 @@
 import com.asolutions.scmsshd.authorizors.AuthorizationLevel;
 import com.asolutions.scmsshd.commands.FilteredCommand;
 import com.asolutions.scmsshd.commands.handlers.ISCMCommandHandler;
-import com.asolutions.scmsshd.exceptions.Failure;
-import com.asolutions.scmsshd.exceptions.MustHaveWritePrivilagesToPushFailure;
-
-import static org.junit.Assert.*;
 
 public class GitSCMCommandHandlerTest extends MockTestCase {
 

diff --git a/src/test/java/com/asolutions/scmsshd/commands/git/GitSCMCommandTest.java b/src/test/java/com/asolutions/scmsshd/commands/git/GitSCMCommandTest.java
@@ -1,11 +1,10 @@
 package com.asolutions.scmsshd.commands.git;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.Properties;
 
 import org.junit.Test;
-import org.spearce.jgit.util.QuotedString.GitPathStyle;
-
-import static org.junit.Assert.*;
 
 import com.asolutions.MockTestCase;
 import com.asolutions.scmsshd.commands.FilteredCommand;

diff --git a/src/test/java/com/asolutions/scmsshd/commands/git/GitUploadPackSCMCommandHandlerTest.java b/src/test/java/com/asolutions/scmsshd/commands/git/GitUploadPackSCMCommandHandlerTest.java
@@ -15,7 +15,6 @@
 import com.asolutions.scmsshd.authorizors.AuthorizationLevel;
 import com.asolutions.scmsshd.commands.FilteredCommand;
 import com.asolutions.scmsshd.commands.factories.GitSCMCommandFactory;
-import com.asolutions.scmsshd.commands.handlers.ISCMCommandHandler;
 
 public class GitUploadPackSCMCommandHandlerTest extends MockTestCase {