Repository: marmotta Updated Branches: refs/heads/develop 174ad5abd -> 3cda9e0a9
fixes memento time issue within memento links Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/09157c5f Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/09157c5f Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/09157c5f Branch: refs/heads/develop Commit: 09157c5f769ecc8424dd108047f3365c2b262bbb Parents: 174ad5a Author: tkurz <[email protected]> Authored: Wed Oct 15 16:49:40 2014 +0200 Committer: tkurz <[email protected]> Committed: Wed Oct 15 16:49:40 2014 +0200 ---------------------------------------------------------------------- .../versioning/model/MementoVersionSet.java | 4 +-- .../webservices/MementoWebService.java | 34 ++++++++------------ 2 files changed, 16 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/09157c5f/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/model/MementoVersionSet.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/model/MementoVersionSet.java b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/model/MementoVersionSet.java index 3424ac1..45a50dc 100644 --- a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/model/MementoVersionSet.java +++ b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/model/MementoVersionSet.java @@ -55,7 +55,7 @@ public class MementoVersionSet { //first, last and current are mandatory if( first == null || last == null || current == null) throw new MementoException("Memento links cannot be produced"); - links.add(buildLink(prefix,original.toString(),first.getCommitTime(),"first memento")); + links.add(buildLink(prefix, original.toString(), first.getCommitTime(), "first memento")); links.add(buildLink(prefix,original.toString(),last.getCommitTime(),"last memento")); links.add(buildLink(prefix,original.toString(),current.getCommitTime(),"memento")); @@ -71,7 +71,7 @@ public class MementoVersionSet { private String buildLink( String prefix, String resource, Date date, String rel ) { return "<" + prefix + MementoUtils.MEMENTO_DATE_FORMAT.format(date) + "/" + resource + - ">;datetime=\"" + date.toString() + "\";rel=\"" + rel +"\""; + ">;datetime=\"" + MementoUtils.MEMENTO_DATE_FORMAT.format(date.toString()) + "\";rel=\"" + rel +"\""; } public Resource getOriginal() { http://git-wip-us.apache.org/repos/asf/marmotta/blob/09157c5f/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java index dffac04..d04bda2 100644 --- a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java +++ b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/webservices/MementoWebService.java @@ -17,24 +17,7 @@ */ package org.apache.marmotta.platform.versioning.webservices; -import java.io.IOException; -import java.io.OutputStream; -import java.text.ParseException; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; - +import com.google.common.base.Preconditions; import org.apache.marmotta.commons.collections.CollectionUtils; import org.apache.marmotta.commons.http.ContentType; import org.apache.marmotta.commons.http.MarmottaHttpUtils; @@ -61,7 +44,18 @@ import org.openrdf.rio.Rio; import org.openrdf.sail.SailException; import org.slf4j.Logger; -import com.google.common.base.Preconditions; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.StreamingOutput; +import java.io.IOException; +import java.io.OutputStream; +import java.text.ParseException; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * Webservice manages memento related services, namely: @@ -227,7 +221,7 @@ public class MementoWebService { .ok() .header("Link", CollectionUtils.fold(links," ,")) .header("Content-Type", type.toString()) - .header("Memento-Datetime", versions.getCurrent().getCommitTime().toString()) + .header("Memento-Datetime", MementoUtils.MEMENTO_DATE_FORMAT.format(versions.getCurrent().getCommitTime())) .entity(entity) .build();
