refactor: clean-up

metacosm · Jan 26, 2024 · 35d8977 · 35d8977
1 parent ea44d87
commit 35d8977
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/...ain/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java b/...ain/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java
@@ -19,20 +19,15 @@ public abstract class MacOSPowermetricsSensor implements PowerSensor {
     public static final String CPU = "CPU";
     public static final String GPU = "GPU";
     public static final String ANE = "ANE";
+    @SuppressWarnings("unused")
     public static final String DRAM = "DRAM";
+    @SuppressWarnings("unused")
     public static final String DCS = "DCS";
     public static final String PACKAGE = "Package";
     public static final String CPU_SHARE = "cpuShare";
 
     private final Measures measures = new MapMeasures();
-    protected CPU cpu;
-
-    protected MacOSPowermetricsSensor() {
-    }
-
-    MacOSPowermetricsSensor(InputStream inputStream) {
-        initMetadata(inputStream);
-    }
+    private CPU cpu;
 
     void initMetadata(InputStream inputStream) {
         try (BufferedReader input = new BufferedReader(new InputStreamReader(inputStream))) {

diff --git a/.../io/github/metacosm/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java b/.../io/github/metacosm/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java
@@ -22,7 +22,7 @@ public boolean isStarted() {
     }
 
     @Override
-    public void start(long samplingFrequencyInMillis) throws Exception {
+    public void start(long samplingFrequencyInMillis) {
         if (!started) {
             started = true;
         }

diff --git a/server/src/test/java/io/github/metacosm/power/MockPowerMeasurer.java b/server/src/test/java/io/github/metacosm/power/MockPowerMeasurer.java
@@ -3,6 +3,7 @@
 import io.quarkus.test.Mock;
 
 @Mock
+@SuppressWarnings("unused")
 public class MockPowerMeasurer extends PowerMeasurer {
 
     @Override

diff --git a/server/src/test/java/io/github/metacosm/power/MockPowerSensor.java b/server/src/test/java/io/github/metacosm/power/MockPowerSensor.java
@@ -4,6 +4,7 @@
 import io.quarkus.test.Mock;
 
 @Mock
+@SuppressWarnings("unused")
 public class MockPowerSensor extends ResourceMacOSPowermetricsSensor {
     public MockPowerSensor() {
         super("sonoma-m1max.txt");

diff --git a/...java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java b/...java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java
@@ -2,8 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.io.*;
-
 import org.junit.jupiter.api.Test;
 
 import io.github.metacosm.power.SensorMetadata;
@@ -13,7 +11,7 @@
 class MacOSPowermetricsSensorTest {
 
     @Test
-    void checkMetadata() throws IOException {
+    void checkMetadata() {
         var metadata = loadMetadata("sonoma-m1max.txt");
         assertEquals(4, metadata.componentCardinality());
         checkComponent(metadata, "CPU", 0);
@@ -37,7 +35,7 @@ void checkMetadata() throws IOException {
         checkComponent(metadata, "cpuShare", 1);
     }
 
-    private static SensorMetadata loadMetadata(String fileName) throws IOException {
+    private static SensorMetadata loadMetadata(String fileName) {
         return new ResourceMacOSPowermetricsSensor(fileName).metadata();
     }
 
@@ -90,7 +88,6 @@ private static void checkPowerMeasure(String testFileName, float total, String t
 
     private static double getComponent(Measures measure, RegisteredPID pid1, SensorMetadata.ComponentMetadata metadata) {
         final var index = metadata.index();
-        final boolean isInWatt = metadata.unit().equals("W");
         return measure.getOrDefault(pid1).components()[index];
     }
 }