From d47fa27e026afb0b85f1ab7021f33cfd6c1791e6 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 15 Nov 2023 07:20:03 +0100
Subject: [PATCH] Cleanup: SensorDataCyclingDistanceSpeed.Data is a record.

---
 .../io/file/importer/ExportImportTest.java    |  6 +---
 .../sensorData/SensorDataCyclingTest.java     |  4 +--
 .../SensorDataCyclingDistanceSpeed.java       | 35 +------------------
 .../sensors/sensorData/SensorDataSet.java     |  6 ++--
 4 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
index e2966bcf7..48af105fb 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
@@ -562,13 +562,9 @@ public class ExportImportTest {
         sensorDataSet.cyclingCadence = cyclingCadence;
 
         if (distance != null && speed != null) {
-            SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
-            Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
-            Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
-
             SensorDataCyclingDistanceSpeed distanceSpeed = Mockito.mock(SensorDataCyclingDistanceSpeed.class);
             Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
-            Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
+            Mockito.when(distanceSpeed.getValue()).thenReturn(new SensorDataCyclingDistanceSpeed.Data(null, distance, Speed.of(speed)));
             sensorDataSet.cyclingDistanceSpeed = distanceSpeed;
         }
 
diff --git a/src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java
index babf235f8..ac98399e5 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java
@@ -104,8 +104,8 @@ public class SensorDataCyclingTest {
         current.add(new Raw<>(new BluetoothHandlerCyclingDistanceSpeed.WheelData(2, 8016)));
 
         // then
-        assertEquals(2.15, current.getValue().getDistance().toM(), 0.01);
-        assertEquals(1.20, current.getValue().getSpeed().toMPS(), 0.01);
+        assertEquals(2.15, current.getValue().distance().toM(), 0.01);
+        assertEquals(1.20, current.getValue().speed().toMPS(), 0.01);
     }
 
     @Test
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingDistanceSpeed.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingDistanceSpeed.java
index 7f9641a1e..271323e00 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingDistanceSpeed.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingDistanceSpeed.java
@@ -73,38 +73,5 @@ public class SensorDataCyclingDistanceSpeed extends SensorData<BluetoothHandlerC
         this.wheelCircumference = wheelCircumference;
     }
 
-    // TODO Make record
-    public static class Data {
-        private final Distance distance;
-        private final Distance distanceOverall;
-        private final Speed speed;
-
-        private Data(Distance distance, Distance distanceOverall, Speed speed) {
-            this.distance = distance;
-            this.distanceOverall = distanceOverall;
-            this.speed = speed;
-        }
-
-        public Distance getDistance() {
-            return distance;
-        }
-
-        public Distance getDistanceOverall() {
-            return distanceOverall;
-        }
-
-        public Speed getSpeed() {
-            return speed;
-        }
-
-        @NonNull
-        @Override
-        public String toString() {
-            return "Data{" +
-                    "distance=" + getDistance() +
-                    ", distance_overall=" + getDistanceOverall() +
-                    ", speed=" + getSpeed() +
-                    '}';
-        }
-    }
+    public record Data(Distance distance, Distance distanceOverall, Speed speed) {}
 }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
index da8527ff8..e426a1963 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
@@ -68,8 +68,8 @@ public final class SensorDataSet {
     }
 
     public Pair<Speed, String> getSpeed() {
-        if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue() && cyclingDistanceSpeed.getValue().getSpeed() != null) {
-            return new Pair<>(cyclingDistanceSpeed.getValue().getSpeed(), cyclingDistanceSpeed.getSensorNameOrAddress());
+        if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue() && cyclingDistanceSpeed.getValue().speed() != null) {
+            return new Pair<>(cyclingDistanceSpeed.getValue().speed(), cyclingDistanceSpeed.getSensorNameOrAddress());
         }
 
         if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasValue() && runningDistanceSpeedCadence.getValue().speed() != null) {
@@ -143,7 +143,7 @@ public final class SensorDataSet {
         }
 
         if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasValue()) {
-            trackPoint.setSensorDistance(cyclingDistanceSpeed.getValue().getDistanceOverall());
+            trackPoint.setSensorDistance(cyclingDistanceSpeed.getValue().distanceOverall());
         }
 
         if (cyclingPower != null && cyclingPower.hasValue()) {