Move Utils to Gremlin.Net.Process
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bc81a5be Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bc81a5be Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bc81a5be Branch: refs/heads/TINKERPOP-1730 Commit: bc81a5be7a6c6fddbd2e6111770d9b99308153ae Parents: 755da22 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> Authored: Wed Aug 9 15:28:21 2017 +0200 Committer: florianhockmann <f...@florian-hockmann.de> Committed: Thu Sep 14 17:04:10 2017 +0200 ---------------------------------------------------------------------- .../src/Gremlin.Net/Driver/ConnectionPool.cs | 2 +- .../Remote/DriverRemoteTraversalSideEffects.cs | 2 +- .../Process/Remote/RemoteStrategy.cs | 1 - gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs | 55 ++++++++++++++++++++ .../src/Gremlin.Net/Structure/Utils.cs | 55 -------------------- 5 files changed, 57 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bc81a5be/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs index 98cb547..945e5e4 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs @@ -26,7 +26,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Gremlin.Net.Structure; +using Gremlin.Net.Process; namespace Gremlin.Net.Driver { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bc81a5be/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs index e8df942..8f2b3e6 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs @@ -25,8 +25,8 @@ using System; using System.Collections.Generic; using System.Linq; using Gremlin.Net.Driver.Messages; +using Gremlin.Net.Process; using Gremlin.Net.Process.Traversal; -using Gremlin.Net.Structure; namespace Gremlin.Net.Driver.Remote { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bc81a5be/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs index b914063..098a46d 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs @@ -23,7 +23,6 @@ using System.Threading.Tasks; using Gremlin.Net.Process.Traversal; -using Gremlin.Net.Structure; namespace Gremlin.Net.Process.Remote { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bc81a5be/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs new file mode 100644 index 0000000..e1781ab --- /dev/null +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs @@ -0,0 +1,55 @@ +#region License + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#endregion + +using System; +using System.Runtime.ExceptionServices; +using System.Threading.Tasks; + +namespace Gremlin.Net.Process +{ + /// <summary> + /// Contains useful methods that can be reused across the project. + /// </summary> + internal static class Utils + { + /// <summary> + /// Waits the completion of the provided Task. + /// When an AggregateException is thrown, the inner exception is thrown. + /// </summary> + public static void WaitUnwrap(this Task task) + { + try + { + task.Wait(); + } + catch (AggregateException ex) + { + if (ex.InnerExceptions.Count == 1) + { + ExceptionDispatchInfo.Capture(ex.InnerException).Throw(); + } + throw; + } + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bc81a5be/gremlin-dotnet/src/Gremlin.Net/Structure/Utils.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/Utils.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/Utils.cs deleted file mode 100644 index 08168ba..0000000 --- a/gremlin-dotnet/src/Gremlin.Net/Structure/Utils.cs +++ /dev/null @@ -1,55 +0,0 @@ -#region License - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#endregion - -using System; -using System.Runtime.ExceptionServices; -using System.Threading.Tasks; - -namespace Gremlin.Net.Structure -{ - /// <summary> - /// Contains useful methods that can be reused across the project. - /// </summary> - internal static class Utils - { - /// <summary> - /// Waits the completion of the provided Task. - /// When an AggregateException is thrown, the inner exception is thrown. - /// </summary> - public static void WaitUnwrap(this Task task) - { - try - { - task.Wait(); - } - catch (AggregateException ex) - { - if (ex.InnerExceptions.Count == 1) - { - ExceptionDispatchInfo.Capture(ex.InnerException).Throw(); - } - throw; - } - } - } -} \ No newline at end of file
