Non-functional changes

5 files changed, 12 insertions, 13 deletions

diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java
index 87b98c8efc1..6d296615c9c 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java
@@ -86,7 +86,7 @@ public class JunitRunner extends AbstractComponent implements TestRunner {
 
     @Override
     public void executeTests(TestDescriptor.TestCategory category, byte[] testConfig) {
-        if (execution != null && !execution.isDone()) {
+        if (execution != null && ! execution.isDone()) {
             throw new IllegalStateException("Test execution already in progress");
         }
         try {
@@ -100,7 +100,7 @@ public class JunitRunner extends AbstractComponent implements TestRunner {
             if (testDescriptor.isEmpty()) {
                 throw new RuntimeException("Could not find test descriptor");
             }
-            execution =  CompletableFuture.supplyAsync(() -> launchJunit(loadClasses(testBundle.get(), testDescriptor.get(), category)));
+            execution = CompletableFuture.supplyAsync(() -> launchJunit(loadClasses(testBundle.get(), testDescriptor.get(), category)));
         } catch (Exception e) {
             execution = CompletableFuture.completedFuture(createReportWithFailedInitialization(e));
         }
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
index 9a1200d0bf3..07b4b7b72e8 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
@@ -110,8 +110,8 @@ public class TestReport {
             return this;
         }
 
-        public Builder withLogs(List<LogRecord> logRecords) {
-            this.logLines = logRecords;
+        public Builder withLogs(Collection<LogRecord> logRecords) {
+            this.logLines = List.copyOf(logRecords);
             return this;
         }
     }
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java
index 31474d6c348..619fe77cf3a 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java
@@ -8,6 +8,7 @@ import com.yahoo.vespa.testrunner.legacy.LegacyTestRunner;
  * @author mortent
  */
 public interface TestRunner {
+
     void executeTests(TestDescriptor.TestCategory category, byte[] testConfig);
 
     boolean isSupported();
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java
index 4c359071fc9..116f9ac311b 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java
@@ -73,21 +73,18 @@ public class TestRunnerHandler extends LoggingRequestHandler {
     private HttpResponse handleGET(HttpRequest request) {
         String path = request.getUri().getPath();
         if (path.equals("/tester/v1/log")) {
+            long fetchRecordsAfter = Optional.ofNullable(request.getProperty("after"))
+                                             .map(Long::parseLong)
+                                             .orElse(-1L);
             if (useOsgiMode) {
-                long fetchRecordsAfter = Optional.ofNullable(request.getProperty("after"))
-                        .map(Long::parseLong)
-                        .orElse(-1L);
-
                 List<LogRecord> logRecords = Optional.ofNullable(junitRunner.getReport())
                         .map(TestReport::logLines)
                         .orElse(Collections.emptyList()).stream()
-                        .filter(record -> record.getSequenceNumber()>fetchRecordsAfter)
+                        .filter(record -> record.getSequenceNumber() > fetchRecordsAfter)
                         .collect(Collectors.toList());
                 return new SlimeJsonResponse(logToSlime(logRecords));
             } else {
-                return new SlimeJsonResponse(logToSlime(testRunner.getLog(request.hasProperty("after")
-                        ? Long.parseLong(request.getProperty("after"))
-                        : -1)));
+                return new SlimeJsonResponse(logToSlime(testRunner.getLog(fetchRecordsAfter)));
             }
         } else if (path.equals("/tester/v1/status")) {
             if (useOsgiMode) {
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/LegacyTestRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/LegacyTestRunner.java
index 418ab7fe5d0..33bfd4bd7c2 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/LegacyTestRunner.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/LegacyTestRunner.java
@@ -19,4 +19,5 @@ public interface LegacyTestRunner {
     enum Status {
         NOT_STARTED, RUNNING, FAILURE, ERROR, SUCCESS
     }
-}
+
+}
\ No newline at end of file