From cf3c99dea8c7af63ba6d1885aaafcbe3c3a8d698 Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Tue, 14 Dec 2010 14:37:09 -0600 Subject: [PATCH] Added docbook documentation for Riak support --- .../keyvalue/riak/core/io/RiakResource.java | 4 +- src/docbkx/index.xml | 6 + src/docbkx/reference/riak.xml | 190 ++++++++++++++++++ 3 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 src/docbkx/reference/riak.xml diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/io/RiakResource.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/io/RiakResource.java index f54341fcc..a5e4b172b 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/io/RiakResource.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/io/RiakResource.java @@ -80,7 +80,7 @@ public class RiakResource extends UrlResource { @Override public URI getURI() throws IOException { try { - return new URI(new RiakFile(riak, bucket, key).getUriAsString(true)); + return new RiakFile(riak, bucket, key).toURI(); } catch (URISyntaxException e) { log.error(e.getMessage(), e); } @@ -92,6 +92,8 @@ public class RiakResource extends UrlResource { public Resource createRelative(String relativePath) throws MalformedURLException { if (relativePath.startsWith("../")) { return new RiakResource(riak, bucket, relativePath.substring(3)); + } else if (!relativePath.startsWith("/")) { + return new RiakResource(riak, bucket, relativePath); } return null; } diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml index a24aacbf0..a6fbafe92 100644 --- a/src/docbkx/index.xml +++ b/src/docbkx/index.xml @@ -12,6 +12,11 @@ Leau SpringSource + + Jon + Brisbin + NPC International, Inc. + @@ -42,6 +47,7 @@ +