Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(cleanup): Adjust for core changes to abstract away the Document type #449

Merged
merged 2 commits into from
May 21, 2024
Merged

chore(cleanup): Adjust for core changes to abstract away the Document type #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65c5570
Adjust for core changes
Josh-Matsuoka May 9, 2024
0f5921e
Remove document reference
Josh-Matsuoka May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/main/java/io/cryostat/events/EventTemplates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.jboss.resteasy.reactive.RestPath;
import org.jboss.resteasy.reactive.RestResponse;
import org.jboss.resteasy.reactive.multipart.FileUpload;
import org.jsoup.nodes.Document;

@Path("")
public class EventTemplates {
Expand Down Expand Up @@ -179,24 +178,24 @@ public Response getTargetTemplate(
@RestPath long id, @RestPath TemplateType templateType, @RestPath String templateName)
throws Exception {
Target target = Target.find("id", id).singleResult();
Document doc;
String xml;
switch (templateType) {
case TARGET:
doc =
xml =
targetTemplateServiceFactory
.create(target)
.getXml(templateName, templateType)
.orElseThrow();
break;
case CUSTOM:
doc = customTemplateService.getXml(templateName, templateType).orElseThrow();
xml = customTemplateService.getXml(templateName, templateType).orElseThrow();
break;
default:
throw new BadRequestException();
}
return Response.status(RestResponse.Status.OK)
.header(HttpHeaders.CONTENT_TYPE, HttpMimeType.JFC.mime())
.entity(doc.toString())
.entity(xml)
.build();
}
}
11 changes: 4 additions & 7 deletions src/main/java/io/cryostat/events/S3TemplateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
import io.cryostat.StorageBuckets;
import io.cryostat.core.FlightRecorderException;
import io.cryostat.core.templates.MutableTemplateService;
import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
import io.cryostat.core.templates.Template;
import io.cryostat.core.templates.TemplateType;
import io.cryostat.ws.MessagingServer;
Expand All @@ -62,7 +60,6 @@
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.parser.Parser;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.services.s3.S3Client;
Expand Down Expand Up @@ -156,12 +153,12 @@ public List<Template> getTemplates() throws FlightRecorderException {
}

@Override
public Optional<Document> getXml(String templateName, TemplateType unused)
public Optional<String> getXml(String templateName, TemplateType unused)
throws FlightRecorderException {
try (var stream = getModel(templateName)) {
Document doc =
Jsoup.parse(stream, StandardCharsets.UTF_8.name(), "", Parser.xmlParser());
return Optional.of(doc);
return Optional.of(
Jsoup.parse(stream, StandardCharsets.UTF_8.name(), "", Parser.xmlParser())
.outerHtml());
} catch (IOException e) {
logger.error(e);
return Optional.empty();
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/io/cryostat/events/TargetTemplateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.jsoup.nodes.Document;

public class TargetTemplateService implements TemplateService {

Expand Down Expand Up @@ -62,11 +61,15 @@ public List<Template> getTemplates() throws FlightRecorderException {
}

@Override
public Optional<Document> getXml(String templateName, TemplateType unused)
public Optional<String> getXml(String templateName, TemplateType unused)
throws FlightRecorderException {
return connectionManager.executeConnectedTask(
target,
conn -> conn.getTemplateService().getXml(templateName, TemplateType.TARGET));
Optional doc =
connectionManager.executeConnectedTask(
target,
conn ->
conn.getTemplateService()
.getXml(templateName, TemplateType.TARGET));
return doc.isPresent() ? Optional.of(doc.toString()) : Optional.empty();
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/io/cryostat/targets/AgentJFRService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ public IRecordingDescriptor start(
null,
templateService
.getXml(templateName, preferredTemplateType)
.orElseThrow()
.outerHtml(),
.orElseThrow(),
duration,
maxSize,
maxAge);
Expand Down
Loading