- r clean up separation

Author: LarsEckart

approvaltests-tests/src/test/java/org/approvaltests/InlineApprovalsTest.java

@@ -83,7 +83,7 @@ public void testReportingCode()
     Options inlineWithCode = new Options().inline("", true);
     Options inlineNoCode = new Options().inline("", false);
     var resultWithCode = inlineWithCode.getReporter();
-    assertEquals(InlineComparator.class, resultWithCode.getClass());
+    assertEquals(InlineJavaReporter.class, resultWithCode.getClass());
     assertEquals(QuietReporter.class,
         ((FirstWorkingReporter) inlineNoCode.getReporter()).getReporters()[1].getClass());
   }

approvaltests/src/main/java/org/approvaltests/inline/InlineComparator.java

@@ -4,24 +4,26 @@
 import org.approvaltests.core.ApprovalFailureReporter;
 import org.approvaltests.core.Options;
 import org.approvaltests.namer.ApprovalNamer;
-import org.approvaltests.namer.StackTraceNamer;
 
 import java.io.File;
 import java.io.IOException;
 
 import static org.approvaltests.writers.Writer.approved;
 import static org.approvaltests.writers.Writer.received;
 
-public class InlineComparator implements ApprovalNamer, ApprovalFailureReporter
+public class InlineComparator implements ApprovalNamer
 {
-  private final InlineJavaReporter inlineJavaReporter;
-  private String                        expected;
-  private File                          approvedFile;
-  private File                          receivedFile;
+  private ApprovalFailureReporter reporter = null;
+  private final String            expected;
+  private File                    approvedFile;
+  private File                    receivedFile;
   public InlineComparator(String expected, ApprovalFailureReporter reporter)
   {
     this.expected = expected;
-    inlineJavaReporter = new InlineJavaReporter(reporter);
+    if (reporter != null)
+    {
+      this.reporter = new InlineJavaReporter(reporter);
+    }
   }
   @Override
   public File getApprovedFile(String extensionWithDot)
@@ -69,25 +71,18 @@ public String getApprovalName()
   @Override
   public String getSourceFilePath()
   {
-    return inlineJavaReporter.getSourceFilePath();
+    return "";
   }
-  @Override
   public boolean report(String received, String approved)
   {
-    return inlineJavaReporter.report(received, approved);
+    return reporter.report(received, approved);
   }
-  private String createReceived(String actual)
-  {
-    return inlineJavaReporter.createReceived(actual);
-  }
-
   public Options setForOptions(Options options)
   {
-    if (inlineJavaReporter.reporter != null)
+    if (reporter != null)
     {
-      options = options.withReporter(this);
+      options = options.withReporter(reporter);
     }
-    return options//
-        .forFile().withNamer(this);
+    return options.forFile().withNamer(this);
   }
 }

approvaltests/src/main/java/org/approvaltests/inline/InlineJavaReporter.java

@@ -8,9 +8,9 @@
 
 public class InlineJavaReporter implements ApprovalFailureReporter
 {
-  public final String                  sourceFilePath;
-  public final StackTraceNamer         stackTraceNamer;
-  public final ApprovalFailureReporter reporter;
+  private final String                  sourceFilePath;
+  private final StackTraceNamer         stackTraceNamer;
+  private final ApprovalFailureReporter reporter;
   public InlineJavaReporter(ApprovalFailureReporter reporter)
   {
     this.reporter = reporter;