QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add getStringFromPropertyOrEnvironment

Browse Source
This commit is contained in:
darin.kelkhoff
2023-11-15 08:52:32 -06:00
parent 1b58cdeb3c
commit 6aa4867bba
2 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreter.java
View File

@ -270,6 +270,32 @@ public class QMetaDataVariableInterpreter
/*******************************************************************************
** First look for a string in the specified system property -
** Next look for a string in the specified env var name -
** Finally return the default.
*******************************************************************************/
public String getStringFromPropertyOrEnvironment(String systemPropertyName, String environmentVariableName, String defaultIfNotSet)
{
String propertyValue = System.getProperty(systemPropertyName);
if(StringUtils.hasContent(propertyValue))
{
LOG.info("Read system property [" + systemPropertyName + "] as [" + propertyValue + "].");
return (propertyValue);
}
String envValue = interpret("${env." + environmentVariableName + "}");
if(StringUtils.hasContent(envValue))
{
LOG.info("Read env var [" + environmentVariableName + "] as [" + envValue + "].");
return (envValue);
}
return defaultIfNotSet;
}
/******************************************************************************* /*******************************************************************************
** First look for a boolean ("true" or "false") in the specified system property - ** First look for a boolean ("true" or "false") in the specified system property -
** Next look for a boolean in the specified env var name - ** Next look for a boolean in the specified env var name -

37
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreterTest.java
View File

@ -226,6 +226,43 @@ class QMetaDataVariableInterpreterTest extends BaseTest
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetStringFromPropertyOrEnvironment()
{
QMetaDataVariableInterpreter interpreter = new QMetaDataVariableInterpreter();
//////////////////////////////////////////////////////////
// if neither prop nor env is set, get back the default //
//////////////////////////////////////////////////////////
assertEquals("default", interpreter.getStringFromPropertyOrEnvironment("notSet", "NOT_SET", "default"));
/////////////////////////////////
// if only prop is set, get it //
/////////////////////////////////
assertEquals("default", interpreter.getStringFromPropertyOrEnvironment("foo.value", "FOO_VALUE", "default"));
System.setProperty("foo.value", "fooPropertyValue");
assertEquals("fooPropertyValue", interpreter.getStringFromPropertyOrEnvironment("foo.value", "FOO_VALUE", "default"));
////////////////////////////////
// if only env is set, get it //
////////////////////////////////
assertEquals("default", interpreter.getStringFromPropertyOrEnvironment("bar.value", "BAR_VALUE", "default"));
interpreter.setEnvironmentOverrides(Map.of("BAR_VALUE", "barEnvValue"));
assertEquals("barEnvValue", interpreter.getStringFromPropertyOrEnvironment("bar.value", "BAR_VALUE", "default"));
///////////////////////////////////
// if both are set, get the prop //
///////////////////////////////////
System.setProperty("baz.value", "bazPropertyValue");
interpreter.setEnvironmentOverrides(Map.of("BAZ_VALUE", "bazEnvValue"));
assertEquals("bazPropertyValue", interpreter.getStringFromPropertyOrEnvironment("baz.value", "BAZ_VALUE", "default"));
}
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/