Skip to content

Commit

Permalink
chore(jmcagent): Rename JMC agent classes and package, remove LocalPr…
Browse files Browse the repository at this point in the history
…obeTemplateService (#398)
  • Loading branch information
Josh-Matsuoka authored May 15, 2024
1 parent d43c082 commit 59097a1
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 265 deletions.
137 changes: 0 additions & 137 deletions src/main/java/io/cryostat/core/agent/LocalProbeTemplateService.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import java.net.URI;
import java.net.URISyntaxException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import java.io.IOException;
import java.util.logging.Level;
Expand All @@ -28,9 +28,9 @@

import org.openjdk.jmc.rjmx.common.IConnectionHandle;

public class AgentJMXHelper {
public class JMCAgentJMXHelper {

private static final Logger logger = Logger.getLogger(AgentJMXHelper.class.getName());
private static final Logger logger = Logger.getLogger(JMCAgentJMXHelper.class.getName());
private static final String AGENT_OBJECT_NAME =
"org.openjdk.jmc.jfr.agent:type=AgentController";
private static final String DEFINE_EVENT_PROBES = "defineEventProbes";
Expand All @@ -40,7 +40,7 @@ public class AgentJMXHelper {
private final IConnectionHandle connectionHandle;
private final MBeanServerConnection mbsc;

public AgentJMXHelper(IConnectionHandle connectionHandle) {
public JMCAgentJMXHelper(IConnectionHandle connectionHandle) {
this.connectionHandle = connectionHandle;
mbsc = connectionHandle.getServiceOrDummy(MBeanServerConnection.class);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;

public class AgentXMLStream extends BufferedInputStream {
public class JMCAgentXMLStream extends BufferedInputStream {

public AgentXMLStream(InputStream is) {
public JMCAgentXMLStream(InputStream is) {
super(is);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import java.io.*;
import java.util.ArrayList;
Expand Down Expand Up @@ -70,7 +70,7 @@ public ProbeTemplate() {
}

public void deserialize(InputStream xmlStream) throws IOException, SAXException {
AgentXMLStream stream = new AgentXMLStream(xmlStream);
JMCAgentXMLStream stream = new JMCAgentXMLStream(xmlStream);
stream.mark(1); // arbitrary readLimit > 0
ProbeValidator validator = new ProbeValidator();
validator.validate(new StreamSource(stream));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

public class ProbeValidationException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.core.agent;
package io.cryostat.core.jmcagent;

import java.io.IOException;

Expand Down
81 changes: 0 additions & 81 deletions src/test/java/io/cryostat/core/agent/ProbeTemplateServiceTest.java

This file was deleted.

30 changes: 0 additions & 30 deletions src/test/resources/io/cryostat/core/agent/template.xml

This file was deleted.

0 comments on commit 59097a1

Please sign in to comment.