more cleanup

fcrepo · Jun 21, 2013 · b7c22fb · b7c22fb
1 parent 4956d85
commit b7c22fb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 16 deletions.
diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/GraphStoreStreamingOutput.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/GraphStoreStreamingOutput.java
@@ -7,7 +7,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
@@ -17,7 +16,6 @@
 
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.update.GraphStore;
 
 public class GraphStoreStreamingOutput implements StreamingOutput {

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
@@ -3,7 +3,7 @@
 
 import static com.google.common.collect.ImmutableList.of;
 import static com.hp.hpl.jena.graph.Node.ANY;
-import static com.hp.hpl.jena.graph.Node.createURI;
+import static com.hp.hpl.jena.graph.NodeFactory.createURI;
 import static org.fcrepo.utils.JcrRdfTools.getRDFNamespaceForJcrNamespace;
 import static org.joda.time.format.DateTimeFormat.forPattern;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -12,14 +12,14 @@
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
 import org.slf4j.Logger;
 
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.sparql.core.Quad;
 import com.hp.hpl.jena.sparql.util.Context;
 import com.hp.hpl.jena.sparql.util.Symbol;

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/functions/CacheLocalTransform.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/functions/CacheLocalTransform.java
@@ -51,6 +51,6 @@ public T call() throws Exception {
 	@Override
 	public void setEnvironment(Cache<K, V> cache, Set<K> keys) {
 		this.store = TRANSFORM.apply(cache);
-        this.cacheName = ((CacheImpl)cache).getName();
+        this.cacheName = ((CacheImpl<K, V>) cache).getName();
 	}
 }
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/LowLevelStorageServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/LowLevelStorageServiceTest.java
@@ -19,15 +19,12 @@
 import static org.powermock.api.mockito.PowerMockito.spy;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import javax.jcr.Node;
 import javax.jcr.Property;
@@ -41,7 +38,6 @@
 import org.fcrepo.utils.impl.LocalBinaryStoreEntry;
 import org.infinispan.Cache;
 import org.infinispan.distexec.DistributedExecutorService;
-import org.infinispan.loaders.CacheLoaderException;
 import org.infinispan.loaders.CacheStore;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/TransactionServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/TransactionServiceTest.java
@@ -1,13 +1,10 @@
-/**
- *
- */
+
 package org.fcrepo.services;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -16,7 +13,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 

diff --git a/fcrepo-rss/pom.xml b/fcrepo-rss/pom.xml
@@ -52,7 +52,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>