This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
commit 57f6e649a6d80b6bf9589a82747ce9e565b840b0 Author: Alex Heneveld <[email protected]> AuthorDate: Tue Oct 18 14:08:48 2022 +0100 supply context for template processing --- .../java/org/apache/brooklyn/entity/database/DatastoreMixins.java | 4 ++-- .../org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java | 2 +- .../brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java | 2 +- .../brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java index dc46f68a3..aa2a3edc3 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java @@ -101,7 +101,7 @@ public class DatastoreMixins { String templateUrl = entity.getConfig(DatastoreMixins.CREATION_SCRIPT_TEMPLATE); if (!Strings.isBlank(templateUrl)) { - String template = TemplateProcessor.processTemplateContents(new ResourceUtils(entity).getResourceAsString(templateUrl), (EntityInternal) entity, ImmutableMap.<String, Object>of()); + String template = TemplateProcessor.processTemplateContents("datastore mixin "+templateUrl, new ResourceUtils(entity).getResourceAsString(templateUrl), (EntityInternal) entity, ImmutableMap.<String, Object>of()); try { return new ByteArrayInputStream(template.getBytes("UTF-8")); } catch (UnsupportedEncodingException e) { @@ -123,7 +123,7 @@ public class DatastoreMixins { String templateUrl = entity.getConfig(DatastoreMixins.CREATION_SCRIPT_TEMPLATE); if (!Strings.isBlank(templateUrl)) - return TemplateProcessor.processTemplateContents(new ResourceUtils(entity).getResourceAsString(templateUrl), (EntityInternal) entity, ImmutableMap.<String, Object>of()); + return TemplateProcessor.processTemplateContents("datastore mixin "+templateUrl, new ResourceUtils(entity).getResourceAsString(templateUrl), (EntityInternal) entity, ImmutableMap.<String, Object>of()); String contents = entity.getConfig(DatastoreMixins.CREATION_SCRIPT_CONTENTS); if (!Strings.isBlank(contents)) diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java index 3800631a6..4222a2f1e 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java @@ -196,7 +196,7 @@ public class CassandraNodeImpl extends SoftwareProcessImpl implements CassandraN public String getCassandraConfigTemplateUrl() { String templatedUrl = getConfig(CassandraNode.CASSANDRA_CONFIG_TEMPLATE_URL); - return TemplateProcessor.processTemplateContents(templatedUrl, this, ImmutableMap.<String, Object>of()); + return TemplateProcessor.processTemplateContents("cassandra url template", templatedUrl, this, ImmutableMap.<String, Object>of()); } @Override public Integer getGossipPort() { return getAttribute(CassandraNode.GOSSIP_PORT); } diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index 699f86354..1a5006aa6 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -100,7 +100,7 @@ public class CassandraNodeSshDriver extends JavaSoftwareProcessSshDriver impleme @Override public String getCassandraConfigTemplateUrl() { String templatedUrl = entity.getConfig(CassandraNode.CASSANDRA_CONFIG_TEMPLATE_URL); - return TemplateProcessor.processTemplateContents(templatedUrl, this, ImmutableMap.<String, Object>of()); + return TemplateProcessor.processTemplateContents("cassandra template url", templatedUrl, this, ImmutableMap.<String, Object>of()); } @Override diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java index efa43f30b..41789d3f5 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java @@ -76,7 +76,7 @@ public class NginxTemplateConfigGenerator implements NginxConfigFileGenerator { // Get template contents and process String contents = ResourceUtils.create(driver.getEntity()).getResourceAsString(templateUrl); - return TemplateProcessor.processTemplateContents(contents, driver, substitutions); + return TemplateProcessor.processTemplateContents("nginx config "+templateUrl, contents, driver, substitutions); } }
