Permalink
Browse files

RavenDB-4203 after merge fixes

  • Loading branch information...
1 parent 1899fb9 commit 17a2e137d320d270a196dae5189ce98fd118a491 @ppekrol ppekrol committed Jan 15, 2016
Showing with 297 additions and 291 deletions.
  1. +1 −2 Bundles/Raven.Bundles.Authorization/Raven.Bundles.Authorization.csproj
  2. +1 −2 Bundles/Raven.Bundles.CascadeDelete/Raven.Bundles.CascadeDelete.csproj
  3. +1 −2 Bundles/Raven.Bundles.Encryption.IndexFileCodec/Raven.Bundles.Encryption.IndexFileCodec.csproj
  4. +1 −2 Bundles/Raven.Bundles.LiveTest/Raven.Bundles.LiveTest.csproj
  5. +1 −2 Bundles/Raven.Bundles.UniqueConstraints/Raven.Bundles.UniqueConstraints.csproj
  6. +1 −2 Bundles/Raven.Client.Authorization/Raven.Client.Authorization.csproj
  7. +1 −2 Bundles/Raven.Client.UniqueConstraints/Raven.Client.UniqueConstraints.csproj
  8. +1 −0 Rachis/Rachis.Tests/Rachis.Tests.csproj
  9. +1 −0 Rachis/Rachis/Rachis.csproj
  10. +1 −1 Raven.Abstractions/Raven.Abstractions.csproj
  11. +1 −3 Raven.Backup/Raven.Backup.csproj
  12. +1 −1 Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs
  13. +16 −16 Raven.Client.Lightweight/FileSystem/AsyncFilesServerClient.cs
  14. +1 −2 Raven.Client.Lightweight/Raven.Client.Lightweight.csproj
  15. +8 −7 Raven.Client.Lightweight/Util/Auth/SingleAuthTokenRetriever.cs
  16. +1 −0 Raven.Database/Config/InMemoryRavenConfiguration.cs
  17. +48 −48 Raven.Database/FileSystem/Actions/FileActions.cs
  18. +3 −1 Raven.Database/Plugins/Builtins/Monitoring/Snmp/Objects/Server/ServerBuildVersion.cs
  19. +28 −28 Raven.Database/Prefetching/PrefetchingBehavior.cs
  20. +1 −1 Raven.Database/Raven.Database.csproj
  21. +1 −1 Raven.Database/Server/Controllers/StudioTasksController.cs
  22. +1 −3 Raven.DtcTests/Raven.DtcTests.csproj
  23. +1 −3 Raven.Migration/Raven.Migration.csproj
  24. +1 −0 Raven.MiniDumper/Raven.MiniDumper.csproj
  25. +3 −2 Raven.Monitor/Raven.Monitor.csproj
  26. +1 −2 Raven.Server/Raven.Server.csproj
  27. +1 −1 Raven.SlowTests/Raven.SlowTests.csproj
  28. +1 −1 Raven.Smuggler/Raven.Smuggler.csproj
  29. +1 −1 Raven.Sparrow/Sparrow.Tests/Sparrow.Tests.csproj
  30. +1 −1 Raven.Sparrow/Sparrow.Tryout/Sparrow.Tryout.csproj
  31. +1 −1 Raven.Sparrow/Sparrow/Sparrow.csproj
  32. +1 −1 Raven.StorageExporter/Raven.StorageExporter.csproj
  33. 0 Raven.Studio.Html5/App/common/{ → bindingHelpers}/enableResizeBindingHandler.ts
  34. +2 −2 Raven.Studio.Html5/App/common/downloader.ts
  35. +2 −2 Raven.Studio.Html5/App/viewmodels/shell.ts
  36. +116 −97 Raven.Studio.Html5/Content/app.less
  37. +2 −12 Raven.Studio.Html5/Raven.Studio.Html5.csproj
  38. +1 −2 Raven.Tests.Bundles/Raven.Tests.Bundles.csproj
  39. +1 −1 Raven.Tests.Common/Raven.Tests.Common.csproj
  40. +1 −1 Raven.Tests.Core/Raven.Tests.Core.csproj
  41. +1 −0 Raven.Tests.Counters/Raven.Tests.Counters.csproj
  42. +1 −1 Raven.Tests.FileSystem/Raven.Tests.FileSystem.csproj
  43. +1 −1 Raven.Tests.Helpers/Raven.Tests.Helpers.csproj
  44. +2 −2 Raven.Tests.Issues/Raven.Tests.Issues.csproj
  45. +7 −9 Raven.Tests.Issues/RavenDB-3460.cs
  46. +1 −1 Raven.Tests.MailingList/Raven.Tests.MailingList.csproj
  47. +3 −2 Raven.Tests.Raft/Raven.Tests.Raft.csproj
  48. +1 −1 Raven.Tests.Server.Runner/Raven.Tests.Server.Runner.csproj
  49. +3 −2 Raven.Tests.TimeSeries/Raven.Tests.TimeSeries.csproj
  50. +3 −3 Raven.Tests.Web/Raven.Tests.Web.csproj
  51. +1 −2 Raven.Tests/Raven.Tests.csproj
  52. +9 −1 Raven.Tryouts/Raven.Tryouts.csproj
  53. +1 −1 Raven.Voron/Voron.Tests/Voron.Tests.csproj
  54. +1 −1 Raven.Voron/Voron.Tryout/Voron.Tryout.csproj
  55. +1 −1 Raven.Voron/Voron/Voron.csproj
  56. +1 −2 Raven.Web/Raven.Web.csproj
  57. +1 −3 Raven.Xunit.Runner/Raven.Xunit.Runner.csproj
  58. +1 −1 RavenDB.sln.DotSettings
  59. +1 −1 Tools/Raven.Traffic/Raven.Traffic.csproj
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,7 +23,7 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>618</NoWarn>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,7 +26,7 @@
<NoWarn>
</NoWarn>
<NoWarn>618</NoWarn>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -27,7 +26,7 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>618</NoWarn>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -21,7 +20,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,7 +23,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -25,7 +24,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -25,7 +24,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -23,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -23,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -30,7 +30,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>
</CodeAnalysisRuleSet>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
@@ -34,7 +32,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<OutputPath>bin\Debug\</OutputPath>
<Prefer32Bit>false</Prefer32Bit>
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -25,6 +25,7 @@
using Raven.Client.Indexes;
using Raven.Client.Listeners;
using Raven.Client.Metrics;
+using Raven.Client.Util.Auth;
using Raven.Database.Data;
using Raven.Imports.Newtonsoft.Json;
using Raven.Imports.Newtonsoft.Json.Linq;
@@ -42,7 +43,6 @@
using System.Threading;
using System.Threading.Tasks;
-
namespace Raven.Client.Connection.Async
{
public class AsyncServerClient : IAsyncDatabaseCommands, IAsyncInfoDatabaseCommands
@@ -51,7 +51,7 @@ public AsyncFilesServerClient(string serverUrl, string fileSystemName, FilesConv
FileSystemName = fileSystemName;
ApiKey = credentials.ApiKey;
this.conflictListeners = conflictListeners ?? new IFilesConflictListener[0];
- if (replicationInformerGetter != null && ReplicationInformer!= null)
+ if (replicationInformerGetter != null && ReplicationInformer != null)
ReplicationInformer.UpdateReplicationInformationIfNeeded(this);
}
catch (Exception)
@@ -326,14 +326,14 @@ public Task<FileHeader[]> StartsWithAsync(string prefix, string matches, int sta
var operationMetadata = new OperationMetadata(this.BaseUrl, this.CredentialsThatShouldBeUsedOnlyInOperationsWithoutReplication, null);
- var sb = new StringBuilder(operationMetadata.Url)
- .Append("/streams/files?etag=")
- .Append(fromEtag)
- .Append("&pageSize=")
- .Append(pageSize);
+ var sb = new StringBuilder(operationMetadata.Url)
+ .Append("/streams/files?etag=")
+ .Append(fromEtag)
+ .Append("&pageSize=")
+ .Append(pageSize);
- var request = RequestFactory.CreateHttpJsonRequest(new CreateHttpJsonRequestParams(this, sb.ToString(), HttpMethods.Get, operationMetadata.Credentials, this.Conventions)
- .AddOperationHeaders(OperationsHeaders));
+ var request = RequestFactory.CreateHttpJsonRequest(new CreateHttpJsonRequestParams(this, sb.ToString(), HttpMethods.Get, operationMetadata.Credentials, this.Conventions)
+ .AddOperationHeaders(OperationsHeaders));
request.RemoveAuthorizationHeader();
@@ -345,7 +345,7 @@ public Task<FileHeader[]> StartsWithAsync(string prefix, string matches, int sta
token = await tokenRetriever.ValidateThatWeCanUseToken(token).ConfigureAwait(false);
}
catch (Exception e)
- {
+ {
request.Dispose();
throw new InvalidOperationException(
@@ -355,13 +355,13 @@ public Task<FileHeader[]> StartsWithAsync(string prefix, string matches, int sta
request.AddOperationHeader("Single-Use-Auth-Token", token);
- var response = await request.ExecuteRawResponseAsync()
- .ConfigureAwait(false);
+ var response = await request.ExecuteRawResponseAsync()
+ .ConfigureAwait(false);
- await response.AssertNotFailingResponse().ConfigureAwait(false);
+ await response.AssertNotFailingResponse().ConfigureAwait(false);
return new YieldStreamResults(request, await response.GetResponseStreamWithHttpDecompression().ConfigureAwait(false));
- }
+ }
internal class YieldStreamResults : IAsyncEnumerator<FileHeader>
{
@@ -695,8 +695,8 @@ public Task UploadRawAsync(string filename, Stream source, RavenJObject metadata
files = await this.GetAsync(new[] { filename }).ConfigureAwait(false);
files.ApplyIfNotNull(x =>
{
- // We notify the listeners.
- foreach (var conflictListener in conflictListeners)
+ // We notify the listeners.
+ foreach (var conflictListener in conflictListeners)
conflictListener.ConflictResolved(x);
});
@@ -1410,7 +1410,7 @@ public AdminClient(AsyncFilesServerClient client, FilesConvention convention)
return;
await CreateOrUpdateFileSystemAsync(MultiDatabase.CreateFileSystemDocument(fileSystem), fileSystem).ConfigureAwait(false);
- }
+ }
public async Task<long> StartRestore(FilesystemRestoreRequest restoreRequest)
{
@@ -32,7 +32,7 @@
<DocumentationFile>bin\Debug\Raven.Client.Lightweight.xml</DocumentationFile>
<NoWarn>1591, 618</NoWarn>
<CodeAnalysisRuleSet />
- <LangVersion>5</LangVersion>
+ <LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -120,7 +120,6 @@
<Compile Include="Connection\Operation.cs" />
<Compile Include="Connection\OperationMetadata.cs" />
<Compile Include="Connection\ReplicationInformer.cs" />
- <Compile Include="Helpers\EnvironmentHelper.cs" />
<Compile Include="QueryConvention.cs" />
<Compile Include="ConventionBase.cs" />
<Compile Include="TimeSeries\Changes\TimeSeriesChangesClient.cs" />
@@ -3,9 +3,10 @@
// Copyright (c) Hibernating Rhinos LTD. All rights reserved.
// </copyright>
// -----------------------------------------------------------------------
-using System;
using System.Collections.Specialized;
+using System.Net.Http;
using System.Threading.Tasks;
+
using Raven.Client.Connection;
using Raven.Client.Connection.Implementation;
using Raven.Client.Connection.Profiling;
@@ -17,11 +18,11 @@ internal class SingleAuthTokenRetriever
{
private readonly IHoldProfilingInformation profilingInfo;
private readonly HttpJsonRequestFactory factory;
- private readonly Convention convention;
+ private readonly ConventionBase convention;
private readonly NameValueCollection operationHeaders;
private readonly OperationMetadata operationMetadata;
- public SingleAuthTokenRetriever(IHoldProfilingInformation profilingInfo, HttpJsonRequestFactory factory, Convention convention, NameValueCollection operationHeaders, OperationMetadata operationMetadata)
+ public SingleAuthTokenRetriever(IHoldProfilingInformation profilingInfo, HttpJsonRequestFactory factory, ConventionBase convention, NameValueCollection operationHeaders, OperationMetadata operationMetadata)
{
this.profilingInfo = profilingInfo;
this.factory = factory;
@@ -32,7 +33,7 @@ public SingleAuthTokenRetriever(IHoldProfilingInformation profilingInfo, HttpJso
internal async Task<string> GetToken()
{
- using (var request = CreateRequestParams(operationMetadata, "/singleAuthToken", "GET", disableRequestCompression: true))
+ using (var request = CreateRequestParams(operationMetadata, "/singleAuthToken", HttpMethod.Get, disableRequestCompression: true))
{
var response = await request.ReadResponseJsonAsync().ConfigureAwait(false);
return response.Value<string>("Token");
@@ -41,18 +42,18 @@ public SingleAuthTokenRetriever(IHoldProfilingInformation profilingInfo, HttpJso
internal async Task<string> ValidateThatWeCanUseToken(string token)
{
- using (var request = CreateRequestParams(operationMetadata, "/singleAuthToken", "GET", disableRequestCompression: true, disableAuthentication: true))
+ using (var request = CreateRequestParams(operationMetadata, "/singleAuthToken", HttpMethod.Get, disableRequestCompression: true, disableAuthentication: true))
{
request.AddOperationHeader("Single-Use-Auth-Token", token);
var result = await request.ReadResponseJsonAsync().ConfigureAwait(false);
return result.Value<string>("Token");
}
}
- private HttpJsonRequest CreateRequestParams(OperationMetadata operationMetadata, string requestUrl, string method, bool disableRequestCompression = false, bool disableAuthentication = false, TimeSpan? timeout = null)
+ private HttpJsonRequest CreateRequestParams(OperationMetadata operationMetadata, string requestUrl, HttpMethod method, bool disableRequestCompression = false, bool disableAuthentication = false)
{
var metadata = new RavenJObject();
- var createHttpJsonRequestParams = new CreateHttpJsonRequestParams(profilingInfo, operationMetadata.Url + requestUrl, method, metadata, operationMetadata.Credentials, convention, timeout)
+ var createHttpJsonRequestParams = new CreateHttpJsonRequestParams(profilingInfo, operationMetadata.Url + requestUrl, method, metadata, operationMetadata.Credentials, convention)
.AddOperationHeaders(operationHeaders);
createHttpJsonRequestParams.DisableRequestCompression = disableRequestCompression;
@@ -1181,6 +1181,7 @@ public string IndexStoragePath
/// Use memory cache as document cacher
/// </summary>
public bool CacheDocumentsInMemory { get; set; }
+
/// <summary>
/// Path to temporary directory used by server.
/// Default: Current user's temporary directory
Oops, something went wrong.

0 comments on commit 17a2e13

Please sign in to comment.