From 172fe46b436fd19b0bc44b923159870e1cafa983 Mon Sep 17 00:00:00 2001 From: ajs6f Date: Mon, 7 Oct 2013 13:39:43 -0400 Subject: [PATCH] Fix fcrepo-http-api integration tests for Mac builds Build issue resolved by using UUIDs instead of fixed names for test resources. Fixed fcrepo-generator-dc integration tests for Mac builds by using UUIDs instead of fixed names for test resources. Minor code cleanup, reducing compiler warnings. --- .../generator/DublinCoreGeneratorIT.java | 22 +++---- .../org/fcrepo/http/api/FedoraContent.java | 14 ++--- .../fcrepo/http/api/FedoraDatastreams.java | 4 +- .../org/fcrepo/http/api/FedoraExport.java | 2 +- .../fcrepo/http/api/FedoraFieldSearch.java | 14 ++--- .../org/fcrepo/http/api/FedoraFixity.java | 2 +- .../fcrepo/http/api/FedoraIdentifiers.java | 2 +- .../org/fcrepo/http/api/FedoraImport.java | 2 +- .../java/org/fcrepo/http/api/FedoraNodes.java | 41 ++++++------- .../org/fcrepo/http/api/FedoraVersions.java | 2 +- .../FedoraRepositoriesProperties.java | 6 +- .../repository/FedoraRepositoryBackup.java | 26 +++++---- .../repository/FedoraRepositoryRestore.java | 31 +++++----- .../FedoraRepositoryWorkspaces.java | 44 +++++++------- .../fcrepo/http/api/url/HttpApiResources.java | 8 +-- .../fcrepo/http/api/FedoraContentTest.java | 1 - .../http/api/FedoraDatastreamsTest.java | 1 - .../org/fcrepo/http/api/FedoraExportTest.java | 5 +- .../http/api/FedoraFieldSearchTest.java | 1 - .../org/fcrepo/http/api/FedoraFixityTest.java | 1 - .../http/api/FedoraIdentifiersTest.java | 2 +- .../org/fcrepo/http/api/FedoraImportTest.java | 1 - .../org/fcrepo/http/api/FedoraNodesTest.java | 4 +- .../fcrepo/http/api/FedoraSitemapTest.java | 1 - .../fcrepo/http/api/FedoraVersionsTest.java | 5 +- .../FedoraRepositoriesPropertiesTest.java | 1 - .../FedoraRepositoryBackupTest.java | 27 +++++---- .../FedoraRepositoryRestoreTest.java | 30 +++++----- .../FedoraRepositoryWorkspacesTest.java | 25 ++++---- .../http/api/url/HttpApiResourcesTest.java | 9 ++- .../integration/http/api/FedoraBackupIT.java | 9 +-- .../integration/http/api/FedoraContentIT.java | 12 ++-- .../http/api/FedoraFieldSearchIT.java | 2 +- .../integration/http/api/FedoraFixityIT.java | 2 +- .../http/api/FedoraIdentifiersIT.java | 2 +- .../http/api/FedoraNamespacesIT.java | 2 +- .../integration/http/api/FedoraNodesIT.java | 58 +++++++++++-------- .../http/api/FedoraTransactionsIT.java | 34 ++++++----- .../http/api/FedoraWorkspacesIT.java | 25 ++++---- .../integration/http/api/ldp/LdprIT.java | 31 +++++----- .../java/org/fcrepo/kernel/Datastream.java | 6 +- .../org/fcrepo/kernel/FedoraResource.java | 6 +- .../kernel/observer/SimpleObserver.java | 3 +- .../kernel/rdf/impl/DefaultGraphSubjects.java | 2 +- .../kernel/services/DatastreamService.java | 2 +- .../fcrepo/kernel/services/NodeService.java | 2 +- .../fcrepo/kernel/services/ObjectService.java | 2 +- .../kernel/services/RepositoryService.java | 4 +- .../policy/StoragePolicyDecisionPoint.java | 4 +- .../utils/JcrPropertyStatementListener.java | 2 +- .../org/fcrepo/kernel/utils/JcrRdfTools.java | 8 +-- .../kernel/observer/SimpleObserverIT.java | 2 +- .../kernel/services/ObjectServiceIT.java | 2 +- .../org/fcrepo/kernel/DatastreamTest.java | 4 +- .../org/fcrepo/kernel/FedoraObjectTest.java | 3 +- .../org/fcrepo/kernel/FedoraResourceTest.java | 4 +- .../org/fcrepo/kernel/TransactionTest.java | 1 - .../org/fcrepo/kernel/TxAwareSessionTest.java | 1 - .../identifiers/UUIDPathMinterTest.java | 1 - .../kernel/identifiers/UUIDPidMinterTest.java | 1 - .../kernel/observer/DefaultFilterTest.java | 1 - .../kernel/observer/FedoraEventTest.java | 1 - .../kernel/observer/NOOPFilterTest.java | 1 - .../kernel/observer/SimpleObserverTest.java | 2 - .../kernel/rdf/SerializationUtilsTest.java | 1 - .../rdf/impl/DefaultGraphSubjectsTest.java | 1 - .../services/DatastreamServiceTest.java | 5 +- .../services/LowLevelStorageServiceTest.java | 2 - .../kernel/services/NodeServiceTest.java | 2 - .../kernel/services/ObjectServiceTest.java | 2 - .../services/RepositoryServiceTest.java | 3 +- .../services/TransactionServiceTest.java | 1 - .../functions/CacheLocalTransformTest.java | 2 - .../functions/CheckCacheEntryFixityTest.java | 1 - .../services/functions/GetBinaryKeyTest.java | 2 +- .../services/functions/GetCacheStoreTest.java | 2 +- .../GetClusterConfigurationTest.java | 1 - .../kernel/utils/EventIteratorTest.java | 1 - .../kernel/utils/FedoraTypesUtilsTest.java | 1 - .../kernel/utils/FixityInputStreamTest.java | 1 - .../fcrepo/kernel/utils/FixityResultTest.java | 1 - .../JcrPropertyStatementListenerTest.java | 15 ++--- .../fcrepo/kernel/utils/JcrRdfToolsTest.java | 4 +- ...NamespaceChangedStatementListenerTest.java | 1 - .../fcrepo/kernel/utils/NodeIteratortest.java | 1 - .../kernel/utils/NodePropertiesToolsTest.java | 1 - .../kernel/utils/PropertyIteratorTest.java | 1 - .../org/fcrepo/kernel/utils/TestHelpers.java | 1 - .../impl/ChainingCacheStoreEntryTest.java | 1 - .../transform/TransformationFactory.java | 10 ++-- .../transform/http/FedoraTransform.java | 8 +-- 91 files changed, 309 insertions(+), 339 deletions(-) diff --git a/fcrepo-generator-dc/src/test/java/org/fcrepo/integration/generator/DublinCoreGeneratorIT.java b/fcrepo-generator-dc/src/test/java/org/fcrepo/integration/generator/DublinCoreGeneratorIT.java index 8977bdc5f0..e648920ee2 100644 --- a/fcrepo-generator-dc/src/test/java/org/fcrepo/integration/generator/DublinCoreGeneratorIT.java +++ b/fcrepo-generator-dc/src/test/java/org/fcrepo/integration/generator/DublinCoreGeneratorIT.java @@ -16,6 +16,8 @@ package org.fcrepo.integration.generator; +import static java.lang.System.err; +import static java.util.UUID.randomUUID; import static java.util.regex.Pattern.DOTALL; import static java.util.regex.Pattern.compile; import static javax.ws.rs.core.MediaType.TEXT_XML; @@ -25,7 +27,6 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.util.EntityUtils; import org.junit.Test; @@ -42,8 +43,8 @@ public void testJcrPropertiesBasedOaiDc() throws Exception { assertEquals(201, status); final HttpPatch post = new HttpPatch(serverAddress + "DublinCoreTest1"); post.setHeader("Content-Type", "application/sparql-update"); - BasicHttpEntity entity = new BasicHttpEntity(); - String subjectURI = serverAddress + "DublinCoreTest1"; + final BasicHttpEntity entity = new BasicHttpEntity(); + final String subjectURI = serverAddress + "DublinCoreTest1"; entity.setContent(new ByteArrayInputStream( ("INSERT { <" + subjectURI + "> \"this is an identifier\" } WHERE {}") .getBytes())); @@ -67,20 +68,21 @@ public void testJcrPropertiesBasedOaiDc() throws Exception { @Test public void testWellKnownPathOaiDc() throws Exception { - HttpResponse response = - client.execute(postObjMethod("DublinCoreTest2")); + + final String pid = randomUUID().toString(); + + HttpResponse response = client.execute(postObjMethod(pid)); assertEquals(201, response.getStatusLine().getStatusCode()); response = - client.execute(postDSMethod("DublinCoreTest2", "DC", - "marbles for everyone")); - int status = response.getStatusLine().getStatusCode(); + client.execute(postDSMethod(pid, "DC", "marbles for everyone")); + final int status = response.getStatusLine().getStatusCode(); if (status != 201) { - System.err.println(EntityUtils.toString(response.getEntity())); + err.println(EntityUtils.toString(response.getEntity())); } assertEquals(201, status); final HttpGet getWorstCaseOaiMethod = - new HttpGet(serverOAIAddress + "DublinCoreTest2/oai:dc"); + new HttpGet(serverOAIAddress + pid + "/oai:dc"); getWorstCaseOaiMethod.setHeader("Accept", TEXT_XML); response = client.execute(getWorstCaseOaiMethod); assertEquals(200, response.getStatusLine().getStatusCode()); diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraContent.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraContent.java index 8f76d88786..768b320798 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraContent.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraContent.java @@ -19,6 +19,7 @@ import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; import static javax.ws.rs.core.Response.created; import static javax.ws.rs.core.Response.noContent; +import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT; import static org.slf4j.LoggerFactory.getLogger; import java.io.IOException; @@ -83,7 +84,7 @@ public class FedoraContent extends AbstractResource { /** * Create an anonymous DS with a newly minted name and content from request * body - * + * * @param pathList * @throws RepositoryException */ @@ -108,7 +109,7 @@ public Response create(@PathParam("path") } logger.debug("create Datastream {}", path); - final Throwable exception = null; + try { final URI checksumURI; @@ -130,9 +131,8 @@ public Response create(@PathParam("path") session.save(); return created( new URI(subjects.getGraphSubject( - datastreamNode - .getNode(JcrConstants.JCR_CONTENT)) - .getURI())).build(); + datastreamNode.getNode(JCR_CONTENT)).getURI())) + .build(); } finally { session.logout(); @@ -141,7 +141,7 @@ public Response create(@PathParam("path") /** * Modify an existing datastream's content - * + * * @param pathList * @param requestContentType Content-Type header * @param requestBodyStream Binary blob @@ -212,7 +212,7 @@ public Response modifyContent(@PathParam("path") /** * Get the binary content of a datastream - * + * * @param pathList * @return Binary blob * @throws RepositoryException diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraDatastreams.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraDatastreams.java index 3a4278a385..78821c1794 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraDatastreams.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraDatastreams.java @@ -52,10 +52,10 @@ import javax.ws.rs.core.Response; import org.fcrepo.http.commons.AbstractResource; -import org.fcrepo.kernel.Datastream; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; -import org.fcrepo.kernel.exception.InvalidChecksumException; import org.fcrepo.http.commons.session.InjectedSession; +import org.fcrepo.kernel.Datastream; +import org.fcrepo.kernel.exception.InvalidChecksumException; import org.fcrepo.kernel.utils.ContentDigest; import org.slf4j.Logger; import org.springframework.context.annotation.Scope; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraExport.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraExport.java index 8253b38355..04655628a5 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraExport.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraExport.java @@ -35,9 +35,9 @@ import javax.ws.rs.core.StreamingOutput; import org.fcrepo.http.commons.AbstractResource; +import org.fcrepo.http.commons.session.InjectedSession; import org.fcrepo.serialization.FedoraObjectSerializer; import org.fcrepo.serialization.SerializerUtil; -import org.fcrepo.http.commons.session.InjectedSession; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFieldSearch.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFieldSearch.java index 722cb8f7a0..7faf591104 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFieldSearch.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFieldSearch.java @@ -21,6 +21,13 @@ import static javax.ws.rs.core.MediaType.TEXT_HTML; import static javax.ws.rs.core.Response.status; import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static org.fcrepo.http.commons.domain.RDFMediaType.N3; +import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT1; +import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT2; +import static org.fcrepo.http.commons.domain.RDFMediaType.NTRIPLES; +import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_JSON; +import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_XML; +import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; import static org.fcrepo.kernel.RdfLexicon.FIRST_PAGE; import static org.fcrepo.kernel.RdfLexicon.NEXT_PAGE; import static org.fcrepo.kernel.RdfLexicon.PAGE; @@ -30,13 +37,6 @@ import static org.fcrepo.kernel.RdfLexicon.SEARCH_OFFSET; import static org.fcrepo.kernel.RdfLexicon.SEARCH_PAGE; import static org.fcrepo.kernel.RdfLexicon.SEARCH_TERMS; -import static org.fcrepo.http.commons.domain.RDFMediaType.N3; -import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT1; -import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT2; -import static org.fcrepo.http.commons.domain.RDFMediaType.NTRIPLES; -import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_JSON; -import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_XML; -import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; import static org.slf4j.LoggerFactory.getLogger; import javax.jcr.RepositoryException; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFixity.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFixity.java index fc2d9df39e..74b7afe3f5 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFixity.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraFixity.java @@ -39,9 +39,9 @@ import javax.ws.rs.core.UriInfo; import org.fcrepo.http.commons.AbstractResource; -import org.fcrepo.kernel.Datastream; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; import org.fcrepo.http.commons.session.InjectedSession; +import org.fcrepo.kernel.Datastream; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraIdentifiers.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraIdentifiers.java index 776015598c..11f4068c53 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraIdentifiers.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraIdentifiers.java @@ -24,7 +24,6 @@ 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 org.fcrepo.kernel.RdfLexicon.HAS_MEMBER_OF_RESULT; import static org.fcrepo.http.commons.domain.RDFMediaType.N3; import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT1; import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT2; @@ -32,6 +31,7 @@ import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_JSON; import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_XML; import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; +import static org.fcrepo.kernel.RdfLexicon.HAS_MEMBER_OF_RESULT; import java.util.Collection; import java.util.List; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraImport.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraImport.java index b83be7fa59..d99caebb94 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraImport.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraImport.java @@ -37,9 +37,9 @@ import org.fcrepo.http.commons.AbstractResource; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; +import org.fcrepo.http.commons.session.InjectedSession; import org.fcrepo.kernel.exception.InvalidChecksumException; import org.fcrepo.serialization.SerializerUtil; -import org.fcrepo.http.commons.session.InjectedSession; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraNodes.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraNodes.java index 6bd083dd4f..f6f9453a1c 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraNodes.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraNodes.java @@ -29,9 +29,6 @@ import static org.apache.http.HttpStatus.SC_NO_CONTENT; import static org.apache.jena.riot.WebContent.contentTypeSPARQLUpdate; import static org.apache.jena.riot.WebContent.contentTypeToLang; -import static org.fcrepo.kernel.RdfLexicon.FIRST_PAGE; -import static org.fcrepo.kernel.RdfLexicon.HAS_CHILD_COUNT; -import static org.fcrepo.kernel.RdfLexicon.NEXT_PAGE; import static org.fcrepo.http.commons.domain.RDFMediaType.N3; import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT1; import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT2; @@ -39,6 +36,9 @@ import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_JSON; import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_XML; import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; +import static org.fcrepo.kernel.RdfLexicon.FIRST_PAGE; +import static org.fcrepo.kernel.RdfLexicon.HAS_CHILD_COUNT; +import static org.fcrepo.kernel.RdfLexicon.NEXT_PAGE; import static org.fcrepo.kernel.rdf.GraphProperties.INLINED_RESOURCES_MODEL; import static org.fcrepo.kernel.rdf.GraphProperties.PROBLEMS_MODEL_NAME; import static org.slf4j.LoggerFactory.getLogger; @@ -50,7 +50,6 @@ import java.util.Date; import java.util.List; -import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.servlet.http.HttpServletResponse; @@ -76,19 +75,17 @@ import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.UriInfo; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; import org.apache.commons.io.IOUtils; import org.apache.jena.riot.Lang; import org.apache.jena.riot.WebContent; import org.fcrepo.http.commons.AbstractResource; -import org.fcrepo.kernel.Datastream; -import org.fcrepo.kernel.FedoraResource; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; -import org.fcrepo.kernel.exception.InvalidChecksumException; import org.fcrepo.http.commons.domain.PATCH; import org.fcrepo.http.commons.session.InjectedSession; import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.Datastream; +import org.fcrepo.kernel.FedoraResource; +import org.fcrepo.kernel.exception.InvalidChecksumException; import org.modeshape.jcr.api.JcrConstants; import org.slf4j.Logger; import org.springframework.context.annotation.Scope; @@ -97,6 +94,8 @@ import com.codahale.metrics.annotation.Timed; 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; /** * CRUD operations on Fedora Nodes @@ -113,7 +112,7 @@ public class FedoraNodes extends AbstractResource { /** * Retrieve the node profile - * + * * @param pathList * @param offset with limit, control the pagination window of details for * child nodes @@ -133,7 +132,7 @@ public Dataset describe(@PathParam("path") final List pathList, @QueryParam("limit") @DefaultValue("-1") final int limit, @QueryParam("non-member-properties") final String nonMemberProperties, @Context final Request request, - @Context HttpServletResponse servletResponse, + @Context final HttpServletResponse servletResponse, @Context final UriInfo uriInfo) throws RepositoryException, IOException { final String path = toPath(pathList); logger.trace("Getting profile for {}", path); @@ -179,7 +178,7 @@ public Dataset describe(@PathParam("path") final List pathList, .contains(subjects.getGraphSubject(resource.getNode()), HAS_CHILD_COUNT)) { - Model requestModel = ModelFactory.createDefaultModel(); + final Model requestModel = ModelFactory.createDefaultModel(); final long childCount = treeModel .listObjectsOfProperty(subjects.getGraphSubject(resource.getNode()), HAS_CHILD_COUNT) @@ -231,7 +230,7 @@ public Dataset describe(@PathParam("path") final List pathList, /** * Update an object using SPARQL-UPDATE - * + * * @param pathList * @return 201 * @throws RepositoryException @@ -275,10 +274,10 @@ public Response updateSparql(@PathParam("path") throw new WebApplicationException(builder.build()); } - Dataset properties = resource.updatePropertiesDataset(new HttpGraphSubjects( + final Dataset properties = resource.updatePropertiesDataset(new HttpGraphSubjects( session, FedoraNodes.class, uriInfo), IOUtils .toString(requestBodyStream)); - Model problems = properties.getNamedModel(PROBLEMS_MODEL_NAME); + final Model problems = properties.getNamedModel(PROBLEMS_MODEL_NAME); if (problems.size() > 0) { logger.info( "Found these problems updating the properties for {}: {}", @@ -369,7 +368,7 @@ public Response createOrReplaceObjectRdf( /** * Creates a new object. - * + * * @param pathList * @return 201 * @throws RepositoryException @@ -487,11 +486,9 @@ public Response createObject(@PathParam("path") result.replacePropertiesDataset(subjects, inputModel); } else if (result instanceof Datastream) { - final Node node = - datastreamService.createDatastreamNode(session, newObjectPath, - contentTypeString, requestBodyStream, - checksumURI); - + datastreamService.createDatastreamNode(session, + newObjectPath, contentTypeString, + requestBodyStream, checksumURI); } } @@ -518,7 +515,7 @@ public Response createObject(@PathParam("path") /** * Deletes an object. - * + * * @param path * @return * @throws RepositoryException diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraVersions.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraVersions.java index 60ae91606c..0acb6dd120 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraVersions.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraVersions.java @@ -47,10 +47,10 @@ import javax.ws.rs.core.Variant; import org.fcrepo.http.commons.AbstractResource; -import org.fcrepo.kernel.FedoraResource; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; import org.fcrepo.http.commons.responses.GraphStoreStreamingOutput; import org.fcrepo.http.commons.session.InjectedSession; +import org.fcrepo.kernel.FedoraResource; import org.slf4j.Logger; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoriesProperties.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoriesProperties.java index 88a8aee7b5..90075a9ee8 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoriesProperties.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoriesProperties.java @@ -33,12 +33,12 @@ import org.apache.commons.io.IOUtils; import org.apache.jena.riot.WebContent; -import org.fcrepo.http.commons.AbstractResource; -import org.fcrepo.kernel.FedoraResource; import org.fcrepo.http.api.FedoraNodes; +import org.fcrepo.http.commons.AbstractResource; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; -import org.fcrepo.kernel.rdf.GraphProperties; import org.fcrepo.http.commons.session.InjectedSession; +import org.fcrepo.kernel.FedoraResource; +import org.fcrepo.kernel.rdf.GraphProperties; import org.slf4j.Logger; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryBackup.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryBackup.java index 6ad4123b39..e9dd6754bd 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryBackup.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryBackup.java @@ -15,7 +15,19 @@ */ package org.fcrepo.http.api.repository; -import com.google.common.io.Files; +import static org.slf4j.LoggerFactory.getLogger; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; + import org.apache.commons.io.IOUtils; import org.fcrepo.http.commons.AbstractResource; import org.fcrepo.http.commons.session.InjectedSession; @@ -25,17 +37,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - -import static org.slf4j.LoggerFactory.getLogger; +import com.google.common.io.Files; @Component @Scope("prototype") diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryRestore.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryRestore.java index a274c934cd..d548968584 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryRestore.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryRestore.java @@ -15,14 +15,14 @@ */ package org.fcrepo.http.api.repository; -import org.apache.commons.io.IOUtils; -import org.fcrepo.http.commons.AbstractResource; -import org.fcrepo.http.commons.session.InjectedSession; -import org.modeshape.jcr.api.Problem; -import org.modeshape.jcr.api.Problems; -import org.slf4j.Logger; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; +import static javax.ws.rs.core.Response.noContent; +import static org.slf4j.LoggerFactory.getLogger; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -30,14 +30,15 @@ import javax.ws.rs.Path; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import static javax.ws.rs.core.Response.noContent; -import static org.slf4j.LoggerFactory.getLogger; +import org.apache.commons.io.IOUtils; +import org.fcrepo.http.commons.AbstractResource; +import org.fcrepo.http.commons.session.InjectedSession; +import org.modeshape.jcr.api.Problem; +import org.modeshape.jcr.api.Problems; +import org.slf4j.Logger; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Component; @Component @Scope("prototype") diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspaces.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspaces.java index 8de9acaf0e..1a62d41974 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspaces.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspaces.java @@ -16,6 +16,18 @@ package org.fcrepo.http.api.repository; +import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; +import static javax.ws.rs.core.MediaType.TEXT_HTML; +import static org.fcrepo.http.commons.domain.RDFMediaType.N3; +import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT1; +import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT2; +import static org.fcrepo.http.commons.domain.RDFMediaType.NTRIPLES; +import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_JSON; +import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_XML; +import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; +import static org.fcrepo.kernel.RdfLexicon.NOT_IMPLEMENTED; +import static org.slf4j.LoggerFactory.getLogger; + import java.net.MalformedURLException; import javax.jcr.RepositoryException; @@ -30,13 +42,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.RDF; -import org.fcrepo.http.commons.AbstractResource; import org.fcrepo.http.api.FedoraNodes; +import org.fcrepo.http.commons.AbstractResource; import org.fcrepo.http.commons.responses.HtmlTemplate; import org.fcrepo.http.commons.session.InjectedSession; import org.fcrepo.kernel.utils.JcrRdfTools; @@ -45,18 +52,11 @@ import org.springframework.stereotype.Component; import com.google.common.collect.ImmutableMap; - -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; -import static javax.ws.rs.core.MediaType.TEXT_HTML; -import static org.fcrepo.kernel.RdfLexicon.NOT_IMPLEMENTED; -import static org.fcrepo.http.commons.domain.RDFMediaType.N3; -import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT1; -import static org.fcrepo.http.commons.domain.RDFMediaType.N3_ALT2; -import static org.fcrepo.http.commons.domain.RDFMediaType.NTRIPLES; -import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_JSON; -import static org.fcrepo.http.commons.domain.RDFMediaType.RDF_XML; -import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; -import static org.slf4j.LoggerFactory.getLogger; +import com.hp.hpl.jena.query.Dataset; +import com.hp.hpl.jena.query.DatasetFactory; +import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.vocabulary.RDF; /** * This class exposes the JCR workspace functionality. It may be @@ -84,19 +84,19 @@ public class FedoraRepositoryWorkspaces extends AbstractResource { @HtmlTemplate("jcr:workspaces") public Dataset getWorkspaces() throws RepositoryException { - Model workspaceModel = + final Model workspaceModel = JcrRdfTools.withContext(null, session).getJcrPropertiesModel(); - String[] workspaces = + final String[] workspaces = session.getWorkspace().getAccessibleWorkspaceNames(); - for (String workspace : workspaces) { + for (final String workspace : workspaces) { final Resource resource = createResource(uriInfo.getBaseUriBuilder() .path("/workspace:" + workspace) .build() .toString()); - + logger.debug("Discovered workspace: {}", resource); workspaceModel.add(resource, RDF.type, NOT_IMPLEMENTED); } diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/url/HttpApiResources.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/url/HttpApiResources.java index 5eddaba37a..f824756655 100644 --- a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/url/HttpApiResources.java +++ b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/url/HttpApiResources.java @@ -20,12 +20,12 @@ import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel; import static org.fcrepo.kernel.RdfLexicon.HAS_FIXITY_SERVICE; import static org.fcrepo.kernel.RdfLexicon.HAS_NAMESPACE_SERVICE; -import static org.fcrepo.kernel.RdfLexicon.HAS_WORKSPACE_SERVICE; import static org.fcrepo.kernel.RdfLexicon.HAS_SEARCH_SERVICE; import static org.fcrepo.kernel.RdfLexicon.HAS_SERIALIZATION; import static org.fcrepo.kernel.RdfLexicon.HAS_SITEMAP; import static org.fcrepo.kernel.RdfLexicon.HAS_TRANSACTION_SERVICE; import static org.fcrepo.kernel.RdfLexicon.HAS_VERSION_HISTORY; +import static org.fcrepo.kernel.RdfLexicon.HAS_WORKSPACE_SERVICE; import static org.fcrepo.kernel.RdfLexicon.RDFS_LABEL; import java.util.Map; @@ -33,19 +33,19 @@ import javax.jcr.RepositoryException; import javax.ws.rs.core.UriInfo; -import org.fcrepo.kernel.FedoraResource; import org.fcrepo.http.api.FedoraExport; import org.fcrepo.http.api.FedoraFieldSearch; import org.fcrepo.http.api.FedoraFixity; import org.fcrepo.http.api.FedoraSitemap; import org.fcrepo.http.api.FedoraVersions; -import org.fcrepo.http.commons.api.rdf.UriAwareResourceModelFactory; import org.fcrepo.http.api.repository.FedoraRepositoryNamespaces; import org.fcrepo.http.api.repository.FedoraRepositoryTransactions; import org.fcrepo.http.api.repository.FedoraRepositoryWorkspaces; +import org.fcrepo.http.commons.api.rdf.UriAwareResourceModelFactory; +import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.FedoraResource; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.serialization.SerializerUtil; -import org.fcrepo.jcr.FedoraJcrTypes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraContentTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraContentTest.java index 4391c11f83..913621a799 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraContentTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraContentTest.java @@ -49,7 +49,6 @@ import javax.ws.rs.core.Response; import org.apache.commons.io.IOUtils; -import org.fcrepo.http.api.FedoraContent; import org.fcrepo.kernel.Datastream; import org.fcrepo.kernel.exception.InvalidChecksumException; import org.fcrepo.kernel.identifiers.PidMinter; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraDatastreamsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraDatastreamsTest.java index ccece0f823..bbc2e31e50 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraDatastreamsTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraDatastreamsTest.java @@ -55,7 +55,6 @@ import javax.ws.rs.core.Response; import org.apache.commons.io.IOUtils; -import org.fcrepo.http.api.FedoraDatastreams; import org.fcrepo.kernel.Datastream; import org.fcrepo.kernel.FedoraResource; import org.fcrepo.kernel.exception.InvalidChecksumException; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraExportTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraExportTest.java index f0ea15438a..f4fc0adcfd 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraExportTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraExportTest.java @@ -31,12 +31,11 @@ import javax.jcr.Session; import javax.ws.rs.core.StreamingOutput; -import org.fcrepo.http.api.FedoraExport; +import org.fcrepo.http.commons.test.util.TestHelpers; import org.fcrepo.kernel.FedoraObject; +import org.fcrepo.kernel.services.ObjectService; import org.fcrepo.serialization.FedoraObjectSerializer; import org.fcrepo.serialization.SerializerUtil; -import org.fcrepo.kernel.services.ObjectService; -import org.fcrepo.http.commons.test.util.TestHelpers; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFieldSearchTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFieldSearchTest.java index 238b1a209d..2eb233c3a9 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFieldSearchTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFieldSearchTest.java @@ -37,7 +37,6 @@ import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.Variant; -import org.fcrepo.http.api.FedoraFieldSearch; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.services.NodeService; import org.junit.Before; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFixityTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFixityTest.java index 84e8e5a54a..8f2fb991f6 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFixityTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFixityTest.java @@ -35,7 +35,6 @@ import javax.ws.rs.core.Request; import javax.ws.rs.core.UriInfo; -import org.fcrepo.http.api.FedoraFixity; import org.fcrepo.kernel.Datastream; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.services.DatastreamService; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraIdentifiersTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraIdentifiersTest.java index 72c972e617..dcc9099cce 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraIdentifiersTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraIdentifiersTest.java @@ -17,11 +17,11 @@ package org.fcrepo.http.api; import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; -import static org.fcrepo.kernel.RdfLexicon.HAS_MEMBER_OF_RESULT; import static org.fcrepo.http.commons.test.util.PathSegmentImpl.createPathList; import static org.fcrepo.http.commons.test.util.TestHelpers.getUriInfoImpl; import static org.fcrepo.http.commons.test.util.TestHelpers.mockSession; import static org.fcrepo.http.commons.test.util.TestHelpers.setField; +import static org.fcrepo.kernel.RdfLexicon.HAS_MEMBER_OF_RESULT; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraImportTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraImportTest.java index 6b6b3549f6..0e7c284f1c 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraImportTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraImportTest.java @@ -29,7 +29,6 @@ import javax.jcr.Node; import javax.jcr.Session; -import org.fcrepo.http.api.FedoraImport; import org.fcrepo.serialization.FedoraObjectSerializer; import org.fcrepo.serialization.SerializerUtil; import org.junit.Before; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraNodesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraNodesTest.java index 53d7e7b25c..657bf0fb55 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraNodesTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraNodesTest.java @@ -25,7 +25,6 @@ import static org.fcrepo.jcr.FedoraJcrTypes.FEDORA_DATASTREAM; import static org.fcrepo.jcr.FedoraJcrTypes.FEDORA_OBJECT; 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.mockito.Matchers.any; @@ -55,9 +54,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import com.hp.hpl.jena.sparql.util.Context; import org.apache.commons.io.IOUtils; -import org.fcrepo.http.api.FedoraNodes; import org.fcrepo.kernel.Datastream; import org.fcrepo.kernel.FedoraObject; import org.fcrepo.kernel.FedoraResource; @@ -75,6 +72,7 @@ import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.sparql.util.Context; public class FedoraNodesTest { diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraSitemapTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraSitemapTest.java index e7843e2bd5..d7538478d7 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraSitemapTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraSitemapTest.java @@ -25,7 +25,6 @@ import javax.jcr.Session; -import org.fcrepo.http.api.FedoraSitemap; import org.fcrepo.http.commons.jaxb.responses.sitemap.SitemapIndex; import org.fcrepo.kernel.services.ObjectService; import org.junit.Before; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraVersionsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraVersionsTest.java index dc32e7f359..6ed13f2148 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraVersionsTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraVersionsTest.java @@ -40,11 +40,10 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Variant; -import org.fcrepo.http.api.FedoraVersions; -import org.fcrepo.kernel.FedoraResource; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; -import org.fcrepo.kernel.services.NodeService; import org.fcrepo.http.commons.test.util.TestHelpers; +import org.fcrepo.kernel.FedoraResource; +import org.fcrepo.kernel.services.NodeService; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoriesPropertiesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoriesPropertiesTest.java index 7c4bb92029..55a05eb363 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoriesPropertiesTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoriesPropertiesTest.java @@ -31,7 +31,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.fcrepo.http.api.repository.FedoraRepositoriesProperties; import org.fcrepo.kernel.FedoraObject; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.services.NodeService; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryBackupTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryBackupTest.java index ddbf3646ae..4fa510b12b 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryBackupTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryBackupTest.java @@ -15,20 +15,6 @@ */ package org.fcrepo.http.api.repository; -import org.fcrepo.kernel.services.NodeService; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.modeshape.jcr.api.Problems; - -import javax.jcr.Session; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.InputStream; - import static org.fcrepo.http.commons.test.util.TestHelpers.getUriInfoImpl; import static org.fcrepo.http.commons.test.util.TestHelpers.setField; import static org.junit.Assert.assertEquals; @@ -37,6 +23,19 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.InputStream; + +import javax.jcr.Session; + +import org.fcrepo.kernel.services.NodeService; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.modeshape.jcr.api.Problems; + /** * @author Andrew Woods * Date: 9/4/13 diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryRestoreTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryRestoreTest.java index bbad15391f..56332560da 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryRestoreTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryRestoreTest.java @@ -15,21 +15,6 @@ */ package org.fcrepo.http.api.repository; -import org.fcrepo.kernel.services.NodeService; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.modeshape.jcr.api.Problems; - -import javax.jcr.Session; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.InputStream; - import static org.fcrepo.http.commons.test.util.TestHelpers.getUriInfoImpl; import static org.fcrepo.http.commons.test.util.TestHelpers.setField; import static org.junit.Assert.assertEquals; @@ -40,6 +25,21 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.InputStream; + +import javax.jcr.Session; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; + +import org.fcrepo.kernel.services.NodeService; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.modeshape.jcr.api.Problems; + /** * @author Andrew Woods * Date: 9/4/13 diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspacesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspacesTest.java index 38ef10696e..b0da0825e6 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspacesTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspacesTest.java @@ -16,24 +16,25 @@ package org.fcrepo.http.api.repository; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Resource; -import org.fcrepo.http.api.repository.FedoraRepositoryWorkspaces; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.modeshape.jcr.api.NamespaceRegistry; +import static org.fcrepo.http.commons.test.util.TestHelpers.setField; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +import java.net.URI; import javax.jcr.Session; import javax.jcr.Workspace; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import java.net.URI; -import static org.fcrepo.http.commons.test.util.TestHelpers.setField; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.when; -import static org.mockito.MockitoAnnotations.initMocks; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.modeshape.jcr.api.NamespaceRegistry; + +import com.hp.hpl.jena.query.Dataset; +import com.hp.hpl.jena.rdf.model.Resource; /** * @author Andrew Woods diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/url/HttpApiResourcesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/url/HttpApiResourcesTest.java index 650cd45432..d9f904bd51 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/url/HttpApiResourcesTest.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/url/HttpApiResourcesTest.java @@ -17,6 +17,9 @@ package org.fcrepo.http.api.url; import static com.google.common.collect.ImmutableSet.of; +import static org.fcrepo.http.commons.test.util.TestHelpers.getUriInfoImpl; +import static org.fcrepo.http.commons.test.util.TestHelpers.setField; +import static org.fcrepo.jcr.FedoraJcrTypes.ROOT; import static org.fcrepo.kernel.RdfLexicon.HAS_FIXITY_SERVICE; import static org.fcrepo.kernel.RdfLexicon.HAS_NAMESPACE_SERVICE; import static org.fcrepo.kernel.RdfLexicon.HAS_SEARCH_SERVICE; @@ -25,9 +28,6 @@ import static org.fcrepo.kernel.RdfLexicon.HAS_TRANSACTION_SERVICE; import static org.fcrepo.kernel.RdfLexicon.HAS_VERSION_HISTORY; import static org.fcrepo.kernel.RdfLexicon.HAS_WORKSPACE_SERVICE; -import static org.fcrepo.http.commons.test.util.TestHelpers.getUriInfoImpl; -import static org.fcrepo.http.commons.test.util.TestHelpers.setField; -import static org.fcrepo.jcr.FedoraJcrTypes.ROOT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -43,10 +43,9 @@ import javax.jcr.nodetype.NodeType; import javax.ws.rs.core.UriInfo; -import org.fcrepo.http.api.url.HttpApiResources; -import org.fcrepo.kernel.FedoraResource; import org.fcrepo.http.api.FedoraNodes; import org.fcrepo.http.commons.api.rdf.HttpGraphSubjects; +import org.fcrepo.kernel.FedoraResource; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.serialization.SerializerUtil; import org.junit.Before; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraBackupIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraBackupIT.java index dce43af550..969ee47149 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraBackupIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraBackupIT.java @@ -16,7 +16,10 @@ package org.fcrepo.integration.http.api; -import com.google.common.io.Files; +import static org.junit.Assert.assertEquals; + +import java.io.File; + import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpGet; @@ -25,9 +28,7 @@ import org.apache.http.util.EntityUtils; import org.junit.Test; -import java.io.File; - -import static org.junit.Assert.assertEquals; +import com.google.common.io.Files; public class FedoraBackupIT extends AbstractResourceIT { diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraContentIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraContentIT.java index 0e0f25fa69..0ea61af355 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraContentIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraContentIT.java @@ -16,6 +16,7 @@ package org.fcrepo.integration.http.api; +import static java.util.UUID.randomUUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -67,16 +68,19 @@ public void testAddDeepDatastream() throws Exception { @Test public void testPutDatastream() throws Exception { - final HttpPost objMethod = postObjMethod("FedoraDatastreamsTestPut"); + + final String pid = randomUUID().toString(); + + final HttpPost objMethod = postObjMethod(pid); assertEquals(201, getStatus(objMethod)); final HttpPut method = - putDSMethod("FedoraDatastreamsTestPut", "zxc", "foo"); + putDSMethod(pid, "zxc", "foo"); final HttpResponse response = client.execute(method); final String location = response.getFirstHeader("Location").getValue(); assertEquals(201, response.getStatusLine().getStatusCode()); assertEquals( "Got wrong URI in Location header for datastream creation!", - serverAddress + "FedoraDatastreamsTestPut/zxc/fcr:content", location); + serverAddress + pid + "/zxc/fcr:content", location); } @Test @@ -95,7 +99,7 @@ public void testMutateDatastream() throws Exception { putDSMethod("FedoraDatastreamsTest3", "ds1", "bar"); mutateDataStreamMethod.setEntity(new StringEntity(faulkner1, "UTF-8")); final HttpResponse response = client.execute(mutateDataStreamMethod); - int status = response.getStatusLine().getStatusCode(); + final int status = response.getStatusLine().getStatusCode(); if (status != 204) { logger.error(EntityUtils.toString(response.getEntity())); } diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFieldSearchIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFieldSearchIT.java index 190faadeda..23c996c5e6 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFieldSearchIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFieldSearchIT.java @@ -30,8 +30,8 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.StringEntity; -import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.http.commons.test.util.TestHelpers; +import org.fcrepo.kernel.RdfLexicon; import org.junit.Test; import com.hp.hpl.jena.graph.Node; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFixityIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFixityIT.java index c5eed9fef7..16bf0c7d04 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFixityIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFixityIT.java @@ -23,8 +23,8 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; -import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.http.commons.test.util.TestHelpers; +import org.fcrepo.kernel.RdfLexicon; import org.junit.Test; import com.hp.hpl.jena.graph.Node; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraIdentifiersIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraIdentifiersIT.java index 8559a4706c..71987c37d0 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraIdentifiersIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraIdentifiersIT.java @@ -25,8 +25,8 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; -import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.http.commons.test.util.TestHelpers; +import org.fcrepo.kernel.RdfLexicon; import org.junit.Test; import com.google.common.collect.Iterators; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNamespacesIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNamespacesIT.java index 643b8bd5e5..28099d6c92 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNamespacesIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNamespacesIT.java @@ -26,8 +26,8 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.BasicHttpEntity; -import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.http.commons.test.util.TestHelpers; +import org.fcrepo.kernel.RdfLexicon; import org.junit.Test; import com.hp.hpl.jena.graph.Node; diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java index 0d4c7fbd15..1b6c9261d7 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java @@ -19,6 +19,7 @@ import static com.hp.hpl.jena.graph.Node.ANY; import static com.hp.hpl.jena.graph.NodeFactory.createLiteral; import static com.hp.hpl.jena.graph.NodeFactory.createURI; +import static java.util.UUID.randomUUID; import static java.util.regex.Pattern.DOTALL; import static java.util.regex.Pattern.compile; import static javax.ws.rs.core.Response.Status.CREATED; @@ -27,15 +28,15 @@ import static javax.ws.rs.core.Response.Status.OK; import static nu.validator.htmlparser.common.DoctypeExpectation.NO_DOCTYPE_ERRORS; import static nu.validator.htmlparser.common.XmlViolationPolicy.ALLOW; +import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; +import static org.fcrepo.http.commons.test.util.TestHelpers.parseTriples; +import static org.fcrepo.jcr.FedoraJcrTypes.ROOT; import static org.fcrepo.kernel.RdfLexicon.DC_TITLE; import static org.fcrepo.kernel.RdfLexicon.HAS_OBJECT_COUNT; import static org.fcrepo.kernel.RdfLexicon.HAS_OBJECT_SIZE; import static org.fcrepo.kernel.RdfLexicon.HAS_PRIMARY_IDENTIFIER; import static org.fcrepo.kernel.RdfLexicon.HAS_PRIMARY_TYPE; import static org.fcrepo.kernel.RdfLexicon.REPOSITORY_NAMESPACE; -import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE; -import static org.fcrepo.http.commons.test.util.TestHelpers.parseTriples; -import static org.fcrepo.jcr.FedoraJcrTypes.ROOT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -46,10 +47,10 @@ import java.io.IOException; import java.io.InputStream; import java.util.Iterator; +import java.util.UUID; import javax.jcr.RepositoryException; -import com.hp.hpl.jena.rdf.model.ResourceFactory; import nu.validator.htmlparser.sax.HtmlParser; import nu.validator.saxtree.TreeBuilder; @@ -62,7 +63,6 @@ import org.apache.http.entity.BasicHttpEntity; import org.apache.http.impl.client.cache.CachingHttpClient; import org.apache.http.util.EntityUtils; -import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.http.commons.test.util.TestHelpers; import org.junit.Ignore; import org.junit.Test; @@ -74,6 +74,7 @@ import com.hp.hpl.jena.graph.Graph; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.Triple; +import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.sparql.core.Quad; import com.hp.hpl.jena.update.GraphStore; @@ -81,7 +82,10 @@ public class FedoraNodesIT extends AbstractResourceIT { @Test public void testIngest() throws Exception { - final HttpPost method = postObjMethod("FedoraObjectsTest1"); + + final String pid = randomUUID().toString(); + + final HttpPost method = postObjMethod(pid); final HttpResponse response = client.execute(method); assertEquals(CREATED.getStatusCode(), response.getStatusLine() .getStatusCode()); @@ -89,8 +93,8 @@ public void testIngest() throws Exception { assertTrue("Response wasn't a PID", compile("[a-z]+").matcher(content) .find()); final String location = response.getFirstHeader("Location").getValue(); - assertEquals("Got wrong Location header for ingest!", serverAddress + - "FedoraObjectsTest1", location); + assertEquals("Got wrong Location header for ingest!", serverAddress + + pid, location); } @Test @@ -116,7 +120,7 @@ public void testIngestWithNew() throws Exception { public void testIngestWithNewAndSparqlQuery() throws Exception { final HttpPost method = postObjMethod(""); method.addHeader("Content-Type", "application/sparql-update"); - BasicHttpEntity entity = new BasicHttpEntity(); + final BasicHttpEntity entity = new BasicHttpEntity(); entity.setContent(new ByteArrayInputStream( ("INSERT { <> \"this is a title\" } WHERE {}") .getBytes())); @@ -144,7 +148,7 @@ public void testIngestWithNewAndSparqlQuery() throws Exception { public void testIngestWithNewAndGraph() throws Exception { final HttpPost method = postObjMethod(""); method.addHeader("Content-Type", "application/n3"); - BasicHttpEntity entity = new BasicHttpEntity(); + final BasicHttpEntity entity = new BasicHttpEntity(); entity.setContent(new ByteArrayInputStream("<> \"this is a title\"".getBytes())); method.setEntity(entity); final HttpResponse response = client.execute(method); @@ -171,7 +175,7 @@ public void testIngestWithNewAndGraph() throws Exception { @Test public void testIngestWithSlug() throws Exception { final HttpPost method = postObjMethod(""); - method.addHeader("Slug", "xyz"); + method.addHeader("Slug", randomUUID().toString()); final HttpResponse response = client.execute(method); final String content = EntityUtils.toString(response.getEntity()); final int status = response.getStatusLine().getStatusCode(); @@ -190,7 +194,7 @@ public void testIngestWithSlug() throws Exception { public void testIngestWithBinary() throws Exception { final HttpPost method = postObjMethod(""); method.addHeader("Content-Type", "application/octet-stream"); - BasicHttpEntity entity = new BasicHttpEntity(); + final BasicHttpEntity entity = new BasicHttpEntity(); entity.setContent(new ByteArrayInputStream("xyz".getBytes())); method.setEntity(entity); final HttpResponse response = client.execute(method); @@ -220,18 +224,19 @@ public void testDeleteObject() throws Exception { @Test public void testGetDatastream() throws Exception { - execute(postObjMethod("FedoraDatastreamsTest4")); - assertEquals(404, getStatus(new HttpGet(serverAddress + - "FedoraDatastreamsTest4/ds1"))); - assertEquals(CREATED.getStatusCode(), getStatus(postDSMethod( - "FedoraDatastreamsTest4", "ds1", "foo"))); + final String pid = UUID.randomUUID().toString(); + + execute(postObjMethod(pid)); + + assertEquals(404, getStatus(new HttpGet(serverAddress + pid + "/ds1"))); + assertEquals(CREATED.getStatusCode(), getStatus(postDSMethod(pid, + "ds1", "foo"))); final HttpResponse response = - execute(new HttpGet(serverAddress + - "FedoraDatastreamsTest4/ds1")); + execute(new HttpGet(serverAddress + pid + "/ds1")); assertEquals(EntityUtils.toString(response.getEntity()), 200, response .getStatusLine().getStatusCode()); - assertEquals(TURTLE, response.getFirstHeader("Content-Type").getValue() ); + assertEquals(TURTLE, response.getFirstHeader("Content-Type").getValue()); } @Test @@ -548,6 +553,9 @@ public void testRoundTripReplaceGraph() throws Exception { @Test public void testDescribeSize() throws Exception { + + final String sizeNode = randomUUID().toString(); + final HttpGet describeMethod = new HttpGet(serverAddress + ""); describeMethod.addHeader("Accept", "text/n3"); HttpResponse response = client.execute(describeMethod); @@ -558,16 +566,16 @@ public void testDescribeSize() throws Exception { graphStore.toString()); Iterator iterator = - graphStore.getDefaultGraph().find(Node.ANY, - HAS_OBJECT_SIZE.asNode(), Node.ANY); + graphStore.getDefaultGraph().find(ANY, HAS_OBJECT_SIZE.asNode(), + ANY); final Integer oldSize = (Integer) iterator.next().getObject().getLiteralValue(); assertEquals(CREATED.getStatusCode(), - getStatus(postObjMethod("sizeNode"))); - assertEquals(CREATED.getStatusCode(), getStatus(postDSMethod( - "sizeNode", "asdf", "1234"))); + getStatus(postObjMethod(sizeNode))); + assertEquals(CREATED.getStatusCode(), getStatus(postDSMethod(sizeNode, + "asdf", "1234"))); response = client.execute(describeMethod); assertEquals(OK.getStatusCode(), response.getStatusLine() diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraTransactionsIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraTransactionsIT.java index 1dba37c56f..c4d0bc996a 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraTransactionsIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraTransactionsIT.java @@ -16,7 +16,11 @@ package org.fcrepo.integration.http.api; +import static com.hp.hpl.jena.graph.Node.ANY; +import static com.hp.hpl.jena.graph.NodeFactory.createURI; +import static java.util.UUID.randomUUID; import static java.util.regex.Pattern.compile; +import static org.fcrepo.http.commons.test.util.TestHelpers.parseTriples; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,9 +28,9 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; +import org.fcrepo.http.commons.test.util.TestHelpers; import org.fcrepo.kernel.Transaction; import org.fcrepo.kernel.services.TransactionService; -import org.fcrepo.http.commons.test.util.TestHelpers; import org.junit.Test; import com.hp.hpl.jena.graph.Node; @@ -39,7 +43,7 @@ public class FedoraTransactionsIT extends AbstractResourceIT { public void testCreateTransaction() throws Exception { /* create a tx */ final HttpPost createTx = new HttpPost(serverAddress + "fcr:tx"); - HttpResponse response = execute(createTx); + final HttpResponse response = execute(createTx); assertEquals(201, response.getStatusLine().getStatusCode()); final String location = response.getFirstHeader("Location").getValue(); @@ -56,7 +60,7 @@ public void testRequestsInTransactionThatDoestExist() throws Exception { /* create a tx */ final HttpPost createTx = new HttpPost(serverAddress + "tx:123/objects"); - HttpResponse response = execute(createTx); + final HttpResponse response = execute(createTx); assertEquals(410, response.getStatusLine().getStatusCode()); } @@ -72,7 +76,7 @@ public void testCreateAndTimeoutTransaction() throws Exception { /* create a tx */ final HttpPost createTx = new HttpPost(serverAddress + "fcr:tx"); - HttpResponse response = execute(createTx); + final HttpResponse response = execute(createTx); assertEquals(201, response.getStatusLine().getStatusCode()); final String location = response.getFirstHeader("Location").getValue(); @@ -104,7 +108,7 @@ public void testCreateDoStuffAndRollbackTransaction() throws Exception { /* create a tx */ final HttpPost createTx = new HttpPost(serverAddress + "fcr:tx"); - HttpResponse response = execute(createTx); + final HttpResponse response = execute(createTx); assertEquals(201, response.getStatusLine().getStatusCode()); final String txLocation = @@ -153,9 +157,12 @@ public void testCreateDoStuffAndRollbackTransaction() throws Exception { @Test public void testCreateDoStuffAndCommitTransaction() throws Exception { /* create a tx */ + + final String objectInTxCommit = randomUUID().toString(); + final HttpPost createTx = new HttpPost(serverAddress + "fcr:tx"); - HttpResponse response = execute(createTx); + final HttpResponse response = execute(createTx); assertEquals(201, response.getStatusLine().getStatusCode()); final String txLocation = @@ -163,12 +170,12 @@ public void testCreateDoStuffAndCommitTransaction() throws Exception { /* create a new object inside the tx */ final HttpPost postNew = - new HttpPost(txLocation + "/object-in-tx-commit"); + new HttpPost(txLocation + "/" + objectInTxCommit); HttpResponse resp = execute(postNew); assertEquals(201, resp.getStatusLine().getStatusCode()); /* fetch the created tx from the endpoint */ - final HttpGet getTx = new HttpGet(txLocation + "/object-in-tx-commit"); + final HttpGet getTx = new HttpGet(txLocation + "/" + objectInTxCommit); getTx.setHeader("Accept", "application/n3"); resp = execute(getTx); assertEquals( @@ -176,16 +183,15 @@ public void testCreateDoStuffAndCommitTransaction() throws Exception { 200, resp.getStatusLine().getStatusCode()); final GraphStore graphStore = - TestHelpers.parseTriples(resp.getEntity().getContent()); + parseTriples(resp.getEntity().getContent()); logger.debug(graphStore.toString()); - assertTrue(graphStore.toDataset().asDatasetGraph().contains(Node.ANY, - NodeFactory.createURI(txLocation + "/object-in-tx-commit"), - Node.ANY, Node.ANY)); + assertTrue(graphStore.toDataset().asDatasetGraph().contains(ANY, + createURI(txLocation + "/" + objectInTxCommit), ANY, ANY)); /* fetch the object-in-tx outside of the tx */ final HttpGet getObj = - new HttpGet(serverAddress + "/object-in-tx-commit"); + new HttpGet(serverAddress + "/" + objectInTxCommit); resp = execute(getObj); assertEquals( "Expected to not find our object within the scope of the transaction", @@ -200,7 +206,7 @@ public void testCreateDoStuffAndCommitTransaction() throws Exception { /* fetch the object-in-tx outside of the tx after it has been committed */ final HttpGet getObjCommitted = - new HttpGet(serverAddress + "/object-in-tx-commit"); + new HttpGet(serverAddress + "/" + objectInTxCommit); resp = execute(getObjCommitted); assertEquals( "Expected to find our object after the transaction was committed", diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraWorkspacesIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraWorkspacesIT.java index 23acf87350..3f399c18f3 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraWorkspacesIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraWorkspacesIT.java @@ -16,8 +16,9 @@ package org.fcrepo.integration.http.api; +import static java.util.UUID.randomUUID; +import static org.fcrepo.http.commons.test.util.TestHelpers.parseTriples; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -30,7 +31,6 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; -import org.fcrepo.http.commons.test.util.TestHelpers; import org.junit.Test; import com.hp.hpl.jena.update.GraphStore; @@ -44,10 +44,10 @@ public void testGetWorkspaces() throws Exception { final HttpResponse response = execute(httpGet); assertEquals(200, response.getStatusLine().getStatusCode()); - InputStream in = response.getEntity().getContent(); - List lines = IOUtils.readLines(in); + final InputStream in = response.getEntity().getContent(); + final List lines = IOUtils.readLines(in); boolean found = false; - for (String line : lines) { + for (final String line : lines) { if (line.contains(serverAddress + "workspace:default")) { found = true; break; @@ -59,28 +59,29 @@ public void testGetWorkspaces() throws Exception { @Test public void shouldDemonstratePathsAndWorkspaces() throws IOException, RepositoryException { + + final String workspace = randomUUID().toString(); + final String pid = randomUUID().toString(); + final HttpPost httpCreateWorkspace = - new HttpPost(serverAddress + "fcr:workspaces/some-workspace"); + new HttpPost(serverAddress + "fcr:workspaces/" + workspace); final HttpResponse createWorkspaceResponse = execute(httpCreateWorkspace); assertEquals(201, createWorkspaceResponse.getStatusLine() .getStatusCode()); final HttpPost httpPost = - new HttpPost(serverAddress + - "workspace:some-workspace/FedoraWorkspacesTest"); + new HttpPost(serverAddress + "workspace:" + workspace + "/" + pid); final HttpResponse response = execute(httpPost); assertEquals(201, response.getStatusLine().getStatusCode()); final HttpGet httpGet = - new HttpGet(serverAddress + - "workspace:some-workspace/FedoraWorkspacesTest"); + new HttpGet(serverAddress + "workspace:" + workspace + "/" + pid); httpGet.setHeader("Accept", "application/n3"); final HttpResponse profileResponse = execute(httpGet); assertEquals(200, profileResponse.getStatusLine().getStatusCode()); final GraphStore graphStore = - TestHelpers.parseTriples(profileResponse.getEntity() - .getContent()); + parseTriples(profileResponse.getEntity().getContent()); logger.info(graphStore.toString()); } } diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/ldp/LdprIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/ldp/LdprIT.java index 4d90da6821..d8a5cc84e3 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/ldp/LdprIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/ldp/LdprIT.java @@ -16,28 +16,29 @@ package org.fcrepo.integration.http.api.ldp; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -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; +import static javax.ws.rs.core.MediaType.TEXT_HTML; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; + import org.apache.http.HttpResponse; import org.apache.http.HttpVersion; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpHead; import org.apache.jena.riot.WebContent; -import org.fcrepo.integration.http.api.AbstractResourceIT; import org.fcrepo.http.commons.test.util.TestHelpers; +import org.fcrepo.integration.http.api.AbstractResourceIT; import org.junit.Test; -import java.io.IOException; - -import static javax.ws.rs.core.MediaType.TEXT_HTML; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +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 LdprIT extends AbstractResourceIT { @@ -94,8 +95,8 @@ public boolean apply(final String input) { final HttpGet testMethod = new HttpGet(serverAddress + ""); testMethod.setHeader("Accept", input); try { - final HttpResponse response = client.execute(testMethod); - } catch (IOException e) { + client.execute(testMethod); + } catch (final IOException e) { throw new RuntimeException("Failed on format " + input); } finally { testMethod.releaseConnection(); diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/Datastream.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/Datastream.java index 0fc5b51661..47842b3340 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/Datastream.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/Datastream.java @@ -16,10 +16,10 @@ package org.fcrepo.kernel; import static com.codahale.metrics.MetricRegistry.name; -import static org.fcrepo.metrics.RegistryService.getMetrics; import static org.fcrepo.kernel.services.ServiceHelpers.getNodePropertySize; import static org.fcrepo.kernel.utils.FedoraTypesUtils.getBinary; import static org.fcrepo.kernel.utils.FedoraTypesUtils.isFedoraDatastream; +import static org.fcrepo.metrics.RegistryService.getMetrics; import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT; import static org.modeshape.jcr.api.JcrConstants.JCR_DATA; import static org.modeshape.jcr.api.JcrConstants.JCR_MIME_TYPE; @@ -35,10 +35,10 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.fcrepo.kernel.services.policy.StoragePolicyDecisionPoint; +import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.exception.InvalidChecksumException; +import org.fcrepo.kernel.services.policy.StoragePolicyDecisionPoint; import org.fcrepo.kernel.utils.ContentDigest; -import org.fcrepo.jcr.FedoraJcrTypes; import org.modeshape.jcr.api.Binary; import org.modeshape.jcr.api.JcrConstants; import org.slf4j.Logger; diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java index 15b2bb6c4d..bcda596460 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java @@ -32,13 +32,11 @@ import javax.jcr.Session; import javax.jcr.version.VersionHistory; -import com.hp.hpl.jena.update.UpdateFactory; -import com.hp.hpl.jena.update.UpdateRequest; import org.apache.commons.codec.digest.DigestUtils; +import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.rdf.GraphProperties; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.rdf.impl.JcrGraphProperties; -import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.fcrepo.kernel.utils.JcrRdfTools; import org.modeshape.jcr.api.JcrConstants; @@ -49,6 +47,8 @@ import com.hp.hpl.jena.query.DatasetFactory; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.update.UpdateAction; +import com.hp.hpl.jena.update.UpdateFactory; +import com.hp.hpl.jena.update.UpdateRequest; /** * Common behaviors across FedoraObject and Datastream types; also used diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/observer/SimpleObserver.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/observer/SimpleObserver.java index ede83caa91..f26dd01993 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/observer/SimpleObserver.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/observer/SimpleObserver.java @@ -16,6 +16,7 @@ package org.fcrepo.kernel.observer; import static com.codahale.metrics.MetricRegistry.name; +import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.filter; import static javax.jcr.observation.Event.NODE_ADDED; import static javax.jcr.observation.Event.NODE_MOVED; @@ -25,10 +26,10 @@ import static javax.jcr.observation.Event.PROPERTY_REMOVED; import static org.fcrepo.metrics.RegistryService.getMetrics; import static org.slf4j.LoggerFactory.getLogger; -import static com.google.common.base.Throwables.propagate; import java.util.HashSet; import java.util.Set; + import javax.annotation.PostConstruct; import javax.inject.Inject; import javax.jcr.Item; diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjects.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjects.java index a41c982978..6892acb75f 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjects.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjects.java @@ -22,9 +22,9 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; +import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.kernel.rdf.GraphSubjects; -import org.fcrepo.jcr.FedoraJcrTypes; import org.modeshape.jcr.api.JcrConstants; import com.hp.hpl.jena.rdf.model.Resource; diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/DatastreamService.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/DatastreamService.java index c98b172dca..3fbc66388b 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/DatastreamService.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/DatastreamService.java @@ -20,8 +20,8 @@ import static com.google.common.collect.Collections2.filter; import static com.google.common.collect.ImmutableSet.copyOf; import static com.google.common.collect.Sets.difference; -import static org.fcrepo.metrics.RegistryService.getMetrics; import static org.fcrepo.kernel.services.ServiceHelpers.getCheckCacheFixityFunction; +import static org.fcrepo.metrics.RegistryService.getMetrics; import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT; import static org.slf4j.LoggerFactory.getLogger; diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/NodeService.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/NodeService.java index 9e0488bb17..7cffdff4f3 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/NodeService.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/NodeService.java @@ -29,8 +29,8 @@ import javax.jcr.version.Version; import javax.jcr.version.VersionHistory; -import org.fcrepo.kernel.FedoraResource; import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.FedoraResource; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/ObjectService.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/ObjectService.java index 3bfdf4a442..b21c32e4f4 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/ObjectService.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/ObjectService.java @@ -23,8 +23,8 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.fcrepo.kernel.FedoraObject; import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.FedoraObject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/RepositoryService.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/RepositoryService.java index e2f0cc0c41..629de72822 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/RepositoryService.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/RepositoryService.java @@ -24,9 +24,9 @@ import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel; import static org.fcrepo.kernel.RdfLexicon.SEARCH_HAS_MORE; import static org.fcrepo.kernel.RdfLexicon.SEARCH_HAS_TOTAL_RESULTS; -import static org.fcrepo.metrics.RegistryService.getMetrics; import static org.fcrepo.kernel.utils.FedoraTypesUtils.getRepositoryCount; import static org.fcrepo.kernel.utils.NamespaceTools.getNamespaceRegistry; +import static org.fcrepo.metrics.RegistryService.getMetrics; import static org.slf4j.LoggerFactory.getLogger; import java.io.File; @@ -48,9 +48,9 @@ import javax.jcr.query.qom.QueryObjectModelFactory; import javax.jcr.query.qom.Source; +import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.rdf.GraphProperties; import org.fcrepo.kernel.rdf.GraphSubjects; -import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.fcrepo.kernel.utils.JcrRdfTools; import org.fcrepo.kernel.utils.NamespaceChangedStatementListener; diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/policy/StoragePolicyDecisionPoint.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/policy/StoragePolicyDecisionPoint.java index 6cbc403ae7..0ae634dab2 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/policy/StoragePolicyDecisionPoint.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/services/policy/StoragePolicyDecisionPoint.java @@ -16,10 +16,10 @@ package org.fcrepo.kernel.services.policy; -import javax.jcr.Node; - import java.util.List; +import javax.jcr.Node; + /** * Service Interface implementation for managing and using StoragePolicy * @author osmandin diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrPropertyStatementListener.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrPropertyStatementListener.java index 4aa551d220..5c91948fda 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrPropertyStatementListener.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrPropertyStatementListener.java @@ -26,7 +26,6 @@ import javax.jcr.Session; import javax.jcr.Value; -import com.hp.hpl.jena.vocabulary.RDF; import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.kernel.rdf.GraphSubjects; import org.slf4j.Logger; @@ -35,6 +34,7 @@ import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Statement; +import com.hp.hpl.jena.vocabulary.RDF; /** * Listen to Jena statement events, and when the statement is changed in the diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java index f4044d8279..3feab908af 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java @@ -64,11 +64,8 @@ import javax.jcr.version.VersionHistory; import javax.jcr.version.VersionIterator; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.services.LowLevelStorageService; import org.fcrepo.kernel.services.functions.GetClusterConfiguration; @@ -77,8 +74,11 @@ import org.slf4j.Logger; import com.codahale.metrics.Counter; +import com.google.common.base.Predicate; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; import com.hp.hpl.jena.datatypes.RDFDatatype; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/observer/SimpleObserverIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/observer/SimpleObserverIT.java index 570da8fd9b..59d039125d 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/observer/SimpleObserverIT.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/observer/SimpleObserverIT.java @@ -23,8 +23,8 @@ import javax.jcr.Session; import org.fcrepo.integration.kernel.AbstractIT; -import org.fcrepo.kernel.observer.FedoraEvent; import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.observer.FedoraEvent; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/services/ObjectServiceIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/services/ObjectServiceIT.java index 18a57ca3ba..a25580b831 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/services/ObjectServiceIT.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/services/ObjectServiceIT.java @@ -28,7 +28,6 @@ import javax.jcr.Repository; import javax.jcr.Session; -import com.google.common.io.Files; import org.fcrepo.integration.kernel.AbstractIT; import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.kernel.services.DatastreamService; @@ -37,6 +36,7 @@ import org.modeshape.jcr.api.Problems; import org.springframework.test.context.ContextConfiguration; +import com.google.common.io.Files; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.ResourceFactory; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/DatastreamTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/DatastreamTest.java index 18b44b0f70..fc8ccae91a 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/DatastreamTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/DatastreamTest.java @@ -51,10 +51,8 @@ import javax.jcr.nodetype.NodeType; import org.apache.tika.io.IOUtils; -import org.fcrepo.kernel.Datastream; -import org.fcrepo.kernel.FedoraObject; -import org.fcrepo.kernel.exception.InvalidChecksumException; import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.exception.InvalidChecksumException; import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.junit.After; import org.junit.Before; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraObjectTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraObjectTest.java index befbad765a..83099744bd 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraObjectTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraObjectTest.java @@ -35,9 +35,8 @@ import javax.jcr.Session; import javax.jcr.nodetype.NodeType; -import org.fcrepo.kernel.FedoraObject; -import org.fcrepo.kernel.services.ServiceHelpers; import org.fcrepo.jcr.FedoraJcrTypes; +import org.fcrepo.kernel.services.ServiceHelpers; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java index 3d38079c98..de2a16930e 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java @@ -17,10 +17,10 @@ package org.fcrepo.kernel; import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel; -import static org.fcrepo.kernel.FedoraResource.hasMixin; import static org.fcrepo.jcr.FedoraJcrTypes.FEDORA_RESOURCE; import static org.fcrepo.jcr.FedoraJcrTypes.JCR_CREATED; import static org.fcrepo.jcr.FedoraJcrTypes.JCR_LASTMODIFIED; +import static org.fcrepo.kernel.FedoraResource.hasMixin; import static org.fcrepo.kernel.utils.FedoraTypesUtils.getBaseVersion; import static org.fcrepo.kernel.utils.FedoraTypesUtils.getVersionHistory; import static org.fcrepo.kernel.utils.JcrRdfTools.getProblemsModel; @@ -48,7 +48,6 @@ import javax.jcr.version.Version; import javax.jcr.version.VersionHistory; -import com.hp.hpl.jena.rdf.model.ModelFactory; import org.apache.commons.codec.digest.DigestUtils; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.rdf.impl.DefaultGraphSubjects; @@ -65,6 +64,7 @@ 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; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TransactionTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TransactionTest.java index 840c2628a7..081428c53b 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TransactionTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TransactionTest.java @@ -31,7 +31,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.fcrepo.kernel.Transaction; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TxAwareSessionTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TxAwareSessionTest.java index 7db09e15f0..a81d46081d 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TxAwareSessionTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/TxAwareSessionTest.java @@ -29,7 +29,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.fcrepo.kernel.TxSession; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPathMinterTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPathMinterTest.java index b1e137d06b..6a9d627620 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPathMinterTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPathMinterTest.java @@ -19,7 +19,6 @@ import static java.util.regex.Pattern.compile; import static org.junit.Assert.assertTrue; -import org.fcrepo.kernel.identifiers.UUIDPathMinter; import org.junit.Test; public class UUIDPathMinterTest { diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPidMinterTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPidMinterTest.java index b1e461b286..2b956499e9 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPidMinterTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/identifiers/UUIDPidMinterTest.java @@ -19,7 +19,6 @@ import static java.util.regex.Pattern.compile; import static org.junit.Assert.assertTrue; -import org.fcrepo.kernel.identifiers.UUIDPidMinter; import org.junit.Test; public class UUIDPidMinterTest { diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/DefaultFilterTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/DefaultFilterTest.java index c43eea2281..2530e5648d 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/DefaultFilterTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/DefaultFilterTest.java @@ -33,7 +33,6 @@ import javax.jcr.Session; import javax.jcr.observation.Event; -import org.fcrepo.kernel.observer.DefaultFilter; import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.junit.Before; import org.junit.Test; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/FedoraEventTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/FedoraEventTest.java index 77684ac3ea..4cca1c8748 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/FedoraEventTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/FedoraEventTest.java @@ -22,7 +22,6 @@ import javax.jcr.RepositoryException; import javax.jcr.observation.Event; -import org.fcrepo.kernel.observer.FedoraEvent; import org.junit.Test; import com.google.common.collect.ImmutableMap; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/NOOPFilterTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/NOOPFilterTest.java index 3d4d1f811e..78e1cd4144 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/NOOPFilterTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/NOOPFilterTest.java @@ -17,7 +17,6 @@ import static org.junit.Assert.assertTrue; -import org.fcrepo.kernel.observer.NOOPFilter; import org.junit.Test; public class NOOPFilterTest { diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/SimpleObserverTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/SimpleObserverTest.java index 87a51bbed4..4d02451acb 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/SimpleObserverTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/observer/SimpleObserverTest.java @@ -38,8 +38,6 @@ import javax.jcr.observation.EventIterator; import javax.jcr.observation.ObservationManager; -import org.fcrepo.kernel.observer.EventFilter; -import org.fcrepo.kernel.observer.SimpleObserver; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/SerializationUtilsTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/SerializationUtilsTest.java index 9c2cb0e1bd..c39e7fe7ed 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/SerializationUtilsTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/SerializationUtilsTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.fcrepo.kernel.rdf.SerializationUtils; import org.junit.Test; import com.hp.hpl.jena.graph.NodeFactory; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjectsTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjectsTest.java index 5bc60b8dc1..8ee7830573 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjectsTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/DefaultGraphSubjectsTest.java @@ -26,7 +26,6 @@ import javax.jcr.Session; import org.fcrepo.kernel.RdfLexicon; -import org.fcrepo.kernel.rdf.impl.DefaultGraphSubjects; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/DatastreamServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/DatastreamServiceTest.java index eae5e5511f..0f63a5779b 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/DatastreamServiceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/DatastreamServiceTest.java @@ -44,14 +44,11 @@ import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.Datastream; -import org.fcrepo.kernel.services.DatastreamService; -import org.fcrepo.kernel.services.LowLevelStorageService; -import org.fcrepo.kernel.services.ServiceHelpers; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.services.functions.CheckCacheEntryFixity; import org.fcrepo.kernel.services.policy.StoragePolicyDecisionPoint; -import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.fcrepo.kernel.utils.FixityResult; import org.fcrepo.kernel.utils.JcrRdfTools; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/LowLevelStorageServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/LowLevelStorageServiceTest.java index ae2b6ce387..dd39fc32f7 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/LowLevelStorageServiceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/LowLevelStorageServiceTest.java @@ -45,8 +45,6 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; -import org.fcrepo.kernel.services.LowLevelStorageService; -import org.fcrepo.kernel.services.ServiceHelpers; import org.fcrepo.kernel.services.functions.CacheLocalTransform; import org.fcrepo.kernel.services.functions.GetBinaryKey; import org.fcrepo.kernel.services.functions.GetCacheStore; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/NodeServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/NodeServiceTest.java index ba10439f29..c773697214 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/NodeServiceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/NodeServiceTest.java @@ -30,8 +30,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.fcrepo.kernel.services.NodeService; -import org.fcrepo.kernel.services.ServiceHelpers; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/ObjectServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/ObjectServiceTest.java index 7a80bcef8b..a684c3d601 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/ObjectServiceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/ObjectServiceTest.java @@ -27,8 +27,6 @@ import javax.jcr.nodetype.NodeType; import org.fcrepo.jcr.FedoraJcrTypes; -import org.fcrepo.kernel.services.ObjectService; -import org.fcrepo.kernel.services.ServiceHelpers; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/RepositoryServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/RepositoryServiceTest.java index cad8bba750..bd8297c293 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/RepositoryServiceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/RepositoryServiceTest.java @@ -51,10 +51,9 @@ import javax.jcr.query.qom.QueryObjectModel; import javax.jcr.query.qom.QueryObjectModelFactory; +import org.fcrepo.jcr.FedoraJcrTypes; import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.kernel.rdf.GraphSubjects; -import org.fcrepo.jcr.FedoraJcrTypes; -import org.fcrepo.kernel.services.RepositoryService; import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.fcrepo.kernel.utils.JcrRdfTools; import org.fcrepo.kernel.utils.NamespaceTools; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/TransactionServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/TransactionServiceTest.java index abf215e304..8672730571 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/TransactionServiceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/TransactionServiceTest.java @@ -38,7 +38,6 @@ import org.fcrepo.kernel.Transaction; import org.fcrepo.kernel.exception.TransactionMissingException; -import org.fcrepo.kernel.services.TransactionService; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CacheLocalTransformTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CacheLocalTransformTest.java index c74cc7c1f8..6263771166 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CacheLocalTransformTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CacheLocalTransformTest.java @@ -24,8 +24,6 @@ import java.lang.reflect.Field; -import org.fcrepo.kernel.services.functions.CacheLocalTransform; -import org.fcrepo.kernel.services.functions.GetCacheStore; import org.fcrepo.kernel.utils.LowLevelCacheEntry; import org.fcrepo.kernel.utils.impl.CacheStoreEntry; import org.infinispan.Cache; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CheckCacheEntryFixityTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CheckCacheEntryFixityTest.java index c71a3f6aac..bab5226f59 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CheckCacheEntryFixityTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/CheckCacheEntryFixityTest.java @@ -23,7 +23,6 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import org.fcrepo.kernel.services.functions.CheckCacheEntryFixity; import org.fcrepo.kernel.utils.LowLevelCacheEntry; import org.junit.Before; import org.junit.Test; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetBinaryKeyTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetBinaryKeyTest.java index 669a4ba89d..50d012383b 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetBinaryKeyTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetBinaryKeyTest.java @@ -24,7 +24,7 @@ import javax.jcr.Node; import javax.jcr.Property; -import org.fcrepo.kernel.services.functions.GetBinaryKey; + import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetCacheStoreTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetCacheStoreTest.java index 1fd6a254ba..936dd0fb78 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetCacheStoreTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetCacheStoreTest.java @@ -22,7 +22,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import javax.jcr.LoginException; -import org.fcrepo.kernel.services.functions.GetCacheStore; + import org.infinispan.AdvancedCache; import org.infinispan.Cache; import org.infinispan.factories.ComponentRegistry; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetClusterConfigurationTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetClusterConfigurationTest.java index f5da407916..fecad39cea 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetClusterConfigurationTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/functions/GetClusterConfigurationTest.java @@ -30,7 +30,6 @@ import javax.jcr.Repository; -import org.fcrepo.kernel.services.functions.GetClusterConfiguration; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.ClusteringConfiguration; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/EventIteratorTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/EventIteratorTest.java index 82ca5dd299..aac70f6064 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/EventIteratorTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/EventIteratorTest.java @@ -25,7 +25,6 @@ import javax.jcr.observation.Event; -import org.fcrepo.kernel.utils.EventIterator; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FedoraTypesUtilsTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FedoraTypesUtilsTest.java index 7a3904524e..e235232afa 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FedoraTypesUtilsTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FedoraTypesUtilsTest.java @@ -68,7 +68,6 @@ import javax.jcr.version.VersionHistory; import javax.jcr.version.VersionManager; -import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityInputStreamTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityInputStreamTest.java index 32f18111f5..359972cf9d 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityInputStreamTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityInputStreamTest.java @@ -23,7 +23,6 @@ import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Hex; -import org.fcrepo.kernel.utils.FixityInputStream; import org.junit.Test; public class FixityInputStreamTest { diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityResultTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityResultTest.java index c7279dacca..72af85a42c 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityResultTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/FixityResultTest.java @@ -24,7 +24,6 @@ import java.net.URI; -import org.fcrepo.kernel.utils.FixityResult; import org.junit.Test; public class FixityResultTest { diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrPropertyStatementListenerTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrPropertyStatementListenerTest.java index 0575d3e19a..eb5a1aed06 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrPropertyStatementListenerTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrPropertyStatementListenerTest.java @@ -31,20 +31,17 @@ import static org.mockito.MockitoAnnotations.initMocks; import static org.powermock.api.mockito.PowerMockito.mockStatic; +import java.util.Collections; +import java.util.Map; + import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.Workspace; import javax.jcr.nodetype.NodeTypeManager; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.kernel.rdf.GraphSubjects; -import org.fcrepo.kernel.utils.JcrPropertyStatementListener; -import org.fcrepo.kernel.utils.JcrRdfTools; -import org.fcrepo.kernel.utils.NodePropertiesTools; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,12 +51,12 @@ import org.powermock.modules.junit4.PowerMockRunner; import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.Statement; - -import java.util.Collections; -import java.util.Map; +import com.hp.hpl.jena.vocabulary.RDF; @RunWith(PowerMockRunner.class) @PowerMockIgnore({"org.slf4j.*", "javax.xml.parsers.*", "org.apache.xerces.*"}) diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java index 012183c531..c673080300 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java @@ -39,6 +39,7 @@ import static javax.jcr.PropertyType.URI; import static javax.jcr.PropertyType.WEAKREFERENCE; import static javax.jcr.query.Query.JCR_SQL2; +import static org.fcrepo.jcr.FedoraJcrTypes.ROOT; import static org.fcrepo.kernel.RdfLexicon.HAS_CHILD; import static org.fcrepo.kernel.RdfLexicon.HAS_COMPUTED_CHECKSUM; import static org.fcrepo.kernel.RdfLexicon.HAS_COMPUTED_SIZE; @@ -52,7 +53,6 @@ import static org.fcrepo.kernel.RdfLexicon.IS_FIXITY_RESULT_OF; import static org.fcrepo.kernel.RdfLexicon.REPOSITORY_NAMESPACE; import static org.fcrepo.kernel.RdfLexicon.RESTAPI_NAMESPACE; -import static org.fcrepo.jcr.FedoraJcrTypes.ROOT; import static org.fcrepo.kernel.utils.FedoraTypesUtils.getPredicateForProperty; import static org.fcrepo.kernel.utils.FedoraTypesUtils.getValueFactory; import static org.fcrepo.kernel.utils.FixityResult.FixityState.BAD_CHECKSUM; @@ -107,7 +107,6 @@ import javax.jcr.version.VersionIterator; import javax.jcr.version.VersionManager; -import com.hp.hpl.jena.rdf.model.ResourceFactory; import org.fcrepo.kernel.RdfLexicon; import org.fcrepo.kernel.rdf.GraphSubjects; import org.fcrepo.kernel.rdf.impl.DefaultGraphSubjects; @@ -132,6 +131,7 @@ import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.update.GraphStore; import com.hp.hpl.jena.update.GraphStoreFactory; import com.hp.hpl.jena.vocabulary.RDF; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NamespaceChangedStatementListenerTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NamespaceChangedStatementListenerTest.java index da9984c457..f9b2c17718 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NamespaceChangedStatementListenerTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NamespaceChangedStatementListenerTest.java @@ -30,7 +30,6 @@ import javax.jcr.Session; import javax.jcr.Workspace; -import org.fcrepo.kernel.utils.NamespaceChangedStatementListener; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodeIteratortest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodeIteratortest.java index 447abcec91..1e74f49f5c 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodeIteratortest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodeIteratortest.java @@ -25,7 +25,6 @@ import javax.jcr.Node; -import org.fcrepo.kernel.utils.NodeIterator; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodePropertiesToolsTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodePropertiesToolsTest.java index 44c111e7e6..980d6858ae 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodePropertiesToolsTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/NodePropertiesToolsTest.java @@ -39,7 +39,6 @@ import javax.jcr.Value; import javax.jcr.nodetype.PropertyDefinition; -import org.fcrepo.kernel.utils.FedoraTypesUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/PropertyIteratorTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/PropertyIteratorTest.java index d4f5ac5679..eacfde84c8 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/PropertyIteratorTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/PropertyIteratorTest.java @@ -25,7 +25,6 @@ import javax.jcr.Property; -import org.fcrepo.kernel.utils.PropertyIterator; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/TestHelpers.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/TestHelpers.java index d4d380d4a8..7caf391b90 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/TestHelpers.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/TestHelpers.java @@ -36,7 +36,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.fcrepo.kernel.utils.ContentDigest; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/impl/ChainingCacheStoreEntryTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/impl/ChainingCacheStoreEntryTest.java index 2229c46fd0..3e3c1cd609 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/impl/ChainingCacheStoreEntryTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/impl/ChainingCacheStoreEntryTest.java @@ -30,7 +30,6 @@ import java.util.Set; import org.fcrepo.kernel.utils.LowLevelCacheEntry; -import org.fcrepo.kernel.utils.impl.ChainingCacheStoreEntry; import org.infinispan.configuration.cache.AbstractStoreConfiguration; import org.infinispan.configuration.cache.CacheStoreConfiguration; import org.infinispan.configuration.cache.FileCacheStoreConfiguration; diff --git a/fcrepo-transform/src/main/java/org/fcrepo/transform/TransformationFactory.java b/fcrepo-transform/src/main/java/org/fcrepo/transform/TransformationFactory.java index 9664fd5d33..2440fefaf2 100644 --- a/fcrepo-transform/src/main/java/org/fcrepo/transform/TransformationFactory.java +++ b/fcrepo-transform/src/main/java/org/fcrepo/transform/TransformationFactory.java @@ -33,13 +33,13 @@ */ public class TransformationFactory { - private Map mimeToTransform; + private Map> mimeToTransform; /** * Get a new TransformationFactory with the default classes */ public TransformationFactory() { - mimeToTransform = new HashMap(); + mimeToTransform = new HashMap>(); mimeToTransform.put(WebContent.contentTypeSPARQLQuery, SparqlQueryTransform.class); mimeToTransform.put(LDPathTransform.APPLICATION_RDF_LDPATH, LDPathTransform.class); @@ -49,8 +49,8 @@ public TransformationFactory() { * Get a new TransformationFactory using the provided mapping * @param mimeToTransform */ - public TransformationFactory(Map mimeToTransform) { - mimeToTransform = mimeToTransform; + public TransformationFactory(final Map> mimeToTransform) { + this.mimeToTransform = mimeToTransform; } /** @@ -64,7 +64,7 @@ public Transformation getTransform(final MediaType contentType, final InputStream inputStream) { if (mimeToTransform.containsKey(contentType.toString())) { - Class transform = mimeToTransform.get(contentType.toString()); + final Class transform = mimeToTransform.get(contentType.toString()); if (Transformation.class.isAssignableFrom(transform)) { try { diff --git a/fcrepo-transform/src/main/java/org/fcrepo/transform/http/FedoraTransform.java b/fcrepo-transform/src/main/java/org/fcrepo/transform/http/FedoraTransform.java index bdc92ad73b..cfc18f8c8c 100644 --- a/fcrepo-transform/src/main/java/org/fcrepo/transform/http/FedoraTransform.java +++ b/fcrepo-transform/src/main/java/org/fcrepo/transform/http/FedoraTransform.java @@ -74,7 +74,7 @@ public class FedoraTransform extends AbstractResource { /** * Register the LDPath configuration tree in JCR - * + * * @throws RepositoryException * @throws java.io.IOException */ @@ -100,7 +100,7 @@ public void setUpRepositoryConfiguration() throws RepositoryException, jcrTools.findOrCreateNode(session, LDPathTransform.CONFIGURATION_FOLDER + "default", NodeType.NT_FOLDER, NodeType.NT_FOLDER); - + logger.debug("Transforming node: {}", node.getPath()); // register an initial demo program if (!node.hasNode(NodeType.NT_BASE)) { final Node base_config = @@ -116,7 +116,7 @@ public void setUpRepositoryConfiguration() throws RepositoryException, /** * Execute an LDpath program transform - * + * * @param pathList * @return Binary blob * @throws RepositoryException @@ -150,7 +150,7 @@ public Object evaluateLdpathProgram(@PathParam("path") /** * Get the LDPath output as a JSON stream appropriate for e.g. Solr - * + * * @param pathList * @param requestBodyStream * @return