Removing unused imports, unused local variables

fcrepo · Jul 25, 2013 · 0a47a88 · 0a47a88
1 parent 5a1cfd0
commit 0a47a88
Show file tree

Hide file tree

Showing 37 changed files with 106 additions and 91 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFieldSearch.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFieldSearch.java
@@ -52,7 +52,6 @@
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
 
-import com.hp.hpl.jena.vocabulary.RDF;
 import org.fcrepo.AbstractResource;
 import org.fcrepo.api.rdf.HttpGraphSubjects;
 import org.fcrepo.responses.HtmlTemplate;
@@ -67,6 +66,7 @@
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.vocabulary.RDF;
 
 /**
  * Basic administrative search across the repository

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraContentTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraContentTest.java
@@ -47,6 +47,7 @@
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
+
 import org.apache.commons.io.IOUtils;
 import org.fcrepo.Datastream;
 import org.fcrepo.exception.InvalidChecksumException;

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
@@ -53,6 +53,7 @@
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
+
 import org.apache.commons.io.IOUtils;
 import org.fcrepo.Datastream;
 import org.fcrepo.FedoraResource;
@@ -62,6 +63,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.MultiPart;
 import com.sun.jersey.multipart.file.StreamDataBodyPart;

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
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import java.net.URI;
-import java.util.Map;
-
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.ws.rs.core.MediaType;
@@ -43,7 +40,6 @@
 import org.fcrepo.services.NodeService;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 
 import com.hp.hpl.jena.rdf.model.ResourceFactory;

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraRepositoryNamespacesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraRepositoryNamespacesTest.java
@@ -36,6 +36,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.query.DatasetFactory;
 import com.hp.hpl.jena.rdf.model.Model;

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraUnnamedObjectsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraUnnamedObjectsTest.java
@@ -16,6 +16,7 @@
 
 package org.fcrepo.api;
 
+import static javax.ws.rs.core.Response.Status.CREATED;
 import static org.fcrepo.test.util.PathSegmentImpl.createPathList;
 import static org.fcrepo.test.util.TestHelpers.getUriInfoImpl;
 import static org.fcrepo.test.util.TestHelpers.mockSession;
@@ -27,7 +28,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
-import static javax.ws.rs.core.Response.Status.CREATED;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraVersionsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraVersionsTest.java
@@ -47,6 +47,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+
 import com.hp.hpl.jena.query.Dataset;
 
 public class FedoraVersionsTest {

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraFieldSearchIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraFieldSearchIT.java
@@ -23,7 +23,6 @@
 
 import java.net.URI;
 
-import com.hp.hpl.jena.vocabulary.RDF;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -37,6 +36,7 @@
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.rdf.model.ResourceFactory;
 import com.hp.hpl.jena.update.GraphStore;
+import com.hp.hpl.jena.vocabulary.RDF;
 
 public class FedoraFieldSearchIT extends AbstractResourceIT {
 

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraNodesIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraNodesIT.java
@@ -44,6 +44,7 @@
 import java.util.Iterator;
 
 import javax.jcr.RepositoryException;
+
 import nu.validator.htmlparser.sax.HtmlParser;
 import nu.validator.saxtree.TreeBuilder;
 

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/url/HttpApiResourcesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/url/HttpApiResourcesTest.java
@@ -49,6 +49,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.Resource;
 

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/BaseHtmlProvider.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/BaseHtmlProvider.java
@@ -21,10 +21,10 @@
 import static javax.ws.rs.core.MediaType.TEXT_HTML;
 import static javax.ws.rs.core.MediaType.TEXT_HTML_TYPE;
 import static org.fcrepo.rdf.SerializationUtils.getDatasetSubject;
+import static org.fcrepo.rdf.SerializationUtils.unifyDatasetModel;
 import static org.fcrepo.responses.RdfSerializationUtils.getFirstValueForPredicate;
 import static org.fcrepo.responses.RdfSerializationUtils.primaryTypePredicate;
 import static org.fcrepo.responses.RdfSerializationUtils.setCachingHeaders;
-import static org.fcrepo.rdf.SerializationUtils.unifyDatasetModel;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.io.IOException;

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/QueryExecutionProvider.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/QueryExecutionProvider.java
@@ -16,24 +16,26 @@
 
 package org.fcrepo.responses;
 
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.sparql.resultset.ResultsFormat;
-import org.slf4j.Logger;
-import org.springframework.stereotype.Component;
+import static com.google.common.collect.ImmutableList.of;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
 
-import static com.google.common.collect.ImmutableList.of;
-import static org.slf4j.LoggerFactory.getLogger;
+import org.slf4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.sparql.resultset.ResultsFormat;
 
 /**
  * Helper for writing QueryExecutions results out in a variety

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/RangeRequestInputStream.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/RangeRequestInputStream.java
@@ -16,14 +16,14 @@
 
 package org.fcrepo.responses;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.commons.io.input.ProxyInputStream;
-
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.BoundedInputStream;
+import org.apache.commons.io.input.ProxyInputStream;
+
 /**
  * An InputStream wrapper that skips N bytes and only returns
  * the data up to a certain length

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/RdfSerializationUtils.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/RdfSerializationUtils.java
@@ -27,8 +27,8 @@
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.fcrepo.rdf.SerializationUtils;
 import org.fcrepo.rdf.GraphProperties;
+import org.fcrepo.rdf.SerializationUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/ResultSetStreamingOutput.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/ResultSetStreamingOutput.java
@@ -16,15 +16,17 @@
 
 package org.fcrepo.responses;
 
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.ws.rs.core.MediaType;
+
+import org.apache.jena.riot.WebContent;
+
 import com.hp.hpl.jena.query.DatasetFactory;
 import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.query.ResultSetFormatter;
 import com.hp.hpl.jena.sparql.resultset.ResultsFormat;
-import org.apache.jena.riot.WebContent;
-
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
-import java.io.OutputStream;
 
 /**
  * Stream the results of a SPARQL Query

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/http/RangeTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/http/RangeTest.java
@@ -16,12 +16,12 @@
 
 package org.fcrepo.http;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 public class RangeTest {
     @Test
     public void testUnboundedRange() {

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/responses/BaseHtmlProviderTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/responses/BaseHtmlProviderTest.java
@@ -27,8 +27,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/responses/QueryExecutionProviderTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/responses/QueryExecutionProviderTest.java
@@ -16,23 +16,6 @@
 
 package org.fcrepo.responses;
 
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.sparql.core.DatasetImpl;
-import org.apache.commons.io.IOUtils;
-import org.apache.jena.riot.WebContent;
-import org.junit.Test;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MultivaluedMap;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.reflect.Type;
-
 import static com.hp.hpl.jena.graph.NodeFactory.createLiteral;
 import static com.hp.hpl.jena.graph.NodeFactory.createURI;
 import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
@@ -44,6 +27,24 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.apache.jena.riot.WebContent;
+import org.junit.Test;
+
+import com.hp.hpl.jena.graph.Triple;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.sparql.core.DatasetImpl;
+
 public class QueryExecutionProviderTest {
 
     final QueryExecutionProvider testObj = new QueryExecutionProvider();

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/responses/RangeRequestInputStreamTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/responses/RangeRequestInputStreamTest.java
@@ -16,14 +16,14 @@
 
 package org.fcrepo.responses;
 
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.junit.Assert.assertEquals;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
 
 public class RangeRequestInputStreamTest {
     @Test

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/responses/ResultSetStreamingOutputTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/responses/ResultSetStreamingOutputTest.java
@@ -16,6 +16,23 @@
 
 package org.fcrepo.responses;
 
+import static com.hp.hpl.jena.graph.NodeFactory.createLiteral;
+import static com.hp.hpl.jena.graph.NodeFactory.createURI;
+import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
+import static org.fcrepo.responses.RdfSerializationUtils.primaryTypePredicate;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import java.io.ByteArrayOutputStream;
+
+import javax.ws.rs.core.MediaType;
+
+import org.apache.jena.riot.WebContent;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
 import com.hp.hpl.jena.graph.Triple;
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.query.Query;
@@ -25,22 +42,6 @@
 import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.sparql.core.DatasetImpl;
 import com.hp.hpl.jena.sparql.resultset.ResultsFormat;
-import org.apache.jena.riot.WebContent;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-
-import javax.ws.rs.core.MediaType;
-
-import java.io.ByteArrayOutputStream;
-
-import static com.hp.hpl.jena.graph.NodeFactory.createLiteral;
-import static com.hp.hpl.jena.graph.NodeFactory.createURI;
-import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
-import static org.fcrepo.responses.RdfSerializationUtils.primaryTypePredicate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.MockitoAnnotations.initMocks;
 
 public class ResultSetStreamingOutputTest {
 

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/session/InjectableSessionTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/session/InjectableSessionTest.java
@@ -21,7 +21,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.servlet.http.HttpServletRequest;

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/session/SessionProviderTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/session/SessionProviderTest.java
@@ -22,7 +22,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.servlet.http.HttpServletRequest;

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/test/util/ContainerWrapper.java b/fcrepo-http-commons/src/test/java/org/fcrepo/test/util/ContainerWrapper.java
@@ -20,6 +20,7 @@
 
 import java.net.URI;
 import java.util.Collection;
+
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.xml.bind.JAXBContext;

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/TxAwareSession.java b/fcrepo-kernel/src/main/java/org/fcrepo/TxAwareSession.java
@@ -17,6 +17,7 @@
 package org.fcrepo;
 
 import static java.lang.reflect.Proxy.newProxyInstance;
+
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;