From 1fd1b4c310b3dc61ec4b5d07dda1d939d2a2a44a Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:23:32 +0100 Subject: [PATCH 01/12] Sort and remove unused using in /src/Apache/Cassandra --- src/Apache/Cassandra/AuthenticationException.cs | 9 +-------- src/Apache/Cassandra/AuthenticationRequest.cs | 8 +------- src/Apache/Cassandra/AuthorizationException.cs | 9 +-------- src/Apache/Cassandra/Cassandra.cs | 10 +++------- src/Apache/Cassandra/CfDef.cs | 8 +------- src/Apache/Cassandra/CfSplit.cs | 9 +-------- src/Apache/Cassandra/Column.cs | 9 +-------- src/Apache/Cassandra/ColumnDef.cs | 8 +------- src/Apache/Cassandra/ColumnOrSuperColumn.cs | 9 +-------- src/Apache/Cassandra/ColumnParent.cs | 9 +-------- src/Apache/Cassandra/ColumnPath.cs | 9 +-------- src/Apache/Cassandra/Constants.cs | 8 -------- src/Apache/Cassandra/CounterColumn.cs | 9 +-------- src/Apache/Cassandra/CounterSuperColumn.cs | 8 +------- src/Apache/Cassandra/CqlMetadata.cs | 8 +------- src/Apache/Cassandra/CqlPreparedResult.cs | 8 +------- src/Apache/Cassandra/CqlResult.cs | 8 +------- src/Apache/Cassandra/CqlRow.cs | 8 +------- src/Apache/Cassandra/Deletion.cs | 9 +-------- src/Apache/Cassandra/EndpointDetails.cs | 9 +-------- src/Apache/Cassandra/IndexClause.cs | 8 +------- src/Apache/Cassandra/IndexExpression.cs | 9 +-------- src/Apache/Cassandra/InvalidRequestException.cs | 9 +-------- src/Apache/Cassandra/KeyCount.cs | 9 +-------- src/Apache/Cassandra/KeyRange.cs | 8 +------- src/Apache/Cassandra/KeySlice.cs | 8 +------- src/Apache/Cassandra/KsDef.cs | 8 +------- src/Apache/Cassandra/Mutation.cs | 9 +-------- src/Apache/Cassandra/NotFoundException.cs | 9 +-------- src/Apache/Cassandra/SchemaDisagreementException.cs | 9 +-------- src/Apache/Cassandra/SlicePredicate.cs | 8 +------- src/Apache/Cassandra/SliceRange.cs | 9 +-------- src/Apache/Cassandra/SuperColumn.cs | 8 +------- src/Apache/Cassandra/TimedOutException.cs | 9 +-------- src/Apache/Cassandra/TokenRange.cs | 8 +------- src/Apache/Cassandra/UnavailableException.cs | 9 +-------- 36 files changed, 37 insertions(+), 272 deletions(-) diff --git a/src/Apache/Cassandra/AuthenticationException.cs b/src/Apache/Cassandra/AuthenticationException.cs index cfdd2a9..b92d6b9 100644 --- a/src/Apache/Cassandra/AuthenticationException.cs +++ b/src/Apache/Cassandra/AuthenticationException.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/AuthenticationRequest.cs b/src/Apache/Cassandra/AuthenticationRequest.cs index 5b42a57..f73f9b6 100644 --- a/src/Apache/Cassandra/AuthenticationRequest.cs +++ b/src/Apache/Cassandra/AuthenticationRequest.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/AuthorizationException.cs b/src/Apache/Cassandra/AuthorizationException.cs index 19aea82..96c03fb 100644 --- a/src/Apache/Cassandra/AuthorizationException.cs +++ b/src/Apache/Cassandra/AuthorizationException.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/Cassandra.cs b/src/Apache/Cassandra/Cassandra.cs index f573fad..0251790 100644 --- a/src/Apache/Cassandra/Cassandra.cs +++ b/src/Apache/Cassandra/Cassandra.cs @@ -1,3 +1,5 @@ +using FluentCassandra.Thrift; +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +7,9 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; -using System.Text; using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; +using System.Text; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CfDef.cs b/src/Apache/Cassandra/CfDef.cs index d2e33f3..5a9e5d8 100644 --- a/src/Apache/Cassandra/CfDef.cs +++ b/src/Apache/Cassandra/CfDef.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CfSplit.cs b/src/Apache/Cassandra/CfSplit.cs index f94dd89..706c732 100644 --- a/src/Apache/Cassandra/CfSplit.cs +++ b/src/Apache/Cassandra/CfSplit.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/Column.cs b/src/Apache/Cassandra/Column.cs index 48c874d..26c6046 100644 --- a/src/Apache/Cassandra/Column.cs +++ b/src/Apache/Cassandra/Column.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/ColumnDef.cs b/src/Apache/Cassandra/ColumnDef.cs index 068708d..a41b846 100644 --- a/src/Apache/Cassandra/ColumnDef.cs +++ b/src/Apache/Cassandra/ColumnDef.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/ColumnOrSuperColumn.cs b/src/Apache/Cassandra/ColumnOrSuperColumn.cs index ec4c8f1..24d14e9 100644 --- a/src/Apache/Cassandra/ColumnOrSuperColumn.cs +++ b/src/Apache/Cassandra/ColumnOrSuperColumn.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/ColumnParent.cs b/src/Apache/Cassandra/ColumnParent.cs index ab5ff25..d1dbefb 100644 --- a/src/Apache/Cassandra/ColumnParent.cs +++ b/src/Apache/Cassandra/ColumnParent.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/ColumnPath.cs b/src/Apache/Cassandra/ColumnPath.cs index c349b3b..aa044b9 100644 --- a/src/Apache/Cassandra/ColumnPath.cs +++ b/src/Apache/Cassandra/ColumnPath.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/Constants.cs b/src/Apache/Cassandra/Constants.cs index f067218..3c842ce 100644 --- a/src/Apache/Cassandra/Constants.cs +++ b/src/Apache/Cassandra/Constants.cs @@ -4,14 +4,6 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CounterColumn.cs b/src/Apache/Cassandra/CounterColumn.cs index a214004..cc329cd 100644 --- a/src/Apache/Cassandra/CounterColumn.cs +++ b/src/Apache/Cassandra/CounterColumn.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CounterSuperColumn.cs b/src/Apache/Cassandra/CounterSuperColumn.cs index ad31c5d..197b3a1 100644 --- a/src/Apache/Cassandra/CounterSuperColumn.cs +++ b/src/Apache/Cassandra/CounterSuperColumn.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CqlMetadata.cs b/src/Apache/Cassandra/CqlMetadata.cs index 883ff34..db400a2 100644 --- a/src/Apache/Cassandra/CqlMetadata.cs +++ b/src/Apache/Cassandra/CqlMetadata.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CqlPreparedResult.cs b/src/Apache/Cassandra/CqlPreparedResult.cs index c0fde10..da9a7f3 100644 --- a/src/Apache/Cassandra/CqlPreparedResult.cs +++ b/src/Apache/Cassandra/CqlPreparedResult.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CqlResult.cs b/src/Apache/Cassandra/CqlResult.cs index 24a09a0..bca3058 100644 --- a/src/Apache/Cassandra/CqlResult.cs +++ b/src/Apache/Cassandra/CqlResult.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/CqlRow.cs b/src/Apache/Cassandra/CqlRow.cs index 2064222..d02da17 100644 --- a/src/Apache/Cassandra/CqlRow.cs +++ b/src/Apache/Cassandra/CqlRow.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/Deletion.cs b/src/Apache/Cassandra/Deletion.cs index 67edab2..9f7de90 100644 --- a/src/Apache/Cassandra/Deletion.cs +++ b/src/Apache/Cassandra/Deletion.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/EndpointDetails.cs b/src/Apache/Cassandra/EndpointDetails.cs index 5d02ee2..64ddc25 100644 --- a/src/Apache/Cassandra/EndpointDetails.cs +++ b/src/Apache/Cassandra/EndpointDetails.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/IndexClause.cs b/src/Apache/Cassandra/IndexClause.cs index 85ba363..f66c9f7 100644 --- a/src/Apache/Cassandra/IndexClause.cs +++ b/src/Apache/Cassandra/IndexClause.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/IndexExpression.cs b/src/Apache/Cassandra/IndexExpression.cs index 8b258dd..738e1ce 100644 --- a/src/Apache/Cassandra/IndexExpression.cs +++ b/src/Apache/Cassandra/IndexExpression.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/InvalidRequestException.cs b/src/Apache/Cassandra/InvalidRequestException.cs index 5806b44..6e87a55 100644 --- a/src/Apache/Cassandra/InvalidRequestException.cs +++ b/src/Apache/Cassandra/InvalidRequestException.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/KeyCount.cs b/src/Apache/Cassandra/KeyCount.cs index 637085c..852b822 100644 --- a/src/Apache/Cassandra/KeyCount.cs +++ b/src/Apache/Cassandra/KeyCount.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/KeyRange.cs b/src/Apache/Cassandra/KeyRange.cs index 45749bb..d59e9c2 100644 --- a/src/Apache/Cassandra/KeyRange.cs +++ b/src/Apache/Cassandra/KeyRange.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/KeySlice.cs b/src/Apache/Cassandra/KeySlice.cs index de45167..065e0cb 100644 --- a/src/Apache/Cassandra/KeySlice.cs +++ b/src/Apache/Cassandra/KeySlice.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/KsDef.cs b/src/Apache/Cassandra/KsDef.cs index a3b0302..6c166b0 100644 --- a/src/Apache/Cassandra/KsDef.cs +++ b/src/Apache/Cassandra/KsDef.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/Mutation.cs b/src/Apache/Cassandra/Mutation.cs index f6c9369..7cf6bc5 100644 --- a/src/Apache/Cassandra/Mutation.cs +++ b/src/Apache/Cassandra/Mutation.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/NotFoundException.cs b/src/Apache/Cassandra/NotFoundException.cs index ad20c19..624f947 100644 --- a/src/Apache/Cassandra/NotFoundException.cs +++ b/src/Apache/Cassandra/NotFoundException.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/SchemaDisagreementException.cs b/src/Apache/Cassandra/SchemaDisagreementException.cs index 7691d1e..8fcc7be 100644 --- a/src/Apache/Cassandra/SchemaDisagreementException.cs +++ b/src/Apache/Cassandra/SchemaDisagreementException.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/SlicePredicate.cs b/src/Apache/Cassandra/SlicePredicate.cs index cffc871..c75071e 100644 --- a/src/Apache/Cassandra/SlicePredicate.cs +++ b/src/Apache/Cassandra/SlicePredicate.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/SliceRange.cs b/src/Apache/Cassandra/SliceRange.cs index 40c360d..f42bbcb 100644 --- a/src/Apache/Cassandra/SliceRange.cs +++ b/src/Apache/Cassandra/SliceRange.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/SuperColumn.cs b/src/Apache/Cassandra/SuperColumn.cs index f57fcab..5c4f751 100644 --- a/src/Apache/Cassandra/SuperColumn.cs +++ b/src/Apache/Cassandra/SuperColumn.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/TimedOutException.cs b/src/Apache/Cassandra/TimedOutException.cs index 46f109d..9e04bf2 100644 --- a/src/Apache/Cassandra/TimedOutException.cs +++ b/src/Apache/Cassandra/TimedOutException.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/TokenRange.cs b/src/Apache/Cassandra/TokenRange.cs index fc9be25..889df56 100644 --- a/src/Apache/Cassandra/TokenRange.cs +++ b/src/Apache/Cassandra/TokenRange.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,8 @@ * @generated */ using System; -using System.Collections; using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { diff --git a/src/Apache/Cassandra/UnavailableException.cs b/src/Apache/Cassandra/UnavailableException.cs index ab0dd7f..899b9c0 100644 --- a/src/Apache/Cassandra/UnavailableException.cs +++ b/src/Apache/Cassandra/UnavailableException.cs @@ -1,3 +1,4 @@ +using FluentCassandra.Thrift.Protocol; /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -5,15 +6,7 @@ * @generated */ using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; -using FluentCassandra.Thrift; -using FluentCassandra.Thrift.Collections; -using System.Runtime.Serialization; -using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Apache.Cassandra { From 659136418c2c2d3fcc7ae8224466993feba27f7e Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:24:13 +0100 Subject: [PATCH 02/12] Sort and remove unused using in /src/ --- src/BaseCassandraColumnFamily.cs | 7 +++---- src/CassandraColumnFamily.cs | 5 ++--- src/CassandraColumnFamilyOperations.cs | 6 +++--- src/CassandraColumnFamilySchema.cs | 6 +++--- src/CassandraColumnSchema.cs | 1 - src/CassandraContext.cs | 10 +++++----- src/CassandraCqlRowSchema.cs | 6 ++---- src/CassandraKeyspace.cs | 8 ++++---- src/CassandraKeyspaceSchema.cs | 3 +-- src/CassandraSession.cs | 7 +++---- src/CassandraSuperColumnFamily.cs | 5 ++--- src/CassandraSuperColumnFamilyOperations.cs | 6 +++--- src/CassandraTokenRange.cs | 3 +-- src/ColumnType.cs | 3 +-- 14 files changed, 33 insertions(+), 43 deletions(-) diff --git a/src/BaseCassandraColumnFamily.cs b/src/BaseCassandraColumnFamily.cs index edb4af4..25a76d9 100644 --- a/src/BaseCassandraColumnFamily.cs +++ b/src/BaseCassandraColumnFamily.cs @@ -1,9 +1,8 @@ -using System; +using FluentCassandra.Operations; +using FluentCassandra.Types; +using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using FluentCassandra.Operations; -using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/CassandraColumnFamily.cs b/src/CassandraColumnFamily.cs index 04500ee..9bca4ca 100644 --- a/src/CassandraColumnFamily.cs +++ b/src/CassandraColumnFamily.cs @@ -1,6 +1,5 @@ -using System; -using System.Linq; -using FluentCassandra.Types; +using FluentCassandra.Types; +using System; namespace FluentCassandra { diff --git a/src/CassandraColumnFamilyOperations.cs b/src/CassandraColumnFamilyOperations.cs index 872692d..29beece 100644 --- a/src/CassandraColumnFamilyOperations.cs +++ b/src/CassandraColumnFamilyOperations.cs @@ -1,7 +1,7 @@ -using System; -using System.Collections.Generic; -using FluentCassandra.Operations; +using FluentCassandra.Operations; using FluentCassandra.Types; +using System; +using System.Collections.Generic; namespace FluentCassandra { diff --git a/src/CassandraColumnFamilySchema.cs b/src/CassandraColumnFamilySchema.cs index 9a8157f..af2fa2b 100644 --- a/src/CassandraColumnFamilySchema.cs +++ b/src/CassandraColumnFamilySchema.cs @@ -1,8 +1,8 @@ -using System; +using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Apache.Cassandra; -using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/CassandraColumnSchema.cs b/src/CassandraColumnSchema.cs index 5283885..7aa9a8c 100644 --- a/src/CassandraColumnSchema.cs +++ b/src/CassandraColumnSchema.cs @@ -1,4 +1,3 @@ -using System; using FluentCassandra.Apache.Cassandra; using FluentCassandra.Types; diff --git a/src/CassandraContext.cs b/src/CassandraContext.cs index ba89d3d..3c42beb 100644 --- a/src/CassandraContext.cs +++ b/src/CassandraContext.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Apache.Cassandra; using FluentCassandra.Connections; using FluentCassandra.Linq; using FluentCassandra.Operations; using FluentCassandra.Types; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; namespace FluentCassandra { diff --git a/src/CassandraCqlRowSchema.cs b/src/CassandraCqlRowSchema.cs index 17a0661..607a646 100644 --- a/src/CassandraCqlRowSchema.cs +++ b/src/CassandraCqlRowSchema.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Apache.Cassandra; using FluentCassandra.Types; +using System.Collections.Generic; namespace FluentCassandra { diff --git a/src/CassandraKeyspace.cs b/src/CassandraKeyspace.cs index f278847..665751f 100644 --- a/src/CassandraKeyspace.cs +++ b/src/CassandraKeyspace.cs @@ -1,10 +1,10 @@ -using System; +using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Operations; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using FluentCassandra.Apache.Cassandra; -using FluentCassandra.Operations; -using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/CassandraKeyspaceSchema.cs b/src/CassandraKeyspaceSchema.cs index 674c505..6a0e700 100644 --- a/src/CassandraKeyspaceSchema.cs +++ b/src/CassandraKeyspaceSchema.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Apache.Cassandra; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Apache.Cassandra; namespace FluentCassandra { diff --git a/src/CassandraSession.cs b/src/CassandraSession.cs index 6148d93..a89bd74 100644 --- a/src/CassandraSession.cs +++ b/src/CassandraSession.cs @@ -1,9 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Apache.Cassandra; using FluentCassandra.Connections; using FluentCassandra.Operations; +using System; +using System.Collections.Generic; namespace FluentCassandra { diff --git a/src/CassandraSuperColumnFamily.cs b/src/CassandraSuperColumnFamily.cs index 6c22688..aa5103c 100644 --- a/src/CassandraSuperColumnFamily.cs +++ b/src/CassandraSuperColumnFamily.cs @@ -1,6 +1,5 @@ -using System; -using System.Linq; -using FluentCassandra.Types; +using FluentCassandra.Types; +using System; namespace FluentCassandra { diff --git a/src/CassandraSuperColumnFamilyOperations.cs b/src/CassandraSuperColumnFamilyOperations.cs index 3c3f5f8..b7e3ad7 100644 --- a/src/CassandraSuperColumnFamilyOperations.cs +++ b/src/CassandraSuperColumnFamilyOperations.cs @@ -1,7 +1,7 @@ -using System; -using System.Collections.Generic; -using FluentCassandra.Operations; +using FluentCassandra.Operations; using FluentCassandra.Types; +using System; +using System.Collections.Generic; namespace FluentCassandra { diff --git a/src/CassandraTokenRange.cs b/src/CassandraTokenRange.cs index 106c176..1f6fbe9 100644 --- a/src/CassandraTokenRange.cs +++ b/src/CassandraTokenRange.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace FluentCassandra { diff --git a/src/ColumnType.cs b/src/ColumnType.cs index fed6186..b52c5b4 100644 --- a/src/ColumnType.cs +++ b/src/ColumnType.cs @@ -1,5 +1,4 @@ -using System; - + namespace FluentCassandra { public enum ColumnType From b96368b7f91b5c7d630d2a5df1bf370797ed1818 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:25:47 +0100 Subject: [PATCH 03/12] Sort and remove unused using in /src/ --- src/CqlHelper.cs | 4 +--- src/FluentColumn.cs | 4 ++-- src/FluentColumnFamily.cs | 4 ++-- src/FluentColumnList`1.cs | 1 - src/FluentColumnParent.cs | 3 +-- src/FluentColumnPath.cs | 3 +-- src/FluentCounterColumn.cs | 1 - src/FluentCqlRow.cs | 7 +++---- src/FluentMutationTracker.cs | 3 +-- src/FluentRecord.cs | 3 +-- src/FluentSuperColumn.cs | 4 ++-- src/FluentSuperColumnFamily.cs | 4 ++-- src/GuidGeneration.cs | 1 - src/GuidVersion.cs | 1 - src/IFluentBaseColumn.cs | 3 +-- src/IFluentBaseColumnFamily.cs | 3 +-- src/IFluentMutationTracker.cs | 3 +-- src/IFluentRecord.cs | 3 +-- src/IFluentRecordExpression.cs | 3 +-- src/ILoadable.cs | 6 +----- src/MutationType.cs | 3 +-- src/TimestampHelper.cs | 1 - 22 files changed, 23 insertions(+), 45 deletions(-) diff --git a/src/CqlHelper.cs b/src/CqlHelper.cs index 4029170..60fbf74 100644 --- a/src/CqlHelper.cs +++ b/src/CqlHelper.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; - + namespace FluentCassandra { public static class CqlHelper diff --git a/src/FluentColumn.cs b/src/FluentColumn.cs index dbf027b..5872931 100644 --- a/src/FluentColumn.cs +++ b/src/FluentColumn.cs @@ -1,5 +1,5 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; +using System; namespace FluentCassandra { diff --git a/src/FluentColumnFamily.cs b/src/FluentColumnFamily.cs index dc1f694..4717e4a 100644 --- a/src/FluentColumnFamily.cs +++ b/src/FluentColumnFamily.cs @@ -1,7 +1,7 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/FluentColumnList`1.cs b/src/FluentColumnList`1.cs index d5691c3..8aa61d2 100644 --- a/src/FluentColumnList`1.cs +++ b/src/FluentColumnList`1.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; -using System.Linq; namespace FluentCassandra { diff --git a/src/FluentColumnParent.cs b/src/FluentColumnParent.cs index 73cc199..355a3a4 100644 --- a/src/FluentColumnParent.cs +++ b/src/FluentColumnParent.cs @@ -1,5 +1,4 @@ -using System; - + namespace FluentCassandra { public class FluentColumnParent diff --git a/src/FluentColumnPath.cs b/src/FluentColumnPath.cs index dba2cde..1e6e04b 100644 --- a/src/FluentColumnPath.cs +++ b/src/FluentColumnPath.cs @@ -1,5 +1,4 @@ -using System; - + namespace FluentCassandra { public class FluentColumnPath : FluentColumnParent diff --git a/src/FluentCounterColumn.cs b/src/FluentCounterColumn.cs index 6ae8d72..ec33c8e 100644 --- a/src/FluentCounterColumn.cs +++ b/src/FluentCounterColumn.cs @@ -1,4 +1,3 @@ -using System; using FluentCassandra.Types; namespace FluentCassandra diff --git a/src/FluentCqlRow.cs b/src/FluentCqlRow.cs index 7fb3c46..2072a58 100644 --- a/src/FluentCqlRow.cs +++ b/src/FluentCqlRow.cs @@ -1,9 +1,8 @@ -using System; +using FluentCassandra.Linq; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using FluentCassandra.Linq; -using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/FluentMutationTracker.cs b/src/FluentMutationTracker.cs index ec9e4b0..a919390 100644 --- a/src/FluentMutationTracker.cs +++ b/src/FluentMutationTracker.cs @@ -1,6 +1,5 @@ -using System; +using System.Collections.Generic; using System.Linq; -using System.Collections.Generic; namespace FluentCassandra { diff --git a/src/FluentRecord.cs b/src/FluentRecord.cs index 3906f3c..a2045f8 100644 --- a/src/FluentRecord.cs +++ b/src/FluentRecord.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel; using System.Dynamic; using System.Linq; diff --git a/src/FluentSuperColumn.cs b/src/FluentSuperColumn.cs index 462061c..8dde451 100644 --- a/src/FluentSuperColumn.cs +++ b/src/FluentSuperColumn.cs @@ -1,7 +1,7 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/FluentSuperColumnFamily.cs b/src/FluentSuperColumnFamily.cs index c69f92a..cb6e70e 100644 --- a/src/FluentSuperColumnFamily.cs +++ b/src/FluentSuperColumnFamily.cs @@ -1,7 +1,7 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/GuidGeneration.cs b/src/GuidGeneration.cs index c66409c..95cb0ee 100644 --- a/src/GuidGeneration.cs +++ b/src/GuidGeneration.cs @@ -1,4 +1,3 @@ -using System; namespace FluentCassandra { diff --git a/src/GuidVersion.cs b/src/GuidVersion.cs index c406ab8..5a73b0b 100644 --- a/src/GuidVersion.cs +++ b/src/GuidVersion.cs @@ -1,4 +1,3 @@ -using System; namespace FluentCassandra { diff --git a/src/IFluentBaseColumn.cs b/src/IFluentBaseColumn.cs index 0dae2b1..f4df0de 100644 --- a/src/IFluentBaseColumn.cs +++ b/src/IFluentBaseColumn.cs @@ -1,5 +1,4 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/IFluentBaseColumnFamily.cs b/src/IFluentBaseColumnFamily.cs index 51cabc3..65610f4 100644 --- a/src/IFluentBaseColumnFamily.cs +++ b/src/IFluentBaseColumnFamily.cs @@ -1,5 +1,4 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra { diff --git a/src/IFluentMutationTracker.cs b/src/IFluentMutationTracker.cs index 842edb5..e0a4c0a 100644 --- a/src/IFluentMutationTracker.cs +++ b/src/IFluentMutationTracker.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace FluentCassandra { diff --git a/src/IFluentRecord.cs b/src/IFluentRecord.cs index 69f19e8..04d3334 100644 --- a/src/IFluentRecord.cs +++ b/src/IFluentRecord.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel; using System.Dynamic; diff --git a/src/IFluentRecordExpression.cs b/src/IFluentRecordExpression.cs index 7775f25..4131d9f 100644 --- a/src/IFluentRecordExpression.cs +++ b/src/IFluentRecordExpression.cs @@ -1,6 +1,5 @@ -using System; -using System.Dynamic; using FluentCassandra.Types; +using System.Dynamic; namespace FluentCassandra { diff --git a/src/ILoadable.cs b/src/ILoadable.cs index b61c22b..366f9a9 100644 --- a/src/ILoadable.cs +++ b/src/ILoadable.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace FluentCassandra { public interface ILoadable diff --git a/src/MutationType.cs b/src/MutationType.cs index fb6fef3..87328d5 100644 --- a/src/MutationType.cs +++ b/src/MutationType.cs @@ -1,5 +1,4 @@ -using System; - + namespace FluentCassandra { public enum MutationType diff --git a/src/TimestampHelper.cs b/src/TimestampHelper.cs index b40fc41..ed2555a 100644 --- a/src/TimestampHelper.cs +++ b/src/TimestampHelper.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; namespace FluentCassandra { From 6089b586cc25c9c40a406ad567bebc6859e52c24 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:26:32 +0100 Subject: [PATCH 04/12] Sort and remove unused using in /src/Connections --- src/Connections/CassandraConnectionException.cs | 3 --- src/Connections/Connection.cs | 6 +++--- src/Connections/ConnectionBuilder.cs | 4 ++-- src/Connections/ConnectionProviderFactory.cs | 3 +-- src/Connections/ConnectionType.cs | 6 +----- src/Connections/CqlVersion.cs | 1 - src/Connections/IConnection.cs | 4 ++-- src/Connections/IConnectionBuilder.cs | 4 ++-- src/Connections/SingleServerManager.cs | 2 -- src/Connections/TSocketWithConnectTimeout.cs | 2 +- src/Connections/TimedLock.cs | 4 ++-- 11 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/Connections/CassandraConnectionException.cs b/src/Connections/CassandraConnectionException.cs index 1666f86..9534497 100644 --- a/src/Connections/CassandraConnectionException.cs +++ b/src/Connections/CassandraConnectionException.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace FluentCassandra.Connections { diff --git a/src/Connections/Connection.cs b/src/Connections/Connection.cs index b0f55da..6f87206 100644 --- a/src/Connections/Connection.cs +++ b/src/Connections/Connection.cs @@ -1,7 +1,7 @@ -using System; -using FluentCassandra.Thrift.Transport; +using FluentCassandra.Apache.Cassandra; using FluentCassandra.Thrift.Protocol; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Thrift.Transport; +using System; namespace FluentCassandra.Connections { diff --git a/src/Connections/ConnectionBuilder.cs b/src/Connections/ConnectionBuilder.cs index 65c245e..26f5531 100644 --- a/src/Connections/ConnectionBuilder.cs +++ b/src/Connections/ConnectionBuilder.cs @@ -1,7 +1,7 @@ -using System; +using FluentCassandra.Apache.Cassandra; +using System; using System.Collections.Generic; using System.Text; -using FluentCassandra.Apache.Cassandra; namespace FluentCassandra.Connections { diff --git a/src/Connections/ConnectionProviderFactory.cs b/src/Connections/ConnectionProviderFactory.cs index 3566e4e..14f6fd9 100644 --- a/src/Connections/ConnectionProviderFactory.cs +++ b/src/Connections/ConnectionProviderFactory.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace FluentCassandra.Connections { diff --git a/src/Connections/ConnectionType.cs b/src/Connections/ConnectionType.cs index 33843bb..88bfc04 100644 --- a/src/Connections/ConnectionType.cs +++ b/src/Connections/ConnectionType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace FluentCassandra.Connections { public enum ConnectionType diff --git a/src/Connections/CqlVersion.cs b/src/Connections/CqlVersion.cs index 5090407..e197b58 100644 --- a/src/Connections/CqlVersion.cs +++ b/src/Connections/CqlVersion.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; namespace FluentCassandra.Connections { diff --git a/src/Connections/IConnection.cs b/src/Connections/IConnection.cs index 0c7b612..ae80af6 100644 --- a/src/Connections/IConnection.cs +++ b/src/Connections/IConnection.cs @@ -1,5 +1,5 @@ -using System; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Apache.Cassandra; +using System; namespace FluentCassandra.Connections { diff --git a/src/Connections/IConnectionBuilder.cs b/src/Connections/IConnectionBuilder.cs index fe0679b..834ae09 100644 --- a/src/Connections/IConnectionBuilder.cs +++ b/src/Connections/IConnectionBuilder.cs @@ -1,5 +1,5 @@ -using System; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Apache.Cassandra; +using System; using System.Collections.Generic; namespace FluentCassandra.Connections diff --git a/src/Connections/SingleServerManager.cs b/src/Connections/SingleServerManager.cs index c02e847..4fe5f96 100644 --- a/src/Connections/SingleServerManager.cs +++ b/src/Connections/SingleServerManager.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Diagnostics; namespace FluentCassandra.Connections diff --git a/src/Connections/TSocketWithConnectTimeout.cs b/src/Connections/TSocketWithConnectTimeout.cs index beda23e..13f53be 100644 --- a/src/Connections/TSocketWithConnectTimeout.cs +++ b/src/Connections/TSocketWithConnectTimeout.cs @@ -21,9 +21,9 @@ * details. */ +using FluentCassandra.Thrift.Transport; using System; using System.Net.Sockets; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Connections { diff --git a/src/Connections/TimedLock.cs b/src/Connections/TimedLock.cs index 347d16e..2d1729d 100644 --- a/src/Connections/TimedLock.cs +++ b/src/Connections/TimedLock.cs @@ -1,8 +1,8 @@ using System; -using System.Threading; -using System.Runtime.Serialization; using System.Collections; using System.Diagnostics; +using System.Runtime.Serialization; +using System.Threading; namespace FluentCassandra.Connections { From f9ab864d82177373826e105779cc8a28d8abee6d Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:26:47 +0100 Subject: [PATCH 05/12] Sort and remove unused using in /src/Linq --- src/Linq/CqlQueryEvaluator.cs | 6 ++---- src/Linq/CqlQueryExtensions.cs | 4 ++-- src/Linq/ICassandraColumnFamilyInfo.cs | 4 +--- src/Linq/ICqlRow.cs | 6 ++---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/Linq/CqlQueryEvaluator.cs b/src/Linq/CqlQueryEvaluator.cs index aa8c938..6eb6a8e 100644 --- a/src/Linq/CqlQueryEvaluator.cs +++ b/src/Linq/CqlQueryEvaluator.cs @@ -1,11 +1,9 @@ +using FluentCassandra.Connections; +using FluentCassandra.Types; using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using FluentCassandra.Connections; -using FluentCassandra.Types; -using FluentCassandra.ObjectSerializer; namespace FluentCassandra.Linq { diff --git a/src/Linq/CqlQueryExtensions.cs b/src/Linq/CqlQueryExtensions.cs index f7c26f8..40b27b0 100644 --- a/src/Linq/CqlQueryExtensions.cs +++ b/src/Linq/CqlQueryExtensions.cs @@ -1,6 +1,6 @@ -using System; +using FluentCassandra.Types; +using System; using System.Linq; -using FluentCassandra.Types; using System.Linq.Expressions; using System.Reflection; diff --git a/src/Linq/ICassandraColumnFamilyInfo.cs b/src/Linq/ICassandraColumnFamilyInfo.cs index 0e01112..85444b9 100644 --- a/src/Linq/ICassandraColumnFamilyInfo.cs +++ b/src/Linq/ICassandraColumnFamilyInfo.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; - + namespace FluentCassandra.Linq { internal interface ICassandraColumnFamilyInfo diff --git a/src/Linq/ICqlRow.cs b/src/Linq/ICqlRow.cs index fc7b316..133140c 100644 --- a/src/Linq/ICqlRow.cs +++ b/src/Linq/ICqlRow.cs @@ -1,8 +1,6 @@ -using System; -using System.Linq; -using FluentCassandra.Types; -using System.Dynamic; +using FluentCassandra.Types; using System.Collections.Generic; +using System.Dynamic; namespace FluentCassandra.Linq { From d6559795802dfad7b5140b0bca8715a78d2756c3 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:27:09 +0100 Subject: [PATCH 06/12] Sort and remove unused using in /src/ObjectSerializer --- src/ObjectSerializer/IObjectSerializer.cs | 5 ++--- src/ObjectSerializer/ObjectSerializerFactory.cs | 1 - src/ObjectSerializer/ReflectionObjectSerializer.cs | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ObjectSerializer/IObjectSerializer.cs b/src/ObjectSerializer/IObjectSerializer.cs index ff0a049..5053550 100644 --- a/src/ObjectSerializer/IObjectSerializer.cs +++ b/src/ObjectSerializer/IObjectSerializer.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Linq; +using System; using System.Collections.Generic; -using System.Linq; -using FluentCassandra.Linq; namespace FluentCassandra.ObjectSerializer { diff --git a/src/ObjectSerializer/ObjectSerializerFactory.cs b/src/ObjectSerializer/ObjectSerializerFactory.cs index 79821b1..ee11e41 100644 --- a/src/ObjectSerializer/ObjectSerializerFactory.cs +++ b/src/ObjectSerializer/ObjectSerializerFactory.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; namespace FluentCassandra.ObjectSerializer { diff --git a/src/ObjectSerializer/ReflectionObjectSerializer.cs b/src/ObjectSerializer/ReflectionObjectSerializer.cs index 8a06866..b2646b5 100644 --- a/src/ObjectSerializer/ReflectionObjectSerializer.cs +++ b/src/ObjectSerializer/ReflectionObjectSerializer.cs @@ -1,8 +1,8 @@ -using System; +using FluentCassandra.Linq; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using FluentCassandra.Linq; namespace FluentCassandra.ObjectSerializer { From b792ba470c47868acc7a3b00aad21c5c5c4a1d53 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:28:16 +0100 Subject: [PATCH 07/12] Sort and remove unused using in /src/Operations --- src/Operations/AddColumn.cs | 3 +-- src/Operations/BatchMutate.cs | 3 +-- src/Operations/CassandraClientWrapper.cs | 5 ++--- src/Operations/CassandraColumn.cs | 5 ++--- src/Operations/CassandraColumnParent.cs | 1 - src/Operations/CassandraColumnPath.cs | 4 +--- src/Operations/CassandraColumnSlicePredicate.cs | 4 +--- src/Operations/CassandraCounterColumn.cs | 4 +--- src/Operations/CassandraIndexClause.cs | 4 ++-- src/Operations/CassandraIndexClauseBuilder.cs | 4 ++-- src/Operations/CassandraKeyRange.cs | 3 +-- src/Operations/CassandraOperationException.cs | 5 ++--- src/Operations/CassandraQuerySetup.cs | 5 ++--- src/Operations/CassandraRangeSlicePredicate.cs | 1 - src/Operations/CassandraSlicePredicate.cs | 3 +-- src/Operations/CassandraSlicePredicateBuilder.cs | 4 ++-- src/Operations/CassandraSlicePredicateQuery.cs | 4 +--- src/Operations/CassandraSlicePredicateQueryable.cs | 6 +++--- src/Operations/ColumnCount.cs | 3 +-- src/Operations/ColumnFamilyOperation.cs | 3 +-- src/Operations/ExecuteCqlNonQuery.cs | 4 +--- src/Operations/ExecuteCqlQuery.cs | 7 +++---- src/Operations/GetColumn.cs | 3 +-- src/Operations/GetColumnFamilyIndexedSlices.cs | 4 ++-- src/Operations/GetColumnFamilyRangeSlices.cs | 3 +-- src/Operations/GetColumnFamilySlice.cs | 3 +-- src/Operations/GetSuperColumn.cs | 2 -- src/Operations/GetSuperColumnFamilyIndexedSlices.cs | 4 ++-- src/Operations/GetSuperColumnFamilyRangeSlices.cs | 3 +-- src/Operations/GetSuperColumnFamilySlice.cs | 3 +-- src/Operations/GetSuperColumnSlice.cs | 3 +-- src/Operations/Helper.cs | 10 +++++----- src/Operations/InsertColumn.cs | 4 ++-- src/Operations/MultiGetColumnCount.cs | 3 +-- src/Operations/MultiGetColumnFamilySlice.cs | 3 +-- src/Operations/MultiGetSuperColumnFamilySlice.cs | 3 +-- src/Operations/Operation.cs | 6 +++--- src/Operations/QueryableColumnFamilyOperation.cs | 3 +-- src/Operations/Remove.cs | 3 +-- src/Operations/SimpleOperation.cs | 1 - src/Operations/Void.cs | 4 +--- 41 files changed, 57 insertions(+), 96 deletions(-) diff --git a/src/Operations/AddColumn.cs b/src/Operations/AddColumn.cs index a2ff425..2fd71d4 100644 --- a/src/Operations/AddColumn.cs +++ b/src/Operations/AddColumn.cs @@ -1,5 +1,4 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/BatchMutate.cs b/src/Operations/BatchMutate.cs index c45312f..dcfb6d4 100644 --- a/src/Operations/BatchMutate.cs +++ b/src/Operations/BatchMutate.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Apache.Cassandra; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Apache.Cassandra; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraClientWrapper.cs b/src/Operations/CassandraClientWrapper.cs index 115fca0..cc53582 100644 --- a/src/Operations/CassandraClientWrapper.cs +++ b/src/Operations/CassandraClientWrapper.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; -using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraColumn.cs b/src/Operations/CassandraColumn.cs index 679f4d8..1a73e9d 100644 --- a/src/Operations/CassandraColumn.cs +++ b/src/Operations/CassandraColumn.cs @@ -1,6 +1,5 @@ -using System; -using System.Linq; -using FluentCassandra.Types; +using FluentCassandra.Types; +using System; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraColumnParent.cs b/src/Operations/CassandraColumnParent.cs index 53904e5..856d2dc 100644 --- a/src/Operations/CassandraColumnParent.cs +++ b/src/Operations/CassandraColumnParent.cs @@ -1,4 +1,3 @@ -using System; using FluentCassandra.Types; namespace FluentCassandra.Operations diff --git a/src/Operations/CassandraColumnPath.cs b/src/Operations/CassandraColumnPath.cs index 79ef62b..e03d31a 100644 --- a/src/Operations/CassandraColumnPath.cs +++ b/src/Operations/CassandraColumnPath.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraColumnSlicePredicate.cs b/src/Operations/CassandraColumnSlicePredicate.cs index caf3e6b..a74d48c 100644 --- a/src/Operations/CassandraColumnSlicePredicate.cs +++ b/src/Operations/CassandraColumnSlicePredicate.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; using FluentCassandra.Types; +using System.Collections.Generic; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraCounterColumn.cs b/src/Operations/CassandraCounterColumn.cs index 31f6553..cfcb02c 100644 --- a/src/Operations/CassandraCounterColumn.cs +++ b/src/Operations/CassandraCounterColumn.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraIndexClause.cs b/src/Operations/CassandraIndexClause.cs index 22279da..f270033 100644 --- a/src/Operations/CassandraIndexClause.cs +++ b/src/Operations/CassandraIndexClause.cs @@ -1,7 +1,7 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq.Expressions; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraIndexClauseBuilder.cs b/src/Operations/CassandraIndexClauseBuilder.cs index e8a3299..5593659 100644 --- a/src/Operations/CassandraIndexClauseBuilder.cs +++ b/src/Operations/CassandraIndexClauseBuilder.cs @@ -1,8 +1,8 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq.Expressions; using Cassandra = FluentCassandra.Apache.Cassandra; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraKeyRange.cs b/src/Operations/CassandraKeyRange.cs index d9b6a58..e5c2324 100644 --- a/src/Operations/CassandraKeyRange.cs +++ b/src/Operations/CassandraKeyRange.cs @@ -1,5 +1,4 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraOperationException.cs b/src/Operations/CassandraOperationException.cs index e97df0d..ebfac10 100644 --- a/src/Operations/CassandraOperationException.cs +++ b/src/Operations/CassandraOperationException.cs @@ -1,7 +1,6 @@ -using System; -using System.Linq; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Apache.Cassandra; using FluentCassandra.Thrift.Transport; +using System; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraQuerySetup.cs b/src/Operations/CassandraQuerySetup.cs index 6c82804..1e1fccd 100644 --- a/src/Operations/CassandraQuerySetup.cs +++ b/src/Operations/CassandraQuerySetup.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; -using System.Linq; -using FluentCassandra.Types; using System.Linq.Expressions; namespace FluentCassandra.Operations diff --git a/src/Operations/CassandraRangeSlicePredicate.cs b/src/Operations/CassandraRangeSlicePredicate.cs index 48a3fd3..0548169 100644 --- a/src/Operations/CassandraRangeSlicePredicate.cs +++ b/src/Operations/CassandraRangeSlicePredicate.cs @@ -1,4 +1,3 @@ -using System; using FluentCassandra.Types; namespace FluentCassandra.Operations diff --git a/src/Operations/CassandraSlicePredicate.cs b/src/Operations/CassandraSlicePredicate.cs index 8d5fa00..3166992 100644 --- a/src/Operations/CassandraSlicePredicate.cs +++ b/src/Operations/CassandraSlicePredicate.cs @@ -1,5 +1,4 @@ -using System; - + namespace FluentCassandra.Operations { public abstract class CassandraSlicePredicate diff --git a/src/Operations/CassandraSlicePredicateBuilder.cs b/src/Operations/CassandraSlicePredicateBuilder.cs index c5bdb91..36fce6d 100644 --- a/src/Operations/CassandraSlicePredicateBuilder.cs +++ b/src/Operations/CassandraSlicePredicateBuilder.cs @@ -1,8 +1,8 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraSlicePredicateQuery.cs b/src/Operations/CassandraSlicePredicateQuery.cs index c4fdebc..838960a 100644 --- a/src/Operations/CassandraSlicePredicateQuery.cs +++ b/src/Operations/CassandraSlicePredicateQuery.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections; +using System.Collections; using System.Collections.Generic; using System.Linq.Expressions; -using System.Linq; namespace FluentCassandra.Operations { diff --git a/src/Operations/CassandraSlicePredicateQueryable.cs b/src/Operations/CassandraSlicePredicateQueryable.cs index fa75e55..f996476 100644 --- a/src/Operations/CassandraSlicePredicateQueryable.cs +++ b/src/Operations/CassandraSlicePredicateQueryable.cs @@ -1,10 +1,10 @@ -using System; +using FluentCassandra.Operations; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; using System.Linq.Expressions; using System.Reflection; -using FluentCassandra.Operations; namespace FluentCassandra { diff --git a/src/Operations/ColumnCount.cs b/src/Operations/ColumnCount.cs index 9ebb3cc..5584449 100644 --- a/src/Operations/ColumnCount.cs +++ b/src/Operations/ColumnCount.cs @@ -1,5 +1,4 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/ColumnFamilyOperation.cs b/src/Operations/ColumnFamilyOperation.cs index 0f8436e..2d7fc11 100644 --- a/src/Operations/ColumnFamilyOperation.cs +++ b/src/Operations/ColumnFamilyOperation.cs @@ -1,5 +1,4 @@ -using System; - + namespace FluentCassandra.Operations { public abstract class ColumnFamilyOperation : Operation diff --git a/src/Operations/ExecuteCqlNonQuery.cs b/src/Operations/ExecuteCqlNonQuery.cs index 26bdbf7..d9a30c5 100644 --- a/src/Operations/ExecuteCqlNonQuery.cs +++ b/src/Operations/ExecuteCqlNonQuery.cs @@ -1,7 +1,5 @@ -using System; +using FluentCassandra.Types; using System.Diagnostics; -using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/ExecuteCqlQuery.cs b/src/Operations/ExecuteCqlQuery.cs index e06c19f..bdc535b 100644 --- a/src/Operations/ExecuteCqlQuery.cs +++ b/src/Operations/ExecuteCqlQuery.cs @@ -1,11 +1,10 @@ -using System; +using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Linq; +using FluentCassandra.Types; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text.RegularExpressions; -using FluentCassandra.Apache.Cassandra; -using FluentCassandra.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetColumn.cs b/src/Operations/GetColumn.cs index 9423662..3be2d48 100644 --- a/src/Operations/GetColumn.cs +++ b/src/Operations/GetColumn.cs @@ -1,5 +1,4 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetColumnFamilyIndexedSlices.cs b/src/Operations/GetColumnFamilyIndexedSlices.cs index d8823f1..5d4c994 100644 --- a/src/Operations/GetColumnFamilyIndexedSlices.cs +++ b/src/Operations/GetColumnFamilyIndexedSlices.cs @@ -1,7 +1,7 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetColumnFamilyRangeSlices.cs b/src/Operations/GetColumnFamilyRangeSlices.cs index d59513b..6c79c6f 100644 --- a/src/Operations/GetColumnFamilyRangeSlices.cs +++ b/src/Operations/GetColumnFamilyRangeSlices.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetColumnFamilySlice.cs b/src/Operations/GetColumnFamilySlice.cs index 2fab4a7..e30f554 100644 --- a/src/Operations/GetColumnFamilySlice.cs +++ b/src/Operations/GetColumnFamilySlice.cs @@ -1,6 +1,5 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetSuperColumn.cs b/src/Operations/GetSuperColumn.cs index 340c5ea..270b70b 100644 --- a/src/Operations/GetSuperColumn.cs +++ b/src/Operations/GetSuperColumn.cs @@ -1,6 +1,4 @@ -using System; using FluentCassandra.Types; -using FluentCassandra.Apache.Cassandra; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetSuperColumnFamilyIndexedSlices.cs b/src/Operations/GetSuperColumnFamilyIndexedSlices.cs index ac66d0b..63fa42d 100644 --- a/src/Operations/GetSuperColumnFamilyIndexedSlices.cs +++ b/src/Operations/GetSuperColumnFamilyIndexedSlices.cs @@ -1,7 +1,7 @@ -using System; +using FluentCassandra.Types; +using System; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetSuperColumnFamilyRangeSlices.cs b/src/Operations/GetSuperColumnFamilyRangeSlices.cs index f4feba8..9ffd515 100644 --- a/src/Operations/GetSuperColumnFamilyRangeSlices.cs +++ b/src/Operations/GetSuperColumnFamilyRangeSlices.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetSuperColumnFamilySlice.cs b/src/Operations/GetSuperColumnFamilySlice.cs index a963b1a..5cce7c0 100644 --- a/src/Operations/GetSuperColumnFamilySlice.cs +++ b/src/Operations/GetSuperColumnFamilySlice.cs @@ -1,6 +1,5 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/GetSuperColumnSlice.cs b/src/Operations/GetSuperColumnSlice.cs index 09ae476..ae5692b 100644 --- a/src/Operations/GetSuperColumnSlice.cs +++ b/src/Operations/GetSuperColumnSlice.cs @@ -1,6 +1,5 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/Helper.cs b/src/Operations/Helper.cs index 7de873f..67574e8 100644 --- a/src/Operations/Helper.cs +++ b/src/Operations/Helper.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Apache.Cassandra; using FluentCassandra.Types; +using System; +using System.Collections.Generic; using System.IO; using System.IO.Compression; +using System.Linq; +using System.Net; namespace FluentCassandra.Operations { diff --git a/src/Operations/InsertColumn.cs b/src/Operations/InsertColumn.cs index 7c6ecc5..1ed39b0 100644 --- a/src/Operations/InsertColumn.cs +++ b/src/Operations/InsertColumn.cs @@ -1,5 +1,5 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; +using System; namespace FluentCassandra.Operations { diff --git a/src/Operations/MultiGetColumnCount.cs b/src/Operations/MultiGetColumnCount.cs index 1330cc0..b291f44 100644 --- a/src/Operations/MultiGetColumnCount.cs +++ b/src/Operations/MultiGetColumnCount.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/MultiGetColumnFamilySlice.cs b/src/Operations/MultiGetColumnFamilySlice.cs index 10c0b9d..d36eaed 100644 --- a/src/Operations/MultiGetColumnFamilySlice.cs +++ b/src/Operations/MultiGetColumnFamilySlice.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/MultiGetSuperColumnFamilySlice.cs b/src/Operations/MultiGetSuperColumnFamilySlice.cs index 9a17b0b..5db8c04 100644 --- a/src/Operations/MultiGetSuperColumnFamilySlice.cs +++ b/src/Operations/MultiGetSuperColumnFamilySlice.cs @@ -1,7 +1,6 @@ -using System; +using FluentCassandra.Types; using System.Collections.Generic; using System.Linq; -using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/Operation.cs b/src/Operations/Operation.cs index ca670ff..8d6290a 100644 --- a/src/Operations/Operation.cs +++ b/src/Operations/Operation.cs @@ -1,8 +1,8 @@ -using System; +using FluentCassandra.Apache.Cassandra; +using FluentCassandra.Thrift.Transport; +using System; using System.Diagnostics; using System.IO; -using FluentCassandra.Apache.Cassandra; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Operations { diff --git a/src/Operations/QueryableColumnFamilyOperation.cs b/src/Operations/QueryableColumnFamilyOperation.cs index 7cc56b0..cfc83f9 100644 --- a/src/Operations/QueryableColumnFamilyOperation.cs +++ b/src/Operations/QueryableColumnFamilyOperation.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace FluentCassandra.Operations { diff --git a/src/Operations/Remove.cs b/src/Operations/Remove.cs index aba7ced..832b2cd 100644 --- a/src/Operations/Remove.cs +++ b/src/Operations/Remove.cs @@ -1,5 +1,4 @@ -using System; -using FluentCassandra.Types; +using FluentCassandra.Types; namespace FluentCassandra.Operations { diff --git a/src/Operations/SimpleOperation.cs b/src/Operations/SimpleOperation.cs index bb8b41b..26b43db 100644 --- a/src/Operations/SimpleOperation.cs +++ b/src/Operations/SimpleOperation.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; namespace FluentCassandra.Operations { diff --git a/src/Operations/Void.cs b/src/Operations/Void.cs index fa9f45e..5a0b8d1 100644 --- a/src/Operations/Void.cs +++ b/src/Operations/Void.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; - + namespace FluentCassandra.Operations { public struct Void From 6c2fcee608535e76618e5ae198543fa08f81a904 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:29:13 +0100 Subject: [PATCH 08/12] Sort and remove unused using in /src/Thrift --- src/Thrift/Protocol/TBase64Utils.cs | 1 - src/Thrift/Protocol/TBinaryProtocol.cs | 2 +- src/Thrift/Protocol/TCompactProtocol.cs | 6 ++---- src/Thrift/Protocol/TField.cs | 3 --- src/Thrift/Protocol/TJSONProtocol.cs | 7 +++---- src/Thrift/Protocol/TList.cs | 3 --- src/Thrift/Protocol/TMap.cs | 3 --- src/Thrift/Protocol/TMessage.cs | 3 --- src/Thrift/Protocol/TMessageType.cs | 1 - src/Thrift/Protocol/TProtocol.cs | 3 +-- src/Thrift/Protocol/TProtocolFactory.cs | 1 - src/Thrift/Protocol/TProtocolUtil.cs | 1 - src/Thrift/Protocol/TSet.cs | 3 --- src/Thrift/Protocol/TStruct.cs | 3 --- src/Thrift/Protocol/TType.cs | 1 - src/Thrift/Server/TServer.cs | 3 +-- src/Thrift/Server/TSimpleServer.cs | 4 ++-- src/Thrift/Server/TThreadPoolServer.cs | 4 ++-- src/Thrift/Server/TThreadedServer.cs | 6 +++--- src/Thrift/TApplicationException.cs | 2 +- src/Thrift/TProcessor.cs | 1 - src/Thrift/Transport/THttpClient.cs | 1 - src/Thrift/Transport/THttpHandler.cs | 7 +++---- src/Thrift/Transport/TServerTransport.cs | 1 - src/Thrift/Transport/TStreamTransport.cs | 1 - src/Thrift/Transport/TTransportFactory.cs | 1 - 26 files changed, 19 insertions(+), 53 deletions(-) diff --git a/src/Thrift/Protocol/TBase64Utils.cs b/src/Thrift/Protocol/TBase64Utils.cs index 32007ca..98acdc2 100644 --- a/src/Thrift/Protocol/TBase64Utils.cs +++ b/src/Thrift/Protocol/TBase64Utils.cs @@ -17,7 +17,6 @@ * under the License. */ -using System; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TBinaryProtocol.cs b/src/Thrift/Protocol/TBinaryProtocol.cs index c0dfff8..209831f 100644 --- a/src/Thrift/Protocol/TBinaryProtocol.cs +++ b/src/Thrift/Protocol/TBinaryProtocol.cs @@ -21,9 +21,9 @@ * details. */ +using FluentCassandra.Thrift.Transport; using System; using System.Text; -using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TCompactProtocol.cs b/src/Thrift/Protocol/TCompactProtocol.cs index 18c4313..47783f0 100644 --- a/src/Thrift/Protocol/TCompactProtocol.cs +++ b/src/Thrift/Protocol/TCompactProtocol.cs @@ -21,12 +21,10 @@ * details. */ -using System; -using System.Text; using FluentCassandra.Thrift.Transport; -using System.Collections; -using System.IO; +using System; using System.Collections.Generic; +using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TField.cs b/src/Thrift/Protocol/TField.cs index b994b89..cc34325 100644 --- a/src/Thrift/Protocol/TField.cs +++ b/src/Thrift/Protocol/TField.cs @@ -21,9 +21,6 @@ * details. */ -using System; -using System.Collections.Generic; -using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TJSONProtocol.cs b/src/Thrift/Protocol/TJSONProtocol.cs index bf6edc2..f1f44d6 100644 --- a/src/Thrift/Protocol/TJSONProtocol.cs +++ b/src/Thrift/Protocol/TJSONProtocol.cs @@ -17,13 +17,12 @@ * under the License. */ +using FluentCassandra.Thrift.Transport; using System; -using System.IO; -using System.Text; using System.Collections.Generic; - -using FluentCassandra.Thrift.Transport; using System.Globalization; +using System.IO; +using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TList.cs b/src/Thrift/Protocol/TList.cs index 9592fa4..895feea 100644 --- a/src/Thrift/Protocol/TList.cs +++ b/src/Thrift/Protocol/TList.cs @@ -21,9 +21,6 @@ * details. */ -using System; -using System.Collections.Generic; -using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TMap.cs b/src/Thrift/Protocol/TMap.cs index 2fcb688..900b34a 100644 --- a/src/Thrift/Protocol/TMap.cs +++ b/src/Thrift/Protocol/TMap.cs @@ -21,9 +21,6 @@ * details. */ -using System; -using System.Collections.Generic; -using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TMessage.cs b/src/Thrift/Protocol/TMessage.cs index e7310a0..0fa83b0 100644 --- a/src/Thrift/Protocol/TMessage.cs +++ b/src/Thrift/Protocol/TMessage.cs @@ -21,9 +21,6 @@ * details. */ -using System; -using System.Collections.Generic; -using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TMessageType.cs b/src/Thrift/Protocol/TMessageType.cs index 153ae43..7c05096 100644 --- a/src/Thrift/Protocol/TMessageType.cs +++ b/src/Thrift/Protocol/TMessageType.cs @@ -17,7 +17,6 @@ * under the License. */ -using System; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TProtocol.cs b/src/Thrift/Protocol/TProtocol.cs index 2275122..b9fdc3b 100644 --- a/src/Thrift/Protocol/TProtocol.cs +++ b/src/Thrift/Protocol/TProtocol.cs @@ -21,9 +21,8 @@ * details. */ -using System; -using System.Text; using FluentCassandra.Thrift.Transport; +using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TProtocolFactory.cs b/src/Thrift/Protocol/TProtocolFactory.cs index da0dd68..1893e92 100644 --- a/src/Thrift/Protocol/TProtocolFactory.cs +++ b/src/Thrift/Protocol/TProtocolFactory.cs @@ -21,7 +21,6 @@ * details. */ -using System; using FluentCassandra.Thrift.Transport; namespace FluentCassandra.Thrift.Protocol diff --git a/src/Thrift/Protocol/TProtocolUtil.cs b/src/Thrift/Protocol/TProtocolUtil.cs index e132280..7b8a75e 100644 --- a/src/Thrift/Protocol/TProtocolUtil.cs +++ b/src/Thrift/Protocol/TProtocolUtil.cs @@ -21,7 +21,6 @@ * details. */ -using System; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TSet.cs b/src/Thrift/Protocol/TSet.cs index fc3911b..5322a55 100644 --- a/src/Thrift/Protocol/TSet.cs +++ b/src/Thrift/Protocol/TSet.cs @@ -21,9 +21,6 @@ * details. */ -using System; -using System.Collections.Generic; -using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TStruct.cs b/src/Thrift/Protocol/TStruct.cs index 2439818..a955626 100644 --- a/src/Thrift/Protocol/TStruct.cs +++ b/src/Thrift/Protocol/TStruct.cs @@ -21,9 +21,6 @@ * details. */ -using System; -using System.Collections.Generic; -using System.Text; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Protocol/TType.cs b/src/Thrift/Protocol/TType.cs index 97686bc..0958534 100644 --- a/src/Thrift/Protocol/TType.cs +++ b/src/Thrift/Protocol/TType.cs @@ -21,7 +21,6 @@ * details. */ -using System; namespace FluentCassandra.Thrift.Protocol { diff --git a/src/Thrift/Server/TServer.cs b/src/Thrift/Server/TServer.cs index 7780080..9af4e4a 100644 --- a/src/Thrift/Server/TServer.cs +++ b/src/Thrift/Server/TServer.cs @@ -21,10 +21,9 @@ * details. */ -using System; using FluentCassandra.Thrift.Protocol; using FluentCassandra.Thrift.Transport; -using System.IO; +using System; namespace FluentCassandra.Thrift.Server { diff --git a/src/Thrift/Server/TSimpleServer.cs b/src/Thrift/Server/TSimpleServer.cs index 76c4f99..85191dc 100644 --- a/src/Thrift/Server/TSimpleServer.cs +++ b/src/Thrift/Server/TSimpleServer.cs @@ -21,9 +21,9 @@ * details. */ -using System; -using FluentCassandra.Thrift.Transport; using FluentCassandra.Thrift.Protocol; +using FluentCassandra.Thrift.Transport; +using System; namespace FluentCassandra.Thrift.Server { diff --git a/src/Thrift/Server/TThreadPoolServer.cs b/src/Thrift/Server/TThreadPoolServer.cs index 40e7ef3..a596912 100644 --- a/src/Thrift/Server/TThreadPoolServer.cs +++ b/src/Thrift/Server/TThreadPoolServer.cs @@ -21,10 +21,10 @@ * details. */ -using System; -using System.Threading; using FluentCassandra.Thrift.Protocol; using FluentCassandra.Thrift.Transport; +using System; +using System.Threading; namespace FluentCassandra.Thrift.Server { diff --git a/src/Thrift/Server/TThreadedServer.cs b/src/Thrift/Server/TThreadedServer.cs index 924129d..94281f9 100644 --- a/src/Thrift/Server/TThreadedServer.cs +++ b/src/Thrift/Server/TThreadedServer.cs @@ -17,12 +17,12 @@ * under the License. */ -using System; -using System.Collections.Generic; -using System.Threading; using FluentCassandra.Thrift.Collections; using FluentCassandra.Thrift.Protocol; using FluentCassandra.Thrift.Transport; +using System; +using System.Collections.Generic; +using System.Threading; namespace FluentCassandra.Thrift.Server { diff --git a/src/Thrift/TApplicationException.cs b/src/Thrift/TApplicationException.cs index 39ac895..e693b99 100644 --- a/src/Thrift/TApplicationException.cs +++ b/src/Thrift/TApplicationException.cs @@ -21,8 +21,8 @@ * details. */ -using System; using FluentCassandra.Thrift.Protocol; +using System; namespace FluentCassandra.Thrift { diff --git a/src/Thrift/TProcessor.cs b/src/Thrift/TProcessor.cs index 56726f8..8caf8fb 100644 --- a/src/Thrift/TProcessor.cs +++ b/src/Thrift/TProcessor.cs @@ -21,7 +21,6 @@ * details. */ -using System; using FluentCassandra.Thrift.Protocol; namespace FluentCassandra.Thrift diff --git a/src/Thrift/Transport/THttpClient.cs b/src/Thrift/Transport/THttpClient.cs index 13aaa9c..b1f4ead 100644 --- a/src/Thrift/Transport/THttpClient.cs +++ b/src/Thrift/Transport/THttpClient.cs @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.IO; using System.Net; -using System.Threading; namespace FluentCassandra.Thrift.Transport { diff --git a/src/Thrift/Transport/THttpHandler.cs b/src/Thrift/Transport/THttpHandler.cs index 6d8d20d..307dfd4 100644 --- a/src/Thrift/Transport/THttpHandler.cs +++ b/src/Thrift/Transport/THttpHandler.cs @@ -7,12 +7,11 @@ // Distributed under the Apache Public License // +using FluentCassandra.Thrift.Protocol; using System; -using System.Web; -using System.Net; using System.IO; - -using FluentCassandra.Thrift.Protocol; +using System.Net; +using System.Web; namespace FluentCassandra.Thrift.Transport { diff --git a/src/Thrift/Transport/TServerTransport.cs b/src/Thrift/Transport/TServerTransport.cs index 9822a92..fcf2e66 100644 --- a/src/Thrift/Transport/TServerTransport.cs +++ b/src/Thrift/Transport/TServerTransport.cs @@ -21,7 +21,6 @@ * details. */ -using System; namespace FluentCassandra.Thrift.Transport { diff --git a/src/Thrift/Transport/TStreamTransport.cs b/src/Thrift/Transport/TStreamTransport.cs index fcc3336..909fec5 100644 --- a/src/Thrift/Transport/TStreamTransport.cs +++ b/src/Thrift/Transport/TStreamTransport.cs @@ -21,7 +21,6 @@ * details. */ -using System; using System.IO; namespace FluentCassandra.Thrift.Transport diff --git a/src/Thrift/Transport/TTransportFactory.cs b/src/Thrift/Transport/TTransportFactory.cs index 7ae4b4c..e6103b7 100644 --- a/src/Thrift/Transport/TTransportFactory.cs +++ b/src/Thrift/Transport/TTransportFactory.cs @@ -21,7 +21,6 @@ * details. */ -using System; namespace FluentCassandra.Thrift.Transport { From d92800b40151a6fcbd1243b1e730e91f9f4ee546 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:29:42 +0100 Subject: [PATCH 09/12] Sort and remove unused using in /src/Types --- src/Types/CassandraConversionHelper.cs | 2 -- src/Types/CassandraObjectConverter.cs | 1 - src/Types/CompositeType`1.cs | 3 +-- src/Types/CounterColumnType.cs | 3 +-- src/Types/EmptyType.cs | 2 -- src/Types/InetAddressType.cs | 1 - src/Types/NullType.cs | 1 - src/Types/ReversedType.cs | 1 - src/Types/UUIDType.cs | 1 - 9 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Types/CassandraConversionHelper.cs b/src/Types/CassandraConversionHelper.cs index 7586ccd..b264b6a 100644 --- a/src/Types/CassandraConversionHelper.cs +++ b/src/Types/CassandraConversionHelper.cs @@ -1,6 +1,4 @@ using System; -using System.Net; -using System.Numerics; namespace FluentCassandra.Types { diff --git a/src/Types/CassandraObjectConverter.cs b/src/Types/CassandraObjectConverter.cs index be6e90b..c04c0f0 100644 --- a/src/Types/CassandraObjectConverter.cs +++ b/src/Types/CassandraObjectConverter.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.ComponentModel; namespace FluentCassandra.Types diff --git a/src/Types/CompositeType`1.cs b/src/Types/CompositeType`1.cs index b75bc26..ba59329 100644 --- a/src/Types/CompositeType`1.cs +++ b/src/Types/CompositeType`1.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; namespace FluentCassandra.Types diff --git a/src/Types/CounterColumnType.cs b/src/Types/CounterColumnType.cs index 4871b6c..50dcd7a 100644 --- a/src/Types/CounterColumnType.cs +++ b/src/Types/CounterColumnType.cs @@ -1,5 +1,4 @@ -using System; - + namespace FluentCassandra.Types { public class CounterColumnType : LongType diff --git a/src/Types/EmptyType.cs b/src/Types/EmptyType.cs index 83bc6bb..9d5c36c 100644 --- a/src/Types/EmptyType.cs +++ b/src/Types/EmptyType.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Net; using System.Numerics; -using System.Text; namespace FluentCassandra.Types { diff --git a/src/Types/InetAddressType.cs b/src/Types/InetAddressType.cs index 7770402..ef11652 100644 --- a/src/Types/InetAddressType.cs +++ b/src/Types/InetAddressType.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Net; namespace FluentCassandra.Types diff --git a/src/Types/NullType.cs b/src/Types/NullType.cs index 5b9909d..8263c70 100644 --- a/src/Types/NullType.cs +++ b/src/Types/NullType.cs @@ -1,5 +1,4 @@ using System; -using System.Numerics; namespace FluentCassandra.Types { diff --git a/src/Types/ReversedType.cs b/src/Types/ReversedType.cs index 269dccd..292f4a1 100644 --- a/src/Types/ReversedType.cs +++ b/src/Types/ReversedType.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; namespace FluentCassandra.Types { diff --git a/src/Types/UUIDType.cs b/src/Types/UUIDType.cs index c70cd50..cd3cdf7 100644 --- a/src/Types/UUIDType.cs +++ b/src/Types/UUIDType.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; namespace FluentCassandra.Types { From 4056e7e1a15426710618be50a9e6c30ca82aa0ce Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:29:58 +0100 Subject: [PATCH 10/12] Sort and remove unused using in /src/System --- src/System/DateTimePrecise.cs | 4 +--- src/System/Numerics/BigDecimal.cs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/System/DateTimePrecise.cs b/src/System/DateTimePrecise.cs index c2a628b..85d8dc3 100644 --- a/src/System/DateTimePrecise.cs +++ b/src/System/DateTimePrecise.cs @@ -1,6 +1,4 @@ -using System; -using System.Diagnostics; -using System.Linq; +using System.Diagnostics; namespace System { diff --git a/src/System/Numerics/BigDecimal.cs b/src/System/Numerics/BigDecimal.cs index 3bd1be9..ebcd449 100644 --- a/src/System/Numerics/BigDecimal.cs +++ b/src/System/Numerics/BigDecimal.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; - + namespace System.Numerics { public struct BigDecimal : IConvertible, IFormattable, IComparable, IComparable, IEquatable From 2d5b0a8c3a4d69b99cd16c2ff7e3ab2925632ad8 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:30:38 +0100 Subject: [PATCH 11/12] Sort and remove unused using in /src/Properties --- src/Properties/AssemblyInfo.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index eb26b60..29e3eb4 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following From 31daab3a7fc496d7b6b01540163ee7cc98b1a9e2 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Tue, 23 Jul 2013 21:56:43 +0100 Subject: [PATCH 12/12] Added a project for integration tests Having both types of tests (unit and integration) in the same project it is difficult for new commiters to understand which tests to run. It's much easier to run unit tests than integration. Let's have to separate projects. --- FluentCassandra.sln | 13 ++++++ FluentCassandra_All.sln | 15 +++++- .../FluentCassandra.Integration.Tests.csproj | 46 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 35 ++++++++++++++ .../Readme.txt | 1 + 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 test/FluentCassandra.Integration.Tests/FluentCassandra.Integration.Tests.csproj create mode 100644 test/FluentCassandra.Integration.Tests/Properties/AssemblyInfo.cs create mode 100644 test/FluentCassandra.Integration.Tests/Readme.txt diff --git a/FluentCassandra.sln b/FluentCassandra.sln index 4f89f8d..724de45 100644 --- a/FluentCassandra.sln +++ b/FluentCassandra.sln @@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1A88B962 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.Tests", "test\FluentCassandra.Tests\FluentCassandra.Tests.csproj", "{9DAF7022-5820-4214-B13E-AC0A1B37691F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.Integration.Tests", "test\FluentCassandra.Integration.Tests\FluentCassandra.Integration.Tests.csproj", "{707F8904-8E10-4577-919B-A804BE23DFB8}" +EndProject Global GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = FluentCassandra.vsmdi @@ -63,6 +65,16 @@ Global {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|Mixed Platforms.Build.0 = Release|Any CPU {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|x86.ActiveCfg = Release|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Debug|x86.ActiveCfg = Debug|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Release|Any CPU.Build.0 = Release|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {707F8904-8E10-4577-919B-A804BE23DFB8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -70,6 +82,7 @@ Global GlobalSection(NestedProjects) = preSolution {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55} = {1A88B962-9A09-4692-80D3-E88712A9E516} {9DAF7022-5820-4214-B13E-AC0A1B37691F} = {1A88B962-9A09-4692-80D3-E88712A9E516} + {707F8904-8E10-4577-919B-A804BE23DFB8} = {1A88B962-9A09-4692-80D3-E88712A9E516} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution $0.CSharpFormattingPolicy = $3 diff --git a/FluentCassandra_All.sln b/FluentCassandra_All.sln index 55e5764..6afcecc 100644 --- a/FluentCassandra_All.sln +++ b/FluentCassandra_All.sln @@ -24,6 +24,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{AC1223D1 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.LinqPad", "utility\FluentCassandra.LinqPad\FluentCassandra.LinqPad.csproj", "{CACA3463-BBEE-4C7E-AC89-49240B0D8F46}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.Integration.Tests", "test\FluentCassandra.Integration.Tests\FluentCassandra.Integration.Tests.csproj", "{16246A39-C85C-483A-92DD-184424548C2C}" +EndProject Global GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = FluentCassandra.vsmdi @@ -75,13 +77,24 @@ Global {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Release|Mixed Platforms.Build.0 = Release|Any CPU {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Release|x86.ActiveCfg = Release|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Debug|x86.ActiveCfg = Debug|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Release|Any CPU.Build.0 = Release|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {16246A39-C85C-483A-92DD-184424548C2C}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {9DAF7022-5820-4214-B13E-AC0A1B37691F} = {1A88B962-9A09-4692-80D3-E88712A9E516} {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55} = {1A88B962-9A09-4692-80D3-E88712A9E516} + {9DAF7022-5820-4214-B13E-AC0A1B37691F} = {1A88B962-9A09-4692-80D3-E88712A9E516} + {16246A39-C85C-483A-92DD-184424548C2C} = {1A88B962-9A09-4692-80D3-E88712A9E516} {CACA3463-BBEE-4C7E-AC89-49240B0D8F46} = {AC1223D1-1638-4DEB-9CFF-8B0C43854BB0} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution diff --git a/test/FluentCassandra.Integration.Tests/FluentCassandra.Integration.Tests.csproj b/test/FluentCassandra.Integration.Tests/FluentCassandra.Integration.Tests.csproj new file mode 100644 index 0000000..22a671c --- /dev/null +++ b/test/FluentCassandra.Integration.Tests/FluentCassandra.Integration.Tests.csproj @@ -0,0 +1,46 @@ + + + + + Debug + AnyCPU + {707F8904-8E10-4577-919B-A804BE23DFB8} + Library + Properties + FluentCassandra.Integration.Tests + FluentCassandra.Integration.Tests + v4.0 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + \ No newline at end of file diff --git a/test/FluentCassandra.Integration.Tests/Properties/AssemblyInfo.cs b/test/FluentCassandra.Integration.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..27e41f1 --- /dev/null +++ b/test/FluentCassandra.Integration.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("FluentCassandra.Integration.Tests")] +[assembly: AssemblyDescription("Integration tests with real Cassandra database")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyProduct("FluentCassandra.Integration.Tests")] +[assembly: AssemblyCompany("Managed Fusion, LLC")] +[assembly: AssemblyCopyright("Copyright © Nick Berardi, Managed Fusion, LLC 2011")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4f0cbb9e-db27-49c1-abac-fc56d9775412")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/FluentCassandra.Integration.Tests/Readme.txt b/test/FluentCassandra.Integration.Tests/Readme.txt new file mode 100644 index 0000000..6158605 --- /dev/null +++ b/test/FluentCassandra.Integration.Tests/Readme.txt @@ -0,0 +1 @@ +This project shall contain all the tests that require a running Cassandra datanase \ No newline at end of file