From 4531296043463887a2809894b818e666bad29cd1 Mon Sep 17 00:00:00 2001 From: Joshua Matsuoka Date: Wed, 15 May 2024 16:03:46 -0400 Subject: [PATCH] chore(jmacagent): update JMC agent-related imports (#465) --- src/main/java/io/cryostat/jmcagent/JMCAgent.java | 15 ++++++++------- .../cryostat/jmcagent/S3ProbeTemplateService.java | 4 ++-- .../jmcagent/SerializableProbeTemplateInfo.java | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/cryostat/jmcagent/JMCAgent.java b/src/main/java/io/cryostat/jmcagent/JMCAgent.java index 82cbc653c..ebb09fd94 100644 --- a/src/main/java/io/cryostat/jmcagent/JMCAgent.java +++ b/src/main/java/io/cryostat/jmcagent/JMCAgent.java @@ -23,10 +23,10 @@ import java.util.Map; import io.cryostat.V2Response; -import io.cryostat.core.agent.AgentJMXHelper; -import io.cryostat.core.agent.AgentJMXHelper.ProbeDefinitionException; -import io.cryostat.core.agent.Event; -import io.cryostat.core.agent.ProbeTemplate; +import io.cryostat.core.jmcagent.Event; +import io.cryostat.core.jmcagent.JMCAgentJMXHelper; +import io.cryostat.core.jmcagent.JMCAgentJMXHelper.ProbeDefinitionException; +import io.cryostat.core.jmcagent.ProbeTemplate; import io.cryostat.core.sys.FileSystem; import io.cryostat.targets.Target; import io.cryostat.targets.TargetConnectionManager; @@ -70,7 +70,7 @@ public Response postProbe(@RestPath long id, @RestPath String probeTemplateName) return connectionManager.executeConnectedTask( target, connection -> { - AgentJMXHelper helper = new AgentJMXHelper(connection.getHandle()); + JMCAgentJMXHelper helper = new JMCAgentJMXHelper(connection.getHandle()); try { ProbeTemplate template = new ProbeTemplate(); // Retrieve template and deserialize to validate @@ -129,7 +129,8 @@ public Response deleteProbe(@RestPath long id) { target, connection -> { try { - AgentJMXHelper helper = new AgentJMXHelper(connection.getHandle()); + JMCAgentJMXHelper helper = + new JMCAgentJMXHelper(connection.getHandle()); // The convention for removing probes in the agent controller mbean is // to call defineEventProbes with a null argument. helper.defineEventProbes(null); @@ -172,7 +173,7 @@ public V2Response getProbes(@RestPath long id) { return connectionManager.executeConnectedTask( target, connection -> { - AgentJMXHelper helper = new AgentJMXHelper(connection.getHandle()); + JMCAgentJMXHelper helper = new JMCAgentJMXHelper(connection.getHandle()); List result = new ArrayList<>(); String probes = helper.retrieveEventProbes(); try { diff --git a/src/main/java/io/cryostat/jmcagent/S3ProbeTemplateService.java b/src/main/java/io/cryostat/jmcagent/S3ProbeTemplateService.java index b42bc8990..a22588846 100644 --- a/src/main/java/io/cryostat/jmcagent/S3ProbeTemplateService.java +++ b/src/main/java/io/cryostat/jmcagent/S3ProbeTemplateService.java @@ -26,8 +26,8 @@ import io.cryostat.ConfigProperties; import io.cryostat.Producers; import io.cryostat.StorageBuckets; -import io.cryostat.core.agent.ProbeTemplate; -import io.cryostat.core.agent.ProbeTemplateService; +import io.cryostat.core.jmcagent.ProbeTemplate; +import io.cryostat.core.jmcagent.ProbeTemplateService; import io.cryostat.ws.MessagingServer; import io.cryostat.ws.Notification; diff --git a/src/main/java/io/cryostat/jmcagent/SerializableProbeTemplateInfo.java b/src/main/java/io/cryostat/jmcagent/SerializableProbeTemplateInfo.java index b11af2dc3..2dceafba3 100644 --- a/src/main/java/io/cryostat/jmcagent/SerializableProbeTemplateInfo.java +++ b/src/main/java/io/cryostat/jmcagent/SerializableProbeTemplateInfo.java @@ -17,7 +17,7 @@ import java.util.Objects; -import io.cryostat.core.agent.ProbeTemplate; +import io.cryostat.core.jmcagent.ProbeTemplate; public record SerializableProbeTemplateInfo(String name, String xml) {