code cleanup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e0834f68 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e0834f68 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e0834f68 Branch: refs/heads/ldp Commit: e0834f68832efdbecdbd2ba782d47a79e307ceeb Parents: bfbc30c Author: Sergio Fernández <[email protected]> Authored: Thu Jun 12 20:12:03 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Thu Jun 12 20:12:03 2014 +0200 ---------------------------------------------------------------------- .../marmotta/platform/ldp/webservices/LdpWebService.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/e0834f68/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 81dedf1..2dc8cf8 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 @@ -110,17 +110,11 @@ public class LdpWebService { log.trace("{} exists, continuing", resource); } - // TODO: Proper content negotiation - final RDFFormat format; if (type.isWildcardType()) { // No explicit Accept Header - if (ldpService.isRdfSourceResource(conn, resource)) { - format = RDFFormat.TURTLE; - } else { - format = null; - } + format = ( ldpService.isRdfSourceResource(conn, resource) ? RDFFormat.TURTLE : null ); } else { - format = Rio.getWriterFormatForMIMEType(LdpUtils.getMimeType(type), null); + format = Rio.getWriterFormatForMIMEType(LdpUtils.getMimeType(type), RDFFormat.TURTLE); } if (format == null) {
