resolving MARMOTTA-188 by removing complicated and duplicated code actually no needed
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f52a0dc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f52a0dc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f52a0dc2 Branch: refs/heads/master Commit: f52a0dc22daed38456c4864b8fef7fefa8ac37b7 Parents: 7b99a5b Author: Sergio Fernández <[email protected]> Authored: Fri Apr 5 17:48:12 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Fri Apr 5 17:48:12 2013 +0200 ---------------------------------------------------------------------- .../services/sparql/SparqlWritersHelper.java | 21 --------------- .../sparql/webservices/SparqlWebService.java | 2 +- 2 files changed, 1 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f52a0dc2/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlWritersHelper.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlWritersHelper.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlWritersHelper.java index f827c57..a5971dd 100644 --- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlWritersHelper.java +++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlWritersHelper.java @@ -21,7 +21,6 @@ import java.io.OutputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; import org.apache.marmotta.platform.core.exception.InvalidArgumentException; import org.apache.marmotta.platform.sparql.services.sparqlio.rdf.SPARQLGraphResultWriter; import org.apache.marmotta.platform.sparql.services.sparqlio.sparqlhtml.SPARQLBooleanHTMLWriter; @@ -93,24 +92,4 @@ public class SparqlWritersHelper { return mimeType; } - public static String buildSparqlContentType(String resultType) { - if(StringUtils.isBlank(resultType)) { - return "application/sparql-results+xml;charset=utf-8"; - } else if(parseSubType(resultType).equals("html") ) { - return "text/html;charset=utf-8"; - } else if(parseSubType(resultType).equals("json") ) { - return "application/sparql-results+json;charset=utf-8"; - } else if(parseSubType(resultType).equals("rdf+xml") ) { - return "application/rdf+xml;charset=utf-8"; - } else if(parseSubType(resultType).equals("rdf+n3") ) { - return "text/rdf+n3;charset=utf-8"; - } else if(parseSubType(resultType).equals("n3") ) { - return "text/rdf+n3;charset=utf-8"; - } else if(parseSubType(resultType).equals("csv") ) { - return "text/csv;charset=utf-8"; - } else { - return "application/sparql-results+xml;charset=utf-8"; - } - } - } http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f52a0dc2/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java index ec827e5..26de52b 100644 --- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java +++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java @@ -520,7 +520,7 @@ public class SparqlWebService { } }; - return Response.ok().entity(entity).header("Content-Type", SparqlWritersHelper.buildSparqlContentType(format)).build(); + return Response.ok().entity(entity).header("Content-Type", format+";charset=utf-8").build(); } }
