Repository: cassandra Updated Branches: refs/heads/trunk d4410263d -> 7dccb3137
simple boxing fixes: parseXXX for primitives, valueOf for boxed objects Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dccb313 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dccb313 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dccb313 Branch: refs/heads/trunk Commit: 7dccb3137375ce310a5827ffd493dbde93ad147a Parents: d441026 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Aug 3 22:26:02 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Aug 3 22:26:02 2016 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/TableAttributes.java | 2 +- src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java | 6 +++--- src/java/org/apache/cassandra/io/compress/LZ4Compressor.java | 2 +- .../org/apache/cassandra/io/sstable/format/SSTableFormat.java | 2 +- src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +- src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +- .../org/apache/cassandra/service/NativeTransportService.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 2 +- .../org/apache/cassandra/tools/nodetool/TopPartitions.java | 4 ++-- src/java/org/apache/cassandra/tracing/TraceStateImpl.java | 2 +- src/java/org/apache/cassandra/utils/HeapUtils.java | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/cql3/statements/TableAttributes.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/TableAttributes.java b/src/java/org/apache/cassandra/cql3/statements/TableAttributes.java index dee3385..63e1eec 100644 --- a/src/java/org/apache/cassandra/cql3/statements/TableAttributes.java +++ b/src/java/org/apache/cassandra/cql3/statements/TableAttributes.java @@ -142,7 +142,7 @@ public final class TableAttributes extends PropertyDefinitions String value = compressionOpts.get(Option.CRC_CHECK_CHANCE.toString().toLowerCase()); try { - return Double.parseDouble(value); + return Double.valueOf(value); } catch (NumberFormatException e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java b/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java index 1c85ed5..c66dd02 100644 --- a/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java +++ b/src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java @@ -141,11 +141,11 @@ public class IndexMode { analyzerClass = Class.forName(indexOptions.get(INDEX_ANALYZER_CLASS_OPTION)); isAnalyzed = indexOptions.get(INDEX_ANALYZED_OPTION) == null - ? true : Boolean.valueOf(indexOptions.get(INDEX_ANALYZED_OPTION)); + ? true : Boolean.parseBoolean(indexOptions.get(INDEX_ANALYZED_OPTION)); } else if (indexOptions.get(INDEX_ANALYZED_OPTION) != null) { - isAnalyzed = Boolean.valueOf(indexOptions.get(INDEX_ANALYZED_OPTION)); + isAnalyzed = Boolean.parseBoolean(indexOptions.get(INDEX_ANALYZED_OPTION)); } } catch (ClassNotFoundException e) @@ -163,7 +163,7 @@ public class IndexMode isLiteral = literalOption == null ? (validator instanceof UTF8Type || validator instanceof AsciiType) - : Boolean.valueOf(literalOption); + : Boolean.parseBoolean(literalOption); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java b/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java index 3fd889e..1b3844d 100644 --- a/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java +++ b/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java @@ -207,7 +207,7 @@ public class LZ4Compressor implements ICompressor Integer level; try { - level = Integer.parseInt(compressionLevel); + level = Integer.valueOf(compressionLevel); } catch (NumberFormatException e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java index e68ca2a..a3f7520 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java @@ -28,7 +28,7 @@ import org.apache.cassandra.io.sstable.format.big.BigFormat; */ public interface SSTableFormat { - static boolean enableSSTableDevelopmentTestMode = Boolean.valueOf(System.getProperty("cassandra.test.sstableformatdevelopment","false")); + static boolean enableSSTableDevelopmentTestMode = Boolean.getBoolean("cassandra.test.sstableformatdevelopment"); Version getLatestVersion(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java index 76b2854..155cd1a 100644 --- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java @@ -74,7 +74,7 @@ public class OutboundTcpConnection extends FastThreadLocalThread * Enabled/disable TCP_NODELAY for intradc connections. Defaults to enabled. */ private static final String INTRADC_TCP_NODELAY_PROPERTY = PREFIX + "otc_intradc_tcp_nodelay"; - private static final boolean INTRADC_TCP_NODELAY = Boolean.valueOf(System.getProperty(INTRADC_TCP_NODELAY_PROPERTY, "true")); + private static final boolean INTRADC_TCP_NODELAY = Boolean.parseBoolean(System.getProperty(INTRADC_TCP_NODELAY_PROPERTY, "true")); /* * Size of buffer in output stream http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java index 7a90dab..992ddfe 100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@ -66,7 +66,7 @@ public final class SchemaKeyspace private static final Logger logger = LoggerFactory.getLogger(SchemaKeyspace.class); - private static final boolean FLUSH_SCHEMA_TABLES = Boolean.valueOf(System.getProperty("cassandra.test.flush_local_schema_changes", "true")); + private static final boolean FLUSH_SCHEMA_TABLES = Boolean.parseBoolean(System.getProperty("cassandra.test.flush_local_schema_changes", "true")); public static final String NAME = "system_schema"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/service/NativeTransportService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/NativeTransportService.java b/src/java/org/apache/cassandra/service/NativeTransportService.java index d63b2b6..28e7dac 100644 --- a/src/java/org/apache/cassandra/service/NativeTransportService.java +++ b/src/java/org/apache/cassandra/service/NativeTransportService.java @@ -158,7 +158,7 @@ public class NativeTransportService */ public static boolean useEpoll() { - final boolean enableEpoll = Boolean.valueOf(System.getProperty("cassandra.native.epoll.enabled", "true")); + final boolean enableEpoll = Boolean.parseBoolean(System.getProperty("cassandra.native.epoll.enabled", "true")); return enableEpoll && Epoll.isAvailable(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/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 0a35296..7701a3e 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -196,7 +196,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE // true when keeping strict consistency while bootstrapping private boolean useStrictConsistency = Boolean.parseBoolean(System.getProperty("cassandra.consistent.rangemovement", "true")); - private static final boolean allowSimultaneousMoves = Boolean.valueOf(System.getProperty("cassandra.consistent.simultaneousmoves.allow","false")); + private static final boolean allowSimultaneousMoves = Boolean.parseBoolean(System.getProperty("cassandra.consistent.simultaneousmoves.allow","false")); private boolean replacing; private final StreamStateStore streamStateStore = new StreamStateStore(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java b/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java index b473a8d..931ac62 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java @@ -59,7 +59,7 @@ public class TopPartitions extends NodeToolCmd checkArgument(topCount < size, "TopK count (-k) option must be smaller then the summary capacity (-s)"); String keyspace = args.get(0); String cfname = args.get(1); - Integer duration = Integer.parseInt(args.get(2)); + Integer duration = Integer.valueOf(args.get(2)); // generate the list of samplers List<Sampler> targets = Lists.newArrayList(); for (String s : samplers.split(",")) @@ -97,7 +97,7 @@ public class TopPartitions extends NodeToolCmd if(!first) System.out.println(); System.out.println(result.getKey().toString()+ " Sampler:"); - System.out.printf(" Cardinality: ~%d (%d capacity)%n", (long) sampling.get("cardinality"), size); + System.out.printf(" Cardinality: ~%d (%d capacity)%n", sampling.get("cardinality"), size); System.out.printf(" Top %d partitions:%n", topCount); if (topk.size() == 0) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/tracing/TraceStateImpl.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java index 55e8389..e20f99b 100644 --- a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java +++ b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java @@ -47,7 +47,7 @@ public class TraceStateImpl extends TraceState { private static final Logger logger = LoggerFactory.getLogger(TraceStateImpl.class); private static final int WAIT_FOR_PENDING_EVENTS_TIMEOUT_SECS = - Integer.valueOf(System.getProperty("cassandra.wait_for_tracing_events_timeout_secs", "1")); + Integer.parseInt(System.getProperty("cassandra.wait_for_tracing_events_timeout_secs", "1")); private final Set<Future<?>> pendingFutures = ConcurrentHashMap.newKeySet(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dccb313/src/java/org/apache/cassandra/utils/HeapUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/HeapUtils.java b/src/java/org/apache/cassandra/utils/HeapUtils.java index 65364d8..8f61470 100644 --- a/src/java/org/apache/cassandra/utils/HeapUtils.java +++ b/src/java/org/apache/cassandra/utils/HeapUtils.java @@ -188,7 +188,7 @@ public final class HeapUtils String jvmName = ManagementFactory.getRuntimeMXBean().getName(); try { - return Long.parseLong(jvmName.split("@")[0]); + return Long.valueOf(jvmName.split("@")[0]); } catch (NumberFormatException e) {