From c34458afea0ec30f84cce54824300f95c3ce471a Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 1 Feb 2024 20:56:49 +0100 Subject: [PATCH 1/2] chore: move from io.github.metacosm to net.laprun.sustainability --- build-tools/pom.xml | 2 +- metadata/pom.xml | 4 ++-- .../sustainability}/power/SensorMeasure.java | 2 +- .../sustainability}/power/SensorMetadata.java | 2 +- pom.xml | 2 +- server/pom.xml | 6 +++--- .../sustainability}/power/PowerMeasurer.java | 6 +++--- .../sustainability}/power/PowerResource.java | 2 +- .../sustainability}/power/sensors/MapMeasures.java | 4 ++-- .../sustainability}/power/sensors/Measures.java | 4 ++-- .../sustainability}/power/sensors/PowerSensor.java | 4 ++-- .../power/sensors/PowerSensorProducer.java | 6 +++--- .../power/sensors/RegisteredPID.java | 2 +- .../sensors/linux/rapl/ByteBufferRAPLFile.java | 2 +- .../power/sensors/linux/rapl/IntelRAPLSensor.java | 12 ++++++------ .../power/sensors/linux/rapl/RAPLFile.java | 2 +- .../sensors/linux/rapl/SingleMeasureMeasures.java | 8 ++++---- .../macos/powermetrics/AppleSiliconCPU.java | 8 ++++---- .../power/sensors/macos/powermetrics/CPU.java | 4 ++-- .../power/sensors/macos/powermetrics/IntelCPU.java | 8 ++++---- .../powermetrics/MacOSPowermetricsSensor.java | 14 +++++++------- .../ProcessMacOSPowermetricsSensor.java | 2 +- .../ResourceMacOSPowermetricsSensor.java | 2 +- .../power/sensors/test/TestPowerSensor.java | 14 +++++++------- .../sustainability}/power/CIPowerResourceTest.java | 2 +- .../power/CIQuarkusTestProfile.java | 2 +- .../sustainability}/power/MockPowerMeasurer.java | 2 +- .../sustainability}/power/MockPowerSensor.java | 4 ++-- .../sustainability}/power/PowerResourceIT.java | 2 +- .../sustainability}/power/PowerResourceTest.java | 2 +- .../powermetrics/MacOSPowermetricsSensorTest.java | 8 ++++---- 31 files changed, 72 insertions(+), 72 deletions(-) rename metadata/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/SensorMeasure.java (61%) rename metadata/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/SensorMetadata.java (97%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/PowerMeasurer.java (92%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/PowerResource.java (94%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/MapMeasures.java (90%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/Measures.java (79%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/PowerSensor.java (75%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/PowerSensorProducer.java (75%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/RegisteredPID.java (81%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/linux/rapl/ByteBufferRAPLFile.java (96%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/linux/rapl/IntelRAPLSensor.java (91%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/linux/rapl/RAPLFile.java (75%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/linux/rapl/SingleMeasureMeasures.java (83%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/macos/powermetrics/AppleSiliconCPU.java (92%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/macos/powermetrics/CPU.java (85%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/macos/powermetrics/IntelCPU.java (81%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java (95%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/macos/powermetrics/ProcessMacOSPowermetricsSensor.java (95%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java (91%) rename server/src/main/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/test/TestPowerSensor.java (77%) rename server/src/test/java/{io/github/metacosm => net/laprun/sustainability}/power/CIPowerResourceTest.java (97%) rename server/src/test/java/{io/github/metacosm => net/laprun/sustainability}/power/CIQuarkusTestProfile.java (84%) rename server/src/test/java/{io/github/metacosm => net/laprun/sustainability}/power/MockPowerMeasurer.java (84%) rename server/src/test/java/{io/github/metacosm => net/laprun/sustainability}/power/MockPowerSensor.java (60%) rename server/src/test/java/{io/github/metacosm => net/laprun/sustainability}/power/PowerResourceIT.java (82%) rename server/src/test/java/{io/github/metacosm => net/laprun/sustainability}/power/PowerResourceTest.java (98%) rename server/src/test/java/{io/github/metacosm => net/laprun/sustainability}/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java (93%) diff --git a/build-tools/pom.xml b/build-tools/pom.xml index 20ba661e..0b44d213 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - io.github.metacosm + net.laprun.sustainability power-server-parent 1.0.0-SNAPSHOT diff --git a/metadata/pom.xml b/metadata/pom.xml index c708d972..25e1514d 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - io.github.metacosm + net.laprun.sustainability power-server-parent 1.0.0-SNAPSHOT @@ -20,7 +20,7 @@ formatter-maven-plugin - io.github.metacosm + net.laprun.sustainability build-tools 1.0.0-SNAPSHOT diff --git a/metadata/src/main/java/io/github/metacosm/power/SensorMeasure.java b/metadata/src/main/java/net/laprun/sustainability/power/SensorMeasure.java similarity index 61% rename from metadata/src/main/java/io/github/metacosm/power/SensorMeasure.java rename to metadata/src/main/java/net/laprun/sustainability/power/SensorMeasure.java index f26ab4d0..24fb0b7a 100644 --- a/metadata/src/main/java/io/github/metacosm/power/SensorMeasure.java +++ b/metadata/src/main/java/net/laprun/sustainability/power/SensorMeasure.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; public record SensorMeasure(double[] components, long tick) { } diff --git a/metadata/src/main/java/io/github/metacosm/power/SensorMetadata.java b/metadata/src/main/java/net/laprun/sustainability/power/SensorMetadata.java similarity index 97% rename from metadata/src/main/java/io/github/metacosm/power/SensorMetadata.java rename to metadata/src/main/java/net/laprun/sustainability/power/SensorMetadata.java index 04db301e..c7b12d75 100644 --- a/metadata/src/main/java/io/github/metacosm/power/SensorMetadata.java +++ b/metadata/src/main/java/net/laprun/sustainability/power/SensorMetadata.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import java.util.Collections; import java.util.Map; diff --git a/pom.xml b/pom.xml index b6b39924..e46fe4aa 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - io.github.metacosm + net.laprun.sustainability power-server-parent 1.0.0-SNAPSHOT pom diff --git a/server/pom.xml b/server/pom.xml index b97c7c0f..56c8cf00 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - io.github.metacosm + net.laprun.sustainability power-server-parent 1.0.0-SNAPSHOT @@ -17,7 +17,7 @@ - io.github.metacosm + net.laprun.sustainability power-server-metadata 1.0.0-SNAPSHOT @@ -30,7 +30,7 @@ formatter-maven-plugin - io.github.metacosm + net.laprun.sustainability build-tools 1.0.0-SNAPSHOT diff --git a/server/src/main/java/io/github/metacosm/power/PowerMeasurer.java b/server/src/main/java/net/laprun/sustainability/power/PowerMeasurer.java similarity index 92% rename from server/src/main/java/io/github/metacosm/power/PowerMeasurer.java rename to server/src/main/java/net/laprun/sustainability/power/PowerMeasurer.java index 974df944..b82910fd 100644 --- a/server/src/main/java/io/github/metacosm/power/PowerMeasurer.java +++ b/server/src/main/java/net/laprun/sustainability/power/PowerMeasurer.java @@ -1,14 +1,14 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import java.time.Duration; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import io.github.metacosm.power.sensors.Measures; -import io.github.metacosm.power.sensors.PowerSensor; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.infrastructure.Infrastructure; +import net.laprun.sustainability.power.sensors.Measures; +import net.laprun.sustainability.power.sensors.PowerSensor; @ApplicationScoped public class PowerMeasurer { diff --git a/server/src/main/java/io/github/metacosm/power/PowerResource.java b/server/src/main/java/net/laprun/sustainability/power/PowerResource.java similarity index 94% rename from server/src/main/java/io/github/metacosm/power/PowerResource.java rename to server/src/main/java/net/laprun/sustainability/power/PowerResource.java index 81a193d7..56b6d055 100644 --- a/server/src/main/java/io/github/metacosm/power/PowerResource.java +++ b/server/src/main/java/net/laprun/sustainability/power/PowerResource.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import jakarta.inject.Inject; import jakarta.ws.rs.*; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/MapMeasures.java b/server/src/main/java/net/laprun/sustainability/power/sensors/MapMeasures.java similarity index 90% rename from server/src/main/java/io/github/metacosm/power/sensors/MapMeasures.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/MapMeasures.java index ef9979d1..10755573 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/MapMeasures.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/MapMeasures.java @@ -1,10 +1,10 @@ -package io.github.metacosm.power.sensors; +package net.laprun.sustainability.power.sensors; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import io.github.metacosm.power.SensorMeasure; +import net.laprun.sustainability.power.SensorMeasure; public class MapMeasures implements Measures { private final ConcurrentMap measures = new ConcurrentHashMap<>(); diff --git a/server/src/main/java/io/github/metacosm/power/sensors/Measures.java b/server/src/main/java/net/laprun/sustainability/power/sensors/Measures.java similarity index 79% rename from server/src/main/java/io/github/metacosm/power/sensors/Measures.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/Measures.java index 297c3b08..e4bf6760 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/Measures.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/Measures.java @@ -1,8 +1,8 @@ -package io.github.metacosm.power.sensors; +package net.laprun.sustainability.power.sensors; import java.util.Set; -import io.github.metacosm.power.SensorMeasure; +import net.laprun.sustainability.power.SensorMeasure; public interface Measures { SensorMeasure missing = new SensorMeasure(new double[] { -1.0 }, -1); diff --git a/server/src/main/java/io/github/metacosm/power/sensors/PowerSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/PowerSensor.java similarity index 75% rename from server/src/main/java/io/github/metacosm/power/sensors/PowerSensor.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/PowerSensor.java index 9a9cf875..901f8fdb 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/PowerSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/PowerSensor.java @@ -1,6 +1,6 @@ -package io.github.metacosm.power.sensors; +package net.laprun.sustainability.power.sensors; -import io.github.metacosm.power.SensorMetadata; +import net.laprun.sustainability.power.SensorMetadata; public interface PowerSensor { diff --git a/server/src/main/java/io/github/metacosm/power/sensors/PowerSensorProducer.java b/server/src/main/java/net/laprun/sustainability/power/sensors/PowerSensorProducer.java similarity index 75% rename from server/src/main/java/io/github/metacosm/power/sensors/PowerSensorProducer.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/PowerSensorProducer.java index 100a602e..820a204c 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/PowerSensorProducer.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/PowerSensorProducer.java @@ -1,10 +1,10 @@ -package io.github.metacosm.power.sensors; +package net.laprun.sustainability.power.sensors; import jakarta.enterprise.inject.Produces; import jakarta.inject.Singleton; -import io.github.metacosm.power.sensors.linux.rapl.IntelRAPLSensor; -import io.github.metacosm.power.sensors.macos.powermetrics.ProcessMacOSPowermetricsSensor; +import net.laprun.sustainability.power.sensors.linux.rapl.IntelRAPLSensor; +import net.laprun.sustainability.power.sensors.macos.powermetrics.ProcessMacOSPowermetricsSensor; @Singleton public class PowerSensorProducer { diff --git a/server/src/main/java/io/github/metacosm/power/sensors/RegisteredPID.java b/server/src/main/java/net/laprun/sustainability/power/sensors/RegisteredPID.java similarity index 81% rename from server/src/main/java/io/github/metacosm/power/sensors/RegisteredPID.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/RegisteredPID.java index b01dbb80..8bfa1fad 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/RegisteredPID.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/RegisteredPID.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power.sensors; +package net.laprun.sustainability.power.sensors; public record RegisteredPID(String stringForMatching) { diff --git a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/ByteBufferRAPLFile.java b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/ByteBufferRAPLFile.java similarity index 96% rename from server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/ByteBufferRAPLFile.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/ByteBufferRAPLFile.java index 4f144d3e..cb993069 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/ByteBufferRAPLFile.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/ByteBufferRAPLFile.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power.sensors.linux.rapl; +package net.laprun.sustainability.power.sensors.linux.rapl; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/IntelRAPLSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java similarity index 91% rename from server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/IntelRAPLSensor.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java index 1a4b9f2e..639ccd0d 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/IntelRAPLSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java @@ -1,15 +1,15 @@ -package io.github.metacosm.power.sensors.linux.rapl; +package net.laprun.sustainability.power.sensors.linux.rapl; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -import io.github.metacosm.power.SensorMeasure; -import io.github.metacosm.power.SensorMetadata; -import io.github.metacosm.power.sensors.Measures; -import io.github.metacosm.power.sensors.PowerSensor; -import io.github.metacosm.power.sensors.RegisteredPID; +import net.laprun.sustainability.power.SensorMeasure; +import net.laprun.sustainability.power.SensorMetadata; +import net.laprun.sustainability.power.sensors.Measures; +import net.laprun.sustainability.power.sensors.PowerSensor; +import net.laprun.sustainability.power.sensors.RegisteredPID; public class IntelRAPLSensor implements PowerSensor { private final RAPLFile[] raplFiles; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/RAPLFile.java b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/RAPLFile.java similarity index 75% rename from server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/RAPLFile.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/RAPLFile.java index 64b7d994..1757d6da 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/RAPLFile.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/RAPLFile.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power.sensors.linux.rapl; +package net.laprun.sustainability.power.sensors.linux.rapl; import java.nio.file.Path; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/SingleMeasureMeasures.java b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/SingleMeasureMeasures.java similarity index 83% rename from server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/SingleMeasureMeasures.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/SingleMeasureMeasures.java index d80bd04a..8128b5aa 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/linux/rapl/SingleMeasureMeasures.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/SingleMeasureMeasures.java @@ -1,11 +1,11 @@ -package io.github.metacosm.power.sensors.linux.rapl; +package net.laprun.sustainability.power.sensors.linux.rapl; import java.util.HashSet; import java.util.Set; -import io.github.metacosm.power.SensorMeasure; -import io.github.metacosm.power.sensors.Measures; -import io.github.metacosm.power.sensors.RegisteredPID; +import net.laprun.sustainability.power.SensorMeasure; +import net.laprun.sustainability.power.sensors.Measures; +import net.laprun.sustainability.power.sensors.RegisteredPID; class SingleMeasureMeasures implements Measures { private final Set trackedPIDs = new HashSet<>(); diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/AppleSiliconCPU.java b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/AppleSiliconCPU.java similarity index 92% rename from server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/AppleSiliconCPU.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/AppleSiliconCPU.java index f83d93e8..1197e1cb 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/AppleSiliconCPU.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/AppleSiliconCPU.java @@ -1,13 +1,13 @@ -package io.github.metacosm.power.sensors.macos.powermetrics; +package net.laprun.sustainability.power.sensors.macos.powermetrics; -import static io.github.metacosm.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.*; +import static net.laprun.sustainability.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.*; import java.util.HashMap; import java.util.Map; -import io.github.metacosm.power.SensorMetadata; +import net.laprun.sustainability.power.SensorMetadata; -class AppleSiliconCPU extends io.github.metacosm.power.sensors.macos.powermetrics.CPU { +class AppleSiliconCPU extends CPU { private static final SensorMetadata.ComponentMetadata cpuComponent = new SensorMetadata.ComponentMetadata(CPU, 0, "CPU power", true, "mW"); private static final SensorMetadata.ComponentMetadata gpuComponent = new SensorMetadata.ComponentMetadata(GPU, 1, diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/CPU.java b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/CPU.java similarity index 85% rename from server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/CPU.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/CPU.java index 487a9fbf..e178d852 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/CPU.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/CPU.java @@ -1,9 +1,9 @@ -package io.github.metacosm.power.sensors.macos.powermetrics; +package net.laprun.sustainability.power.sensors.macos.powermetrics; import java.util.HashMap; import java.util.Map; -import io.github.metacosm.power.SensorMetadata; +import net.laprun.sustainability.power.SensorMetadata; abstract class CPU { private SensorMetadata metadata; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/IntelCPU.java b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/IntelCPU.java similarity index 81% rename from server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/IntelCPU.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/IntelCPU.java index 068ea150..538f19ad 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/IntelCPU.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/IntelCPU.java @@ -1,12 +1,12 @@ -package io.github.metacosm.power.sensors.macos.powermetrics; +package net.laprun.sustainability.power.sensors.macos.powermetrics; -import static io.github.metacosm.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.CPU_SHARE; -import static io.github.metacosm.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.PACKAGE; +import static net.laprun.sustainability.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.CPU_SHARE; +import static net.laprun.sustainability.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.PACKAGE; import java.util.HashMap; import java.util.Map; -import io.github.metacosm.power.SensorMetadata; +import net.laprun.sustainability.power.SensorMetadata; class IntelCPU extends CPU { diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java similarity index 95% rename from server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java index 31cb335b..efd3d994 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power.sensors.macos.powermetrics; +package net.laprun.sustainability.power.sensors.macos.powermetrics; import java.io.BufferedReader; import java.io.IOException; @@ -9,12 +9,12 @@ import java.util.Map; import java.util.regex.Pattern; -import io.github.metacosm.power.SensorMeasure; -import io.github.metacosm.power.SensorMetadata; -import io.github.metacosm.power.sensors.MapMeasures; -import io.github.metacosm.power.sensors.Measures; -import io.github.metacosm.power.sensors.PowerSensor; -import io.github.metacosm.power.sensors.RegisteredPID; +import net.laprun.sustainability.power.SensorMeasure; +import net.laprun.sustainability.power.SensorMetadata; +import net.laprun.sustainability.power.sensors.MapMeasures; +import net.laprun.sustainability.power.sensors.Measures; +import net.laprun.sustainability.power.sensors.PowerSensor; +import net.laprun.sustainability.power.sensors.RegisteredPID; public abstract class MacOSPowermetricsSensor implements PowerSensor { public static final String CPU = "CPU"; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/ProcessMacOSPowermetricsSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/ProcessMacOSPowermetricsSensor.java similarity index 95% rename from server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/ProcessMacOSPowermetricsSensor.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/ProcessMacOSPowermetricsSensor.java index 6c93da33..72105a5d 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/ProcessMacOSPowermetricsSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/ProcessMacOSPowermetricsSensor.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power.sensors.macos.powermetrics; +package net.laprun.sustainability.power.sensors.macos.powermetrics; import java.io.InputStream; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java similarity index 91% rename from server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java index 3578eb59..7f20722c 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/ResourceMacOSPowermetricsSensor.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power.sensors.macos.powermetrics; +package net.laprun.sustainability.power.sensors.macos.powermetrics; import java.io.InputStream; diff --git a/server/src/main/java/io/github/metacosm/power/sensors/test/TestPowerSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java similarity index 77% rename from server/src/main/java/io/github/metacosm/power/sensors/test/TestPowerSensor.java rename to server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java index 124be1ee..de95f341 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/test/TestPowerSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java @@ -1,13 +1,13 @@ -package io.github.metacosm.power.sensors.test; +package net.laprun.sustainability.power.sensors.test; import java.util.Map; -import io.github.metacosm.power.SensorMeasure; -import io.github.metacosm.power.SensorMetadata; -import io.github.metacosm.power.sensors.MapMeasures; -import io.github.metacosm.power.sensors.Measures; -import io.github.metacosm.power.sensors.PowerSensor; -import io.github.metacosm.power.sensors.RegisteredPID; +import net.laprun.sustainability.power.SensorMeasure; +import net.laprun.sustainability.power.SensorMetadata; +import net.laprun.sustainability.power.sensors.MapMeasures; +import net.laprun.sustainability.power.sensors.Measures; +import net.laprun.sustainability.power.sensors.PowerSensor; +import net.laprun.sustainability.power.sensors.RegisteredPID; public class TestPowerSensor implements PowerSensor { public static final String CPU = "cpu"; diff --git a/server/src/test/java/io/github/metacosm/power/CIPowerResourceTest.java b/server/src/test/java/net/laprun/sustainability/power/CIPowerResourceTest.java similarity index 97% rename from server/src/test/java/io/github/metacosm/power/CIPowerResourceTest.java rename to server/src/test/java/net/laprun/sustainability/power/CIPowerResourceTest.java index b48c566a..6b21ed69 100644 --- a/server/src/test/java/io/github/metacosm/power/CIPowerResourceTest.java +++ b/server/src/test/java/net/laprun/sustainability/power/CIPowerResourceTest.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.*; diff --git a/server/src/test/java/io/github/metacosm/power/CIQuarkusTestProfile.java b/server/src/test/java/net/laprun/sustainability/power/CIQuarkusTestProfile.java similarity index 84% rename from server/src/test/java/io/github/metacosm/power/CIQuarkusTestProfile.java rename to server/src/test/java/net/laprun/sustainability/power/CIQuarkusTestProfile.java index c219e2c3..e0271fe6 100644 --- a/server/src/test/java/io/github/metacosm/power/CIQuarkusTestProfile.java +++ b/server/src/test/java/net/laprun/sustainability/power/CIQuarkusTestProfile.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import java.util.Set; diff --git a/server/src/test/java/io/github/metacosm/power/MockPowerMeasurer.java b/server/src/test/java/net/laprun/sustainability/power/MockPowerMeasurer.java similarity index 84% rename from server/src/test/java/io/github/metacosm/power/MockPowerMeasurer.java rename to server/src/test/java/net/laprun/sustainability/power/MockPowerMeasurer.java index 3888faea..5b1919e8 100644 --- a/server/src/test/java/io/github/metacosm/power/MockPowerMeasurer.java +++ b/server/src/test/java/net/laprun/sustainability/power/MockPowerMeasurer.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import io.quarkus.test.Mock; diff --git a/server/src/test/java/io/github/metacosm/power/MockPowerSensor.java b/server/src/test/java/net/laprun/sustainability/power/MockPowerSensor.java similarity index 60% rename from server/src/test/java/io/github/metacosm/power/MockPowerSensor.java rename to server/src/test/java/net/laprun/sustainability/power/MockPowerSensor.java index 22bdfac4..fe9cd1e3 100644 --- a/server/src/test/java/io/github/metacosm/power/MockPowerSensor.java +++ b/server/src/test/java/net/laprun/sustainability/power/MockPowerSensor.java @@ -1,7 +1,7 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; -import io.github.metacosm.power.sensors.macos.powermetrics.ResourceMacOSPowermetricsSensor; import io.quarkus.test.Mock; +import net.laprun.sustainability.power.sensors.macos.powermetrics.ResourceMacOSPowermetricsSensor; @Mock @SuppressWarnings("unused") diff --git a/server/src/test/java/io/github/metacosm/power/PowerResourceIT.java b/server/src/test/java/net/laprun/sustainability/power/PowerResourceIT.java similarity index 82% rename from server/src/test/java/io/github/metacosm/power/PowerResourceIT.java rename to server/src/test/java/net/laprun/sustainability/power/PowerResourceIT.java index 09186082..cd174de6 100644 --- a/server/src/test/java/io/github/metacosm/power/PowerResourceIT.java +++ b/server/src/test/java/net/laprun/sustainability/power/PowerResourceIT.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/server/src/test/java/io/github/metacosm/power/PowerResourceTest.java b/server/src/test/java/net/laprun/sustainability/power/PowerResourceTest.java similarity index 98% rename from server/src/test/java/io/github/metacosm/power/PowerResourceTest.java rename to server/src/test/java/net/laprun/sustainability/power/PowerResourceTest.java index 2a323fc8..10117e6c 100644 --- a/server/src/test/java/io/github/metacosm/power/PowerResourceTest.java +++ b/server/src/test/java/net/laprun/sustainability/power/PowerResourceTest.java @@ -1,4 +1,4 @@ -package io.github.metacosm.power; +package net.laprun.sustainability.power; import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.*; diff --git a/server/src/test/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java b/server/src/test/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java similarity index 93% rename from server/src/test/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java rename to server/src/test/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java index 62749773..075a4abc 100644 --- a/server/src/test/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java +++ b/server/src/test/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java @@ -1,12 +1,12 @@ -package io.github.metacosm.power.sensors.macos.powermetrics; +package net.laprun.sustainability.power.sensors.macos.powermetrics; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import io.github.metacosm.power.SensorMetadata; -import io.github.metacosm.power.sensors.Measures; -import io.github.metacosm.power.sensors.RegisteredPID; +import net.laprun.sustainability.power.SensorMetadata; +import net.laprun.sustainability.power.sensors.Measures; +import net.laprun.sustainability.power.sensors.RegisteredPID; class MacOSPowermetricsSensorTest { From c3ff23bfe05f7c0be2e10487dc217c2369cb2508 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 1 Feb 2024 20:58:10 +0100 Subject: [PATCH 2/2] refactor: clean-up --- .../power/sensors/linux/rapl/IntelRAPLSensor.java | 2 +- .../sustainability/power/sensors/test/TestPowerSensor.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java index 639ccd0d..a7feed03 100644 --- a/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java @@ -67,7 +67,7 @@ private static boolean isReadable(Path file) { } @Override - public void start(long frequency) throws Exception { + public void start(long frequency) { this.frequency = frequency; // perform an initial measure to prime the data diff --git a/server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java index de95f341..0fe7f5ba 100644 --- a/server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java @@ -9,6 +9,7 @@ import net.laprun.sustainability.power.sensors.PowerSensor; import net.laprun.sustainability.power.sensors.RegisteredPID; +@SuppressWarnings("unused") public class TestPowerSensor implements PowerSensor { public static final String CPU = "cpu"; public static final SensorMetadata DEFAULT = new SensorMetadata( @@ -37,7 +38,7 @@ public boolean isStarted() { } @Override - public void start(long samplingFrequencyInMillis) throws Exception { + public void start(long samplingFrequencyInMillis) { if (!started) { started = true; }