diff --git a/src/androidTest/java/de/dennisguse/opentracks/EspressoCustomLayoutTest.java b/src/androidTest/java/de/dennisguse/opentracks/EspressoCustomLayoutTest.java index be11c398d..42a938c9f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/EspressoCustomLayoutTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/EspressoCustomLayoutTest.java @@ -9,10 +9,10 @@ import androidx.test.espresso.ViewAction; import androidx.test.espresso.ViewAssertion; import androidx.test.espresso.ViewInteraction; import androidx.test.espresso.action.MotionEvents; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; -import androidx.test.runner.AndroidJUnit4; import android.content.Context; import android.content.SharedPreferences; @@ -83,7 +83,7 @@ public class EspressoCustomLayoutTest { } RecyclerView recyclerView = (RecyclerView) view; - RecyclerView.Adapter adapter = recyclerView.getAdapter(); + RecyclerView.Adapter adapter = recyclerView.getAdapter(); assertThat(adapter.getItemCount(), is(expectedCount)); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java b/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java index 3e1469202..3d892fe4c 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java @@ -143,7 +143,7 @@ public class EspressoDeleteTrackTest { private static Matcher childAtPosition( final Matcher parentMatcher, final int position) { - return new TypeSafeMatcher() { + return new TypeSafeMatcher<>() { @Override public void describeTo(Description description) { description.appendText("Child at position " + position + " in parent "); @@ -160,13 +160,15 @@ public class EspressoDeleteTrackTest { } public static Matcher withListSize (final int size) { - return new TypeSafeMatcher () { - @Override public boolean matchesSafely (final View view) { - return ((ListView) view).getCount () == size; + return new TypeSafeMatcher<>() { + @Override + public boolean matchesSafely(final View view) { + return ((ListView) view).getCount() == size; } - @Override public void describeTo (final Description description) { - description.appendText ("ListView should have " + size + " items"); + @Override + public void describeTo(final Description description) { + description.appendText("ListView should have " + size + " items"); } }; } diff --git a/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java b/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java index 521439440..dd841e2fb 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java @@ -144,7 +144,7 @@ public class EspressoEditTrackRecordingTest { // check track's name is "New Name" ViewInteraction textView = onView( allOf(withId(R.id.stats_name_value), - withParent(withParent(IsInstanceOf.instanceOf(android.widget.ScrollView.class))), + withParent(withParent(IsInstanceOf.instanceOf(android.widget.ScrollView.class))), isDisplayed())); textView.check(matches(withText("New Name"))); } @@ -153,7 +153,7 @@ public class EspressoEditTrackRecordingTest { private static Matcher childAtPosition( final Matcher parentMatcher, final int position) { - return new TypeSafeMatcher() { + return new TypeSafeMatcher<>() { @Override public void describeTo(Description description) { description.appendText("Child at position " + position + " in parent "); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java index c56ad7bd7..4d195ae4f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java @@ -107,7 +107,7 @@ public class TrackRecordingServiceTestLocation { @MediumTest @Test - public void testOnLocationChangedAsync_movingAccurate() throws Exception { + public void testOnLocationChangedAsync_movingAccurate() { // given Track.Id trackId = service.startNewTrack(); service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); @@ -180,7 +180,7 @@ public class TrackRecordingServiceTestLocation { @MediumTest @Test - public void testOnLocationChangedAsync_slowMovingAccurate() throws Exception { + public void testOnLocationChangedAsync_slowMovingAccurate() { // given Track.Id trackId = service.startNewTrack(); service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); @@ -225,7 +225,7 @@ public class TrackRecordingServiceTestLocation { @MediumTest @Test - public void testOnLocationChangedAsync_idle() throws Exception { + public void testOnLocationChangedAsync_idle() { // given Track.Id trackId = service.startNewTrack(); service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); @@ -277,7 +277,7 @@ public class TrackRecordingServiceTestLocation { @MediumTest @Test - public void testOnLocationChangedAsync_idle_withMovement() throws Exception { + public void testOnLocationChangedAsync_idle_withMovement() { // given Track.Id trackId = service.startNewTrack(); service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); @@ -337,7 +337,7 @@ public class TrackRecordingServiceTestLocation { @MediumTest @Test - public void testOnLocationChangedAsync_idle_withSensorData() throws Exception { + public void testOnLocationChangedAsync_idle_withSensorData() { // given Track.Id trackId = service.startNewTrack(); service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); @@ -432,7 +432,7 @@ public class TrackRecordingServiceTestLocation { @MediumTest @Test - public void testOnLocationChangedAsync_segment() throws Exception { + public void testOnLocationChangedAsync_segment() { // given Track.Id trackId = service.startNewTrack(); service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java index e309fa814..320be25b9 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java @@ -77,6 +77,7 @@ public class ChartPoint { return power; } + @NonNull @Override public String toString() { return "ChartPoint{" + "timeOrDistance=" + timeOrDistance + '}'; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Distance.java b/src/main/java/de/dennisguse/opentracks/content/data/Distance.java index ee610454c..08cec6bbd 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Distance.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/Distance.java @@ -123,6 +123,7 @@ public class Distance { return Objects.hash(distance_m); } + @NonNull @Override public String toString() { return "Distance{" + diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Speed.java b/src/main/java/de/dennisguse/opentracks/content/data/Speed.java index c483a6d0f..50bb58c46 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Speed.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/Speed.java @@ -1,5 +1,7 @@ package de.dennisguse.opentracks.content.data; +import androidx.annotation.NonNull; + import java.time.Duration; import java.util.Objects; @@ -132,6 +134,7 @@ public class Speed { return Objects.hash(speed_mps); } + @NonNull @Override public String toString() { return "Speed{" + diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java index 534bee338..6c067a7c4 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java +++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java @@ -191,6 +191,7 @@ public final class SensorDataCycling { return speed; } + @NonNull @Override public String toString() { return "Data{" + diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java index 403dff6cd..8fa35fb78 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java +++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java @@ -1,5 +1,6 @@ package de.dennisguse.opentracks.content.sensor; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -92,10 +93,12 @@ public final class SensorDataRunning extends SensorData return cadence; } + @Nullable public Distance getDistance() { return distance; } + @NonNull @Override public String toString() { return "Data{" + diff --git a/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java b/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java index 6c30b6b7e..53007ed44 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java @@ -3,7 +3,6 @@ package de.dennisguse.opentracks.settings; import android.content.Context; import android.os.Bundle; import android.util.AttributeSet; -import android.util.Log; import android.widget.Toast; import androidx.fragment.app.FragmentActivity; diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java index 38fd4142a..04a1329db 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java @@ -271,6 +271,7 @@ public class TrackStatisticsUpdater { return true; } + @NonNull @Override public String toString() { return "TrackStatisticsUpdater{" +