Skip to content

Fix issues with deserializing mappings #829

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

Merged
merged 1 commit into from
Jul 25, 2014
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
Expand Up @@ -5,6 +5,7 @@

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<AnalyzerFieldMapping>))]
public interface IAnalyzerFieldMapping : ISpecialField
{
[JsonProperty("index"), JsonConverter(typeof(YesNoBoolConverter))]
Expand Down
2 changes: 2 additions & 0 deletions src/Nest/Domain/Mapping/SpecialFields/BoostFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using System.Linq.Expressions;
using Newtonsoft.Json;
using Nest.Resolvers.Converters;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<BoostFieldMapping>))]
public interface IBoostFieldMapping : ISpecialField
{
[JsonProperty("name")]
Expand Down
4 changes: 3 additions & 1 deletion src/Nest/Domain/Mapping/SpecialFields/IdFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Newtonsoft.Json;
using Nest.Resolvers.Converters;
using Newtonsoft.Json;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<IdFieldMapping>))]
public interface IIdFieldMapping : ISpecialField
{
[JsonProperty("path")]
Expand Down
4 changes: 3 additions & 1 deletion src/Nest/Domain/Mapping/SpecialFields/IndexFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Newtonsoft.Json;
using Nest.Resolvers.Converters;
using Newtonsoft.Json;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<IndexFieldMapping>))]
public interface IIndexFieldMapping : ISpecialField
{
[JsonProperty("enabled")]
Expand Down
2 changes: 2 additions & 0 deletions src/Nest/Domain/Mapping/SpecialFields/RoutingFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using Newtonsoft.Json;
using System.Linq.Expressions;
using Nest.Resolvers.Converters;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<RoutingFieldMapping>))]
public interface IRoutingFieldMapping : ISpecialField
{
[JsonProperty("required")]
Expand Down
4 changes: 3 additions & 1 deletion src/Nest/Domain/Mapping/SpecialFields/SizeFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Newtonsoft.Json;
using Nest.Resolvers.Converters;
using Newtonsoft.Json;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<SizeFieldMapping>))]
public interface ISizeFieldMapping : ISpecialField
{
[JsonProperty("enabled")]
Expand Down
2 changes: 2 additions & 0 deletions src/Nest/Domain/Mapping/SpecialFields/SourceFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.Collections.Generic;
using Newtonsoft.Json;
using Nest.Resolvers.Converters;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<SourceFieldMapping>))]
public interface ISourceFieldMapping : ISpecialField
{
[JsonProperty("enabled")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using Newtonsoft.Json;
using System.Linq.Expressions;
using Nest.Resolvers.Converters;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<TimestampFieldMapping>))]
public interface ITimestampFieldMapping : ISpecialField
{
[JsonProperty("enabled")]
Expand Down
4 changes: 3 additions & 1 deletion src/Nest/Domain/Mapping/SpecialFields/TtlFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Newtonsoft.Json;
using Nest.Resolvers.Converters;
using Newtonsoft.Json;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<TtlFieldMapping>))]
public interface ITtlFieldMapping : ISpecialField
{
[JsonProperty("enabled")]
Expand Down
4 changes: 3 additions & 1 deletion src/Nest/Domain/Mapping/SpecialFields/TypeFieldMapping.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using Newtonsoft.Json;
using Nest.Resolvers.Converters;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;

namespace Nest
{
[JsonConverter(typeof(ReadAsTypeConverter<TypeFieldMapping>))]
public interface ITypeFieldMapping : ISpecialField
{
[JsonProperty("index"), JsonConverter(typeof(StringEnumConverter))]
Expand Down
104 changes: 104 additions & 0 deletions src/Tests/Nest.Tests.Unit/Core/Map/GetMappingSerializationTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
using Newtonsoft.Json;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;

namespace Nest.Tests.Unit.Core.Map
{
class GetMappingSerializationTests : BaseJsonTests
{
/// <summary>
/// Verify that we can serialize/deserialize a populated root mapping.
/// If we can round trip a full root mapping, we're in a pretty good place.
/// </summary>
[Test]
public void CanDeserializeRootMapping()
{
var rootMapping = new RootObjectMapping()
{
AllFieldMapping = new AllFieldMapping()
{
Enabled = true,
IndexAnalyzer = "index_analyzer"
},
SourceFieldMappingDescriptor = new SourceFieldMapping()
{
Compress = false,
Excludes = new[] { "excluded" }
},
RoutingFieldMapping = new RoutingFieldMapping()
{
Path = "routing_path"
},
SizeFieldMapping = new SizeFieldMapping()
{
Enabled = true,
},
TtlFieldMappingDescriptor = new TtlFieldMapping()
{
Enabled = true,
},
IdFieldMappingDescriptor = new IdFieldMapping()
{
Index = "not_analyzed",
Store = false,
Path = "id_field",
},
TimestampFieldMapping = new TimestampFieldMapping()
{
Enabled = true,
Format = "YYY-MM-dd",
Path = "the_timestamp",
},
IndexFieldMapping = new IndexFieldMapping()
{
Enabled = true,
},
AnalyzerFieldMapping = new AnalyzerFieldMapping()
{
Path = "index_path",
},
BoostFieldMapping = new BoostFieldMapping()
{
Name = "boost",
NullValue = 2.0,
},
Parent = new ParentTypeMapping()
{
Type = "type"
},
TypeFieldMappingDescriptor = new TypeFieldMapping()
{
Index = NonStringIndexOption.NotAnalyzed,
Store = false,
}
};
var json = TestElasticClient.Serialize(rootMapping);

var mapping = TestElasticClient.Deserialize<RootObjectMapping>(json);
TestElasticClient.Serialize(mapping).JsonEquals(json);
}

/// <summary>
/// Verify that we can serialize/deserialize an empty root mapping. One of the
/// failure modes of serialization/deserialization is handling data that's not there.
/// </summary>
[Test]
public void CanDeserializeEmptyRootMapping()
{
var rootMapping = new RootObjectMapping()
{
};
var json = TestElasticClient.Serialize(rootMapping);

var mapping = TestElasticClient.Deserialize<RootObjectMapping>(json);
TestElasticClient.Serialize(mapping).JsonEquals(json);
}

}
}
2 changes: 1 addition & 1 deletion src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
<Compile Include="Core\Indices\Analysis\Analyzers\AnalyzerTests.cs" />
<Compile Include="Core\Indices\Similarity\SimilarityTests.cs" />
<Compile Include="Core\Map\CustomMapping\ImagePluginMappingTests.cs" />
<Compile Include="Core\Map\GetMappingSerializationTests.cs" />
<Compile Include="Core\Map\MappingBehaviourTests.cs" />
<None Include="Cluster\PutSettings\PutSettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down Expand Up @@ -1216,7 +1217,6 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
7 changes: 7 additions & 0 deletions src/Tests/Nest.Tests.Unit/TestElasticClient.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;

Expand All @@ -15,9 +16,15 @@ static TestElasticClient()

Client = new ElasticClient(Settings);
}

public static string Serialize<T>(T obj) where T : class
{
return Encoding.UTF8.GetString(Client.Serializer.Serialize(obj));
}

public static T Deserialize<T>(string json) where T : class
{
return Client.Serializer.Deserialize<T>(new MemoryStream(Encoding.UTF8.GetBytes(json)));
}
}
}