marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject [1/2] marmotta git commit: MARMOTTA-590: remove N-Triples from supported formats in LDP
Date Mon, 09 Feb 2015 13:36:32 GMT
Repository: marmotta
Updated Branches:
  refs/heads/develop 876a287b2 -> 0b8f74833


MARMOTTA-590: remove N-Triples from supported formats in LDP


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d19a04af
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d19a04af
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d19a04af

Branch: refs/heads/develop
Commit: d19a04afc4628eb6c2ae740b0a68eeceba54ec9c
Parents: 876a287
Author: Jakob Frank <jakob@apache.org>
Authored: Mon Feb 9 14:35:27 2015 +0100
Committer: Jakob Frank <jakob@apache.org>
Committed: Mon Feb 9 14:35:27 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/marmotta/platform/ldp/api/LdpService.java    | 2 +-
 .../apache/marmotta/platform/ldp/services/LdpServiceImpl.java    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/d19a04af/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
index 8080106..44c8d07 100644
--- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
+++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
@@ -53,7 +53,7 @@ public interface LdpService {
             LDP.contains, DCTERMS.CREATED, DCTERMS.MODIFIED
     ));
     public static final List<RDFFormat> SERVER_PREFERED_RDF_FORMATS = Arrays.asList(
-            RDFFormat.TURTLE, RDFFormat.JSONLD, RDFFormat.RDFXML, RDFFormat.N3, RDFFormat.NTRIPLES
+            RDFFormat.TURTLE, RDFFormat.JSONLD, RDFFormat.RDFXML, RDFFormat.N3
     );
 
     public static enum InteractionModel {

http://git-wip-us.apache.org/repos/asf/marmotta/blob/d19a04af/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
index bfdb07a..4882d8b 100644
--- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
+++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
@@ -439,9 +439,7 @@ public class LdpServiceImpl implements LdpService {
         final ValueFactory valueFactory = connection.getValueFactory();
         final Literal now = valueFactory.createLiteral(new Date());
 
-
-        // TODO: find a better way to ingest n-triples (text/plain) while still supporting
regular text files
-        final RDFFormat rdfFormat = ("text/plain".equals(type) ? null : Rio.getParserFormatForMIMEType(type));
+        final RDFFormat rdfFormat = Rio.getParserFormatForMIMEType(type);
         // Check submitted format vs. real resource type (RDF-S vs. Non-RDF)
         if (rdfFormat == null && isNonRdfSourceResource(connection, resource)) {
             log.debug("Updating <{}> as LDP-NR (binary) - {}", resource, type);


Mime
View raw message