Skip to content

Lazy template engine #253

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

Merged
merged 2 commits into from
Oct 30, 2025
Merged

Lazy template engine #253

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
61de92b
Lazy template engine
krystian-panek-vmltech Oct 30, 2025
79a58ba
Defensive tpl engine
krystian-panek-vmltech Oct 30, 2025
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
19 changes: 15 additions & 4 deletions core/src/main/java/dev/vml/es/acm/core/code/Executor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Component(
immediate = true,
Expand All @@ -43,6 +45,8 @@ public class Executor implements EventListener {

public static final String LOCK_DIR = "executor";

private static final Logger LOG = LoggerFactory.getLogger(Executor.class);

@ObjectClassDefinition(name = "AEM Content Manager - Code Executor")
public @interface Config {

Expand Down Expand Up @@ -278,10 +282,8 @@ private void handleNotifications(ContextualExecution execution) {
? "✅"
: (execution.getStatus() == ExecutionStatus.FAILED ? "❌" : "⚠️"));
templateVars.put("statusHere", execution.getStatus() == ExecutionStatus.SUCCEEDED ? "" : "@here");
TemplateFormatter templateFormatter =
execution.getContext().getCodeContext().getFormatter().getTemplate();
String title = StringUtils.trim(templateFormatter.renderString(config.notificationTitle(), templateVars));
String text = StringUtils.trim(templateFormatter.renderString(config.notificationText(), templateVars));
String title = StringUtils.trim(formatTemplate(config.notificationTitle(), templateVars));
String text = StringUtils.trim(formatTemplate(config.notificationText(), templateVars));

Map<String, Object> fields = new LinkedHashMap<>();
fields.put("Status", execution.getStatus().name().toLowerCase());
Expand Down Expand Up @@ -372,4 +374,13 @@ private void useLocker(ResourceResolverFactory resolverFactory, Consumer<Locker>
private void useHistory(ResourceResolverFactory resolverFactory, Consumer<ExecutionHistory> consumer) {
ResolverUtils.useContentResolver(resolverFactory, null, r -> consumer.accept(new ExecutionHistory(r)));
}

private String formatTemplate(String template, Map<String, Object> vars) {
try {
return new TemplateFormatter().renderString(template, vars);
} catch (Exception e) {
LOG.warn("Cannot format template '{}'!", template, e);
return template;
}
}
}
20 changes: 9 additions & 11 deletions core/src/main/java/dev/vml/es/acm/core/format/TemplateFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,10 @@

public class TemplateFormatter {

private final GStringTemplateEngine engine;

public TemplateFormatter() {
this.engine = new GStringTemplateEngine();
}

public String renderString(String template, Map<?, ?> vars) {
try {
Writer writer = new StringWriter();
engine.createTemplate(template).make(vars).writeTo(writer);
getEngine().createTemplate(template).make(vars).writeTo(writer);
return writer.toString();
} catch (Exception e) {
throw new FormatException("Cannot render template from & to string!", e);
Expand All @@ -24,7 +18,7 @@ public String renderString(String template, Map<?, ?> vars) {

public void renderFromString(String template, Map<?, ?> vars, Writer writer) {
try {
engine.createTemplate(template).make(vars).writeTo(writer);
getEngine().createTemplate(template).make(vars).writeTo(writer);
} catch (Exception e) {
throw new FormatException("Cannot render template from string!", e);
}
Expand All @@ -33,7 +27,7 @@ public void renderFromString(String template, Map<?, ?> vars, Writer writer) {
public String renderToString(Reader reader, Map<?, ?> vars) {
try {
Writer writer = new StringWriter();
engine.createTemplate(reader).make(vars).writeTo(writer);
getEngine().createTemplate(reader).make(vars).writeTo(writer);
return writer.toString();
} catch (Exception e) {
throw new FormatException("Cannot render template to string!", e);
Expand All @@ -43,17 +37,21 @@ public String renderToString(Reader reader, Map<?, ?> vars) {
public void render(InputStream inputStream, Map<?, ?> vars, OutputStream outputStream) {
try (Reader reader = new InputStreamReader(inputStream);
Writer writer = new OutputStreamWriter(outputStream)) {
engine.createTemplate(reader).make(vars).writeTo(writer);
getEngine().createTemplate(reader).make(vars).writeTo(writer);
} catch (Exception e) {
throw new FormatException("Cannot render template!", e);
}
}

public void render(Reader reader, Map<?, ?> vars, Writer writer) {
try {
engine.createTemplate(reader).make(vars).writeTo(writer);
getEngine().createTemplate(reader).make(vars).writeTo(writer);
} catch (Exception e) {
throw new FormatException("Cannot render template!", e);
}
}

private GStringTemplateEngine getEngine() {
return new GStringTemplateEngine();
}
}