Reinstate simple constructor for AnnotationLine

Author: harrisric

opengrok-indexer/src/main/java/org/opengrok/indexer/history/AnnotationLine.java

@@ -47,6 +47,16 @@ public AnnotationLine() {
         // for serialization
     }
 
+    /**
+     * An annotation line where the revision is not overridden for display purposes.
+     * @param revision
+     * @param author
+     * @param enabled
+     */
+    AnnotationLine(String revision, String author, boolean enabled) {
+      this(revision, author, enabled, null);
+    }
+
     AnnotationLine(String revision, String author, boolean enabled, String displayRevision) {
         this.revision = revision == null ? "" : revision;
         this.author = author == null ? "" : author;

opengrok-indexer/src/test/java/org/opengrok/indexer/history/AnnotationDataTest.java

@@ -66,9 +66,9 @@ void testEqualsNegativeFileName() {
      */
     @Test
     void testEqualsNegative() {
-        final AnnotationLine annotationLine1 = new AnnotationLine("1.0", "Me", true, null);
-        final AnnotationLine annotationLine2 = new AnnotationLine("1.1", "Me", true, null);
-        final AnnotationLine annotationLine3 = new AnnotationLine("1.2", "Me", true, null);
+        final AnnotationLine annotationLine1 = new AnnotationLine("1.0", "Me", true);
+        final AnnotationLine annotationLine2 = new AnnotationLine("1.1", "Me", true);
+        final AnnotationLine annotationLine3 = new AnnotationLine("1.2", "Me", true);
 
         AnnotationData annotationData1 = new AnnotationData();
         annotationData1.addLine(annotationLine1);
@@ -88,8 +88,8 @@ void testEqualsNegative() {
      */
     @Test
     void testEqualsNegativeStoredRevision() {
-        final AnnotationLine annotationLine1 = new AnnotationLine("1.0", "Me", true, null);
-        final AnnotationLine annotationLine2 = new AnnotationLine("1.1", "Me", true, null);
+        final AnnotationLine annotationLine1 = new AnnotationLine("1.0", "Me", true);
+        final AnnotationLine annotationLine2 = new AnnotationLine("1.1", "Me", true);
 
         AnnotationData annotationData1 = new AnnotationData();
         annotationData1.addLine(annotationLine1);
@@ -111,9 +111,9 @@ void testEqualsNegativeStoredRevision() {
     @Test
     void testEqualsPositive() {
         final String fileName = "foo.txt";
-        final AnnotationLine annotationLine1 = new AnnotationLine("1.0", "Me", true, null);
-        final AnnotationLine annotationLine2 = new AnnotationLine("1.1", "Me", true, null);
-        final AnnotationLine annotationLine3 = new AnnotationLine("1.2", "Me", true, null);
+        final AnnotationLine annotationLine1 = new AnnotationLine("1.0", "Me", true);
+        final AnnotationLine annotationLine2 = new AnnotationLine("1.1", "Me", true);
+        final AnnotationLine annotationLine3 = new AnnotationLine("1.2", "Me", true);
 
         AnnotationData annotationData1 = new AnnotationData(fileName);
         annotationData1.addLine(annotationLine1);

opengrok-indexer/src/test/java/org/opengrok/indexer/history/AnnotationLineTest.java

@@ -37,8 +37,8 @@ class AnnotationLineTest {
      */
     @Test
     void testEqualsNegative1() {
-        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true, null);
-        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "barX", true, null);
+        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true);
+        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "barX", true);
         assertNotEquals(annotationLine1, annotationLine2);
     }
 
@@ -47,8 +47,8 @@ void testEqualsNegative1() {
      */
     @Test
     void testEqualsNegative2() {
-        AnnotationLine annotationLine1 = new AnnotationLine("1.0.1", "bar", true, null);
-        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "bar", true, null);
+        AnnotationLine annotationLine1 = new AnnotationLine("1.0.1", "bar", true);
+        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "bar", true);
         assertNotEquals(annotationLine1, annotationLine2);
     }
 
@@ -57,8 +57,8 @@ void testEqualsNegative2() {
      */
     @Test
     void testEqualsNegative3() {
-        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true, null);
-        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "bar", false, null);
+        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true);
+        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "bar", false);
         assertNotEquals(annotationLine1, annotationLine2);
     }
 
@@ -67,8 +67,8 @@ void testEqualsNegative3() {
      */
     @Test
     void testEqualsPositive() {
-        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true, null);
-        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "bar", true, null);
+        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true);
+        AnnotationLine annotationLine2 = new AnnotationLine("1.0", "bar", true);
         assertEquals(annotationLine1, annotationLine2);
     }
 
@@ -77,7 +77,7 @@ void testEqualsPositive() {
      */
     @Test
     void testDisplayRevisionFallBack() {
-        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true, null);
+        AnnotationLine annotationLine1 = new AnnotationLine("1.0", "bar", true);
         assertEquals("1.0", annotationLine1.getDisplayRevision());
     }