Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup RethinkDb namespace #141

Merged
merged 3 commits into from
Sep 29, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using NUnit.Framework;
using NSubstitute;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using NUnit.Framework;
using RethinkDb.Spec;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using NUnit.Framework;
using RethinkDb.Spec;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using NUnit.Framework;
using RethinkDb.Spec;
using System;
using RethinkDb;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand All @@ -14,11 +14,11 @@ public void ReturnsAvailableConverter_Single()
var fact = new AggregateDatumConverterFactory(PrimitiveDatumConverterFactory.Instance);
var stringConverter = fact.Get<string>();
Assert.That(stringConverter, Is.Not.Null);
Assert.That(stringConverter, Is.TypeOf(typeof(RethinkDb.PrimitiveDatumConverterFactory.StringDatumConverter)));
Assert.That(stringConverter, Is.TypeOf(typeof(PrimitiveDatumConverterFactory.StringDatumConverter)));

var intConverter = fact.Get<int>();
Assert.That(intConverter, Is.Not.Null);
Assert.That(intConverter, Is.TypeOf(typeof(RethinkDb.PrimitiveDatumConverterFactory.IntDatumConverter)));
Assert.That(intConverter, Is.TypeOf(typeof(PrimitiveDatumConverterFactory.IntDatumConverter)));
}

[Test]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using RethinkDb;
using NSubstitute;
using System.Collections.Generic;
using RethinkDb.DatumConverters;
using RethinkDb.Test.Integration;

namespace RethinkDb.Test.DatumConverters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using NUnit.Framework;
using RethinkDb.Spec;
using NSubstitute;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using NUnit.Framework;
using RethinkDb.Spec;
using System;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using RethinkDb.Spec;
using RethinkDb.Test.Integration;
using NSubstitute;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Linq;
using NUnit.Framework;
using RethinkDb.Spec;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Linq;
using NUnit.Framework;
using RethinkDb.DatumConverters;
using RethinkDb.Spec;

namespace RethinkDb.Test.DatumConverters
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using NUnit.Framework;
using RethinkDb.Spec;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;
using RethinkDb.Spec;

namespace RethinkDb.Test.DatumConverters
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using NUnit.Framework;
using RethinkDb.Spec;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.Linq;
using NUnit.Framework;
using System.Collections.Generic;
using RethinkDb.Spec;
using NSubstitute;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using NUnit.Framework;
using RethinkDb.DatumConverters;

namespace RethinkDb.Test.DatumConverters
{
Expand Down
1 change: 1 addition & 0 deletions rethinkdb-net-test/Integration/TestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Linq;
using System.Threading.Tasks;
using RethinkDb.Configuration;
using RethinkDb.Logging;

namespace RethinkDb.Test.Integration
{
Expand Down
6 changes: 4 additions & 2 deletions rethinkdb-net/Connection.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using ProtoBuf;
using RethinkDb.DatumConverters;
using RethinkDb.Spec;
using System.Diagnostics;
using System.Text;
using RethinkDb.Logging;

namespace RethinkDb
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using RethinkDb.Spec;
using System.Reflection;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public abstract class AbstractDatumConverterFactory : IDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using RethinkDb.Spec;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public abstract class AbstractReferenceTypeDatumConverter<T> : IDatumConverter<T>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using RethinkDb.Spec;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public abstract class AbstractValueTypeDatumConverter<T> : IDatumConverter<T>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class AggregateDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Runtime.CompilerServices;
using System.Linq;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class AnonymousTypeDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections;
using System.Reflection;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class ArrayDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Reflection.Emit;
using System.Runtime.Serialization;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class DataContractDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Linq;
using RethinkDb.Spec;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class DateTimeDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text;
using RethinkDb.Spec;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class DateTimeOffsetDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public static class DatumConverterFactoryExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion rethinkdb-net/DatumConverters/GuidDatumConverterFactory.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class GuidDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using RethinkDb.Spec;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class NullableDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class PrimitiveDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Reflection;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class TupleDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using RethinkDb.Spec;

namespace RethinkDb
namespace RethinkDb.DatumConverters
{
public class UriDatumConverterFactory : AbstractDatumConverterFactory
{
Expand Down
5 changes: 3 additions & 2 deletions rethinkdb-net/Expressions/BaseExpression.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using System.Collections.Generic;
using RethinkDb.QueryTerm;
using RethinkDb.Spec;
using System;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using RethinkDb.DatumConverters;
using RethinkDb.QueryTerm;
using RethinkDb.Spec;

namespace RethinkDb.Expressions
{
Expand Down
Loading