Repository: cassandra Updated Branches: refs/heads/trunk 2522873be -> f6ca48251
trivial boxing issue: parseXXX for primitives, valueOf for Objects Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6ca4825 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6ca4825 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6ca4825 Branch: refs/heads/trunk Commit: f6ca482516d3915b9a0b87a787d0c7893e39c92b Parents: 2522873 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Jul 15 19:21:15 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Jul 15 19:21:44 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- src/java/org/apache/cassandra/db/ReadCommand.java | 2 +- src/java/org/apache/cassandra/db/lifecycle/LogRecord.java | 6 +++--- .../org/apache/cassandra/db/monitoring/ApproximateTime.java | 2 +- .../org/apache/cassandra/db/monitoring/MonitoringTask.java | 4 ++-- src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 2 +- .../cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 18a6d44..374c64d 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -2221,6 +2221,6 @@ public class DatabaseDescriptor public static int searchConcurrencyFactor() { - return Integer.valueOf(System.getProperty("cassandra.search_concurrency_factor", "1")); + return Integer.parseInt(System.getProperty("cassandra.search_concurrency_factor", "1")); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/db/ReadCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index 68c9e3b..372cf1c 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -59,7 +59,7 @@ import org.apache.cassandra.utils.Pair; */ public abstract class ReadCommand extends MonitorableImpl implements ReadQuery { - private static final int TEST_ITERATION_DELAY_MILLIS = Integer.valueOf(System.getProperty("cassandra.test.read_iteration_delay_ms", "0")); + private static final int TEST_ITERATION_DELAY_MILLIS = Integer.parseInt(System.getProperty("cassandra.test.read_iteration_delay_ms", "0")); protected static final Logger logger = LoggerFactory.getLogger(ReadCommand.class); public static final IVersionedSerializer<ReadCommand> serializer = new Serializer(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java b/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java index 02f8841..447ea73 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java @@ -123,9 +123,9 @@ final class LogRecord Type type = Type.fromPrefix(matcher.group(1)); return new LogRecord(type, matcher.group(2), - Long.valueOf(matcher.group(3)), - Integer.valueOf(matcher.group(4)), - Long.valueOf(matcher.group(5)), + Long.parseLong(matcher.group(3)), + Integer.parseInt(matcher.group(4)), + Long.parseLong(matcher.group(5)), line); } catch (IllegalArgumentException e) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/db/monitoring/ApproximateTime.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/monitoring/ApproximateTime.java b/src/java/org/apache/cassandra/db/monitoring/ApproximateTime.java index 1d57398..cc4b410 100644 --- a/src/java/org/apache/cassandra/db/monitoring/ApproximateTime.java +++ b/src/java/org/apache/cassandra/db/monitoring/ApproximateTime.java @@ -36,7 +36,7 @@ import org.apache.cassandra.config.Config; public class ApproximateTime { private static final Logger logger = LoggerFactory.getLogger(ApproximateTime.class); - private static final int CHECK_INTERVAL_MS = Math.max(5, Integer.valueOf(System.getProperty(Config.PROPERTY_PREFIX + "approximate_time_precision_ms", "10"))); + private static final int CHECK_INTERVAL_MS = Math.max(5, Integer.parseInt(System.getProperty(Config.PROPERTY_PREFIX + "approximate_time_precision_ms", "10"))); private static volatile long time = System.currentTimeMillis(); static http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java b/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java index 6d28078..a44773a 100644 --- a/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java +++ b/src/java/org/apache/cassandra/db/monitoring/MonitoringTask.java @@ -51,13 +51,13 @@ public class MonitoringTask /** * Defines the interval for reporting any operations that have timed out. */ - private static final int REPORT_INTERVAL_MS = Math.max(0, Integer.valueOf(System.getProperty(Config.PROPERTY_PREFIX + "monitoring_report_interval_ms", "5000"))); + private static final int REPORT_INTERVAL_MS = Math.max(0, Integer.parseInt(System.getProperty(Config.PROPERTY_PREFIX + "monitoring_report_interval_ms", "5000"))); /** * Defines the maximum number of unique timed out queries that will be reported in the logs. * Use a negative number to remove any limit. */ - private static final int MAX_OPERATIONS = Integer.valueOf(System.getProperty(Config.PROPERTY_PREFIX + "monitoring_max_operations", "50")); + private static final int MAX_OPERATIONS = Integer.parseInt(System.getProperty(Config.PROPERTY_PREFIX + "monitoring_max_operations", "50")); @VisibleForTesting static MonitoringTask instance = make(REPORT_INTERVAL_MS, MAX_OPERATIONS); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java b/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java index 8b38530..9815233 100644 --- a/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java +++ b/src/java/org/apache/cassandra/index/sasi/utils/TypeUtil.java @@ -63,7 +63,7 @@ public class TypeUtil break; default: - upcastToken = Long.valueOf(UTF8Type.instance.getString(term)); + upcastToken = Long.parseLong(UTF8Type.instance.getString(term)); } return LongType.instance.decompose(upcastToken); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 7500593..2883e24 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1895,7 +1895,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { try { - MessagingService.instance().setVersion(endpoint, Integer.valueOf(value.value)); + MessagingService.instance().setVersion(endpoint, Integer.parseInt(value.value)); } catch (NumberFormatException e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6ca4825/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java index 275673e..a33fe7d 100644 --- a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java +++ b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java @@ -102,6 +102,6 @@ public class LegacyJMXProgressSupport implements ProgressListener protected static int getCmd(String tag) { - return Integer.valueOf(tag.split(":")[1]); + return Integer.parseInt(tag.split(":")[1]); } }