Skip to content

Commit

Permalink
stash TransactionService changes for rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@barmintor
barmintor committed Nov 11, 2013
1 parent 6cbd1dc commit d5bc9d1
Show file tree
Hide file tree
Showing 18 changed files with 97 additions and 59 deletions.
2 changes: 0 additions & 2 deletions fcrepo-generator-dc/src/main/java/org/fcrepo/generator/DublinCoreGenerator.java
View file
Expand Up @@ -38,12 +38,10 @@
import org.fcrepo.kernel.FedoraResource;
import org.fcrepo.generator.dublincore.DCGenerator;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

/**
* Dublin Core output controller
*/
@Component
@Scope("prototype")
@Path("/{path: .*}/oai:dc")
public class DublinCoreGenerator extends AbstractResource {
Expand Down
10 changes: 10 additions & 0 deletions fcrepo-http-api/pom.xml
View file
Expand Up @@ -157,6 +157,16 @@
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
<version>2.2.0-b21</version>
</dependency>
<dependency>
<groupId>org.jvnet.mimepull</groupId>
<artifactId>mimepull</artifactId>
<version>1.9.3</version>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 0 additions & 2 deletions fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraDatastreams.java
View file
Expand Up @@ -65,15 +65,13 @@
import org.fcrepo.kernel.utils.ContentDigest;
import org.slf4j.Logger;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

import com.codahale.metrics.annotation.Timed;

/**
* Controller for manipulating binary streams in larger batches
* by using multipart requests and responses
*/
@Component
@Scope("prototype")
@Path("/{path: .*}/fcr:datastreams")
public class FedoraDatastreams extends AbstractResource {
Expand Down
44 changes: 24 additions & 20 deletions fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraNodes.java
View file
Expand Up @@ -17,7 +17,7 @@
package org.fcrepo.http.api;

import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE;
import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
import static javax.ws.rs.core.Response.created;
import static javax.ws.rs.core.Response.noContent;
Expand Down Expand Up @@ -84,7 +84,6 @@
import javax.ws.rs.core.UriInfo;

import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.sun.jersey.multipart.FormDataParam;
import org.apache.commons.io.IOUtils;
import org.apache.jena.riot.Lang;
import org.fcrepo.http.commons.AbstractResource;
Expand All @@ -96,6 +95,7 @@
import org.fcrepo.kernel.Datastream;
import org.fcrepo.kernel.FedoraResource;
import org.fcrepo.kernel.rdf.GraphSubjects;
import org.glassfish.jersey.media.multipart.FormDataParam;
import org.modeshape.jcr.api.JcrConstants;
import org.slf4j.Logger;

Expand Down Expand Up @@ -135,6 +135,8 @@ public Dataset describe(@PathParam("path") final List<PathSegment> pathList,
@QueryParam("offset") @DefaultValue("0") final int offset,
@QueryParam("limit") @DefaultValue("-1") final int limit,
@QueryParam("non-member-properties") final String nonMemberProperties,
@HeaderParam("Content-Type") @DefaultValue(TURTLE)
final String requestContentType,
@Context final Request request,
@Context final HttpServletResponse servletResponse,
@Context final UriInfo uriInfo) throws RepositoryException, IOException {
Expand Down Expand Up @@ -322,8 +324,8 @@ public Response updateSparql(@PathParam("path")
public Response createOrReplaceObjectRdf(
@PathParam("path") final List<PathSegment> pathList,
@Context final UriInfo uriInfo,
@HeaderParam("Content-Type")
final MediaType requestContentType,
@HeaderParam("Content-Type") @DefaultValue(TURTLE)
final String requestContentType,
final InputStream requestBodyStream,
@Context final Request request) throws Exception {
final String path = toPath(pathList);
Expand Down Expand Up @@ -381,16 +383,21 @@ public Response createOrReplaceObjectRdf(
* @throws Exception
*/
@POST
@Consumes(MediaType.WILDCARD)
@Timed
public Response createObject(@PathParam("path")
final List<PathSegment> pathList,
@QueryParam("mixin")
@DefaultValue("")
final String mixin,
@QueryParam("checksum")
@DefaultValue("")
final String checksum,
@HeaderParam("Content-Type")
final MediaType requestContentType,
@DefaultValue("")
final String requestContentType,
@HeaderParam("Slug")
@DefaultValue("")
final String slug,
@Context
final UriInfo uriInfo, final InputStream requestBodyStream)
Expand All @@ -403,7 +410,7 @@ public Response createObject(@PathParam("path")
if (nodeService.exists(session, path)) {
final String pid;

if (slug != null) {
if (!slug.isEmpty()) {
pid = slug;
} else {
pid = pidMinter.mintPid();
Expand All @@ -424,7 +431,7 @@ public Response createObject(@PathParam("path")

final URI checksumURI;

if (checksum != null && !checksum.equals("")) {
if (!checksum.isEmpty()) {
checksumURI = new URI(checksum);
} else {
checksumURI = null;
Expand All @@ -434,12 +441,11 @@ public Response createObject(@PathParam("path")

final String objectType;

if (mixin != null) {
if (!mixin.isEmpty()) {
objectType = mixin;
} else {
if (requestContentType != null) {
final String s = requestContentType.toString();
if (s.equals(contentTypeSPARQLUpdate) || contentTypeToLang(s) != null) {
if (!requestContentType.isEmpty()) {
if (requestContentType.equals(contentTypeSPARQLUpdate) || contentTypeToLang(requestContentType) != null) {
objectType = FEDORA_OBJECT;
} else {
objectType = FEDORA_DATASTREAM;
Expand All @@ -464,17 +470,15 @@ public Response createObject(@PathParam("path")

if (requestBodyStream != null) {

final MediaType contentType =
final String contentType =
requestContentType != null ? requestContentType
: APPLICATION_OCTET_STREAM_TYPE;

final String contentTypeString = contentType.toString();
: APPLICATION_OCTET_STREAM;

if (contentTypeString.equals(contentTypeSPARQLUpdate)) {
if (contentType.equals(contentTypeSPARQLUpdate)) {
result.updatePropertiesDataset(subjects, IOUtils.toString(requestBodyStream));
} else if (contentTypeToLang(contentTypeString) != null) {
} else if (contentTypeToLang(contentType) != null) {

final Lang lang = contentTypeToLang(contentTypeString);
final Lang lang = contentTypeToLang(contentType);

if (lang == null) {
throw new NotAcceptableException("Invalid Content type " + contentType);
Expand All @@ -493,7 +497,7 @@ public Response createObject(@PathParam("path")
} else if (result instanceof Datastream) {

datastreamService.createDatastreamNode(session,
newObjectPath, contentTypeString,
newObjectPath, contentType,
requestBodyStream, checksumURI);

}
Expand Down Expand Up @@ -529,7 +533,7 @@ public Response createObject(@PathParam("path")
* @return
* @throws Exception
*/
@POST
//@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Timed
public Response createObjectFromFormPost(
Expand Down
3 changes: 1 addition & 2 deletions fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraTransactions.java
View file
Expand Up @@ -42,7 +42,6 @@
import org.fcrepo.kernel.TxSession;
import org.fcrepo.kernel.services.TransactionService;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;

/**
Expand All @@ -54,7 +53,7 @@ public class FedoraTransactions extends AbstractResource {

private static final Logger LOGGER = getLogger(FedoraTransactions.class);

@Autowired
@Inject
private TransactionService txService;

@Inject
Expand Down
25 changes: 10 additions & 15 deletions fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraNodesTest.java
View file
Expand Up @@ -16,7 +16,7 @@

package org.fcrepo.http.api;

import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE;
import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
import static javax.ws.rs.core.Response.Status.CONFLICT;
import static javax.ws.rs.core.Response.Status.CREATED;
import static javax.ws.rs.core.Response.Status.NO_CONTENT;
Expand Down Expand Up @@ -56,7 +56,6 @@
import javax.jcr.Session;
import javax.jcr.ValueFactory;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
Expand All @@ -65,7 +64,6 @@
import org.fcrepo.http.commons.domain.RDFMediaType;
import org.fcrepo.kernel.Datastream;
import org.fcrepo.kernel.FedoraObject;
import org.fcrepo.kernel.FedoraResource;
import org.fcrepo.kernel.identifiers.PidMinter;
import org.fcrepo.kernel.rdf.GraphSubjects;
import org.fcrepo.kernel.services.DatastreamService;
Expand Down Expand Up @@ -99,9 +97,6 @@ public class FedoraNodesTest {
@Mock
private Request mockRequest;

@Mock
private FedoraResource mockResource;

Session mockSession;

@Mock
Expand Down Expand Up @@ -156,8 +151,8 @@ public void testCreateObject() throws Exception {
when(mockObject.getNode()).thenReturn(mockNode);
when(mockNode.getPath()).thenReturn(path);
final Response actual =
testObj.createObject(createPathList(pid), FEDORA_OBJECT, null,
null, null, getUriInfoImpl(), null);
testObj.createObject(createPathList(pid), FEDORA_OBJECT, "",
null, "", getUriInfoImpl(), null);
assertNotNull(actual);
assertEquals(CREATED.getStatusCode(), actual.getStatus());
assertTrue(actual.getEntity().toString().endsWith(pid));
Expand All @@ -177,8 +172,8 @@ public void testCreateChildObject() throws Exception {
when(mockObject.getNode()).thenReturn(mockNode);
when(mockNode.getPath()).thenReturn(path);
final Response actual =
testObj.createObject(createPathList(pid), FEDORA_OBJECT, null,
null, null, getUriInfoImpl(), null);
testObj.createObject(createPathList(pid), FEDORA_OBJECT, "",
null, "", getUriInfoImpl(), null);
assertNotNull(actual);
assertEquals(CREATED.getStatusCode(), actual.getStatus());
assertTrue(actual.getEntity().toString().endsWith("a"));
Expand All @@ -197,7 +192,7 @@ public void testCreateChildObjectWithSlug() throws Exception {
when(mockObject.getNode()).thenReturn(mockNode);
when(mockNode.getPath()).thenReturn(path);
final Response actual =
testObj.createObject(createPathList(pid), FEDORA_OBJECT, null,
testObj.createObject(createPathList(pid), FEDORA_OBJECT, "",
null, "some-slug", getUriInfoImpl(), null);
assertNotNull(actual);
assertEquals(CREATED.getStatusCode(), actual.getStatus());
Expand Down Expand Up @@ -226,7 +221,7 @@ public void testCreateDatastream() throws Exception {
when(mockNode.getPath()).thenReturn(dsPath);
final Response actual =
testObj.createObject(createPathList(pid, dsId),
FEDORA_DATASTREAM, null, APPLICATION_OCTET_STREAM_TYPE, null, getUriInfoImpl(),
FEDORA_DATASTREAM, "", APPLICATION_OCTET_STREAM, "", getUriInfoImpl(),
dsContentStream);
assertEquals(CREATED.getStatusCode(), actual.getStatus());
verify(mockDatastreams)
Expand Down Expand Up @@ -262,7 +257,7 @@ public void testDescribeObject() throws RepositoryException, IOException {
.thenReturn(mockObject);
final Request mockRequest = mock(Request.class);
final Dataset dataset =
testObj.describe(createPathList(path), 0, -1, null, mockRequest, mockResponse,
testObj.describe(createPathList(path), 0, -1, null, null, mockRequest, mockResponse,
uriInfo);
assertNotNull(dataset.getDefaultModel());
verify(mockResponse).addHeader("Accept-Patch", "application/sparql-update");
Expand All @@ -285,7 +280,7 @@ public void testDescribeObjectNoInlining() throws RepositoryException, IOExcepti
.thenReturn(mockObject);
final Request mockRequest = mock(Request.class);
final Dataset dataset =
testObj.describe(createPathList(path), 0, -1, "", mockRequest, mockResponse,
testObj.describe(createPathList(path), 0, -1, "", null, mockRequest, mockResponse,
uriInfo);
assertNotNull(dataset.getDefaultModel());

Expand Down Expand Up @@ -326,7 +321,7 @@ public void testReplaceRdf() throws IllegalArgumentException, Exception {
new ByteArrayInputStream("<a> <b> <c>".getBytes());
when(mockNodes.getObject(mockSession, path)).thenReturn(mockObject);

testObj.createOrReplaceObjectRdf(createPathList(pid), getUriInfoImpl(), RDFMediaType.N3_APPLICATION_TYPE, mockStream, mockRequest);
testObj.createOrReplaceObjectRdf(createPathList(pid), getUriInfoImpl(), RDFMediaType.N3_APPLICATION, mockStream, mockRequest);
verify(mockObject).replaceProperties(any(GraphSubjects.class), any(Model.class));
}

Expand Down
19 changes: 19 additions & 0 deletions fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java
View file
Expand Up @@ -65,6 +65,7 @@
import nu.validator.saxtree.TreeBuilder;

import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.client.methods.HttpDelete;
Expand All @@ -74,6 +75,9 @@
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.BasicHttpEntity;
import org.apache.http.entity.InputStreamEntity;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.impl.client.cache.CachingHttpClient;
import org.apache.http.util.EntityUtils;
import org.fcrepo.http.commons.domain.RDFMediaType;
Expand All @@ -100,6 +104,9 @@ public void testIngest() throws Exception {
final String pid = randomUUID().toString();

final HttpPost method = postObjMethod(pid);
MultipartEntityBuilder foo = MultipartEntityBuilder.create();
//method.setEntity(new InputStreamEntity(new NullInputStream(), 0));
// method.setEntity(foo.build());
final HttpResponse response = client.execute(method);
assertEquals(CREATED.getStatusCode(), response.getStatusLine()
.getStatusCode());
Expand All @@ -110,6 +117,18 @@ public void testIngest() throws Exception {
assertEquals("Got wrong Location header for ingest!", serverAddress
+ pid, location);
}

static class NullInputStream extends InputStream {

/**
* @inherit
*/
@Override
public int read() throws IOException {
return -1;
}

}

@Test
public void testIngestWithNew() throws Exception {
Expand Down
6 changes: 2 additions & 4 deletions ...po-http-api/src/test/java/org/fcrepo/integration/http/api/html/FedoraHtmlResponsesIT.java
View file
Expand Up @@ -17,7 +17,6 @@

import com.gargoylesoftware.htmlunit.BrowserVersion;
import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlButton;
import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
Expand All @@ -35,8 +34,7 @@
import java.io.IOException;

import static java.util.UUID.randomUUID;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

Expand Down Expand Up @@ -96,7 +94,7 @@ public void testCreateNewNodeWithGeneratedId() throws IOException, InterruptedEx
assertTrue(page1.asText().length() > page.asText().length());
}

@Test
@Ignore
public void testCreateNewDatastream() throws IOException, InterruptedException {

final String pid = randomUUID().toString();
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/resources/web.xml
View file
Expand Up @@ -21,7 +21,7 @@
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>jersey.config.server.provider.packages</param-name>
<param-value>org.fcrepo.http;org.fcrepo.http.commons.responses;org.fcrepo.http.api</param-value>
<param-value>org.fcrepo.kernel.services;org.fcrepo.http;org.fcrepo.http.commons.responses;org.fcrepo.http.api</param-value>
</init-param>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
Expand Down

0 comments on commit d5bc9d1

Please sign in to comment.