Skip to content

Commit

Permalink
Cleans up unused imports. STOP littering source files with unused imp…
Browse files Browse the repository at this point in the history 
…orts.
  • Loading branch information
Edwin Shin committed Jun 21, 2013
1 parent 187294d commit 9eae908
Show file tree
Hide file tree
Showing 19 changed files with 70 additions and 111 deletions.
5 changes: 0 additions & 5 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraIdentifiers.java
View file
Expand Up @@ -4,13 +4,11 @@
import static com.google.common.collect.Collections2.transform;
import static com.google.common.collect.ContiguousSet.create;
import static com.google.common.collect.DiscreteDomain.integers;
import static com.google.common.collect.ImmutableBiMap.of;
import static com.google.common.collect.Range.closed;
import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
import static com.hp.hpl.jena.update.GraphStoreFactory.create;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
import static javax.ws.rs.core.Response.created;
import static org.fcrepo.RdfLexicon.HAS_MEMBER_OF_RESULT;
import static org.fcrepo.http.RDFMediaType.N3;
import static org.fcrepo.http.RDFMediaType.N3_ALT1;
Expand All @@ -20,7 +18,6 @@
import static org.fcrepo.http.RDFMediaType.RDF_XML;
import static org.fcrepo.http.RDFMediaType.TURTLE;

import java.net.URI;
import java.util.Collection;
import java.util.List;

Expand All @@ -34,7 +31,6 @@
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;

import org.fcrepo.AbstractResource;
Expand All @@ -47,7 +43,6 @@
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.rdf.model.ResourceFactory;

/**
* JAX-RS Resource offering PID creation.
Expand Down
9 changes: 2 additions & 7 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraTransactions.java
View file
@@ -1,25 +1,18 @@
package org.fcrepo.api;

import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
import static javax.ws.rs.core.MediaType.TEXT_XML;
import static javax.ws.rs.core.Response.created;
import static javax.ws.rs.core.Response.noContent;
import static javax.ws.rs.core.Response.ok;

import java.util.List;

import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.Response;

import com.google.common.collect.ImmutableMap;
import org.fcrepo.AbstractResource;
import org.fcrepo.Transaction;
import org.fcrepo.TxSession;
Expand All @@ -29,6 +22,8 @@
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

import com.google.common.collect.ImmutableMap;

@Component
@Scope("prototype")
@Path("/{path: .*}/fcr:tx")
Expand Down
2 changes: 0 additions & 2 deletions fcrepo-http-api/src/main/java/org/fcrepo/responses/HtmlProvider.java
View file
Expand Up @@ -2,8 +2,6 @@

import org.springframework.stereotype.Component;

import javax.ws.rs.ext.Provider;

@Component
public class HtmlProvider extends BaseHtmlProvider {
}
3 changes: 1 addition & 2 deletions fcrepo-http-commons/src/main/java/org/fcrepo/responses/BaseHtmlProvider.java
View file
Expand Up @@ -35,7 +35,6 @@
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;

import com.hp.hpl.jena.rdf.model.Model;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
Expand All @@ -46,12 +45,12 @@
import org.fcrepo.session.SessionFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap.Builder;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;

/**
* A simple JAX-RS Entity Provider that can accept RDF datasets
Expand Down
1 change: 0 additions & 1 deletion fcrepo-http-commons/src/main/java/org/fcrepo/session/SessionFactory.java
View file
Expand Up @@ -4,7 +4,6 @@
import static org.slf4j.LoggerFactory.getLogger;

import javax.annotation.PostConstruct;
import javax.jcr.PathNotFoundException;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
Expand Down
28 changes: 14 additions & 14 deletions fcrepo-http-commons/src/test/java/org/fcrepo/responses/ViewHelpersTest.java
View file
@@ -1,5 +1,19 @@
package org.fcrepo.responses;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.util.Iterator;
import java.util.List;
import java.util.Map;

import javax.ws.rs.core.UriInfo;

import org.fcrepo.RdfLexicon;
import org.fcrepo.test.util.TestHelpers;
import org.junit.Before;
import org.junit.Test;

import com.google.common.collect.ImmutableMap;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.NodeFactory;
Expand All @@ -13,20 +27,6 @@
import com.hp.hpl.jena.sparql.core.DatasetGraph;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory;
import com.hp.hpl.jena.sparql.core.Quad;
import org.fcrepo.RdfLexicon;
import org.fcrepo.test.util.TestHelpers;
import org.junit.Before;
import org.junit.Test;

import javax.ws.rs.core.UriInfo;

import java.util.Iterator;
import java.util.List;
import java.util.Map;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;

public class ViewHelpersTest {

Expand Down
4 changes: 0 additions & 4 deletions fcrepo-http-commons/src/test/java/org/fcrepo/test/util/TestHelpers.java
View file
@@ -1,6 +1,5 @@
package org.fcrepo.test.util;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand All @@ -26,7 +25,6 @@
import javax.jcr.nodetype.NodeTypeManager;
import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.SecurityContext;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
Expand All @@ -38,8 +36,6 @@
import org.fcrepo.Datastream;
import org.fcrepo.FedoraObject;
import org.fcrepo.identifiers.UUIDPidMinter;
import org.fcrepo.session.AuthenticatedSessionProvider;
import org.fcrepo.session.SessionFactory;
import org.fcrepo.utils.ContentDigest;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
Expand Down
20 changes: 2 additions & 18 deletions fcrepo-jms/src/test/java/org/fcrepo/messaging/legacy/LegacyMethodStaticTest.java
View file
Expand Up @@ -6,36 +6,20 @@
import static javax.jcr.observation.Event.PROPERTY_CHANGED;
import static javax.jcr.observation.Event.PROPERTY_REMOVED;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.io.IOException;
import java.io.Writer;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;

import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeType;
import javax.jcr.observation.Event;

import javax.jms.JMSException;
import javax.jms.Message;

import org.apache.abdera.model.Category;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Person;
import org.apache.abdera.model.Text;
import org.fcrepo.utils.FedoraJcrTypes;
import org.fcrepo.utils.FedoraTypesUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

public class LegacyMethodStaticTest {

Expand Down
22 changes: 11 additions & 11 deletions fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java
View file
Expand Up @@ -9,8 +9,8 @@
import static com.codahale.metrics.MetricRegistry.name;
import static com.google.common.collect.ImmutableSet.copyOf;
import static com.google.common.collect.Sets.difference;
import static org.slf4j.LoggerFactory.getLogger;
import static org.fcrepo.metrics.RegistryService.getMetrics;
import static org.slf4j.LoggerFactory.getLogger;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -22,20 +22,10 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;

import com.codahale.metrics.Counter;
import com.codahale.metrics.Timer;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.update.GraphStoreFactory;
import org.fcrepo.Datastream;
import org.fcrepo.binary.PolicyDecisionPoint;
import org.fcrepo.exception.InvalidChecksumException;
import org.fcrepo.rdf.GraphSubjects;
import org.fcrepo.utils.ContentDigest;
import org.fcrepo.utils.FixityResult;
import org.fcrepo.utils.JcrRdfTools;
import org.fcrepo.utils.LowLevelCacheEntry;
Expand All @@ -44,6 +34,16 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.codahale.metrics.Counter;
import com.codahale.metrics.Timer;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.update.GraphStoreFactory;

/**
* Service for creating and retrieving Datastreams without using the JCR API.
*
Expand Down
5 changes: 2 additions & 3 deletions fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrRdfTools.java
View file
Expand Up @@ -43,8 +43,6 @@
import javax.jcr.version.VersionHistory;
import javax.jcr.version.VersionIterator;

import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.rdf.model.Literal;
import org.fcrepo.RdfLexicon;
import org.fcrepo.rdf.GraphSubjects;
import org.fcrepo.services.LowLevelStorageService;
Expand All @@ -60,6 +58,7 @@
import com.google.common.collect.PeekingIterator;
import com.hp.hpl.jena.datatypes.RDFDatatype;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFNode;
Expand Down Expand Up @@ -214,7 +213,7 @@ public static Model getJcrNamespaceModel(final Session session)
* @throws RepositoryException
*/
public static Model getJcrNodeIteratorModel(final GraphSubjects factory,
final Iterator nodeIterator, final Resource iteratorSubject)
final Iterator<Node> nodeIterator, final Resource iteratorSubject)
throws RepositoryException {

if (!nodeIterator.hasNext()) {
Expand Down
13 changes: 6 additions & 7 deletions fcrepo-kernel/src/test/java/org/fcrepo/FedoraResourceTest.java
View file
Expand Up @@ -9,8 +9,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
Expand All @@ -29,11 +27,6 @@
import javax.jcr.version.Version;
import javax.jcr.version.VersionHistory;

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.rdf.model.Resource;
import com.hp.hpl.jena.sparql.util.Symbol;
import org.fcrepo.rdf.GraphSubjects;
import org.fcrepo.utils.FedoraTypesUtils;
import org.fcrepo.utils.JcrPropertyStatementListener;
Expand All @@ -48,6 +41,12 @@
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

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.rdf.model.Resource;
import com.hp.hpl.jena.sparql.util.Symbol;

/**
* @todo Add Documentation.
* @author Benjamin Armintor
Expand Down
12 changes: 5 additions & 7 deletions fcrepo-kernel/src/test/java/org/fcrepo/TxAwareSessionTest.java
View file
@@ -1,16 +1,14 @@
package org.fcrepo;

import org.junit.Before;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

import javax.jcr.AccessDeniedException;
import javax.jcr.ItemExistsException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;

public class TxAwareSessionTest {
private Session mockSession;
Expand Down
1 change: 0 additions & 1 deletion fcrepo-kernel/src/test/java/org/fcrepo/integration/services/DatastreamServiceIT.java
View file
Expand Up @@ -14,7 +14,6 @@

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.security.MessageDigest;
import java.util.Collection;

import javax.inject.Inject;
Expand Down
1 change: 0 additions & 1 deletion fcrepo-kernel/src/test/java/org/fcrepo/integration/utils/LowLevelCacheEntryIT.java
View file
Expand Up @@ -29,7 +29,6 @@
import org.modeshape.jcr.JcrRepository;
import org.modeshape.jcr.value.BinaryKey;
import org.modeshape.jcr.value.binary.BinaryStore;
import org.modeshape.jcr.value.binary.infinispan.InfinispanBinaryStore;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

Expand Down
6 changes: 3 additions & 3 deletions fcrepo-kernel/src/test/java/org/fcrepo/services/DatastreamServiceTest.java
View file
Expand Up @@ -19,7 +19,6 @@
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Collection;
Expand All @@ -30,8 +29,6 @@
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;

import com.google.common.base.Function;
import com.hp.hpl.jena.rdf.model.Model;
import org.fcrepo.Datastream;
import org.fcrepo.binary.PolicyDecisionPoint;
import org.fcrepo.rdf.GraphSubjects;
Expand All @@ -53,6 +50,9 @@
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

import com.google.common.base.Function;
import com.hp.hpl.jena.rdf.model.Model;

/**
* @todo Add Documentation.
* @a Chris Beeruthor
Expand Down
1 change: 0 additions & 1 deletion fcrepo-kernel/src/test/java/org/fcrepo/services/functions/CheckCacheEntryFixityTest.java
View file
Expand Up @@ -10,7 +10,6 @@
import static org.mockito.Mockito.verify;

import java.net.URI;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;

Expand Down

0 comments on commit 9eae908

Please sign in to comment.