Optimize imports

Reformatted code (Java convention; tab is 4 spaces)

pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.ahocorasick</groupId>

src/main/java/org/ahocorasick/interval/IntervalNode.java

@@ -75,9 +75,9 @@ public class IntervalNode {
     }
 
     protected void addToOverlaps(
-        final Intervalable interval,
+            final Intervalable interval,
-        final List<Intervalable> overlaps,
+            final List<Intervalable> overlaps,
-        final List<Intervalable> newOverlaps) {
+            final List<Intervalable> newOverlaps) {
         for (final Intervalable currentInterval : newOverlaps) {
             if (!currentInterval.equals(interval)) {
                 overlaps.add(currentInterval);
@@ -94,7 +94,7 @@ public class IntervalNode {
     }
 
     protected List<Intervalable> checkForOverlaps(
-        final Intervalable interval, final Direction direction) {
+            final Intervalable interval, final Direction direction) {
         final List<Intervalable> overlaps = new ArrayList<>();
 
         for (final Intervalable currentInterval : this.intervals) {
@@ -117,7 +117,7 @@ public class IntervalNode {
 
     protected List<Intervalable> findOverlappingRanges(IntervalNode node, Intervalable interval) {
         return node == null
-            ? Collections.<Intervalable>emptyList()
+                ? Collections.<Intervalable>emptyList()
-            : node.findOverlaps( interval );
+                : node.findOverlaps(interval);
     }
 }

src/main/java/org/ahocorasick/interval/IntervalTree.java

@@ -1,10 +1,11 @@
 package org.ahocorasick.interval;
 
-import static java.util.Collections.sort;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static java.util.Collections.sort;
+
 public class IntervalTree {
 
     private final IntervalNode rootNode;

src/main/java/org/ahocorasick/trie/State.java

@@ -4,43 +4,51 @@ import java.util.*;
 
 /**
  * <p>
- *     A state has various important tasks it must attend to:
+ * A state has various important tasks it must attend to:
  * </p>
- *
- * <ul>
- *     <li>success; when a character points to another state, it must return that state</li>
- *     <li>failure; when a character has no matching state, the algorithm must be able to fall back on a
- *         state with less depth</li>
- *     <li>emits; when this state is passed and keywords have been matched, the matches must be
- *         'emitted' so that they can be used later on.</li>
- * </ul>
- *
  * <p>
- *     The root state is special in the sense that it has no failure state; it cannot fail. If it 'fails'
+ * <ul>
- *     it will still parse the next character and start from the root node. This ensures that the algorithm
+ * <li>success; when a character points to another state, it must return that state</li>
- *     always runs. All other states always have a fail state.
+ * <li>failure; when a character has no matching state, the algorithm must be able to fall back on a
+ * state with less depth</li>
+ * <li>emits; when this state is passed and keywords have been matched, the matches must be
+ * 'emitted' so that they can be used later on.</li>
+ * </ul>
+ * <p>
+ * <p>
+ * The root state is special in the sense that it has no failure state; it cannot fail. If it 'fails'
+ * it will still parse the next character and start from the root node. This ensures that the algorithm
+ * always runs. All other states always have a fail state.
  * </p>
  *
  * @author Robert Bor
  */
 public class State {
 
-    /** effective the size of the keyword */
+    /**
+     * effective the size of the keyword
+     */
     private final int depth;
 
-    /** only used for the root state to refer to itself in case no matches have been found */
+    /**
+     * only used for the root state to refer to itself in case no matches have been found
+     */
     private final State rootState;
 
     /**
      * referred to in the white paper as the 'goto' structure. From a state it is possible to go
      * to other states, depending on the character passed.
      */
-    private final Map<Character,State> success = new HashMap<>();
+    private final Map<Character, State> success = new HashMap<>();
 
-    /** if no matching states are found, the failure state will be returned */
+    /**
+     * if no matching states are found, the failure state will be returned
+     */
     private State failure;
 
-    /** whenever this state is reached, it will emit the matches keywords for future reference */
+    /**
+     * whenever this state is reached, it will emit the matches keywords for future reference
+     */
     private Set<String> emits;
 
     public State() {
@@ -70,20 +78,20 @@ public class State {
         return nextState(character, true);
     }
 
-    public State addState(final String keyword ) {
+    public State addState(final String keyword) {
-      State state = this;
+        State state = this;
 
-      for (final Character character : keyword.toCharArray()) {
+        for (final Character character : keyword.toCharArray()) {
-          state = state.addState(character);
+            state = state.addState(character);
-      }
+        }
 
-      return state;
+        return state;
     }
 
     public State addState(final Character character) {
         State nextState = nextStateIgnoreRootState(character);
         if (nextState == null) {
-            nextState = new State(this.depth+1);
+            nextState = new State(this.depth + 1);
             this.success.put(character, nextState);
         }
         return nextState;
@@ -107,7 +115,7 @@ public class State {
     }
 
     public Collection<String> emit() {
-        return this.emits == null ? Collections.<String> emptyList() : this.emits;
+        return this.emits == null ? Collections.<String>emptyList() : this.emits;
     }
 
     public State failure() {

src/main/java/org/ahocorasick/trie/Trie.java

@@ -1,17 +1,19 @@
 package org.ahocorasick.trie;
 
-import static java.lang.Character.isAlphabetic;
+import org.ahocorasick.interval.IntervalTree;
-import static java.lang.Character.isWhitespace;
+import org.ahocorasick.interval.Intervalable;
-import static java.lang.Character.toLowerCase;
+import org.ahocorasick.trie.handler.DefaultEmitHandler;
+import org.ahocorasick.trie.handler.EmitHandler;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingDeque;
-import org.ahocorasick.interval.IntervalTree;
+
-import org.ahocorasick.interval.Intervalable;
+import static java.lang.Character.*;
-import org.ahocorasick.trie.handler.DefaultEmitHandler;
+
-import org.ahocorasick.trie.handler.EmitHandler;
+import java.lang.Character;
 
 /**
  * Based on the Aho-Corasick white paper, Bell technologies:
@@ -34,21 +36,20 @@ public class Trie {
      * Used by the builder to add a text search keyword.
      *
      * @param keyword The search term to add to the list of search terms.
-     * 
      * @throws NullPointerException if the keyword is null.
      */
-    private void addKeyword( String keyword ) {
+    private void addKeyword(String keyword) {
-        if( keyword.length() > 0 ) {
+        if (keyword.length() > 0) {
-            if( isCaseInsensitive() ) {
+            if (isCaseInsensitive()) {
                 keyword = keyword.toLowerCase();
             }
 
-            addState( keyword ).addEmit( keyword );
+            addState(keyword).addEmit(keyword);
         }
     }
 
-    private State addState( final String keyword ) {
+    private State addState(final String keyword) {
-        return getRootState().addState( keyword );
+        return getRootState().addState(keyword);
     }
 
     public Collection<Token> tokenize(final String text) {
@@ -73,14 +74,14 @@ public class Trie {
     }
 
     private Token createFragment(
-        final Emit emit, 
+            final Emit emit,
-        final String text,
+            final String text,
-        final int lastCollectedPosition) {
+            final int lastCollectedPosition) {
-        return new FragmentToken(text.substring(lastCollectedPosition+1, emit == null ? text.length() : emit.getStart()));
+        return new FragmentToken(text.substring(lastCollectedPosition + 1, emit == null ? text.length() : emit.getStart()));
     }
 
     private Token createMatch(final Emit emit, final String text) {
-        return new MatchToken(text.substring(emit.getStart(), emit.getEnd()+1), emit);
+        return new MatchToken(text.substring(emit.getStart(), emit.getEnd() + 1), emit);
     }
 
     @SuppressWarnings("unchecked")
@@ -99,7 +100,7 @@ public class Trie {
         }
 
         if (!trieConfig.isAllowOverlaps()) {
-            IntervalTree intervalTree = new IntervalTree((List<Intervalable>)(List<?>)collectedEmits);
+            IntervalTree intervalTree = new IntervalTree((List<Intervalable>) (List<?>) collectedEmits);
             intervalTree.removeOverlaps((List<Intervalable>) (List<?>) collectedEmits);
         }
 
@@ -170,9 +171,9 @@ public class Trie {
 
     private boolean isPartialMatch(final CharSequence searchText, final Emit emit) {
         return (emit.getStart() != 0 &&
-            isAlphabetic(searchText.charAt(emit.getStart() - 1))) ||
+                isAlphabetic(searchText.charAt(emit.getStart() - 1))) ||
-            (emit.getEnd() + 1 != searchText.length() &&
+                (emit.getEnd() + 1 != searchText.length() &&
-            isAlphabetic(searchText.charAt(emit.getEnd() + 1)));
+                        isAlphabetic(searchText.charAt(emit.getEnd() + 1)));
     }
 
     private void removePartialMatches(final CharSequence searchText, final List<Emit> collectedEmits) {
@@ -195,7 +196,7 @@ public class Trie {
 
         for (final Emit emit : collectedEmits) {
             if ((emit.getStart() == 0 || isWhitespace(searchText.charAt(emit.getStart() - 1))) &&
-                (emit.getEnd() + 1 == size || isWhitespace(searchText.charAt(emit.getEnd() + 1)))) {
+                    (emit.getEnd() + 1 == size || isWhitespace(searchText.charAt(emit.getEnd() + 1)))) {
                 continue;
             }
             removeEmits.add(emit);
@@ -249,9 +250,9 @@ public class Trie {
     }
 
     private boolean storeEmits(
-        final int position,
+            final int position,
-        final State currentState,
+            final State currentState,
-        final EmitHandler emitHandler) {
+            final EmitHandler emitHandler) {
         boolean emitted = false;
         final Collection<String> emits = currentState.emit();
 
@@ -267,11 +268,11 @@ public class Trie {
     }
 
     private boolean isCaseInsensitive() {
-      return trieConfig.isCaseInsensitive();
+        return trieConfig.isCaseInsensitive();
     }
 
     private State getRootState() {
-      return this.rootState;
+        return this.rootState;
     }
 
     /**
@@ -296,18 +297,18 @@ public class Trie {
         /**
          * Default (empty) constructor.
          */
-        private TrieBuilder() {}
+        private TrieBuilder() {
+        }
 
         /**
          * Adds a keyword to the Trie's list of text search keywords.
          *
          * @param keyword The keyword to add to the list.
-         * 
          * @return This builder.
          * @throws NullPointerException if the keyword is null.
          */
         public TrieBuilder addKeyword(final CharSequence keyword) {
-            getTrie().addKeyword( keyword.toString() );
+            getTrie().addKeyword(keyword.toString());
             return this;
         }
 
@@ -315,12 +316,11 @@ public class Trie {
          * Adds a list of keywords to the Trie's list of text search keywords.
          *
          * @param keywords The keywords to add to the list.
-         * 
          * @return This builder.
          */
         public TrieBuilder addKeywords(final CharSequence... keywords) {
-            for( final CharSequence keyword : keywords ) {
+            for (final CharSequence keyword : keywords) {
-                addKeyword( keyword );
+                addKeyword(keyword);
             }
 
             return this;
@@ -330,11 +330,10 @@ public class Trie {
          * Adds a list of keywords to the Trie's list of text search keywords.
          *
          * @param keywords The keywords to add to the list.
-         * 
          * @return This builder.
          */
         public TrieBuilder addKeywords(final Collection<CharSequence> keywords) {
-            return addKeywords( keywords.toArray( new CharSequence[ keywords.size() ] ) );
+            return addKeywords(keywords.toArray(new CharSequence[keywords.size()]));
         }
 
         /**
@@ -413,7 +412,7 @@ public class Trie {
          * @deprecated Use onlyFirstMatch()
          */
         public TrieBuilder stopOnHit() {
-          return onlyFirstMatch();
+            return onlyFirstMatch();
         }
 
         /**

src/main/java/org/ahocorasick/trie/handler/DefaultEmitHandler.java

@@ -1,8 +1,9 @@
 package org.ahocorasick.trie.handler;
 
+import org.ahocorasick.trie.Emit;
+
 import java.util.ArrayList;
 import java.util.List;
-import org.ahocorasick.trie.Emit;
 
 public class DefaultEmitHandler implements EmitHandler {
 

src/test/java/org/ahocorasick/interval/IntervalTest.java

@@ -2,11 +2,11 @@ package org.ahocorasick.interval;
 
 import org.junit.Test;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
 
-import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.*;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
 
 public class IntervalTest {
 

src/test/java/org/ahocorasick/interval/IntervalableComparatorByPositionTest.java

@@ -3,10 +3,9 @@ package org.ahocorasick.interval;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import static java.util.Collections.sort;
 import java.util.List;
 
+import static java.util.Collections.sort;
 import static junit.framework.Assert.assertEquals;
 
 public class IntervalableComparatorByPositionTest {
@@ -14,9 +13,9 @@ public class IntervalableComparatorByPositionTest {
     @Test
     public void sortOnPosition() {
         List<Intervalable> intervals = new ArrayList<>();
-        intervals.add(new Interval(4,5));
+        intervals.add(new Interval(4, 5));
-        intervals.add(new Interval(1,4));
+        intervals.add(new Interval(1, 4));
-        intervals.add(new Interval(3,8));
+        intervals.add(new Interval(3, 8));
         sort(intervals, new IntervalableComparatorByPosition());
         assertEquals(4, intervals.get(0).size());
         assertEquals(6, intervals.get(1).size());

src/test/java/org/ahocorasick/interval/IntervalableComparatorBySizeTest.java

@@ -3,11 +3,9 @@ package org.ahocorasick.interval;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import static java.util.Collections.sort;
-import static java.util.Collections.sort;
 import java.util.List;
 
+import static java.util.Collections.sort;
 import static junit.framework.Assert.assertEquals;
 
 public class IntervalableComparatorBySizeTest {
@@ -15,9 +13,9 @@ public class IntervalableComparatorBySizeTest {
     @Test
     public void sortOnSize() {
         List<Intervalable> intervals = new ArrayList<>();
-        intervals.add(new Interval(4,5));
+        intervals.add(new Interval(4, 5));
-        intervals.add(new Interval(1,4));
+        intervals.add(new Interval(1, 4));
-        intervals.add(new Interval(3,8));
+        intervals.add(new Interval(3, 8));
         sort(intervals, new IntervalableComparatorBySize());
         assertEquals(6, intervals.get(0).size());
         assertEquals(4, intervals.get(1).size());
@@ -27,8 +25,8 @@ public class IntervalableComparatorBySizeTest {
     @Test
     public void sortOnSizeThenPosition() {
         List<Intervalable> intervals = new ArrayList<>();
-        intervals.add(new Interval(4,7));
+        intervals.add(new Interval(4, 7));
-        intervals.add(new Interval(2,5));
+        intervals.add(new Interval(2, 5));
         sort(intervals, new IntervalableComparatorBySize());
         assertEquals(2, intervals.get(0).getStart());
         assertEquals(4, intervals.get(1).getStart());

src/test/java/org/ahocorasick/trie/StateTest.java

@@ -1,6 +1,5 @@
 package org.ahocorasick.trie;
 
-import org.ahocorasick.trie.State;
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;

src/test/java/org/ahocorasick/trie/TrieTest.java

@@ -1,36 +1,37 @@
 package org.ahocorasick.trie;
 
+import org.ahocorasick.trie.handler.EmitHandler;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
+
 import static java.util.concurrent.ThreadLocalRandom.current;
 import static junit.framework.Assert.assertEquals;
 import static org.ahocorasick.trie.Trie.builder;
-import org.ahocorasick.trie.handler.EmitHandler;
 import static org.junit.Assert.assertTrue;
-import org.junit.Test;
 
 public class TrieTest {
     private final static String[] ALPHABET = new String[]{
-      "abc", "bcd", "cde"
+            "abc", "bcd", "cde"
     };
 
     private final static String[] PRONOUNS = new String[]{
-      "hers", "his", "she", "he"
+            "hers", "his", "she", "he"
     };
 
     private final static String[] FOOD = new String[]{
-      "veal", "cauliflower", "broccoli", "tomatoes"
+            "veal", "cauliflower", "broccoli", "tomatoes"
     };
 
     private final static String[] GREEK_LETTERS = new String[]{
-      "Alpha", "Beta", "Gamma"
+            "Alpha", "Beta", "Gamma"
     };
 
     private final static String[] UNICODE = new String[]{
-      "turning", "once", "again", "börkü"
+            "turning", "once", "again", "börkü"
     };
 
     @Test
@@ -408,7 +409,7 @@ public class TrieTest {
                 .onlyWholeWordsWhiteSpaceSeparated()
                 .addKeyword("#sugar-123")
                 .build();
-        Collection < Emit > emits = trie.parseText("#sugar-123 #sugar-1234"); // left, middle, right test
+        Collection<Emit> emits = trie.parseText("#sugar-123 #sugar-1234"); // left, middle, right test
         assertEquals(1, emits.size()); // Match must not be made
         checkEmit(emits.iterator().next(), 0, 9, "#sugar-123");
     }
@@ -417,19 +418,19 @@ public class TrieTest {
     public void testLargeString() {
         final int interval = 100;
         final int textSize = 1000000;
-        final String keyword = FOOD[ 1 ];
+        final String keyword = FOOD[1];
-        final StringBuilder text = randomNumbers( textSize );
+        final StringBuilder text = randomNumbers(textSize);
 
-        injectKeyword( text, keyword, interval );
+        injectKeyword(text, keyword, interval);
 
         Trie trie = builder()
-            .onlyWholeWords()
+                .onlyWholeWords()
-            .addKeyword( keyword )
+                .addKeyword(keyword)
-            .build();
+                .build();
 
-        final Collection<Emit> emits = trie.parseText( text );
+        final Collection<Emit> emits = trie.parseText(text);
 
-        assertEquals( textSize / interval, emits.size() );
+        assertEquals(textSize / interval, emits.size());
     }
 
     /**
@@ -438,11 +439,11 @@ public class TrieTest {
      * @param count The number of numbers to generate.
      * @return A character sequence filled with random digits.
      */
-    private StringBuilder randomNumbers( final int count ) {
+    private StringBuilder randomNumbers(final int count) {
-        final StringBuilder sb = new StringBuilder( count );
+        final StringBuilder sb = new StringBuilder(count);
 
-        for( int i = count - 1; i >= 0; i-- ) {
+        for (int i = count - 1; i >= 0; i--) {
-            sb.append( randomInt( 0, 10 ) );
+            sb.append(randomInt(0, 10));
         }
 
         return sb;
@@ -451,23 +452,23 @@ public class TrieTest {
     /**
      * Injects keywords into a string builder.
      *
-     * @param source Should contain a bunch of random data that cannot match
+     * @param source   Should contain a bunch of random data that cannot match
-     * any keyword.
+     *                 any keyword.
-     * @param keyword A keyword to inject repeatedly in the text.
+     * @param keyword  A keyword to inject repeatedly in the text.
      * @param interval How often to inject the keyword.
      */
     private void injectKeyword(
-        final StringBuilder source, 
+            final StringBuilder source,
-        final String keyword,
+            final String keyword,
-        final int interval ) {
+            final int interval) {
         final int length = source.length();
-        for( int i = 0; i < length; i += interval ) {
+        for (int i = 0; i < length; i += interval) {
-            source.replace( i, i + keyword.length(), keyword );
+            source.replace(i, i + keyword.length(), keyword);
         }
     }
 
-    private int randomInt( final int min, final int max ) {
+    private int randomInt(final int min, final int max) {
-        return current().nextInt( min, max );
+        return current().nextInt(min, max);
     }
 
     private void checkEmit(Emit next, int expectedStart, int expectedEnd, String expectedKeyword) {