Inspection fixes and upgrade of most libraries and some more whacky hacks to make JavaFX tests work.

Author: Bytekeeper

.travis.yml

@@ -2,7 +2,7 @@ language: java
 jdk:
 - oraclejdk8
 addons:
-  sonarqube:
+  sonarcloud:
     branches:
       - dev
       - master

build.gradle

@@ -6,12 +6,12 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
+    classpath 'com.github.ben-manes:gradle-versions-plugin:0.16.0'
   }
 }
 
 plugins {
-    id "net.ltgt.apt" version "0.10"
+    id "net.ltgt.apt-idea" version "0.12"
     id "org.sonarqube" version "2.5"
 }
 
@@ -56,17 +56,17 @@ configurations {
 dependencies {
 	antlr  group: "org.antlr", name: "antlr4", version: "4.7"
     compile group: "org.antlr", name: "antlr4-runtime", version: "4.7"
-    compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.7-M5'
-	compile 'org.yaml:snakeyaml:1.18'
-    compile 'com.google.dagger:dagger:2.11'
+    compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.8.0'
+	compile 'org.yaml:snakeyaml:1.19'
+    compile 'com.google.dagger:dagger:2.12'
     compile 'javax.inject:javax.inject:1'
-    apt  'com.google.dagger:dagger-compiler:2.11'
+    apt  'com.google.dagger:dagger-compiler:2.12'
     compile 'net.engio:mbassador:1.3.1'
     compile 'org.controlsfx:controlsfx:8.40.14'
 	compile 'net.rcarz:jira-client:0.5'
-    compile 'com.jsoniter:jsoniter:0.9.15'
+    compile 'com.jsoniter:jsoniter:0.9.17'
 
-    testCompile 'commons-io:commons-io:2.5'
+    testCompile 'commons-io:commons-io:2.6'
 	testCompile 'junit:junit-dep:4.11'
 	testCompile 'org.hamcrest:hamcrest-core:1.3'
 	testCompile 'org.hamcrest:hamcrest-library:1.3'
@@ -96,7 +96,7 @@ tasks.withType(FindBugs) {
 }
 
 task wrapper(type: Wrapper) {
-	gradleVersion = '3.5'
+	gradleVersion = '4.2.1'
 }
 
 task release(dependsOn: 'distZip') {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Mar 22 22:45:21 WAT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -97,25 +97,28 @@ public void removeActivityAndCloseGap(RemoveActivity command) {
         Optional<TimeTrackingItem> previous = adjacentItems.previousItem();
         Optional<TimeTrackingItem> next = adjacentItems.nextItem();
 
-        if (previousAndNextActivitiesMatch(previous, next)) {
-            TimeTrackingItem replaceAllWith = next.get().getEnd()
-                    .map(previous.get()::withEnd).orElse(previous.get().withPendingEnd());
-            persister.persist(replaceAllWith);
-            publisher.publish(new ItemInserted(replaceAllWith));
-        } else if (previous.isPresent()
-                && DateTimes.isOnSameDay(previous.get().getStart(), command.itemToDelete.getStart())
-                && !command.itemToDelete.getEnd().isPresent()) {
-            TimeTrackingItem replaceAllWith = previous.get().withPendingEnd();
-            persister.persist(replaceAllWith);
-            publisher.publish(new ItemInserted(replaceAllWith));
-        } else {
-            removeActivity(command);
+        if (previous.isPresent()) {
+            TimeTrackingItem previousItem = previous.get();
+            if (next.isPresent() && previousAndNextActivitiesMatch(previousItem, next.get())) {
+                TimeTrackingItem replaceAllWith = next.get().getEnd()
+                        .map(previousItem::withEnd).orElse(previousItem.withPendingEnd());
+                persister.persist(replaceAllWith);
+                publisher.publish(new ItemInserted(replaceAllWith));
+                return;
+            }
+            if (DateTimes.isOnSameDay(previousItem.getStart(), command.itemToDelete.getStart())
+                    && !command.itemToDelete.getEnd().isPresent()) {
+                TimeTrackingItem replaceAllWith = previousItem.withPendingEnd();
+                persister.persist(replaceAllWith);
+                publisher.publish(new ItemInserted(replaceAllWith));
+                return;
+            }
         }
+        removeActivity(command);
     }
 
-    private boolean previousAndNextActivitiesMatch(Optional<TimeTrackingItem> previous, Optional<TimeTrackingItem> next) {
-        return previous.isPresent() && next.isPresent()
-                && previous.get().getActivity().equals(next.get().getActivity());
+    private boolean previousAndNextActivitiesMatch(TimeTrackingItem previousItem, TimeTrackingItem nextItem) {
+        return previousItem.getActivity().equals(nextItem.getActivity());
     }
 
     @Override

gradlew

@@ -105,17 +105,16 @@ static ActivityTextDisplayProcessor hyperlinkMapper(ExecutorService executorServ
         });
     }
 
-    private static Stream<?> toHyperlink(ExecutorService executorService, String o) {
+    private static Stream<?> toHyperlink(ExecutorService executorService, String activity) {
         List<Object> result = new ArrayList<>();
-        String string = o;
-        Matcher matcher = URL_PATTERN.matcher(string);
+        Matcher matcher = URL_PATTERN.matcher(activity);
         int index = 0;
         while (matcher.find(index)) {
-            String preamble = string.substring(index, matcher.start());
+            String preamble = activity.substring(index, matcher.start());
             if (!preamble.isEmpty()) {
                 result.add(preamble);
             }
-            String uri = string.substring(matcher.start(), matcher.end());
+            String uri = activity.substring(matcher.start(), matcher.end());
             Hyperlink hyperlink = new Hyperlink(uri);
             hyperlink.setOnAction(event -> executorService.submit(() -> {
                 try {
@@ -127,7 +126,7 @@ private static Stream<?> toHyperlink(ExecutorService executorService, String o)
             result.add(hyperlink);
             index = matcher.end();
         }
-        result.add(string.substring(index));
+        result.add(activity.substring(index));
         return result.stream();
     }
 

src/main/java/org/stt/command/Activities.java

@@ -45,7 +45,7 @@ public void update() {
         TokenStream tokenStream = new CommonTokenStream(lexer);
         EnglishCommandsParser parser = new EnglishCommandsParser(tokenStream);
         parser.command().accept(visitor);
-        ItemGrouper.Group[] groups = itemGrouper.getGroupsOf(text).stream().toArray(ItemGrouper.Group[]::new);
+        ItemGrouper.Group[] groups = itemGrouper.getGroupsOf(text).toArray(new ItemGrouper.Group[0]);
         for (int i = 0; i < groups.length - 1; i++) {
             ItemGrouper.Group group = groups[i];
             if (group.type == ItemGrouper.Type.MATCH) {

src/main/java/org/stt/gui/jfx/JFXModule.java

@@ -3,6 +3,7 @@
 import org.stt.time.DateTimes;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
@@ -12,7 +13,7 @@
 public final class TimeTrackingItem {
     private final String activity;
     private final LocalDateTime start;
-    private final Optional<LocalDateTime> end;
+    private final LocalDateTime end;
 
     /**
      * @param activity activity string describing this item.
@@ -21,9 +22,9 @@ public final class TimeTrackingItem {
      */
     public TimeTrackingItem(String activity, LocalDateTime start, LocalDateTime end) {
         this.activity = requireNonNull(activity);
-        this.start = requireNonNull(start, "start must not be null");
-        this.end = Optional.of(DateTimes.preciseToSecond(end));
-        requireThat(!end.isBefore(DateTimes.preciseToSecond(start)),
+        this.start = DateTimes.preciseToSecond(requireNonNull(start, "start must not be null"));
+        this.end = DateTimes.preciseToSecond(requireNonNull(end, "end must not be null"));
+        requireThat(!end.isBefore(start),
                 "end must not be before start for item!");
     }
 
@@ -34,13 +35,12 @@ public TimeTrackingItem(String activity, LocalDateTime start, LocalDateTime end)
     public TimeTrackingItem(String activity, LocalDateTime start) {
         this.activity = requireNonNull(activity);
         this.start = DateTimes.preciseToSecond(requireNonNull(start));
-        this.end = Optional.empty();
+        this.end = null;
     }
 
     public boolean sameEndAs(TimeTrackingItem other) {
-        return getEnd()
-                .map(endA -> other.getEnd().map(endA::equals).orElse(false))
-                .orElse(!other.getEnd().isPresent());
+        return end == other.end
+                || end != null && end.equals(other.end);
     }
 
     public boolean sameActivityAs(TimeTrackingItem other) {
@@ -52,19 +52,16 @@ public boolean sameStartAs(TimeTrackingItem other) {
     }
 
     public boolean intersects(TimeTrackingItem other) {
-        return other.getEnd().map(actualEnd -> actualEnd.isAfter(start)).orElse(true)
-                && end.map(actualEnd -> actualEnd.isAfter(other.start)).orElse(true);
+        return (end == null || end.isAfter(other.start))
+                && (other.end == null || other.end.isAfter(start));
     }
 
     public boolean endsSameOrAfter(TimeTrackingItem other) {
-        return end.map(actualEnd -> other.getEnd().map(otherEnd -> !actualEnd.isBefore(otherEnd))
-                .orElse(false))
-                .orElse(true);
+        return end == null || other.end != null && !end.isBefore(other.end);
     }
 
     public boolean endsAtOrBefore(LocalDateTime dateTime) {
-        return end.map(actualEnd -> !dateTime.isBefore(actualEnd))
-                .orElse(false);
+        return end != null && !dateTime.isBefore(end);
     }
 
     public String getActivity() {
@@ -76,35 +73,30 @@ public LocalDateTime getStart() {
     }
 
     public Optional<LocalDateTime> getEnd() {
-        return end;
+        return Optional.ofNullable(end);
     }
 
 
     @Override
     public String toString() {
         return start.toString() + " - "
-                + (end.isPresent() ? end.get().toString() : "null") + " : "
+                + (end == null ? "null" : end.toString()) + " : "
                 + activity;
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-
         TimeTrackingItem that = (TimeTrackingItem) o;
-
-        if (!activity.equals(that.activity)) return false;
-        if (!start.equals(that.start)) return false;
-        return end.equals(that.end);
+        return Objects.equals(activity, that.activity) &&
+                Objects.equals(start, that.start) &&
+                Objects.equals(end, that.end);
     }
 
     @Override
     public int hashCode() {
-        int result = activity.hashCode();
-        result = 31 * result + start.hashCode();
-        result = 31 * result + end.hashCode();
-        return result;
+        return Objects.hash(activity, start, end);
     }
 
     public TimeTrackingItem withEnd(LocalDateTime newEnd) {
@@ -118,13 +110,13 @@ public TimeTrackingItem withPendingEnd() {
 
     public TimeTrackingItem withStart(LocalDateTime newStart) {
         requireNonNull(newStart);
-        return end.map(time -> new TimeTrackingItem(activity, newStart, time))
-                .orElse(new TimeTrackingItem(activity, newStart));
+        return end != null ? new TimeTrackingItem(activity, newStart, end)
+                : new TimeTrackingItem(activity, newStart);
     }
 
     public TimeTrackingItem withActivity(String newActivity) {
         requireNonNull(newActivity);
-        return end.map(time -> new TimeTrackingItem(newActivity, start, time))
-                .orElse(new TimeTrackingItem(newActivity, start));
+        return end != null ? new TimeTrackingItem(newActivity, start, end)
+                : new TimeTrackingItem(newActivity, start);
     }
 }

src/main/java/org/stt/gui/jfx/text/CommandHighlighter.java

@@ -3,7 +3,6 @@
 import org.stt.model.TimeTrackingItem;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.Optional;
 
 /**
@@ -22,7 +21,6 @@ public interface ItemReader extends Closeable {
 	 * 
 	 * @return An {@link Optional} of the {@link TimeTrackingItem} or absent if
 	 *         none is available
-	 * @throws IOException
 	 */
 	Optional<TimeTrackingItem> read();