Skip to content

Commit b963cd6

Browse files
author
Chris Santero
committed
more configuration interface cleanup
1 parent 6ca6010 commit b963cd6

File tree

6 files changed

+23
-14
lines changed

6 files changed

+23
-14
lines changed

JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/Startup.cs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using JSONAPI.Autofac.EntityFramework;
1212
using JSONAPI.Configuration;
1313
using JSONAPI.EntityFramework;
14+
using JSONAPI.EntityFramework.Configuration;
1415
using Owin;
1516

1617
namespace JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp

JSONAPI.EntityFramework/Configuration/JsonApiAutofacConfigurationExtensions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
using JSONAPI.Configuration;
33
using JSONAPI.EntityFramework.Http;
44

5-
namespace JSONAPI.Autofac.EntityFramework
5+
namespace JSONAPI.EntityFramework.Configuration
66
{
7-
public static class JsonApiAutofacConfigurationExtensions
7+
public static class JsonApiConfigurationExtensions
88
{
99
public static void RegisterEntityFrameworkResourceType<TResourceType>(this JsonApiConfiguration jsonApiConfiguration,
10-
Action<ResourceTypeConfiguration<TResourceType>> configurationAction = null) where TResourceType : class
10+
Action<IResourceTypeConfigurator<TResourceType>> configurationAction = null) where TResourceType : class
1111
{
1212
jsonApiConfiguration.RegisterResourceType<TResourceType>(c =>
1313
{

JSONAPI.TodoMVC.API/Startup.cs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using JSONAPI.Autofac.EntityFramework;
88
using JSONAPI.Configuration;
99
using JSONAPI.Core;
10+
using JSONAPI.EntityFramework.Configuration;
1011
using JSONAPI.TodoMVC.API.Models;
1112
using Owin;
1213

JSONAPI/Configuration/IResourceTypeConfigurator.cs

+17
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,22 @@ void ConfigureRelationship(Expression<Func<TResourceType, object>> property,
2727
/// </summary>
2828
/// <param name="materializerTypeFactory"></param>
2929
void UseDefaultRelatedResourceMaterializer(Func<ResourceTypeRelationship, Type> materializerTypeFactory);
30+
31+
/// <summary>
32+
/// Overrides the resource type name from naming conventions
33+
/// </summary>
34+
/// <param name="resourceTypeName"></param>
35+
void OverrideDefaultResourceTypeName(string resourceTypeName);
36+
37+
/// <summary>
38+
/// Specifies a function to use build expressions that allow filtering resources of this type by ID
39+
/// </summary>
40+
void OverrideDefaultFilterById(Func<ParameterExpression, string, BinaryExpression> filterByIdExpressionFactory);
41+
42+
/// <summary>
43+
/// Specifies a function to use build expressions that allow sorting resources of this type by ID
44+
/// </summary>
45+
void OverrideDefaultSortById(Func<ParameterExpression, Expression> sortByIdExpressionFactory);
46+
3047
}
3148
}

JSONAPI/Configuration/JsonApiConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public JsonApiConfiguration(IResourceTypeRegistrar resourceTypeRegistrar)
5656
/// <summary>
5757
/// Registers a resource type with the configuration
5858
/// </summary>
59-
public void RegisterResourceType<TResourceType>(Action<ResourceTypeConfiguration<TResourceType>> configurationAction = null)
59+
public void RegisterResourceType<TResourceType>(Action<IResourceTypeConfigurator<TResourceType>> configurationAction = null)
6060
{
6161
var configuration = new ResourceTypeConfiguration<TResourceType>(_resourceTypeRegistrar);
6262
if (configurationAction != null)

JSONAPI/Configuration/ResourceTypeConfiguration.cs

-10
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,16 @@ public void UseDefaultRelatedResourceMaterializer(Func<ResourceTypeRelationship,
5757
RelatedResourceMaterializerTypeFactory = materializerTypeFactory;
5858
}
5959

60-
/// <summary>
61-
/// Overrides the resource type name from naming conventions
62-
/// </summary>
63-
/// <param name="resourceTypeName"></param>
6460
public void OverrideDefaultResourceTypeName(string resourceTypeName)
6561
{
6662
ResourceTypeName = resourceTypeName;
6763
}
6864

69-
/// <summary>
70-
/// Specifies a function to use build expressions that allow filtering resources of this type by ID
71-
/// </summary>
7265
public void OverrideDefaultFilterById(Func<ParameterExpression, string, BinaryExpression> filterByIdExpressionFactory)
7366
{
7467
FilterByIdExpressionFactory = filterByIdExpressionFactory;
7568
}
7669

77-
/// <summary>
78-
/// Specifies a function to use build expressions that allow sorting resources of this type by ID
79-
/// </summary>
8070
public void OverrideDefaultSortById(Func<ParameterExpression, Expression> sortByIdExpressionFactory)
8171
{
8272
SortByIdExpressionFactory = sortByIdExpressionFactory;

0 commit comments

Comments
 (0)