reduce field visibility in PendingToken (#3822)

* reduce symbol visibility

* add copyright

* remove the nonpos field

* fix position increment

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/PendingToken.java

@@ -18,6 +18,7 @@
  */
 
 /*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
@@ -34,11 +35,6 @@ public class PendingToken {
     public final String str;
     public final int start;
     public final int end;
-    /**
-     * When tokenizers allow overlapping tokens, the following field is set to
-     * {@code true} for tokens that should not increment the position attribute.
-     */
-    public boolean nonpos;
 
     /**
      * Initializes an instance with immutable fields for the specified
@@ -86,7 +82,6 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        return "PendingToken{" + str + "<<< start=" + start + ",end=" + end +
-            ",nonpos=" + nonpos + '}';
+        return "PendingToken{" + str + "<<< start=" + start + ",end=" + end + '}';
     }
 }

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/plain/DefinitionsTokenStream.java

@@ -18,6 +18,7 @@
  */
 
 /*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.plain;
@@ -104,7 +105,7 @@ public final boolean incrementToken() throws IOException {
     private void setAttribs(PendingToken tok) {
         clearAttributes();
 
-        this.posIncrAtt.setPositionIncrement(tok.nonpos ? 0 : 1);
+        this.posIncrAtt.setPositionIncrement(1);
         this.termAtt.setEmpty();
         this.termAtt.append(tok.str);
         this.offsetAtt.setOffset(tok.start, tok.end);

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/PendingTokenTest.java

@@ -18,6 +18,7 @@
  */
 
 /*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
@@ -32,91 +33,80 @@
 /**
  * Represents a container for tests of {@link PendingToken}.
  */
-public class PendingTokenTest {
+class PendingTokenTest {
 
     @Test
-    public void testEquals1() {
+    void testEquals1() {
         PendingToken instance = new PendingToken("", 0, 0);
         boolean result = instance.equals(instance);
         assertTrue(result, "PendingToken instance equals itself");
     }
 
     @Test
-    public void testEquals2() {
+    void testEquals2() {
         PendingToken instance1 = new PendingToken("a", 0, 1);
-        assertFalse(instance1.nonpos, "PendingToken default nonpos");
-
         PendingToken instance2 = new PendingToken("a", 0, 1);
-        instance2.nonpos = true;
         boolean result = instance1.equals(instance2);
-        assertTrue(result, "PendingToken instance equivalence ignores nonpos");
+        assertTrue(result, "PendingToken instance equivalence false");
     }
 
     @Test
-    public void testNotEquals1() {
+    void testNotEquals1() {
         PendingToken instance1 = new PendingToken("", 0, 0);
         PendingToken instance2 = new PendingToken("", 0, 1); // nonsense but ok
         boolean result = instance1.equals(instance2);
         assertFalse(result, "PendingToken equals() only 2 immutables match");
     }
 
     @Test
-    public void testNotEquals2() {
+    void testNotEquals2() {
         PendingToken instance1 = new PendingToken("", 0, 0);
         PendingToken instance2 = new PendingToken("", 1, 0); // nonsense but ok
         boolean result = instance1.equals(instance2);
         assertFalse(result, "PendingToken equals() only 2 immutables match");
     }
 
     @Test
-    public void testNotEquals3() {
+    void testNotEquals3() {
         PendingToken instance1 = new PendingToken("", 0, 0);
         PendingToken instance2 = new PendingToken("a", 0, 0); // nonsense but ok
         boolean result = instance1.equals(instance2);
         assertFalse(result, "PendingToken equals() only 2 immutables match");
     }
 
     @Test
-    public void testSameHashCodes() {
+    void testSameHashCodes() {
         PendingToken instance1 = new PendingToken("a", 0, 1);
-        assertFalse(instance1.nonpos, "PendingToken default nonpos");
-
         PendingToken instance2 = new PendingToken("a", 0, 1);
-        instance2.nonpos = true;
-        assertEquals(instance1.hashCode(), instance2.hashCode(), "PendingToken instance HashCode ignores nonpos");
+        assertEquals(instance1.hashCode(), instance2.hashCode(), "PendingToken instance HashCode differs");
     }
 
     @Test
-    public void testDifferentHashCodes1() {
+    void testDifferentHashCodes1() {
         PendingToken instance1 = new PendingToken("", 0, 0);
         PendingToken instance2 = new PendingToken("", 0, 1); // nonsense but ok
         assertNotEquals(instance1.hashCode(), instance2.hashCode(), "PendingToken hashCode() only 2 immutables match");
     }
 
     @Test
-    public void testDifferentHashCodes2() {
+    void testDifferentHashCodes2() {
         PendingToken instance1 = new PendingToken("", 0, 0);
         PendingToken instance2 = new PendingToken("", 1, 0); // nonsense but ok
         assertNotEquals(instance1.hashCode(), instance2.hashCode(), "PendingToken hashCode() only 2 immutables match");
     }
 
     @Test
-    public void testDifferentHashCodes3() {
+    void testDifferentHashCodes3() {
         PendingToken instance1 = new PendingToken("", 0, 0);
         PendingToken instance2 = new PendingToken("a", 0, 0); // nonsense but ok
         assertNotEquals(instance1.hashCode(), instance2.hashCode(), "PendingToken hashCode() only 2 immutables match");
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
         PendingToken instance = new PendingToken("abc", 0, 4);
-        String expResult = "PendingToken{abc<<< start=0,end=4,nonpos=false}";
+        String expResult = "PendingToken{abc<<< start=0,end=4}";
         String result = instance.toString();
         assertEquals(expResult, result, "PendingToken toString()");
-
-        instance.nonpos = true;
-        expResult = "PendingToken{abc<<< start=0,end=4,nonpos=true}";
-        result = instance.toString();
-        assertEquals(expResult, result, "PendingToken toString()");
     }
 }