Made recursion of complex type an opt-in feature

Author: FortuneN

Community.Data.OData.Linq/Builder/ODataModelBuilder.cs

@@ -140,6 +140,11 @@ public virtual IEnumerable<OperationConfiguration> Operations
             get { return this._operations; }
         }
 
+        /// <summary>
+        /// Gets/Sets the ability to allow recursion of complex types
+        /// </summary>
+        public bool AllowRecursiveLoopOfComplexTypes { get; set; }
+
         /// <summary>
         /// Gets or sets the navigation property binding options.
         /// </summary>

Community.Data.OData.Linq/Builder/StructuralTypeConfiguration.cs

@@ -383,9 +383,9 @@ public virtual ComplexPropertyConfiguration AddComplexProperty(PropertyInfo prop
                 throw Error.Argument("propertyInfo", SRResources.PropertyDoesNotBelongToType, propertyInfo.Name, this.ClrType.FullName);
             }
 
-            if (propertyInfo.PropertyType == this.ClrType)
+            if (propertyInfo.PropertyType == this.ClrType && ModelBuilder?.AllowRecursiveLoopOfComplexTypes != true)
             {
-                //throw Error.Argument("propertyInfo", SRResources.RecursiveComplexTypesNotAllowed, this.ClrType.FullName, propertyInfo.Name);
+                throw Error.Argument("propertyInfo", SRResources.RecursiveComplexTypesNotAllowed, this.ClrType.FullName, propertyInfo.Name);
             }
 
             this.ValidatePropertyNotAlreadyDefinedInBaseTypes(propertyInfo);

Community.Data.OData.Linq/ODataSettings.cs

@@ -49,6 +49,8 @@ public static void SetInitializer(Action<ODataSettings> initializer)
 
         public bool EnableCaseInsensitive { get; set; } = true;
 
+        public bool AllowRecursiveLoopOfComplexTypes { get; set; } = false;
+
         public DefaultQuerySettings DefaultQuerySettings { get; } =
             new DefaultQuerySettings
             {

Community.Data.OData.Linq/OdataLinqExtensions.cs

@@ -54,13 +54,16 @@ public static ODataQuery<T> OData<T>(this IQueryable<T> query, Action<ODataSetti
         {
             if (query == null) throw new ArgumentNullException(nameof(query));
 
+            ODataSettings settings = new ODataSettings();
+            configuration?.Invoke(settings);
+
             if (edmModel == null)
             {
                 edmModel = Models.GetOrAdd(typeof(T), t =>
                 {
                     ODataConventionModelBuilder builder = new ODataConventionModelBuilder();
                     builder.AddEntityType(t);
-                    builder.AddEntitySet(t.Name, new EntityTypeConfiguration(new ODataModelBuilder(), t));
+                    builder.AddEntitySet(t.Name, new EntityTypeConfiguration(new ODataModelBuilder { AllowRecursiveLoopOfComplexTypes = settings.AllowRecursiveLoopOfComplexTypes }, t));
                     return builder.GetEdmModel();
                 });
             }
@@ -72,9 +75,6 @@ public static ODataQuery<T> OData<T>(this IQueryable<T> query, Action<ODataSetti
                 }
             }
 
-            ODataSettings settings = new ODataSettings();
-            configuration?.Invoke(settings);
-
             int settingsHash = HashCode.Combine(
                 settings.QuerySettings, 
                 settings.DefaultQuerySettings,