diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlClusterImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlClusterImpl.java index 96471ef7e..31a2c4039 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlClusterImpl.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlClusterImpl.java @@ -310,7 +310,7 @@ public String apply(Host input) { this.cluster = builder.build(); if (!(this.cpMonitor instanceof JavaDriverConnectionPoolMonitorImpl)) - this.cluster.getMetrics().getRegistry().addListener((MetricRegistryListener) this.metricsRegListener); + this.cluster.getMetrics().getRegistry().addListener(this.metricsRegListener); this.session = cluster.connect(); } } diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlKeyspaceImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlKeyspaceImpl.java index c9d40f983..d9c5d1bfc 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlKeyspaceImpl.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlKeyspaceImpl.java @@ -398,7 +398,7 @@ public String apply(Host input) { cluster = builder.build(); if (!(this.cpMonitor instanceof JavaDriverConnectionPoolMonitorImpl)) - this.cluster.getMetrics().getRegistry().addListener((MetricRegistryListener) this.metricsRegListener); + this.cluster.getMetrics().getRegistry().addListener(this.metricsRegListener); Logger.info("Connecting to cluster"); session = cluster.connect(); diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/CqlColumnQueryImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/CqlColumnQueryImpl.java index e53ad2571..5c8ba6b55 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/CqlColumnQueryImpl.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/CqlColumnQueryImpl.java @@ -87,7 +87,7 @@ public Column parseResultSet(ResultSet rs) throws NotFoundException { return null; } - CqlColumnImpl cqlCol = new CqlColumnImpl((C) columnName, row, 0); + CqlColumnImpl cqlCol = new CqlColumnImpl(columnName, row, 0); return cqlCol; } } diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/model/CqlColumnSlice.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/model/CqlColumnSlice.java index bc2db0642..ea400cf1d 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/model/CqlColumnSlice.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/model/CqlColumnSlice.java @@ -82,7 +82,7 @@ public CqlColumnSlice(CqlColumnSlice cqlColumnSlice) { } private void initFrom(CqlColumnSlice cqlColumnSlice) { - this.cqlColumns = (Collection) cqlColumnSlice.cqlColumns; + this.cqlColumns = cqlColumnSlice.cqlColumns; this.cqlRange = cqlColumnSlice.cqlRange; } @@ -109,12 +109,12 @@ public Collection getColumns() { @Override public C getStartColumn() { - return (cqlRange != null) ? (C) cqlRange.getCqlStart() : null; + return (cqlRange != null) ? cqlRange.getCqlStart() : null; } @Override public C getEndColumn() { - return (cqlRange != null) ? (C) cqlRange.getCqlEnd() : null; + return (cqlRange != null) ? cqlRange.getCqlEnd() : null; } @Override @@ -140,11 +140,11 @@ public boolean isRangeQuery() { if (isColumnSelectQuery()) { return false; } - + if (cqlRange != null) { return true; } - + return false; } diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java index fe325265e..48290c224 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java @@ -863,7 +863,7 @@ private static Map propertiesToMap(Properties props) { } node = (Map)node.get(parts[i]); } - node.put(parts[parts.length-1], (String)prop.getValue()); + node.put(parts[parts.length-1], prop.getValue()); } return root; } diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlKeyspaceDefinitionImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlKeyspaceDefinitionImpl.java index 3dd849c39..bc7a9b7da 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlKeyspaceDefinitionImpl.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlKeyspaceDefinitionImpl.java @@ -321,7 +321,7 @@ private static Map propertiesToMap(Properties props) { } node = (Map)node.get(parts[i]); } - node.put(parts[parts.length-1], (String)prop.getValue()); + node.put(parts[parts.length-1], prop.getValue()); } return root; } diff --git a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueEntry.java b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueEntry.java index 1c3e2cbe0..04b943ea9 100644 --- a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueEntry.java +++ b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueEntry.java @@ -84,7 +84,7 @@ public static MessageQueueEntry newMessageEntry(byte priority, UUID timestamp, M } public static MessageQueueEntry newBusyEntry(Message message) { - return new MessageQueueEntry(MessageQueueEntryType.Message, (byte)message.getPriority(), message.getToken(), message.getRandom(), MessageQueueEntryState.Busy); + return new MessageQueueEntry(MessageQueueEntryType.Message, message.getPriority(), message.getToken(), message.getRandom(), MessageQueueEntryState.Busy); } public static MessageQueueEntry fromMetadata(MessageMetadataEntry meta) { diff --git a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/ShardedDistributedMessageQueue.java b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/ShardedDistributedMessageQueue.java index 6e18a1bdb..b05b2204d 100644 --- a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/ShardedDistributedMessageQueue.java +++ b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/ShardedDistributedMessageQueue.java @@ -443,7 +443,7 @@ String serializeToString(T trigger) throws JsonGenerationException, JsonMapp } private T deserializeString(String data, Class clazz) throws JsonParseException, JsonMappingException, IOException { - return (T) mapper.readValue( + return mapper.readValue( new ByteArrayInputStream(data.getBytes()), clazz); } @@ -842,7 +842,7 @@ public SendMessageResponse sendMessages(Collection messages) throws Mes String groupKey = getCompositeKey(getName(), message.getKey()); uniqueKeys.put(groupKey, message); mb.withRow(keyIndexColumnFamily, groupKey) - .putEmptyColumn(lockColumn, (Integer)lockTtl); + .putEmptyColumn(lockColumn, lockTtl); } } diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java index b54d48ebe..8cff6df69 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java @@ -44,7 +44,7 @@ public static void init() throws Exception { String rowKey = Character.toString(keyName); ColumnListMutation cfmStandard = m.withRow(CF_ALL_ROWS, rowKey); for (char cName = 'a'; cName <= 'z'; cName++) { - cfmStandard.putColumn(Character.toString(cName), (int) (cName - 'a') + 1, null); + cfmStandard.putColumn(Character.toString(cName), cName - 'a' + 1, null); } m.withCaching(true); m.execute(); diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java index 95b376b80..ed26686ee 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java @@ -405,7 +405,7 @@ public void testFunctionalQuery() throws Exception { ColumnListMutation cfmStandard = m.withRow(CF_STANDARD1, rowKey); for (char cName = 'a'; cName <= 'z'; cName++) { cfmStandard.putColumn(Character.toString(cName), - (int) (cName - 'a') + 1, null); + cName - 'a' + 1, null); } m.withCaching(true); m.execute(); diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ColumnCountQueryTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ColumnCountQueryTests.java index 3a74ce31e..5d68dc30d 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ColumnCountQueryTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ColumnCountQueryTests.java @@ -307,7 +307,7 @@ private void populateRowsForColumnRange() throws Exception { String rowKey = Character.toString(keyName); ColumnListMutation colMutation = m.withRow(CF_COLUMN_RANGE_TEST, rowKey); for (char cName = 'a'; cName <= 'z'; cName++) { - colMutation.putColumn(Character.toString(cName), (int) (cName - 'a') + 1, null); + colMutation.putColumn(Character.toString(cName), cName - 'a' + 1, null); } m.withCaching(true); m.execute(); diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/PreparedStatementTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/PreparedStatementTests.java index 3cea455cc..42d9762ba 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/PreparedStatementTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/PreparedStatementTests.java @@ -299,7 +299,7 @@ private static void populateRowsForColumnRange() throws Exception { String rowKey = Character.toString(keyName); ColumnListMutation colMutation = m.withRow(CF_ROW_RANGE, rowKey); for (char cName = 'a'; cName <= 'z'; cName++) { - colMutation.putColumn(Character.toString(cName), (int) (cName - 'a') + 1, null); + colMutation.putColumn(Character.toString(cName), cName - 'a' + 1, null); } m.withCaching(true); m.execute(); diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/AllRowsReaderTest.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/AllRowsReaderTest.java index 7a346170f..72cf75395 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/AllRowsReaderTest.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/AllRowsReaderTest.java @@ -42,7 +42,7 @@ public static void init() throws Exception { String rowKey = Character.toString(keyName); ColumnListMutation cfmStandard = m.withRow(CF_ALL_ROWS_READER, rowKey); for (char cName = 'a'; cName <= 'z'; cName++) { - cfmStandard.putColumn(Character.toString(cName), (int) (cName - 'a') + 1, null); + cfmStandard.putColumn(Character.toString(cName), cName - 'a' + 1, null); } m.execute(); m.discardMutations(); diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/utils/TestUtils.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/utils/TestUtils.java index 61483cf6c..d27539fde 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/utils/TestUtils.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/utils/TestUtils.java @@ -77,7 +77,7 @@ public static void populateRowsForColumnRange(Keyspace keyspace) throws Exceptio String rowKey = Character.toString(keyName); ColumnListMutation colMutation = m.withRow(CF_COLUMN_RANGE_TEST, rowKey); for (char cName = 'a'; cName <= 'z'; cName++) { - colMutation.putColumn(Character.toString(cName), (int) (cName - 'a') + 1, null); + colMutation.putColumn(Character.toString(cName), cName - 'a' + 1, null); } m.withCaching(true); m.execute(); diff --git a/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftFamilyFactory.java b/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftFamilyFactory.java index a8f804601..91ffd2886 100644 --- a/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftFamilyFactory.java +++ b/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftFamilyFactory.java @@ -44,13 +44,13 @@ public Keyspace createKeyspace(String ksName, ConnectionPool c @Override public Cluster createCluster(ConnectionPool cp, AstyanaxConfiguration asConfig, KeyspaceTracerFactory tracerFactory) { - return new ThriftClusterImpl(asConfig, (ConnectionPool) cp, tracerFactory); + return new ThriftClusterImpl(asConfig, cp, tracerFactory); } @Override public ConnectionFactory createConnectionFactory(AstyanaxConfiguration asConfig, ConnectionPoolConfiguration cfConfig, KeyspaceTracerFactory tracerFactory, ConnectionPoolMonitor monitor) { - return (ConnectionFactory) new ThriftSyncConnectionFactoryImpl(asConfig, cfConfig, tracerFactory, + return new ThriftSyncConnectionFactoryImpl(asConfig, cfConfig, tracerFactory, monitor); } diff --git a/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftUtils.java b/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftUtils.java index db2a3a4dd..688a5e023 100644 --- a/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftUtils.java +++ b/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftUtils.java @@ -305,7 +305,7 @@ public static Map propertiesToMap(Properties props) { } node = (Map)node.get(parts[i]); } - node.put(parts[parts.length-1], (String)prop.getValue()); + node.put(parts[parts.length-1], prop.getValue()); } return root; }