Add input as argument to LinkRenderer

This way, the renderer gets all the necessary data from its arguments
instead of requiring users to capture the input text.

Author: robinst

README.md

@@ -76,11 +76,11 @@ LinkExtractor linkExtractor = LinkExtractor.builder()
         .linkTypes(EnumSet.of(LinkType.URL)) // limit to URLs
         .build();
 Iterable<LinkSpan> links = linkExtractor.extractLinks(input);
-String result = Autolink.renderLinks(input, links, (link, sb) -> {
+String result = Autolink.renderLinks(input, links, (link, text, sb) -> {
     sb.append("<a href=\"");
-    sb.append(input, link.getBeginIndex(), link.getEndIndex());
+    sb.append(text, link.getBeginIndex(), link.getEndIndex());
     sb.append("\">");
-    sb.append(input, link.getBeginIndex(), link.getEndIndex());
+    sb.append(text, link.getBeginIndex(), link.getEndIndex());
     sb.append("</a>");
 });
 result;  // "wow <a href=\"http://test.com\">http://test.com</a> such linked"

src/main/java/org/nibor/autolink/Autolink.java

@@ -11,15 +11,15 @@ public class Autolink {
      *
      * @param input the input text
      * @param links the links to render, see {@link LinkExtractor} to extract them
-     * @param linkRenderer the link rendering function
+     * @param linkRenderer the link rendering implementation
      * @return the rendered string
      */
     public static String renderLinks(CharSequence input, Iterable<LinkSpan> links, LinkRenderer linkRenderer) {
         StringBuilder sb = new StringBuilder(input.length() + 16);
         int lastIndex = 0;
         for (LinkSpan link : links) {
             sb.append(input, lastIndex, link.getBeginIndex());
-            linkRenderer.render(link, sb);
+            linkRenderer.render(link, input, sb);
             lastIndex = link.getEndIndex();
         }
         if (lastIndex < input.length()) {

src/main/java/org/nibor/autolink/LinkRenderer.java

@@ -1,7 +1,17 @@
 package org.nibor.autolink;
 
+/**
+ * Renderer for a link.
+ */
 public interface LinkRenderer {
 
-    void render(LinkSpan link, StringBuilder sb);
+    /**
+     * Render the supplied link of the input text to the supplied output.
+     *
+     * @param link the link span of the link to render
+     * @param input the input text where the link occurs
+     * @param output the output to write the link to
+     */
+    void render(LinkSpan link, CharSequence input, StringBuilder output);
 
 }

src/test/java/org/nibor/autolink/AutolinkTestCase.java

@@ -16,16 +16,16 @@ protected void assertNotLinked(String input) {
 
     protected abstract LinkExtractor getLinkExtractor();
 
-    protected String link(final String input, final String marker, final LinkType expectedLinkType) {
+    protected String link(String input, final String marker, final LinkType expectedLinkType) {
         Iterable<LinkSpan> links = getLinkExtractor().extractLinks(input);
         return Autolink.renderLinks(input, links, new LinkRenderer() {
             @Override
-            public void render(LinkSpan link, StringBuilder sb) {
+            public void render(LinkSpan link, CharSequence text, StringBuilder sb) {
                 if (expectedLinkType != null) {
                     assertEquals(expectedLinkType, link.getType());
                 }
                 sb.append(marker);
-                sb.append(input, link.getBeginIndex(), link.getEndIndex());
+                sb.append(text, link.getBeginIndex(), link.getEndIndex());
                 sb.append(marker);
             }
         });