Repository: marmotta Updated Branches: refs/heads/develop 374513a21 -> b25a26898
upgrade Guava to 16.0.1 (fixes MARMOTTA-308) - this is now save because there are no more conflicts with CDI Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b25a2689 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b25a2689 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b25a2689 Branch: refs/heads/develop Commit: b25a26898c5e0ba8104f9ab6a25e5da697516003 Parents: 374513a Author: Sebastian Schaffert <[email protected]> Authored: Mon Mar 17 11:33:02 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Mar 17 11:33:02 2014 +0100 ---------------------------------------------------------------------- .../marmotta/commons/http/ETagGenerator.java | 24 ++++++++++---------- .../commons/sesame/model/LiteralCommons.java | 13 ++++++----- parent/pom.xml | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/b25a2689/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/ETagGenerator.java ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/ETagGenerator.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/ETagGenerator.java index 4d93807..96bd533 100644 --- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/ETagGenerator.java +++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/ETagGenerator.java @@ -17,8 +17,10 @@ */ package org.apache.marmotta.commons.http; +import com.google.common.hash.HashFunction; +import com.google.common.hash.Hasher; +import com.google.common.hash.Hashing; import org.apache.marmotta.commons.sesame.repository.ResourceUtils; -import org.openrdf.model.BNode; import org.openrdf.model.Resource; import org.openrdf.model.Statement; import org.openrdf.model.URI; @@ -26,9 +28,7 @@ import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; import org.openrdf.repository.RepositoryResult; -import com.google.common.hash.HashFunction; -import com.google.common.hash.Hasher; -import com.google.common.hash.Hashing; +import java.nio.charset.Charset; /** * HTTP ETag generator for Sesame @@ -47,14 +47,14 @@ public class ETagGenerator { if (resource == null) return ""; Hasher hasher = buildHasher(); - hasher.putString(resource.stringValue()); + hasher.putString(resource.stringValue(), Charset.defaultCharset()); //FIXME: The order of the statements is not defined -> might result in different hash! RepositoryResult<Statement> outgoing = conn.getStatements(resource, null, null, true); try { while (outgoing.hasNext()) { Statement statement = outgoing.next(); - hasher.putString(statement.getPredicate().stringValue()); - hasher.putString(statement.getObject().stringValue()); + hasher.putString(statement.getPredicate().stringValue(), Charset.defaultCharset()); + hasher.putString(statement.getObject().stringValue(), Charset.defaultCharset()); //TODO: statement modification date? } } finally { @@ -64,8 +64,8 @@ public class ETagGenerator { try { while (incoming.hasNext()) { Statement statement = incoming.next(); - hasher.putString(statement.getSubject().stringValue()); - hasher.putString(statement.getPredicate().stringValue()); + hasher.putString(statement.getSubject().stringValue(), Charset.defaultCharset()); + hasher.putString(statement.getPredicate().stringValue(), Charset.defaultCharset()); //TODO: statement modification date? } } finally { @@ -96,14 +96,14 @@ public class ETagGenerator { if (resource == null) return ""; Hasher hasher = buildHasher(); - hasher.putString(resource.stringValue()); + hasher.putString(resource.stringValue(), Charset.defaultCharset()); //FIXME: The order of the statements is not defined -> might result in different hash! RepositoryResult<Statement> statements = conn.getStatements(resource, null, null, true); try { while (statements.hasNext()) { Statement statement = statements.next(); - hasher.putString(statement.getPredicate().stringValue()); - hasher.putString(statement.getObject().stringValue()); + hasher.putString(statement.getPredicate().stringValue(), Charset.defaultCharset()); + hasher.putString(statement.getObject().stringValue(), Charset.defaultCharset()); //TODO: statement modification date? } } finally { http://git-wip-us.apache.org/repos/asf/marmotta/blob/b25a2689/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralCommons.java ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralCommons.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralCommons.java index 5749e37..9ccf335 100644 --- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralCommons.java +++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralCommons.java @@ -25,6 +25,7 @@ import org.openrdf.model.URI; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; +import java.nio.charset.Charset; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; @@ -67,12 +68,12 @@ public class LiteralCommons { */ public static String createCacheKey(String content, Locale language, String type) { Hasher hasher = Hashing.goodFastHash(64).newHasher(); - hasher.putString(content); + hasher.putString(content, Charset.defaultCharset()); if(type != null) { - hasher.putString(type); + hasher.putString(type, Charset.defaultCharset()); } if(language != null) { - hasher.putString(language.getLanguage().toLowerCase()); + hasher.putString(language.getLanguage().toLowerCase(), Charset.defaultCharset()); } return hasher.hash().toString(); } @@ -104,12 +105,12 @@ public class LiteralCommons { */ public static String createCacheKey(Literal l) { Hasher hasher = Hashing.goodFastHash(64).newHasher(); - hasher.putString(l.getLabel()); + hasher.putString(l.getLabel(), Charset.defaultCharset()); if(l.getDatatype() != null) { - hasher.putString(l.getDatatype().stringValue()); + hasher.putString(l.getDatatype().stringValue(), Charset.defaultCharset()); } if(l.getLanguage() != null) { - hasher.putString(l.getLanguage().toLowerCase()); + hasher.putString(l.getLanguage().toLowerCase(), Charset.defaultCharset()); } return hasher.hash().toString(); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/b25a2689/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index abb622c..809d58a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -629,7 +629,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>14.0.1</version> + <version>16.0.1</version> </dependency> <dependency> <groupId>commons-io</groupId>
