From 864bc8fad9aa8712f2c7e2a7c41532f5c53ecbba Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 15 Jan 2022 23:16:53 +0100
Subject: [PATCH] Cleanup.

---
 .../ui/aggregatedStatistics/EspressoAggregatedFilterTest.java  | 2 +-
 .../java/de/dennisguse/opentracks/data/models/Altitude.java    | 3 +++
 .../java/de/dennisguse/opentracks/data/models/TrackPoint.java  | 1 +
 .../dennisguse/opentracks/services/TrackRecordingService.java  | 1 +
 .../opentracks/services/handlers/TrackPointCreator.java        | 2 --
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java
index 91cee8049..e46147a12 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java
@@ -17,9 +17,9 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.GrantPermissionRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.core.IsInstanceOf;
 import org.junit.Before;
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Altitude.java b/src/main/java/de/dennisguse/opentracks/data/models/Altitude.java
index 36c0990b2..fe806efc4 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Altitude.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Altitude.java
@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.data.models;
 
+import androidx.annotation.NonNull;
+
 import de.dennisguse.opentracks.R;
 
 public abstract class Altitude {
@@ -60,6 +62,7 @@ public abstract class Altitude {
         }
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Altitude{" +
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
index 665820e54..82f1ca03d 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java
@@ -420,6 +420,7 @@ public class TrackPoint {
         return this;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "TrackPoint{" +
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 26c616551..fe4626cbf 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -635,6 +635,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
             return Objects.hash(track, latestTrackPoint, sensorDataSet);
         }
 
+        @NonNull
         @Override
         public String toString() {
             return "RecordingData{" +
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
index 5d75b7f68..fb1af2c2b 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
@@ -112,8 +112,6 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
 
     /**
      * Got a new TrackPoint from Bluetooth only; contains no GPS location.
-     *
-     * @param sensorDataSet
      */
     @Override
     public void onChange(SensorDataSet sensorDataSet) {