You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/09/06 20:23:27 UTC
git commit: simplify/avoid possible npes
Repository: cassandra
Updated Branches:
refs/heads/trunk 995904c2d -> 182051c45
simplify/avoid possible npes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/182051c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/182051c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/182051c4
Branch: refs/heads/trunk
Commit: 182051c453c30f6941b49c030092008918cfa2e2
Parents: 995904c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Sep 6 14:22:08 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Sep 6 14:22:08 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/auth/Resources.java | 2 +-
src/java/org/apache/cassandra/cli/CliClient.java | 2 +-
src/java/org/apache/cassandra/cql3/ResultSet.java | 2 +-
src/java/org/apache/cassandra/db/context/CounterContext.java | 2 +-
src/java/org/apache/cassandra/db/marshal/TypeParser.java | 4 ++--
src/java/org/apache/cassandra/exceptions/RepairException.java | 2 +-
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
.../cassandra/hadoop/AbstractColumnFamilyRecordWriter.java | 2 +-
src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 2 +-
src/java/org/apache/cassandra/streaming/StreamEvent.java | 2 +-
src/java/org/apache/cassandra/streaming/StreamLockfile.java | 2 +-
src/java/org/apache/cassandra/thrift/TCustomServerSocket.java | 2 +-
src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +-
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +-
.../cassandra/stress/operations/predefined/CqlOperation.java | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/auth/Resources.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/Resources.java b/src/java/org/apache/cassandra/auth/Resources.java
index 86900f9..47a7aa4 100644
--- a/src/java/org/apache/cassandra/auth/Resources.java
+++ b/src/java/org/apache/cassandra/auth/Resources.java
@@ -58,7 +58,7 @@ public final class Resources
if (component instanceof byte[])
buff.append(Hex.bytesToHex((byte[])component));
else
- buff.append(component.toString());
+ buff.append(component);
}
return buff.toString();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index c6b3bcd..703d4c1 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -2102,7 +2102,7 @@ public class CliClient
UUID sessionId = TimeUUIDType.instance.compose(thriftClient.trace_next_query());
- sessionState.out.println("Will trace next query. Session ID: " + sessionId.toString());
+ sessionState.out.println("Will trace next query. Session ID: " + sessionId);
}
private void describeKeySpace(String keySpaceName, KsDef metadata) throws TException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/cql3/ResultSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java b/src/java/org/apache/cassandra/cql3/ResultSet.java
index 25635fa..30b5c4e 100644
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@ -333,7 +333,7 @@ public class ResultSet
{
for (ColumnSpecification name : names)
{
- sb.append("[").append(name.name.toString());
+ sb.append("[").append(name.name);
sb.append("(").append(name.ksName).append(", ").append(name.cfName).append(")");
sb.append(", ").append(name.type).append("]");
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/db/context/CounterContext.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java
index 455ffc7..ffffbb1 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -509,7 +509,7 @@ public class CounterContext
if (state.getElementIndex() > 0)
sb.append(",");
sb.append("{");
- sb.append(state.getCounterId().toString()).append(", ");
+ sb.append(state.getCounterId()).append(", ");
sb.append(state.getClock()).append(", ");
sb.append(state.getCount());
sb.append("}");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/db/marshal/TypeParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/TypeParser.java b/src/java/org/apache/cassandra/db/marshal/TypeParser.java
index 1b83180..37f8708 100644
--- a/src/java/org/apache/cassandra/db/marshal/TypeParser.java
+++ b/src/java/org/apache/cassandra/db/marshal/TypeParser.java
@@ -271,7 +271,7 @@ public class TypeParser
{
AbstractType<?> type = parse();
if (!(type instanceof CollectionType))
- throw new SyntaxException(type.toString() + " is not a collection type");
+ throw new SyntaxException(type + " is not a collection type");
map.put(bb, (CollectionType)type);
}
catch (SyntaxException e)
@@ -572,7 +572,7 @@ public class TypeParser
{
sb.append(',');
sb.append(ByteBufferUtil.bytesToHex(columnNames.get(i))).append(":");
- sb.append(columnTypes.get(i).toString());
+ sb.append(columnTypes.get(i));
}
sb.append(')');
return sb.toString();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/exceptions/RepairException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/exceptions/RepairException.java b/src/java/org/apache/cassandra/exceptions/RepairException.java
index 832a6d8..2f5f2c1 100644
--- a/src/java/org/apache/cassandra/exceptions/RepairException.java
+++ b/src/java/org/apache/cassandra/exceptions/RepairException.java
@@ -41,6 +41,6 @@ public class RepairException extends Exception
@Override
public String getMessage()
{
- return desc.toString() + " " + super.getMessage();
+ return desc + " " + super.getMessage();
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index 41246a1..ec72379 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -277,7 +277,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
{
ArrivalWindow hWnd = arrivalSamples.get(ep);
sb.append(ep + " : ");
- sb.append(hWnd.toString());
+ sb.append(hWnd);
sb.append(System.getProperty("line.separator"));
}
sb.append("-----------------------------------------------------------------------");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java
index 501ca65..cb44beb 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java
@@ -186,7 +186,7 @@ public abstract class AbstractColumnFamilyRecordWriter<K, Y> extends RecordWrite
@Override
public String toString()
{
- return "#<Client for " + endpoints.toString() + ">";
+ return "#<Client for " + endpoints + ">";
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
index c8c0f14..04bd1b7 100644
--- a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
+++ b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
@@ -175,7 +175,7 @@ public class StreamCoordinator
{
HostStreamingData data = peerSessions.get(peer);
if (data == null)
- throw new IllegalArgumentException("Unknown peer requested: " + peer.toString());
+ throw new IllegalArgumentException("Unknown peer requested: " + peer);
return data;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/streaming/StreamEvent.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamEvent.java b/src/java/org/apache/cassandra/streaming/StreamEvent.java
index 8089323..e3cdce5 100644
--- a/src/java/org/apache/cassandra/streaming/StreamEvent.java
+++ b/src/java/org/apache/cassandra/streaming/StreamEvent.java
@@ -66,7 +66,7 @@ public abstract class StreamEvent
@Override
public String toString()
{
- return "<ProgressEvent " + progress.toString() + ">";
+ return "<ProgressEvent " + progress + ">";
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/streaming/StreamLockfile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamLockfile.java b/src/java/org/apache/cassandra/streaming/StreamLockfile.java
index 4d20479..d00842a 100644
--- a/src/java/org/apache/cassandra/streaming/StreamLockfile.java
+++ b/src/java/org/apache/cassandra/streaming/StreamLockfile.java
@@ -57,7 +57,7 @@ public class StreamLockfile
public StreamLockfile(File directory, UUID uuid)
{
- lockfile = new File(directory, uuid.toString() + FILE_EXT);
+ lockfile = new File(directory, uuid + FILE_EXT);
}
public StreamLockfile(File lockfile)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java b/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
index d88cf71..477ef8c 100644
--- a/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
+++ b/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
@@ -72,7 +72,7 @@ public class TCustomServerSocket extends TServerTransport
catch (IOException ioe)
{
serverSocket = null;
- throw new TTransportException("Could not create ServerSocket on address " + bindAddr.toString() + ".");
+ throw new TTransportException("Could not create ServerSocket on address " + bindAddr + ".");
}
this.keepAlive = keepAlive;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 1e1def0..19f49b1 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -181,7 +181,7 @@ public class BulkLoader
// recalculate progress across all sessions in all hosts and display
for (InetAddress peer : sessionsByHost.keySet())
{
- sb.append("[").append(peer.toString()).append("]");
+ sb.append("[").append(peer).append("]");
for (SessionInfo session : sessionsByHost.get(peer))
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 4178312..9fbee9c 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -828,7 +828,7 @@ public class NodeTool
{
for (String ks : filter.keySet())
if (verifier.get(ks).size() > 0)
- throw new IllegalArgumentException("Unknown tables: " + verifier.get(ks).toString() + " in keyspace: " + ks);
+ throw new IllegalArgumentException("Unknown tables: " + verifier.get(ks) + " in keyspace: " + ks);
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/182051c4/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
index 318555e..a8144c9 100644
--- a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
@@ -638,7 +638,7 @@ public abstract class CqlOperation<V> extends PredefinedOperation
if (parm instanceof ByteBuffer)
result.append(getUnQuotedCqlBlob((ByteBuffer) parm));
else if (parm instanceof Long)
- result.append(parm.toString());
+ result.append(parm);
else throw new AssertionError();
position = marker + 1;