Cleaned unused imports

fcrepo · Apr 2, 2013 · 8c39edd · 8c39edd
1 parent 8c9c620
commit 8c39edd
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 72 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraDatastreams.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraDatastreams.java
@@ -159,8 +159,6 @@ public MultipartBody getDatastreamsContents(@PathParam("pid")
     final String pid, @QueryParam("dsid")
     List<String> dsids) throws RepositoryException, IOException {
 
-        final Session session = getAuthenticatedSession();
-
         if (dsids.isEmpty()) {
             NodeIterator ni = objectService.getObjectNode(pid).getNodes();
             while (ni.hasNext()) {

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraDatastreamsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraDatastreamsTest.java
@@ -49,8 +49,6 @@
 import org.junit.Test;
 import org.modeshape.jcr.api.Repository;
 
-import com.google.common.base.Function;
-
 public class FedoraDatastreamsTest {
 
 	FedoraDatastreams testObj;

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraFieldSearchTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraFieldSearchTest.java
@@ -32,7 +32,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.modeshape.jcr.api.Repository;
 
 public class FedoraFieldSearchTest {
 

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraNamespacesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraNamespacesTest.java
@@ -21,8 +21,8 @@
 import javax.jcr.Session;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.SecurityContext;
 
 import org.fcrepo.identifiers.UUIDPidMinter;
 import org.fcrepo.jaxb.responses.management.NamespaceListing;

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraObjectsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraObjectsTest.java
@@ -19,8 +19,8 @@
 import javax.jcr.Session;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.SecurityContext;
 
 import org.fcrepo.FedoraObject;
 import org.fcrepo.identifiers.UUIDPidMinter;
@@ -32,8 +32,6 @@
 import org.junit.Test;
 import org.modeshape.jcr.api.Repository;
 
-import com.google.common.base.Function;
-
 public class FedoraObjectsTest {
 
 	FedoraObjects testObj;

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraRepositoryTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraRepositoryTest.java
@@ -4,7 +4,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -19,15 +18,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.PathSegment;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
 
 import org.fcrepo.jaxb.responses.access.DescribeRepository;
 import org.fcrepo.services.ObjectService;
 import org.fcrepo.session.SessionFactory;
 import org.jboss.resteasy.specimpl.UriInfoImpl;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraSitemapTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraSitemapTest.java
@@ -2,7 +2,7 @@
 
 import static org.fcrepo.api.TestHelpers.getUriInfoImpl;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java b/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java
@@ -1,21 +1,15 @@
 
 package org.fcrepo;
 
-import static com.google.common.collect.Collections2.transform;
-import static com.google.common.collect.ImmutableSet.copyOf;
 import static javax.ws.rs.core.Response.noContent;
 
-import java.util.Collection;
-
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import javax.jcr.Credentials;
 import javax.jcr.LoginException;
 import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.Value;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
@@ -26,15 +20,9 @@
 import org.fcrepo.services.ObjectService;
 import org.fcrepo.session.SessionFactory;
 import org.modeshape.jcr.api.JcrTools;
-import org.modeshape.jcr.api.Repository;
-import org.modeshape.jcr.api.ServletCredentials;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.fcrepo.utils.FedoraTypesUtils.map;
-
-import com.google.common.base.Function;
-
 /**
  * Abstract superclass for Fedora JAX-RS Resources, providing convenience fields
  * and methods.

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/session/SessionFactory.java b/fcrepo-http-commons/src/main/java/org/fcrepo/session/SessionFactory.java
@@ -1,3 +1,4 @@
+
 package org.fcrepo.session;
 
 import javax.annotation.PostConstruct;
@@ -14,49 +15,51 @@
 import org.slf4j.LoggerFactory;
 
 public class SessionFactory {
-
-    final private Logger logger = LoggerFactory
-            .getLogger(SessionFactory.class);
+
+    final private Logger logger = LoggerFactory.getLogger(SessionFactory.class);
 
     @Inject
     private Repository repo;
-    
+
     public SessionFactory() {
-    	
+
     }
-    
+
     @PostConstruct
     public void init() {
-    	if (repo == null) {
-    		logger.error("SessionFactory requires a Repository instance!");
-    		throw new IllegalStateException();
-    	}
+        if (repo == null) {
+            logger.error("SessionFactory requires a Repository instance!");
+            throw new IllegalStateException();
+        }
+    }
+
+    public void setRepository(Repository repo) {
+        this.repo = repo;
+    }
+
+    public Session getSession() throws LoginException, RepositoryException {
+        return repo.login();
     }
 
-	public void setRepository(Repository repo) {
-		this.repo = repo;
-	}
-
-	public Session getSession() throws LoginException, RepositoryException {
-		return repo.login();
-	}
-
-	public Session getSession(SecurityContext securityContext, HttpServletRequest servletRequest) {
-		Session session = null;
-
-		try {
-            if(securityContext.getUserPrincipal() != null) {
-            	logger.debug("Authenticated user: " + securityContext.getUserPrincipal().getName());
-                ServletCredentials credentials = new ServletCredentials(servletRequest);
-
-				session = repo.login(credentials);
+    public Session getSession(SecurityContext securityContext,
+            HttpServletRequest servletRequest) {
+        Session session = null;
+
+        try {
+            if (securityContext.getUserPrincipal() != null) {
+                logger.debug("Authenticated user: " +
+                        securityContext.getUserPrincipal().getName());
+                ServletCredentials credentials =
+                        new ServletCredentials(servletRequest);
+
+                session = repo.login(credentials);
             } else {
-            	logger.debug("No authenticated user found!");
-            	session = repo.login();
+                logger.debug("No authenticated user found!");
+                session = repo.login();
             }
-		} catch (RepositoryException e) {
-			throw new IllegalStateException(e);
-		}
+        } catch (RepositoryException e) {
+            throw new IllegalStateException(e);
+        }
         return session;
-	}
+    }
 }
diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/session/SessionFactoryTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/session/SessionFactoryTest.java
@@ -1,6 +1,6 @@
 package org.fcrepo.session;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/FedoraObjectTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/FedoraObjectTest.java
@@ -1,27 +1,18 @@
 package org.fcrepo;
 
-import static org.fcrepo.TestHelpers.getContentNodeMock;
-import static org.fcrepo.services.PathService.getDatastreamJcrNodePath;
 import static org.fcrepo.services.PathService.getObjectJcrNodePath;
-import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
-
 
 import java.util.Collection;
-import java.util.Date;
 
-import javax.jcr.Binary;
 import javax.jcr.LoginException;
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
 import javax.jcr.Property;
-import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/LowLevelStorageServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/LowLevelStorageServiceTest.java
@@ -1,13 +1,9 @@
 package org.fcrepo.services;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.verifyNew;
-import static org.powermock.api.mockito.PowerMockito.whenNew;
 
 import javax.jcr.LoginException;
 import javax.jcr.Repository;