natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify CassandraRelevantProperties default value fallback mechanism 

Used second parameter of System.getProperty method for handling config default values. This way code readability is increased and also some extra null checks are prevented.

patch by Arshiya Kiani;
This commit is contained in:
Arshiya Kiani 2024-03-15 15:04:30 +03:30
parent 98ca5f8f1a
commit a5898b15ad
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
View File

@ -205,8 +205,6 @@ public enum CassandraRelevantProperties
DTEST_API_LOG_TOPOLOGY("cassandra.dtest.api.log.topology"),
/** This property indicates if the code is running under the in-jvm dtest framework */
DTEST_IS_IN_JVM_DTEST("org.apache.cassandra.dtest.is_in_jvm_dtest"),
/** In_JVM dtest property indicating that the test should use "latest" configuration */
DTEST_JVM_DTESTS_USE_LATEST("jvm_dtests.latest"),
ENABLE_DC_LOCAL_COMMIT("cassandra.enable_dc_local_commit", "true"),
/**
* Whether {@link org.apache.cassandra.db.ConsistencyLevel#NODE_LOCAL} should be allowed.
@ -790,10 +788,10 @@ public enum CassandraRelevantProperties
*/
public int getInt()
{
String value = System.getProperty(key);
if (value == null && defaultVal == null)
String value = System.getProperty(key, defaultVal);
if (value == null)
throw new ConfigurationException("Missing property value or default value is not set: " + key);
return INTEGER_CONVERTER.convert(value == null ? defaultVal : value);
return INTEGER_CONVERTER.convert(value);
}
/**
@ -802,10 +800,10 @@ public enum CassandraRelevantProperties
*/
public long getLong()
{
String value = System.getProperty(key);
if (value == null && defaultVal == null)
String value = System.getProperty(key, defaultVal);
if (value == null)
throw new ConfigurationException("Missing property value or default value is not set: " + key);
return LONG_CONVERTER.convert(value == null ? defaultVal : value);
return LONG_CONVERTER.convert(value);
}
/**
@ -827,10 +825,10 @@ public enum CassandraRelevantProperties
*/
public double getDouble()
{
String value = System.getProperty(key);
if (value == null && defaultVal == null)
String value = System.getProperty(key, defaultVal);
if (value == null)
throw new ConfigurationException("Missing property value or default value is not set: " + key);
return DOUBLE_CONVERTER.convert(value == null ? defaultVal : value);
return DOUBLE_CONVERTER.convert(value);
}
/**
@ -852,10 +850,10 @@ public enum CassandraRelevantProperties
*/
public long getSizeInBytes()
{
String value = System.getProperty(key);
if (value == null && defaultVal == null)
String value = System.getProperty(key, defaultVal);
if (value == null)
throw new ConfigurationException("Missing property value or default value is not set: " + key);
return SIZE_IN_BYTES_CONVERTER.convert(value == null ? defaultVal : value);
return SIZE_IN_BYTES_CONVERTER.convert(value);
}
/**