Skip to content

Commit 661ef1d

Browse files
jonasbergqvistjonasbergqvist
committed
.
1 parent 0c9b840 commit 661ef1d

18 files changed

+155
-90
lines changed

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk.Sample/ExampleData.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace Optimizely.Graph.Source.Sdk.Sample
1+
namespace Optimizely.Graph.Source.Sdk.Sample
82
{
93
public class ExampleData
104
{

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk.Sample/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Optimizely.Graph.Source.Sdk.Repository;
44
using Optimizely.Graph.Source.Sdk.Sample;
55

6-
var repository = new DefaultGraphSourceRepository();
6+
var repository = new DefaultGraphSourceRepository("https://cg.optimizely.com", "", "");
77

88
repository.Confiture<ExampleData>()
99
.Field(x => x.FirstName, Optimizely.Graph.Source.Sdk.Model.IndexingType.Searchable)

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionConstantExtractor.cs‎ renamed to ‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHelper/ExpressionConstantExtractor.cs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Linq.Expressions;
5-
using System.Text;
6-
using System.Threading.Tasks;
7-
8-
namespace Optimizely.Graph.Source.Sdk.Expression
1+
using System.Linq.Expressions;
2+
3+
namespace Optimizely.Graph.Source.Sdk.ExpressionHelper
94
{
105
public class ExpressionConstantExtractor : System.Linq.Expressions.ExpressionVisitor
116
{

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionExtensions.cs‎ renamed to ‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHelper/ExpressionExtensions.cs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Linq.Expressions;
5-
using System.Text;
6-
using System.Threading.Tasks;
7-
using System;
8-
using System.Collections.Generic;
9-
using System.Linq.Expressions;
1+
using System.Linq.Expressions;
102
using System.Reflection;
113

12-
namespace Optimizely.Graph.Source.Sdk.Expression
4+
namespace Optimizely.Graph.Source.Sdk.ExpressionHelper
135
{
146
public static class ExpressionExtensions
157
{

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionFinder.cs‎ renamed to ‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHelper/ExpressionFinder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text;
66
using System.Threading.Tasks;
77

8-
namespace Optimizely.Graph.Source.Sdk.Expression
8+
namespace Optimizely.Graph.Source.Sdk.ExpressionHelper
99
{
1010
/// <summary>
1111
/// A class used to search for <see cref="Expression"/> instances.

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHashCalculator.cs‎ renamed to ‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHelper/ExpressionHashCalculator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Text;
77
using System.Threading.Tasks;
88

9-
namespace Optimizely.Graph.Source.Sdk.Expression
9+
namespace Optimizely.Graph.Source.Sdk.ExpressionHelper
1010
{
1111
public class ExpressionHashCalculator
1212
{

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionReplacer.cs‎ renamed to ‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHelper/ExpressionReplacer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text;
66
using System.Threading.Tasks;
77

8-
namespace Optimizely.Graph.Source.Sdk.Expression
8+
namespace Optimizely.Graph.Source.Sdk.ExpressionHelper
99
{
1010
/// <summary>
1111
/// A class that is capable of doing a find and replace in an <see cref="Expression"/> tree.

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionVisitor.cs‎ renamed to ‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHelper/ExpressionVisitor.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Text;
77
using System.Threading.Tasks;
88

9-
namespace Optimizely.Graph.Source.Sdk.Expression
9+
namespace Optimizely.Graph.Source.Sdk.ExpressionHelper
1010
{
1111
public abstract class ExpressionVisitor
1212
{
@@ -100,7 +100,7 @@ protected virtual MemberBinding VisitBinding(MemberBinding binding)
100100

101101
protected virtual ElementInit VisitElementInitializer(ElementInit initializer)
102102
{
103-
ReadOnlyCollection<Expression> arguments = this.VisitExpressionList(initializer.Arguments);
103+
ReadOnlyCollection<Expression> arguments = VisitExpressionList(initializer.Arguments);
104104
if (arguments != initializer.Arguments)
105105
{
106106
return Expression.ElementInit(initializer.AddMethod, arguments);
@@ -110,7 +110,7 @@ protected virtual ElementInit VisitElementInitializer(ElementInit initializer)
110110

111111
protected virtual Expression VisitUnary(UnaryExpression u)
112112
{
113-
Expression operand = this.Visit(u.Operand);
113+
Expression operand = Visit(u.Operand);
114114
if (operand != u.Operand)
115115
{
116116
return Expression.MakeUnary(u.NodeType, operand, u.Type, u.Method);
@@ -120,9 +120,9 @@ protected virtual Expression VisitUnary(UnaryExpression u)
120120

121121
protected virtual Expression VisitBinary(BinaryExpression b)
122122
{
123-
Expression left = this.Visit(b.Left);
124-
Expression right = this.Visit(b.Right);
125-
Expression conversion = this.Visit(b.Conversion);
123+
Expression left = Visit(b.Left);
124+
Expression right = Visit(b.Right);
125+
Expression conversion = Visit(b.Conversion);
126126
if (left != b.Left || right != b.Right || conversion != b.Conversion)
127127
{
128128
if (b.NodeType == ExpressionType.Coalesce && b.Conversion != null)
@@ -135,7 +135,7 @@ protected virtual Expression VisitBinary(BinaryExpression b)
135135

136136
protected virtual Expression VisitTypeIs(TypeBinaryExpression b)
137137
{
138-
Expression expr = this.Visit(b.Expression);
138+
Expression expr = Visit(b.Expression);
139139
if (expr != b.Expression)
140140
{
141141
return Expression.TypeIs(expr, b.TypeOperand);
@@ -150,9 +150,9 @@ protected virtual Expression VisitConstant(ConstantExpression c)
150150

151151
protected virtual Expression VisitConditional(ConditionalExpression c)
152152
{
153-
Expression test = this.Visit(c.Test);
154-
Expression ifTrue = this.Visit(c.IfTrue);
155-
Expression ifFalse = this.Visit(c.IfFalse);
153+
Expression test = Visit(c.Test);
154+
Expression ifTrue = Visit(c.IfTrue);
155+
Expression ifFalse = Visit(c.IfFalse);
156156
if (test != c.Test || ifTrue != c.IfTrue || ifFalse != c.IfFalse)
157157
{
158158
return Expression.Condition(test, ifTrue, ifFalse);
@@ -167,7 +167,7 @@ protected virtual Expression VisitParameter(ParameterExpression p)
167167

168168
protected virtual Expression VisitMemberAccess(MemberExpression m)
169169
{
170-
Expression exp = this.Visit(m.Expression);
170+
Expression exp = Visit(m.Expression);
171171
if (exp != m.Expression)
172172
{
173173
return Expression.MakeMemberAccess(exp, m.Member);
@@ -177,8 +177,8 @@ protected virtual Expression VisitMemberAccess(MemberExpression m)
177177

178178
protected virtual Expression VisitMethodCall(MethodCallExpression m)
179179
{
180-
Expression obj = this.Visit(m.Object);
181-
IEnumerable<Expression> args = this.VisitExpressionList(m.Arguments);
180+
Expression obj = Visit(m.Object);
181+
IEnumerable<Expression> args = VisitExpressionList(m.Arguments);
182182
if (obj != m.Object || args != m.Arguments)
183183
{
184184
return Expression.Call(obj, m.Method, args);
@@ -215,7 +215,7 @@ protected virtual ReadOnlyCollection<Expression> VisitExpressionList(ReadOnlyCol
215215

216216
protected virtual MemberAssignment VisitMemberAssignment(MemberAssignment assignment)
217217
{
218-
Expression e = this.Visit(assignment.Expression);
218+
Expression e = Visit(assignment.Expression);
219219
if (e != assignment.Expression)
220220
{
221221
//if (e is ConstantExpression)
@@ -317,7 +317,7 @@ protected virtual IEnumerable<ElementInit> VisitElementInitializerList(ReadOnlyC
317317

318318
protected virtual Expression VisitLambda(LambdaExpression lambda)
319319
{
320-
Expression body = this.Visit(lambda.Body);
320+
Expression body = Visit(lambda.Body);
321321
if (body != lambda.Body)
322322
{
323323
return Expression.Lambda(lambda.Type, body, lambda.Parameters);
@@ -327,7 +327,7 @@ protected virtual Expression VisitLambda(LambdaExpression lambda)
327327

328328
protected virtual NewExpression VisitNew(NewExpression nex)
329329
{
330-
IEnumerable<Expression> args = this.VisitExpressionList(nex.Arguments);
330+
IEnumerable<Expression> args = VisitExpressionList(nex.Arguments);
331331
if (args != nex.Arguments)
332332
{
333333
if (nex.Members != null)
@@ -362,7 +362,7 @@ protected virtual Expression VisitListInit(ListInitExpression init)
362362

363363
protected virtual Expression VisitNewArray(NewArrayExpression na)
364364
{
365-
IEnumerable<Expression> exprs = this.VisitExpressionList(na.Expressions);
365+
IEnumerable<Expression> exprs = VisitExpressionList(na.Expressions);
366366
if (exprs != na.Expressions)
367367
{
368368
if (na.NodeType == ExpressionType.NewArrayInit)
@@ -379,8 +379,8 @@ protected virtual Expression VisitNewArray(NewArrayExpression na)
379379

380380
protected virtual Expression VisitInvocation(InvocationExpression iv)
381381
{
382-
IEnumerable<Expression> args = this.VisitExpressionList(iv.Arguments);
383-
Expression expr = this.Visit(iv.Expression);
382+
IEnumerable<Expression> args = VisitExpressionList(iv.Arguments);
383+
Expression expr = Visit(iv.Expression);
384384
if (args != iv.Arguments || expr != iv.Expression)
385385
{
386386
return Expression.Invoke(expr, args);

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/FieldPathVisitor.cs‎ renamed to ‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/ExpressionHelper/FieldPathVisitor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text;
66
using System.Threading.Tasks;
77

8-
namespace Optimizely.Graph.Source.Sdk.Expression
8+
namespace Optimizely.Graph.Source.Sdk.ExpressionHelper
99
{
1010
public class FieldPathVisitor : ExpressionVisitor
1111
{
@@ -40,7 +40,7 @@ protected override Expression VisitMemberAccess(MemberExpression node)
4040
{
4141
PrependMemberName(node.Member.Name);
4242
}
43-
Expression exp = this.Visit(node.Expression);
43+
Expression exp = Visit(node.Expression);
4444
if (exp != node.Expression)
4545
{
4646
var methodCall = node.Expression as MethodCallExpression;
@@ -62,15 +62,15 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
6262
}
6363

6464
var returnValue = node;
65-
Expression obj = this.Visit(node.Object);
65+
Expression obj = Visit(node.Object);
6666

6767
if (handlingGenericDictionaryItemGetter)
6868
{
6969
//We need to prevent other visitors from writing to the member name
7070
//while visiting the key for the dictionary as we've already taken care of that.
7171
inGenericDictionaryKeyExpression = true;
7272
}
73-
IEnumerable<Expression> args = this.VisitExpressionList(node.Arguments);
73+
IEnumerable<Expression> args = VisitExpressionList(node.Arguments);
7474
if (obj != node.Object || args != node.Arguments)
7575
{
7676

‎Optimizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/Model/ContentTypeFieldConfiguration.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace Optimizely.Graph.Source.Sdk.Model
1+
namespace Optimizely.Graph.Source.Sdk.Model
82
{
93
public class ContentTypeFieldConfiguration
104
{
115
public ContentTypeFieldConfiguration(Type type)
126
{
137
ContentTypeName = type.Name;
14-
Fields = new Dictionary<string, IndexingType>();
8+
//Fields = new Dictionary<string, IndexingType>();
9+
Fields = new List<FieldInfo>();
1510
}
1611

1712
public string ContentTypeName { get; set; }
1813

19-
public IDictionary<string, IndexingType> Fields { get; private set; }
14+
//public IDictionary<string, IndexingType> Fields { get; private set; }
15+
public IList<FieldInfo> Fields { get; private set; }
2016
}
2117
}

0 commit comments

Comments
 (0)