aboutsummaryrefslogtreecommitdiff
path: root/ServiceStack
diff options
context:
space:
mode:
Diffstat (limited to 'ServiceStack')
-rw-r--r--ServiceStack/ReflectionExtensions.cs168
-rw-r--r--ServiceStack/RestPath.cs108
-rw-r--r--ServiceStack/ServiceStack.csproj2
-rw-r--r--ServiceStack/ServiceStackHost.cs42
-rw-r--r--ServiceStack/StringMapTypeDeserializer.cs13
5 files changed, 102 insertions, 231 deletions
diff --git a/ServiceStack/ReflectionExtensions.cs b/ServiceStack/ReflectionExtensions.cs
deleted file mode 100644
index 4bbf9e6ac..000000000
--- a/ServiceStack/ReflectionExtensions.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace ServiceStack
-{
- public static class ReflectionExtensions
- {
- public static Type FirstGenericType(this Type type)
- {
- while (type != null)
- {
- if (type.IsGeneric())
- return type;
-
- type = type.BaseType();
- }
- return null;
- }
-
- public static Type GetTypeWithGenericTypeDefinitionOf(this Type type, Type genericTypeDefinition)
- {
- foreach (var t in type.GetTypeInterfaces())
- {
- if (t.IsGeneric() && t.GetGenericTypeDefinition() == genericTypeDefinition)
- {
- return t;
- }
- }
-
- var genericType = type.FirstGenericType();
- if (genericType != null && genericType.GetGenericTypeDefinition() == genericTypeDefinition)
- {
- return genericType;
- }
-
- return null;
- }
-
- public static PropertyInfo[] GetPublicProperties(this Type type)
- {
- if (type.IsInterface())
- {
- var propertyInfos = new List<PropertyInfo>();
-
- var considered = new List<Type>();
- var queue = new Queue<Type>();
- considered.Add(type);
- queue.Enqueue(type);
-
- while (queue.Count > 0)
- {
- var subType = queue.Dequeue();
- foreach (var subInterface in subType.GetTypeInterfaces())
- {
- if (considered.Contains(subInterface)) continue;
-
- considered.Add(subInterface);
- queue.Enqueue(subInterface);
- }
-
- var typeProperties = subType.GetTypesPublicProperties();
-
- var newPropertyInfos = typeProperties
- .Where(x => !propertyInfos.Contains(x));
-
- propertyInfos.InsertRange(0, newPropertyInfos);
- }
-
- return propertyInfos.ToArray();
- }
-
- return type.GetTypesPublicProperties()
- .Where(t => t.GetIndexParameters().Length == 0) // ignore indexed properties
- .ToArray();
- }
-
- public const string DataMember = "DataMemberAttribute";
-
- internal static string[] IgnoreAttributesNamed = new[] {
- "IgnoreDataMemberAttribute",
- "JsonIgnoreAttribute"
- };
-
- public static PropertyInfo[] GetSerializableProperties(this Type type)
- {
- var properties = type.GetPublicProperties();
- return properties.OnlySerializableProperties(type);
- }
-
-
- private static List<Type> _excludeTypes = new List<Type> { typeof(Stream) };
-
- public static PropertyInfo[] OnlySerializableProperties(this PropertyInfo[] properties, Type type = null)
- {
- var readableProperties = properties.Where(x => x.PropertyGetMethod(nonPublic: false) != null);
-
- // else return those properties that are not decorated with IgnoreDataMember
- return readableProperties
- .Where(prop => prop.AllAttributes()
- .All(attr =>
- {
- var name = attr.GetType().Name;
- return !IgnoreAttributesNamed.Contains(name);
- }))
- .Where(prop => !_excludeTypes.Contains(prop.PropertyType))
- .ToArray();
- }
- }
-
- public static class PlatformExtensions //Because WinRT is a POS
- {
- public static bool IsInterface(this Type type)
- {
- return type.GetTypeInfo().IsInterface;
- }
-
- public static bool IsGeneric(this Type type)
- {
- return type.GetTypeInfo().IsGenericType;
- }
-
- public static Type BaseType(this Type type)
- {
- return type.GetTypeInfo().BaseType;
- }
-
- public static Type[] GetTypeInterfaces(this Type type)
- {
- return type.GetTypeInfo().ImplementedInterfaces.ToArray();
- }
-
- internal static PropertyInfo[] GetTypesPublicProperties(this Type subType)
- {
- var pis = new List<PropertyInfo>();
- foreach (var pi in subType.GetRuntimeProperties())
- {
- var mi = pi.GetMethod ?? pi.SetMethod;
- if (mi != null && mi.IsStatic) continue;
- pis.Add(pi);
- }
- return pis.ToArray();
- }
-
- public static MethodInfo PropertyGetMethod(this PropertyInfo pi, bool nonPublic = false)
- {
- return pi.GetMethod;
- }
-
- public static object[] AllAttributes(this PropertyInfo propertyInfo)
- {
- return propertyInfo.GetCustomAttributes(true).ToArray();
- }
-
- public static object[] AllAttributes(this Type type)
- {
- return type.GetTypeInfo().GetCustomAttributes(true).ToArray();
- }
-
- public static List<TAttr> AllAttributes<TAttr>(this Type type)
- where TAttr : Attribute
- {
- return type.GetTypeInfo().GetCustomAttributes<TAttr>(true).ToList();
- }
- }
-}
diff --git a/ServiceStack/RestPath.cs b/ServiceStack/RestPath.cs
index 5e86001d3..afd1f73e1 100644
--- a/ServiceStack/RestPath.cs
+++ b/ServiceStack/RestPath.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
+using System.Reflection;
using System.Text;
using MediaBrowser.Model.Logging;
using ServiceStack.Serialization;
@@ -71,7 +73,7 @@ namespace ServiceStack
public static string[] GetPathPartsForMatching(string pathInfo)
{
var parts = pathInfo.ToLower().Split(PathSeperatorChar)
- .Where(x => !string.IsNullOrEmpty(x)).ToArray();
+ .Where(x => !String.IsNullOrEmpty(x)).ToArray();
return parts;
}
@@ -107,14 +109,14 @@ namespace ServiceStack
return list;
}
- public RestPath(Type requestType, string path, string verbs, string summary = null, string notes = null)
+ public RestPath(Func<Type, object> createInstanceFn, Func<Type, Func<string, object>> getParseFn, Type requestType, string path, string verbs, string summary = null, string notes = null)
{
this.RequestType = requestType;
this.Summary = summary;
this.Notes = notes;
this.restPath = path;
- this.allowsAllVerbs = verbs == null || string.Equals(verbs, WildCard, StringComparison.OrdinalIgnoreCase);
+ this.allowsAllVerbs = verbs == null || String.Equals(verbs, WildCard, StringComparison.OrdinalIgnoreCase);
if (!this.allowsAllVerbs)
{
this.allowedVerbs = verbs.ToUpper();
@@ -126,7 +128,7 @@ namespace ServiceStack
var hasSeparators = new List<bool>();
foreach (var component in this.restPath.Split(PathSeperatorChar))
{
- if (string.IsNullOrEmpty(component)) continue;
+ if (String.IsNullOrEmpty(component)) continue;
if (StringContains(component, VariablePrefix)
&& component.IndexOf(ComponentSeperator) != -1)
@@ -199,19 +201,95 @@ namespace ServiceStack
this.IsValid = sbHashKey.Length > 0;
this.UniqueMatchHashKey = sbHashKey.ToString();
- this.typeDeserializer = new StringMapTypeDeserializer(this.RequestType);
+ this.typeDeserializer = new StringMapTypeDeserializer(createInstanceFn, getParseFn, this.RequestType);
RegisterCaseInsenstivePropertyNameMappings();
}
private void RegisterCaseInsenstivePropertyNameMappings()
{
- foreach (var propertyInfo in RequestType.GetSerializableProperties())
+ foreach (var propertyInfo in GetSerializableProperties(RequestType))
{
var propertyName = propertyInfo.Name;
propertyNamesMap.Add(propertyName.ToLower(), propertyName);
}
}
+ internal static string[] IgnoreAttributesNamed = new[] {
+ "IgnoreDataMemberAttribute",
+ "JsonIgnoreAttribute"
+ };
+
+
+ private static List<Type> _excludeTypes = new List<Type> { typeof(Stream) };
+
+ internal static PropertyInfo[] GetSerializableProperties(Type type)
+ {
+ var properties = GetPublicProperties(type);
+ var readableProperties = properties.Where(x => x.GetMethod != null);
+
+ // else return those properties that are not decorated with IgnoreDataMember
+ return readableProperties
+ .Where(prop => prop.GetCustomAttributes(true)
+ .All(attr =>
+ {
+ var name = attr.GetType().Name;
+ return !IgnoreAttributesNamed.Contains(name);
+ }))
+ .Where(prop => !_excludeTypes.Contains(prop.PropertyType))
+ .ToArray();
+ }
+
+ private static PropertyInfo[] GetPublicProperties(Type type)
+ {
+ if (type.GetTypeInfo().IsInterface)
+ {
+ var propertyInfos = new List<PropertyInfo>();
+
+ var considered = new List<Type>();
+ var queue = new Queue<Type>();
+ considered.Add(type);
+ queue.Enqueue(type);
+
+ while (queue.Count > 0)
+ {
+ var subType = queue.Dequeue();
+ foreach (var subInterface in subType.GetTypeInfo().ImplementedInterfaces)
+ {
+ if (considered.Contains(subInterface)) continue;
+
+ considered.Add(subInterface);
+ queue.Enqueue(subInterface);
+ }
+
+ var typeProperties = GetTypesPublicProperties(subType);
+
+ var newPropertyInfos = typeProperties
+ .Where(x => !propertyInfos.Contains(x));
+
+ propertyInfos.InsertRange(0, newPropertyInfos);
+ }
+
+ return propertyInfos.ToArray();
+ }
+
+ return GetTypesPublicProperties(type)
+ .Where(t => t.GetIndexParameters().Length == 0) // ignore indexed properties
+ .ToArray();
+ }
+
+ private static PropertyInfo[] GetTypesPublicProperties(Type subType)
+ {
+ var pis = new List<PropertyInfo>();
+ foreach (var pi in subType.GetRuntimeProperties())
+ {
+ var mi = pi.GetMethod ?? pi.SetMethod;
+ if (mi != null && mi.IsStatic) continue;
+ pis.Add(pi);
+ }
+ return pis.ToArray();
+ }
+
+
public bool IsValid { get; set; }
/// <summary>
@@ -243,7 +321,7 @@ namespace ServiceStack
score += Math.Max((10 - VariableArgsCount), 1) * 100;
//Exact verb match is better than ANY
- var exactVerb = string.Equals(httpMethod, AllowedVerbs, StringComparison.OrdinalIgnoreCase);
+ var exactVerb = String.Equals(httpMethod, AllowedVerbs, StringComparison.OrdinalIgnoreCase);
score += exactVerb ? 10 : 1;
return score;
@@ -339,7 +417,7 @@ namespace ServiceStack
private bool LiteralsEqual(string str1, string str2)
{
// Most cases
- if (string.Equals(str1, str2, StringComparison.OrdinalIgnoreCase))
+ if (String.Equals(str1, str2, StringComparison.OrdinalIgnoreCase))
{
return true;
}
@@ -349,7 +427,7 @@ namespace ServiceStack
str2 = str2.ToUpperInvariant();
// Invariant IgnoreCase would probably be better but it's not available in PCL
- return string.Equals(str1, str2, StringComparison.CurrentCultureIgnoreCase);
+ return String.Equals(str1, str2, StringComparison.CurrentCultureIgnoreCase);
}
private bool ExplodeComponents(ref string[] withPathInfoParts)
@@ -358,7 +436,7 @@ namespace ServiceStack
for (var i = 0; i < withPathInfoParts.Length; i++)
{
var component = withPathInfoParts[i];
- if (string.IsNullOrEmpty(component)) continue;
+ if (String.IsNullOrEmpty(component)) continue;
if (this.PathComponentsCount != this.TotalComponentsCount
&& this.componentsWithSeparators[i])
@@ -380,7 +458,7 @@ namespace ServiceStack
public object CreateRequest(string pathInfo, Dictionary<string, string> queryStringAndFormData, object fromInstance)
{
var requestComponents = pathInfo.Split(PathSeperatorChar)
- .Where(x => !string.IsNullOrEmpty(x)).ToArray();
+ .Where(x => !String.IsNullOrEmpty(x)).ToArray();
ExplodeComponents(ref requestComponents);
@@ -390,7 +468,7 @@ namespace ServiceStack
&& requestComponents.Length >= this.TotalComponentsCount - this.wildcardCount;
if (!isValidWildCardPath)
- throw new ArgumentException(string.Format(
+ throw new ArgumentException(String.Format(
"Path Mismatch: Request Path '{0}' has invalid number of components compared to: '{1}'",
pathInfo, this.restPath));
}
@@ -409,7 +487,7 @@ namespace ServiceStack
string propertyNameOnRequest;
if (!this.propertyNamesMap.TryGetValue(variableName.ToLower(), out propertyNameOnRequest))
{
- if (string.Equals("ignore", variableName, StringComparison.OrdinalIgnoreCase))
+ if (String.Equals("ignore", variableName, StringComparison.OrdinalIgnoreCase))
{
pathIx++;
continue;
@@ -439,12 +517,12 @@ namespace ServiceStack
// hits a match for the next element in the definition (which must be a literal)
// It may consume 0 or more path parts
var stopLiteral = i == this.TotalComponentsCount - 1 ? null : this.literalsToMatch[i + 1];
- if (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
+ if (!String.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
{
var sb = new StringBuilder();
sb.Append(value);
pathIx++;
- while (!string.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
+ while (!String.Equals(requestComponents[pathIx], stopLiteral, StringComparison.OrdinalIgnoreCase))
{
sb.Append(PathSeperatorChar + requestComponents[pathIx++]);
}
diff --git a/ServiceStack/ServiceStack.csproj b/ServiceStack/ServiceStack.csproj
index 36c467b8e..33226971e 100644
--- a/ServiceStack/ServiceStack.csproj
+++ b/ServiceStack/ServiceStack.csproj
@@ -69,9 +69,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Compile Include="ReflectionExtensions.cs" />
<Compile Include="StringMapTypeDeserializer.cs" />
- <Compile Include="ServiceStackHost.cs" />
<Compile Include="UrlExtensions.cs" />
<Compile Include="RestPath.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/ServiceStack/ServiceStackHost.cs b/ServiceStack/ServiceStackHost.cs
deleted file mode 100644
index 09fe9a242..000000000
--- a/ServiceStack/ServiceStackHost.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Service Stack LLC. All Rights Reserved.
-// License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
-
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
-
-namespace ServiceStack
-{
- public abstract class ServiceStackHost : IDisposable
- {
- public static ServiceStackHost Instance { get; protected set; }
-
- protected ServiceStackHost()
- {
- GlobalResponseFilters = new List<Action<IRequest, IResponse, object>>();
- }
-
- public abstract object CreateInstance(Type type);
-
- public List<Action<IRequest, IResponse, object>> GlobalResponseFilters { get; set; }
-
- public abstract RouteAttribute[] GetRouteAttributes(Type requestType);
-
- public abstract Func<string, object> GetParseFn(Type propertyType);
-
- public abstract void SerializeToJson(object o, Stream stream);
- public abstract void SerializeToXml(object o, Stream stream);
- public abstract object DeserializeXml(Type type, Stream stream);
- public abstract object DeserializeJson(Type type, Stream stream);
-
- public virtual void Dispose()
- {
- //JsConfig.Reset(); //Clears Runtime Attributes
-
- Instance = null;
- }
- }
-}
diff --git a/ServiceStack/StringMapTypeDeserializer.cs b/ServiceStack/StringMapTypeDeserializer.cs
index 8b76c39d0..82724fc4a 100644
--- a/ServiceStack/StringMapTypeDeserializer.cs
+++ b/ServiceStack/StringMapTypeDeserializer.cs
@@ -34,14 +34,19 @@ namespace ServiceStack.Serialization
if (propertyType == typeof(string))
return s => s;
- return ServiceStackHost.Instance.GetParseFn(propertyType);
+ return _GetParseFn(propertyType);
}
- public StringMapTypeDeserializer(Type type)
+ private readonly Func<Type, object> _CreateInstanceFn;
+ private readonly Func<Type, Func<string, object>> _GetParseFn;
+
+ public StringMapTypeDeserializer(Func<Type, object> createInstanceFn, Func<Type, Func<string, object>> getParseFn, Type type)
{
+ _CreateInstanceFn = createInstanceFn;
+ _GetParseFn = getParseFn;
this.type = type;
- foreach (var propertyInfo in type.GetSerializableProperties())
+ foreach (var propertyInfo in RestPath.GetSerializableProperties(type))
{
var propertySetFn = TypeAccessor.GetSetPropertyMethod(type, propertyInfo);
var propertyType = propertyInfo.PropertyType;
@@ -59,7 +64,7 @@ namespace ServiceStack.Serialization
PropertySerializerEntry propertySerializerEntry = null;
if (instance == null)
- instance = ServiceStackHost.Instance.CreateInstance(type);
+ instance = _CreateInstanceFn(type);
foreach (var pair in keyValuePairs.Where(x => !string.IsNullOrEmpty(x.Value)))
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 22:46:09 +0000