20: Update PriceAlarmDefinition to support expressions

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmAction.tjava

@@ -2,5 +2,5 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 
 @FunctionalInterface
 public interface AlarmAction {
-    void trigger(OraclePrice price, ResolvedPriceAlarm alarm);
+    void trigger(OraclePrice price, PriceAlarmDefinition alarm);
 }

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmConfiguration.tjava

@@ -1,19 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-
-public record AlarmConfiguration(
-        List<PriceAlarmDefinition> definitions,
-        Map<String, String> variables
-) {
-    public AlarmConfiguration {
-        Objects.requireNonNull(definitions, "definitions");
-        Objects.requireNonNull(variables, "variables");
-
-        definitions = List.copyOf(definitions);
-        variables = new ConcurrentHashMap<>(variables);
-    }
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmConfigurationParser.tjava

@@ -3,13 +3,14 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 import com.r35157.jupiterperpsalarm.AlarmSeverity;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 
 public final class AlarmConfigurationParser {
 
-    public static AlarmConfiguration parse(Path path) throws IOException {
+    public static List<PriceAlarmDefinition> parse(Path path) throws IOException {
         List<String> lines = Files.readAllLines(path);
         List<PriceAlarmDefinition> alarms = new ArrayList<>();
         Map<String, String> constants = new LinkedHashMap<>();
@@ -26,7 +27,8 @@ public final class AlarmConfigurationParser {
                 if(isConstantDefinition(trimmed)) {
                     parseConstantDefinition(constants, line);
                 } else {
-                    alarms.add(parseLine(line));
+                    String resolvedLine = replaceConstants(line, constants);
+                    alarms.add(parseLine(resolvedLine));
                 }
             } catch (RuntimeException exception) {
                 throw new IllegalArgumentException(
@@ -40,7 +42,7 @@ public final class AlarmConfigurationParser {
             throw new IllegalArgumentException("No alarms found in " + path);
         }
 
-        return new AlarmConfiguration(alarms, constants);
+        return List.copyOf(alarms);
     }
 
     static PriceAlarmDefinition parseLine(String line) {
@@ -56,7 +58,7 @@ public final class AlarmConfigurationParser {
                 cursor.nextToken("direction").toUpperCase(Locale.ROOT)
         );
 
-        String targetExpression = cursor.nextToken("target");
+        BigDecimal target = parseTarget(cursor.nextToken("target"));
 
         TriggerConfiguration triggerConfiguration = parseTrigger(
                 cursor.nextToken("trigger")
@@ -79,7 +81,7 @@ public final class AlarmConfigurationParser {
                 id,
                 asset,
                 direction,
-                targetExpression,
+                target,
                 triggerConfiguration.trigger(),
                 triggerConfiguration.gracePeriod(),
                 severity,
@@ -87,6 +89,28 @@ public final class AlarmConfigurationParser {
         );
     }
 
+    private static BigDecimal parseTargetPercentage(
+            String targetStr,
+            int operatorIndex,
+            boolean add
+    ) {
+        BigDecimal base = new BigDecimal(targetStr.substring(0, operatorIndex));
+        String percentStr = targetStr.substring(operatorIndex + 1, targetStr.length() - 1);
+        BigDecimal percent = new BigDecimal(percentStr);
+
+        BigDecimal delta = base
+                .multiply(percent)
+                .divide(BigDecimal.valueOf(100));
+
+        BigDecimal target = add ? base.add(delta) : base.subtract(delta);
+
+        validateTarget(base, targetStr);
+        validateTarget(percent, targetStr);
+        validateTarget(target, targetStr);
+
+        return target;
+    }
+
     private static TriggerConfiguration parseTrigger(String triggerText) {
         String normalized = triggerText.toUpperCase(Locale.ROOT);
 
@@ -131,6 +155,35 @@ public final class AlarmConfigurationParser {
         throw new IllegalArgumentException("Unknown trigger: " + triggerText);
     }
 
+    private static void validateTarget(BigDecimal target, String originalTargetStr) {
+        if (target.compareTo(BigDecimal.ZERO) < 0) {
+            throw new IllegalArgumentException(
+                    "Target must be zero or positive: " + originalTargetStr
+            );
+        }
+    }
+
+    private static BigDecimal parseTarget(String targetStr) {
+        String trimmedTargetStr = targetStr.trim();
+
+        if (trimmedTargetStr.endsWith("%")) {
+            int plusIndex = trimmedTargetStr.indexOf('+');
+            int minusIndex = trimmedTargetStr.indexOf('-', 1);
+
+            if (plusIndex >= 0) {
+                return parseTargetPercentage(trimmedTargetStr, plusIndex, true);
+            }
+
+            if (minusIndex >= 0) {
+                return parseTargetPercentage(trimmedTargetStr, minusIndex, false);
+            }
+        }
+
+        BigDecimal target = new BigDecimal(trimmedTargetStr);
+        validateTarget(target, targetStr);
+        return target;
+    }
+
     private static final class Cursor {
         private Cursor(String line) {
             this.line = line;
@@ -237,21 +290,9 @@ public final class AlarmConfigurationParser {
 
         validateConstantName(name);
 
-        constants.put(parseVariableName(name), value);
+        if (constants.putIfAbsent(name, value) != null) {
+            throw new IllegalArgumentException("Duplicate constant: " + name);
         }
-
-    private static String parseVariableName(String variableName) {
-        if (!variableName.startsWith("{{") || !variableName.endsWith("}}")) {
-            throw new IllegalArgumentException("Invalid variable name: " + variableName);
-        }
-
-        String parsedVariableName = variableName.substring(2, variableName.length() - 2);
-
-        if (parsedVariableName.isBlank()) {
-            throw new IllegalArgumentException("Variable name cannot be blank: " + variableName);
-        }
-
-        return parsedVariableName;
     }
 
     private static String replaceConstants(

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmTargetParser.tjava

@@ -1,60 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.math.BigDecimal;
-
-public final class AlarmTargetParser {
-
-    private AlarmTargetParser() {
-    }
-
-    public static BigDecimal parse(String targetStr) {
-        String trimmedTargetStr = targetStr.trim();
-
-        if (trimmedTargetStr.endsWith("%")) {
-            int plusIndex = trimmedTargetStr.indexOf('+');
-            int minusIndex = trimmedTargetStr.indexOf('-', 1);
-
-            if (plusIndex >= 0) {
-                return parseTargetPercentage(trimmedTargetStr, plusIndex, true);
-            }
-
-            if (minusIndex >= 0) {
-                return parseTargetPercentage(trimmedTargetStr, minusIndex, false);
-            }
-        }
-
-        BigDecimal target = new BigDecimal(trimmedTargetStr);
-        validateTarget(target, targetStr);
-        return target;
-    }
-
-    private static BigDecimal parseTargetPercentage(
-            String targetStr,
-            int operatorIndex,
-            boolean add
-    ) {
-        BigDecimal base = new BigDecimal(targetStr.substring(0, operatorIndex));
-        String percentStr = targetStr.substring(operatorIndex + 1, targetStr.length() - 1);
-        BigDecimal percent = new BigDecimal(percentStr);
-
-        BigDecimal delta = base
-                .multiply(percent)
-                .divide(BigDecimal.valueOf(100));
-
-        BigDecimal target = add ? base.add(delta) : base.subtract(delta);
-
-        validateTarget(base, targetStr);
-        validateTarget(percent, targetStr);
-        validateTarget(target, targetStr);
-
-        return target;
-    }
-
-    private static void validateTarget(BigDecimal target, String originalTargetStr) {
-        if (target.compareTo(BigDecimal.ZERO) < 0) {
-            throw new IllegalArgumentException(
-                    "Target must be zero or positive: " + originalTargetStr
-            );
-        }
-    }
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmVariableResolver.tjava

@@ -1,30 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.util.Map;
-import java.util.Objects;
-
-public final class AlarmVariableResolver {
-
-    public AlarmVariableResolver(Map<String, String> variables) {
-        this.variables = Objects.requireNonNull(variables, "variables");
-    }
-
-    public String resolve(String text) {
-        Objects.requireNonNull(text, "text");
-
-        String resolvedText = text;
-
-        for (Map.Entry<String, String> entry : variables.entrySet()) {
-            String placeholder = "{{" + entry.getKey() + "}}";
-            resolvedText = resolvedText.replace(placeholder, entry.getValue());
-        }
-
-        if (resolvedText.contains("{{") || resolvedText.contains("}}")) {
-            throw new IllegalArgumentException("Unresolved variable in text: " + text);
-        }
-
-        return resolvedText;
-    }
-
-    private final Map<String, String> variables;
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AssetPriceAlarmMonitor.tjava

@@ -12,7 +12,6 @@ public final class AssetPriceAlarmMonitor {
     public AssetPriceAlarmMonitor(
             JupiterPerpsAsset asset,
             List<PriceAlarmDefinition> definitions,
-            AlarmVariableResolver variableResolver,
             AlarmAction action
     ) {
         this.asset = asset;
@@ -23,7 +22,7 @@ public final class AssetPriceAlarmMonitor {
                                 "Alarm asset " + definition.asset() + " does not match monitor " + asset
                         );
                     }
-                    return new PriceAlarm(definition, variableResolver, action);
+                    return new PriceAlarm(definition, action);
                 })
                 .toList();
 

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/CompositeAlarmAction.tjava

@@ -9,7 +9,7 @@ public final class CompositeAlarmAction implements AlarmAction {
     }
 
     @Override
-    public void trigger(OraclePrice price, ResolvedPriceAlarm alarm) {
+    public void trigger(OraclePrice price, PriceAlarmDefinition alarm) {
         for (AlarmAction action : actions) {
             try {
                 action.trigger(price, alarm);

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/ConsoleAlarmAction.tjava

@@ -2,7 +2,7 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 
 public final class ConsoleAlarmAction implements AlarmAction {
     @Override
-    public void trigger(OraclePrice price, ResolvedPriceAlarm alarm) {
+    public void trigger(OraclePrice price, PriceAlarmDefinition alarm) {
         System.err.println();
         System.err.println("============================================================");
         System.err.printf(

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/JupiterPerpsAlarmImpl.tjava

@@ -1,10 +1,5 @@
 package com.r35157.jupiterperpsalarm.impl.ref;
 
-import com.r35157.libs.jupiter.perps.JupiterPerpsService;
-import com.r35157.libs.jupiter.perps.impl.anchoridl.AnchorIdlJupiterPerpsServiceImpl;
-import com.r35157.libs.solana.SolanaBlockChain;
-import com.r35157.libs.solana.impl.ref.SolanaBlockChainImpl;
-
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -18,7 +13,6 @@ public final class JupiterPerpsAlarmImpl {
 
     public static void main(String[] args) throws Exception {
         Config config;
-
         try {
             config = Config.parse(args, System.getenv());
         } catch (IllegalArgumentException exception) {
@@ -28,34 +22,13 @@ public final class JupiterPerpsAlarmImpl {
         }
 
         List<PriceAlarmDefinition> definitions;
-        AlarmConfiguration alarmConfiguration;
-
         try {
-            alarmConfiguration = AlarmConfigurationParser.parse(config.alarmConfiguration());
+            definitions = AlarmConfigurationParser.parse(config.alarmConfiguration());
-            definitions = alarmConfiguration.definitions();
         } catch (Exception exception) {
             String errMsg = "Could not load alarm configuration: " + exception.getMessage() + "!";
             throw new IllegalStateException(errMsg, exception);
         }
 
-        AlarmVariableResolver variableResolver = new AlarmVariableResolver(
-                alarmConfiguration.variables()
-        );
-
-        SolanaBlockChain solanaBlockChain = new SolanaBlockChainImpl();
-        JupiterPerpsService jupiterPerpsService = new AnchorIdlJupiterPerpsServiceImpl(solanaBlockChain);
-        JupiterPerpsEntryPriceVariableRefresher entryPriceVariableRefresher =
-                new JupiterPerpsEntryPriceVariableRefresher(alarmConfiguration.variables(), jupiterPerpsService);
-        entryPriceVariableRefresher.refresh();
-
-        JupiterPerpsEntryPriceVariableRefreshWatcher entryPriceVariableRefreshWatcher =
-                new JupiterPerpsEntryPriceVariableRefreshWatcher(
-                        config.alarmConfiguration().getParent(),
-                        entryPriceVariableRefresher
-                );
-
-        entryPriceVariableRefreshWatcher.start();
-
         List<AlarmAction> actions = new ArrayList<>();
         actions.add(new ConsoleAlarmAction());
 
@@ -79,10 +52,9 @@ public final class JupiterPerpsAlarmImpl {
         Map<JupiterPerpsAsset, AssetPriceAlarmMonitor> monitors = new EnumMap<>(
                 JupiterPerpsAsset.class
         );
-
         definitionsByAsset.forEach((asset, assetDefinitions) -> monitors.put(
                 asset,
-                new AssetPriceAlarmMonitor(asset, assetDefinitions, variableResolver, action)
+                new AssetPriceAlarmMonitor(asset, assetDefinitions, action)
         ));
 
         List<OracleWebSocketClient> clients = new ArrayList<>();
@@ -113,7 +85,7 @@ public final class JupiterPerpsAlarmImpl {
             assetDefinitions.forEach(definition -> System.out.printf(
                     "    %s %s USD, %s, severity=%s%n",
                     definition.direction(),
-                    definition.targetExpression(),
+                    definition.target().toPlainString(),
                     definition.trigger(),
                     definition.severity()
             ));

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/JupiterPerpsEntryPriceVariableRefreshWatcher.tjava

@@ -1,92 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.nio.file.*;
-import java.util.Objects;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.FileSystems;
-import java.nio.file.StandardWatchEventKinds;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
-
-public final class JupiterPerpsEntryPriceVariableRefreshWatcher {
-
-    public JupiterPerpsEntryPriceVariableRefreshWatcher(
-            Path confDirectory,
-            JupiterPerpsEntryPriceVariableRefresher refresher
-    ) {
-        this.confDirectory = Objects.requireNonNull(confDirectory, "confDirectory");
-        this.refresher = Objects.requireNonNull(refresher, "refresher");
-    }
-
-    public void start() {
-        Thread thread = new Thread(
-                this::run,
-                "jupiter-perps-entry-price-variable-refresh-watcher"
-        );
-
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    private void run() {
-        try (WatchService watchService = FileSystems.getDefault().newWatchService()) {
-
-            confDirectory.register(
-                    watchService,
-                    StandardWatchEventKinds.ENTRY_CREATE
-            );
-
-            System.out.println(
-                    "Jupiter Perps entry price variable refresh watcher started for directory: "
-                            + confDirectory
-            );
-            while (true) {
-                WatchKey key = watchService.take();
-
-                for (WatchEvent<?> event : key.pollEvents()) {
-                    Path path = (Path) event.context();
-
-                    if (!REFRESH_TRIGGER_FILE_NAME.equals(path.getFileName().toString())) {
-                        continue;
-                    }
-
-                    Path triggerFile = confDirectory.resolve(path);
-
-                    System.out.println("Refresh trigger file detected: " + triggerFile);
-
-                    try {
-                        refresher.refresh();
-                    } finally {
-                        Files.deleteIfExists(triggerFile);
-                    }
-                }
-
-                if (!key.reset()) {
-                    System.err.println(
-                            "Jupiter Perps entry price variable refresh watcher stopped: watch key is no longer valid"
-                    );
-                    return;
-                }
-            }
-        } catch (IOException exception) {
-            System.err.println(
-                    "Could not start Jupiter Perps entry price variable refresh watcher: "
-                            + exception.getMessage()
-            );
-        } catch (InterruptedException exception) {
-            Thread.currentThread().interrupt();
-
-            System.err.println(
-                    "Jupiter Perps entry price variable refresh watcher interrupted"
-            );
-        }
-    }
-
-    private static final String REFRESH_TRIGGER_FILE_NAME =
-            "jupiter-perps-alarm-var.refresh";
-
-    private final Path confDirectory;
-    private final JupiterPerpsEntryPriceVariableRefresher refresher;
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/JupiterPerpsEntryPriceVariableRefresher.tjava

@@ -1,86 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import com.r35157.libs.jupiter.perps.JupiterPerpsPosition;
-import com.r35157.libs.jupiter.perps.JupiterPerpsService;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-public final class JupiterPerpsEntryPriceVariableRefresher {
-
-    public JupiterPerpsEntryPriceVariableRefresher(
-            Map<String, String> variables,
-            JupiterPerpsService jupiterPerpsService
-    ) {
-        this.variables = Objects.requireNonNull(variables, "variables");
-        this.jupiterPerpsService = Objects.requireNonNull(jupiterPerpsService, "jupiterPerpsService");
-    }
-
-    public void refresh() {
-        ΩSolanaWalletIdΩ  wallet = variables.get("JUPITER_PERPS_WALLET");
-
-        if (wallet == null || wallet.isBlank()) {
-            System.err.println("Cannot refresh Jupiter Perps entry price variables: JUPITER_PERPS_WALLET is not configured");
-            return;
-        }
-
-        try {
-            Set<JupiterPerpsPosition> positions = jupiterPerpsService.getOpenPositions(wallet);
-
-            System.out.println(
-                    "Fetched " + positions.size()
-                            + " open Jupiter Perps positions for wallet: " + wallet
-            );
-
-            removeEntryPriceVariables();
-
-            for (JupiterPerpsPosition position : positions) {
-                String variableName = createEntryPriceVariableName(position);
-
-                System.out.println(
-                        "Jupiter Perps position maps to variable "
-                                + variableName
-                                + " = "
-                                + position.entryPrice()
-                );
-                variables.put(variableName, position.entryPrice().toPlainString());
-            }
-        } catch (IOException | InterruptedException exception) {
-            if (exception instanceof InterruptedException) {
-                Thread.currentThread().interrupt();
-            }
-
-            System.err.println(
-                    "Could not refresh Jupiter Perps entry price variables: "
-                            + exception.getMessage()
-            );
-        }
-    }
-
-    private void removeEntryPriceVariables() {
-        variables.remove("SOL_LONG_ENTRY_PRICE");
-        variables.remove("SOL_SHORT_ENTRY_PRICE");
-        variables.remove("BTC_LONG_ENTRY_PRICE");
-        variables.remove("BTC_SHORT_ENTRY_PRICE");
-        variables.remove("ETH_LONG_ENTRY_PRICE");
-        variables.remove("ETH_SHORT_ENTRY_PRICE");
-    }
-
-    private static String createEntryPriceVariableName(JupiterPerpsPosition position) {
-        String asset = switch (position.tradedTokenMint()) {
-            case "So11111111111111111111111111111111111111112" -> "SOL";
-            case "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh" -> "BTC";
-            case "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs" -> "ETH";
-            default -> throw new IllegalArgumentException(
-                    "Unsupported Jupiter Perps traded token mint: " + position.tradedTokenMint()
-            );
-        };
-
-        return asset + "_" + position.direction() + "_ENTRY_PRICE";
-    }
-
-    private final Map<String, String> variables;
-    private final JupiterPerpsService jupiterPerpsService;
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/PriceAlarm.tjava

@@ -1,17 +1,11 @@
 package com.r35157.jupiterperpsalarm.impl.ref;
 
-import java.math.BigDecimal;
 import java.time.Instant;
 
 public final class PriceAlarm {
 
-    public PriceAlarm(
+    public PriceAlarm(PriceAlarmDefinition definition, AlarmAction action) {
-            PriceAlarmDefinition definition,
-            AlarmVariableResolver variableResolver,
-            AlarmAction action
-    ) {
         this.definition = definition;
-        this.variableResolver = variableResolver;
         this.action = action;
     }
 
@@ -22,23 +16,9 @@ public final class PriceAlarm {
             );
         }
 
-        BigDecimal target;
-        try {
-            target = AlarmTargetParser.parse(
-                    variableResolver.resolve(definition.targetExpression())
-            );
-        } catch (RuntimeException exception) {
-            System.err.printf(
-                    "Could not resolve target for alarm %d: %s%n",
-                    definition.id(),
-                    exception.getMessage()
-            );
-            return;
-        }
-
         boolean reached = definition.direction().reached(
                 price.priceUsd(),
-                target
+                definition.target()
         );
 
         boolean enteredTriggeredSide = previousReached == null
@@ -57,13 +37,13 @@ public final class PriceAlarm {
                 return;
             }
 
-            trigger(price, target);
+            trigger(price);
             return;
         }
 
         if (definition.trigger() == AlarmTrigger.PERSISTENT) {
             if (lastTriggeredAt == null || persistentGracePeriodHasPassed()) {
-                trigger(price, target);
+                trigger(price);
             }
             return;
         }
@@ -95,39 +75,13 @@ public final class PriceAlarm {
         );
     }
 
-    private void trigger(OraclePrice price, BigDecimal target) {
+    private void trigger(OraclePrice price) {
         triggerCount++;
         lastTriggeredAt = Instant.now();
-
+        action.trigger(price, definition);
-        String note;
-
-        try {
-            note = variableResolver.resolve(definition.note());
-        } catch (RuntimeException exception) {
-            System.err.printf(
-                    "Could not resolve note for alarm %d: %s%n",
-                    definition.id(),
-                    exception.getMessage()
-            );
-            return;
-        }
-
-        ResolvedPriceAlarm resolvedAlarm = new ResolvedPriceAlarm(
-                definition.id(),
-                definition.asset(),
-                definition.direction(),
-                target,
-                definition.trigger(),
-                definition.triggerGracePeriod(),
-                definition.severity(),
-                note
-        );
-
-        action.trigger(price, resolvedAlarm);
     }
 
     private final PriceAlarmDefinition definition;
-    private final AlarmVariableResolver variableResolver;
     private final AlarmAction action;
 
     private Instant lastTriggeredAt;

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/PriceAlarmDefinition.tjava

@@ -2,6 +2,7 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 
 import com.r35157.jupiterperpsalarm.AlarmSeverity;
 
+import java.math.BigDecimal;
 import java.util.Objects;
 
 public record PriceAlarmDefinition(

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/PushoverAlarmAction.tjava

@@ -18,7 +18,7 @@ public final class PushoverAlarmAction implements AlarmAction {
     }
 
     @Override
-    public void trigger(OraclePrice price, ResolvedPriceAlarm alarm) {
+    public void trigger(OraclePrice price, PriceAlarmDefinition alarm) {
         String title = "Jupiter Perps " + price.asset() + " alarm";
         String message = createMessage(price, alarm);
 
@@ -26,7 +26,7 @@ public final class PushoverAlarmAction implements AlarmAction {
                 form("user", userKey) + "&" +
                 form("title", title) + "&" +
                 form("message", message) + "&" +
-                createPushoverSeverityParameters(alarm.severity());
+                createPushoverSeverityParameters(alarm.severity());;
 
         HttpRequest request = HttpRequest.newBuilder(PUSHOVER_URI)
                 .timeout(Duration.ofSeconds(15))
@@ -69,7 +69,7 @@ public final class PushoverAlarmAction implements AlarmAction {
         };
     }
 
-    private static String createMessage(OraclePrice price, ResolvedPriceAlarm alarm) {
+    private static String createMessage(OraclePrice price, PriceAlarmDefinition alarm) {
         return String.format(
                 "%d - %s: %s%n%n%s is %s USD.%nTarget: %s %s USD.%nOracle time: %s.%nSlot: %d.",
                 alarm.id(),

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/ResolvedPriceAlarm.tjava

@@ -1,16 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import com.r35157.jupiterperpsalarm.AlarmSeverity;
-import java.math.BigDecimal;
-
-public record ResolvedPriceAlarm(
-        int id,
-        JupiterPerpsAsset asset,
-        PriceDirection direction,
-        BigDecimal target,
-        AlarmTrigger trigger,
-        ΩsecondsΩ triggerGracePeriod,
-        AlarmSeverity severity,
-        String note
-) {
-}