same issue about text/plain affecting GET requests
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/97930503 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/97930503 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/97930503 Branch: refs/heads/ldp Commit: 97930503bb49035aed8be0bb2a09f56d51d0eb1a Parents: 7f0afc9 Author: Sergio Fernández <[email protected]> Authored: Mon Jun 30 17:36:30 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon Jun 30 17:36:30 2014 +0200 ---------------------------------------------------------------------- .../platform/ldp/webservices/LdpWebService.java | 22 +++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/97930503/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java index 9bbecdd..60c21cf 100644 --- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java +++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java @@ -119,15 +119,21 @@ public class LdpWebService { } final RDFFormat format; - if (type.isWildcardSubtype()) { - if (type.isWildcardType() || "text".equals(type.getType())) { - format = RDFFormat.TURTLE; + if ("text/plain".equals(LdpUtils.getMimeType(type))) { + // TODO: find a better way to support n-triples (text/plain) + // while still supporting regular text files + format = null; + } else { + if (type.isWildcardSubtype()) { + if (type.isWildcardType() || "text".equals(type.getType())) { + format = RDFFormat.TURTLE; + } else { + ContentType contentType = MarmottaHttpUtils.performContentNegotiation(LdpUtils.getMimeType(type), exportService.getProducedTypes()); + format = (contentType != null ? Rio.getWriterFormatForMIMEType(contentType.getMime(), RDFFormat.TURTLE) : null); + } } else { - ContentType contentType = MarmottaHttpUtils.performContentNegotiation(LdpUtils.getMimeType(type), exportService.getProducedTypes()); - format = (contentType != null ? Rio.getWriterFormatForMIMEType(contentType.getMime(), RDFFormat.TURTLE) : null); + format = Rio.getWriterFormatForMIMEType(LdpUtils.getMimeType(type), RDFFormat.TURTLE); } - } else { - format = Rio.getWriterFormatForMIMEType(LdpUtils.getMimeType(type), RDFFormat.TURTLE); } if (format == null) { @@ -573,7 +579,7 @@ public class LdpWebService { * * @param connection * @param status the StatusCode - * @param resource the uri/url of the resouce + * @param resource the iri/uri/url of the resouce * @return the provided ResponseBuilder for chaining */ protected Response.ResponseBuilder createResponse(RepositoryConnection connection, Response.Status status, String resource) throws RepositoryException {
