Make Scanner interface less silly

Author: robinst

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

@@ -83,47 +83,13 @@ public LinkExtractor build() {
         }
     }
 
-    private static class LinkSpanImpl implements LinkSpan {
-
-        private final LinkType linkType;
-        private final int beginIndex;
-        private final int endIndex;
-
-        private LinkSpanImpl(LinkType linkType, int beginIndex, int endIndex) {
-            this.linkType = linkType;
-            this.beginIndex = beginIndex;
-            this.endIndex = endIndex;
-        }
-
-        @Override
-        public LinkType getType() {
-            return linkType;
-        }
-
-        @Override
-        public int getBeginIndex() {
-            return beginIndex;
-        }
-
-        @Override
-        public int getEndIndex() {
-            return endIndex;
-        }
-
-        @Override
-        public String toString() {
-            return "Link{type=" + getType() + ", beginIndex=" + beginIndex + ", endIndex=" + endIndex + "}";
-        }
-    }
-
     private class LinkIterator implements Iterator<LinkSpan> {
 
         private final CharSequence input;
 
         private LinkSpan next = null;
         private int index = 0;
         private int rewindIndex = 0;
-        private int[] result = new int[2];
 
         public LinkIterator(CharSequence input) {
             this.input = input;
@@ -160,11 +126,11 @@ private void setNext() {
             while (index < length) {
                 Scanner scanner = trigger(input.charAt(index));
                 if (scanner != null) {
-                    boolean found = scanner.scan(input, index, rewindIndex, result);
-                    if (found) {
-                        next = new LinkSpanImpl(scanner.getLinkType(), result[0], result[1]);
-                        rewindIndex = result[1];
-                        index = result[1];
+                    LinkSpan link = scanner.scan(input, index, rewindIndex);
+                    if (link != null) {
+                        next = link;
+                        index = link.getEndIndex();
+                        rewindIndex = index;
                         break;
                     } else {
                         index++;

src/main/java/org/nibor/autolink/internal/EmailScanner.java

@@ -1,5 +1,6 @@
 package org.nibor.autolink.internal;
 
+import org.nibor.autolink.LinkSpan;
 import org.nibor.autolink.LinkType;
 
 /**
@@ -10,27 +11,20 @@
 public class EmailScanner implements Scanner {
 
     @Override
-    public LinkType getLinkType() {
-        return LinkType.EMAIL;
-    }
-
-    @Override
-    public boolean scan(CharSequence input, int triggerIndex, int rewindIndex, int[] result) {
+    public LinkSpan scan(CharSequence input, int triggerIndex, int rewindIndex) {
         int beforeAt = triggerIndex - 1;
         int first = findFirst(input, beforeAt, rewindIndex);
         if (first == -1) {
-            return false;
+            return null;
         }
 
         int afterAt = triggerIndex + 1;
         int last = findLast(input, afterAt);
         if (last == -1) {
-            return false;
+            return null;
         }
 
-        result[0] = first;
-        result[1] = last + 1;
-        return true;
+        return new LinkSpanImpl(LinkType.EMAIL, first, last + 1);
     }
 
     // See "Local-part" in RFC 5321, plus extensions in RFC 6531

src/main/java/org/nibor/autolink/internal/LinkSpanImpl.java

@@ -0,0 +1,38 @@
+package org.nibor.autolink.internal;
+
+import org.nibor.autolink.LinkSpan;
+import org.nibor.autolink.LinkType;
+
+public class LinkSpanImpl implements LinkSpan {
+
+    private final LinkType linkType;
+    private final int beginIndex;
+    private final int endIndex;
+
+    public LinkSpanImpl(LinkType linkType, int beginIndex, int endIndex) {
+        this.linkType = linkType;
+        this.beginIndex = beginIndex;
+        this.endIndex = endIndex;
+    }
+
+    @Override
+    public LinkType getType() {
+        return linkType;
+    }
+
+    @Override
+    public int getBeginIndex() {
+        return beginIndex;
+    }
+
+    @Override
+    public int getEndIndex() {
+        return endIndex;
+    }
+
+    @Override
+    public String toString() {
+        return "Link{type=" + getType() + ", beginIndex=" + beginIndex + ", endIndex=" + endIndex + "}";
+    }
+
+}

src/main/java/org/nibor/autolink/internal/Scanner.java

@@ -1,23 +1,17 @@
 package org.nibor.autolink.internal;
 
-import org.nibor.autolink.LinkType;
+import org.nibor.autolink.LinkSpan;
 
 public interface Scanner {
 
-    /**
-     * @return the type of link that this scanner tries to match
-     */
-    LinkType getLinkType();
-
     /**
      * @param input input text
      * @param triggerIndex the index at which the trigger character for this scanner was
      * @param rewindIndex the index that can maximally be rewound to (either the very first character of the input or
      * the character after the last matched link)
-     * @param result when a match was successful (true is returned), the beginIndex (inclusive) and endIndex (exclusive)
      * need to be set to be set here
-     * @return true if matched, false otherwise
+     * @return the matched link, or {@code null} if no link matched
      */
-    boolean scan(CharSequence input, int triggerIndex, int rewindIndex, int[] result);
+    LinkSpan scan(CharSequence input, int triggerIndex, int rewindIndex);
 
 }

src/main/java/org/nibor/autolink/internal/UrlScanner.java

@@ -1,5 +1,6 @@
 package org.nibor.autolink.internal;
 
+import org.nibor.autolink.LinkSpan;
 import org.nibor.autolink.LinkType;
 
 /**
@@ -10,28 +11,21 @@
 public class UrlScanner implements Scanner {
 
     @Override
-    public LinkType getLinkType() {
-        return LinkType.URL;
-    }
-
-    @Override
-    public boolean scan(CharSequence input, int triggerIndex, int rewindIndex, int[] result) {
+    public LinkSpan scan(CharSequence input, int triggerIndex, int rewindIndex) {
         int length = input.length();
         int afterSlashSlash = triggerIndex + 3;
         if (afterSlashSlash >= length || input.charAt(triggerIndex + 1) != '/' || input.charAt(triggerIndex + 2) != '/') {
-            return false;
+            return null;
         }
 
         int first = findFirst(input, triggerIndex - 1, rewindIndex);
         if (first == -1) {
-            return false;
+            return null;
         }
 
         int last = findLast(input, afterSlashSlash);
 
-        result[0] = first;
-        result[1] = last + 1;
-        return true;
+        return new LinkSpanImpl(LinkType.URL, first, last + 1);
     }
 
     // See "scheme" in RFC 3986