Skip to content

Commit

Permalink
0002878: Provide for BSH scripting when reading properties files
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Hanes committed Oct 25, 2016
1 parent b1ad453 commit c3cc03b
Show file tree
Hide file tree
Showing 3 changed files with 154 additions and 22 deletions.
22 changes: 17 additions & 5 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
View file
Expand Up @@ -280,8 +280,10 @@ protected void init() {

TypedProperties properties = this.propertiesFactory.reload();

MDC.put("engineName", properties.get(ParameterConstants.ENGINE_NAME));

String engineName = properties.get(ParameterConstants.ENGINE_NAME);
if (!StringUtils.contains(engineName, '`') && !StringUtils.contains(engineName, '(')) {
MDC.put("engineName", engineName);
}
this.platform = createDatabasePlatform(properties);

this.parameterService = new ParameterService(platform, propertiesFactory,
Expand All @@ -293,7 +295,17 @@ protected void init() {
this.parameterService.setDatabaseHasBeenInitialized(true);
this.parameterService.rereadParameters();
}


// So that the key properties are initialized in a predictable order

parameterService.getNodeGroupId();
parameterService.getExternalId();
parameterService.getEngineName();
parameterService.getSyncUrl();
parameterService.getRegistrationUrl();

MDC.put("engineName", parameterService.getEngineName());

this.platform.setMetadataIgnoreCase(this.parameterService
.is(ParameterConstants.DB_METADATA_IGNORE_CASE));
this.platform.setClearCacheModelTimeoutInMs(parameterService
Expand Down Expand Up @@ -403,7 +415,7 @@ public Properties getProperties() {
}

public String getEngineName() {
return parameterService.getString(ParameterConstants.ENGINE_NAME);
return parameterService.getEngineName();
}

public void setup() {
Expand Down Expand Up @@ -969,7 +981,7 @@ public IDataExtractorService getDataExtractorService() {
public IDataExtractorService getFileSyncExtractorService() {
return this.fileSyncExtractorService;
}

public IDataLoaderService getDataLoaderService() {
return this.dataLoaderService;
}
Expand Down
2 changes: 1 addition & 1 deletion symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java
View file
Expand Up @@ -659,7 +659,7 @@ public boolean isTransactionIdOverrideSupported() {
}

public String getEngineName() {
return parameterService.getString(ParameterConstants.ENGINE_NAME);
return parameterService.getEngineName();
}

public boolean supportsOpenCursorsAcrossCommit() {
Expand Down
152 changes: 136 additions & 16 deletions ...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java
View file
Expand Up @@ -37,6 +37,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import bsh.EvalError;
import bsh.Interpreter;

abstract public class AbstractParameterService {

protected final Logger log = LoggerFactory.getLogger(getClass());
Expand All @@ -53,6 +56,16 @@ abstract public class AbstractParameterService {

protected boolean databaseHasBeenInitialized = false;

protected String externalId=null;

protected String engineName=null;

protected String nodeGroupId=null;

protected String syncUrl=null;

protected String registrationUrl=null;

public AbstractParameterService() {
this.systemProperties = (Properties) System.getProperties().clone();
}
Expand Down Expand Up @@ -177,37 +190,85 @@ public Date getLastTimeParameterWereCached() {
return new Date(lastTimeParameterWereCached);
}


public String getExternalId() {
return substituteVariables(ParameterConstants.EXTERNAL_ID);
if (externalId==null) {
String value = getString(ParameterConstants.EXTERNAL_ID);
value = substituteScripts(value);
externalId = substituteVariablesFromValue(value);
if (log.isDebugEnabled()) {
log.debug("External Id eval results in: {}",externalId);
}
}
return externalId;
}

public String getSyncUrl() {
return substituteVariables(ParameterConstants.SYNC_URL);
if (syncUrl==null) {
String value = getString(ParameterConstants.SYNC_URL);
value = substituteScripts(value);
value = substituteVariablesFromValue(value);
if (value != null) {
value = value.trim();
}
syncUrl = value;
if (log.isDebugEnabled()) {
log.debug("Sync URL eval results in: {}",syncUrl);
}
}
return syncUrl;
}

public String getNodeGroupId() {
return getString(ParameterConstants.NODE_GROUP_ID);
if (nodeGroupId==null) {
String value = getString(ParameterConstants.NODE_GROUP_ID);
value = substituteScripts(value);
nodeGroupId = substituteVariablesFromValue(value);
if (log.isDebugEnabled()) {
log.debug("Node Group Id eval results in: {}",nodeGroupId);
}
}
return nodeGroupId;
}

public String getRegistrationUrl() {
String url = substituteVariables(ParameterConstants.REGISTRATION_URL);
if (url != null) {
url = url.trim();
if (registrationUrl==null) {
String value = getString(ParameterConstants.REGISTRATION_URL);
value = substituteScripts(value);
value = substituteVariablesFromValue(value);
if (value != null) {
value = value.trim();
}
registrationUrl=value;
if (log.isDebugEnabled()) {
log.debug("Registration URL eval results in: {}",registrationUrl);
}
}
return registrationUrl;
}

public String getEngineName() {
if (engineName==null) {
String value = getString(ParameterConstants.ENGINE_NAME,"SymmetricDS");
value = substituteScripts(value);
engineName = substituteVariablesFromValue(value);
if (log.isDebugEnabled()) {
log.debug("Engine Name eval results in: {}",engineName);
}
}
return url;
return engineName;
}

public Map<String, String> getReplacementValues() {
Map<String, String> replacementValues = new HashMap<String, String>(2);
replacementValues.put("externalId", getExternalId());
replacementValues.put("nodeGroupId", getNodeGroupId());
replacementValues.put("externalId", getExternalId());
replacementValues.put("engineName", getEngineName());
replacementValues.put("syncUrl", getSyncUrl());
replacementValues.put("registrationUrl", getRegistrationUrl());
return replacementValues;
}

public String getEngineName() {
return getString(ParameterConstants.ENGINE_NAME, "SymmetricDS");
}


public void setDatabaseHasBeenInitialized(boolean databaseHasBeenInitialized) {
if (this.databaseHasBeenInitialized != databaseHasBeenInitialized) {
this.databaseHasBeenInitialized = databaseHasBeenInitialized;
Expand All @@ -232,9 +293,8 @@ protected TypedProperties rereadDatabaseParameters(Properties p) {
return new TypedProperties();
}
}

protected String substituteVariables(String paramKey) {
String value = getString(paramKey);

protected String substituteVariablesFromValue(String value) {
if (!StringUtils.isBlank(value)) {
if (value.contains("hostName")) {
value = FormatUtils.replace("hostName", AppUtils.getHostName(), value);
Expand All @@ -248,6 +308,18 @@ protected String substituteVariables(String paramKey) {
if (value.contains("engineName")) {
value = FormatUtils.replace("engineName", getEngineName(), value);
}
if (value.contains("nodeGroupId")) {
value = FormatUtils.replace("nodeGroupId", getNodeGroupId(), value);
}
if (value.contains("externalId")) {
value = FormatUtils.replace("externalId", getExternalId(), value);
}
if (value.contains("syncUrl")) {
value = FormatUtils.replace("syncUrl", getSyncUrl(), value);
}
if (value.contains("registrationUrl")) {
value = FormatUtils.replace("registrationUrl", getRegistrationUrl(), value);
}
}
return value;
}
Expand All @@ -256,4 +328,52 @@ public void setExtensionService(IExtensionService extensionService) {
this.extensionService = extensionService;
}


protected String substituteScripts(String value) {
if (log.isDebugEnabled()) {
log.debug("substituteScripts starting value is: {}",value);
}
int startTick = StringUtils.indexOf(value, '`');
if (startTick!=-1) {
int endTick = StringUtils.lastIndexOf(value, '`');
if (endTick!=-1 && startTick!=endTick) {
// there's a bean shell script present in this case
String script = StringUtils.substring(value, startTick+1,endTick);
if (log.isDebugEnabled()) {
log.debug("Script found. Script is is: {}",script);
}

Interpreter interpreter = new Interpreter();
try {
interpreter.set("hostName", AppUtils.getHostName());
interpreter.set("log", log);
interpreter.set("nodeGroupId", nodeGroupId);
interpreter.set("syncUrl", syncUrl);
interpreter.set("registrationUrl", registrationUrl);
interpreter.set("externalId", externalId);
interpreter.set("engineName", engineName);

Object scriptResult = interpreter.eval(script);

if (scriptResult==null) {
scriptResult ="";
}

if (log.isDebugEnabled()) {
log.debug("Script output is: {}",scriptResult);
}
value = StringUtils.substring(value, 0,startTick) + scriptResult.toString() +
StringUtils.substring(value, endTick+1);
} catch (EvalError e) {
throw new RuntimeException(e.getMessage(),e);
}

if (log.isDebugEnabled()) {
log.debug("substituteScripts return value is {}",value);
}
}
}
return value;
}

}

0 comments on commit c3cc03b

Please sign in to comment.