Browse Source

Minor refactorings to make resharper happy

pull/1/head
Sebastian 10 years ago
parent
commit
e8dd45b347
  1. 33
      Squidex.sln.DotSettings
  2. 2
      src/Squidex.Core/ContentEnricher.cs
  3. 2
      src/Squidex.Core/Identity/SquidexClaimTypes.cs
  4. 2
      src/Squidex.Core/Schemas/FieldRegistry.cs
  5. 2
      src/Squidex.Events/Schemas/Utils/SchemaEventDispatcher.cs
  6. 12
      src/Squidex.Infrastructure.MongoDb/MongoRepositoryBase.cs
  7. 2
      src/Squidex.Infrastructure.Redis/RedisInfrastructureErrors.cs
  8. 2
      src/Squidex.Infrastructure/CQRS/Commands/AggregateHandler.cs
  9. 11
      src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult.cs
  10. 2
      src/Squidex.Infrastructure/CQRS/Events/CommonHeaders.cs
  11. 2
      src/Squidex.Infrastructure/CollectionExtensions.cs
  12. 2
      src/Squidex.Infrastructure/Dispatching/ActionContextDispatcherFactory.cs
  13. 2
      src/Squidex.Infrastructure/Dispatching/ActionDispatcherFactory.cs
  14. 12
      src/Squidex.Infrastructure/Language.cs
  15. 2
      src/Squidex.Infrastructure/Security/OpenIdClaims.cs
  16. 2
      src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs
  17. 13
      src/Squidex.Write/Apps/ClientKeyGenerator.cs
  18. 2
      src/Squidex/Config/Constants.cs
  19. 2
      src/Squidex/Config/Domain/ClusterModule.cs
  20. 2
      src/Squidex/Config/Domain/EventStoreModule.cs
  21. 4
      src/Squidex/Config/Domain/InfrastructureModule.cs
  22. 4
      src/Squidex/Config/Domain/ReadModule.cs
  23. 8
      src/Squidex/Config/Domain/Serializers.cs
  24. 2
      src/Squidex/Config/Domain/StoreModule.cs
  25. 2
      src/Squidex/Config/Domain/StoreMongoDbModule.cs
  26. 4
      src/Squidex/Config/Domain/WriteModule.cs
  27. 3
      src/Squidex/Config/Identity/IdentityServices.cs
  28. 4
      src/Squidex/Config/Web/WebModule.cs
  29. 6
      src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
  30. 4
      src/Squidex/Pipeline/RandomErrorAttribute.cs
  31. 4
      src/Squidex/Pipeline/Swagger/SwaggerHelper.cs
  32. 6
      src/Squidex/Startup.cs

33
Squidex.sln.DotSettings

@ -14,41 +14,27 @@
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ets/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ets/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_005Ftest_002Doutput_002A/@EntryIndexedValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_005Ftest_002Doutput_002A/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_005Ftest_002Doutput_002A/@EntryIndexRemoved">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_005Ftest_002Doutput_002A/@EntryIndexRemoved">True</s:Boolean>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=61F6BBCE_002DA080_002D4400_002DB194_002D70E2F5D2096E_002Fd_003A_005Ftest_002Doutput/@EntryIndexedValue"></s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue"></s:String>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=61F6BBCE_002DA080_002D4400_002DB194_002D70E2F5D2096E_002Fd_003A_005Ftest_002Doutput/@EntryIndexRemoved">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexRemoved">True</s:Boolean>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=A2569FB7_002D99E7_002D48B4_002DB97F_002DE48B6F57E492_002Fd_003Awwwroot_002Fd_003Anode_005Fmodules/@EntryIndexedValue">ExplicitlyExcluded</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertMethodToExpressionBody/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=Html_002ETagNotResolved/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingHasOwnPropertyInForeach/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReturnTypeCanBeEnumerable_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReturnTypeCanBeEnumerable_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">SUGGESTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FElsewhere/@EntryIndexedValue">SUGGESTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">SUGGESTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TsResolvedFromInaccessibleModule/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=61F6BBCE_002DA080_002D4400_002DB194_002D70E2F5D2096E_002Fd_003A_005Ftest_002Doutput/@EntryIndexRemoved">True</s:Boolean>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=61F6BBCE_002DA080_002D4400_002DB194_002D70E2F5D2096E_002Fd_003A_005Ftest_002Doutput/@EntryIndexedValue"></s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=A2569FB7_002D99E7_002D48B4_002DB97F_002DE48B6F57E492_002Fd_003Awwwroot_002Fd_003Anode_005Fmodules/@EntryIndexedValue">ExplicitlyExcluded</s:String>
<s:String x:Key="/Default/CodeInspection/TypeScriptInspections/Level/@EntryValue">TypeScript16</s:String> <s:String x:Key="/Default/CodeInspection/TypeScriptInspections/Level/@EntryValue">TypeScript16</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Header/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Header"&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;/Profile&gt;</s:String> <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Header/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Header"&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Namespaces/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Namespaces"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;/Profile&gt;</s:String> <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Namespaces/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Namespaces"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Typescript/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Typescript"&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;/Profile&gt;</s:String> <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Typescript/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Typescript"&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue"></s:String> <s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue"></s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/QUOTE_STYLE/@EntryValue">SingleQuoted</s:String> <s:String x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/QUOTE_STYLE/@EntryValue">SingleQuoted</s:String>
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">==========================================================================&#xD; <s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">==========================================================================&#xD;
$FILENAME$&#xD; $FILENAME$&#xD;
@ -99,9 +85,4 @@
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/CodeStyle/TypeScriptCodeStyle/ExplicitPublicModifier/@EntryValue">True</s:Boolean> </wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

2
src/Squidex.Core/ContentEnricher.cs

@ -58,7 +58,7 @@ namespace Squidex.Core
} }
} }
private void Enrich(Field field, ContentFieldData fieldData, Language language) private static void Enrich(Field field, ContentFieldData fieldData, Language language)
{ {
Guard.NotNull(fieldData, nameof(fieldData)); Guard.NotNull(fieldData, nameof(fieldData));
Guard.NotNull(language, nameof(language)); Guard.NotNull(language, nameof(language));

2
src/Squidex.Core/Identity/SquidexClaimTypes.cs

@ -8,7 +8,7 @@
namespace Squidex.Core.Identity namespace Squidex.Core.Identity
{ {
public class SquidexClaimTypes public static class SquidexClaimTypes
{ {
public static readonly string SquidexDisplayName = "urn:squidex:name"; public static readonly string SquidexDisplayName = "urn:squidex:name";

2
src/Squidex.Core/Schemas/FieldRegistry.cs

@ -75,7 +75,7 @@ namespace Squidex.Core.Schemas
(id, name, p) => new GeolocationField(id, name, (GeolocationFieldProperties)p)); (id, name, p) => new GeolocationField(id, name, (GeolocationFieldProperties)p));
} }
public void Add<TFieldProperties>(FactoryFunction fieldFactory) private void Add<TFieldProperties>(FactoryFunction fieldFactory)
{ {
Guard.NotNull(fieldFactory, nameof(fieldFactory)); Guard.NotNull(fieldFactory, nameof(fieldFactory));

2
src/Squidex.Events/Schemas/Utils/SchemaEventDispatcher.cs

@ -12,7 +12,7 @@ using Squidex.Core.Schemas;
namespace Squidex.Events.Schemas.Utils namespace Squidex.Events.Schemas.Utils
{ {
public class SchemaEventDispatcher public static class SchemaEventDispatcher
{ {
public static Schema Dispatch(SchemaCreated @event) public static Schema Dispatch(SchemaCreated @event)
{ {

12
src/Squidex.Infrastructure.MongoDb/MongoRepositoryBase.cs

@ -30,7 +30,7 @@ namespace Squidex.Infrastructure.MongoDb
} }
} }
protected ProjectionDefinitionBuilder<TEntity> Projection protected static ProjectionDefinitionBuilder<TEntity> Projection
{ {
get get
{ {
@ -38,7 +38,7 @@ namespace Squidex.Infrastructure.MongoDb
} }
} }
protected SortDefinitionBuilder<TEntity> Sort protected static SortDefinitionBuilder<TEntity> Sort
{ {
get get
{ {
@ -46,7 +46,7 @@ namespace Squidex.Infrastructure.MongoDb
} }
} }
protected UpdateDefinitionBuilder<TEntity> Update protected static UpdateDefinitionBuilder<TEntity> Update
{ {
get get
{ {
@ -54,7 +54,7 @@ namespace Squidex.Infrastructure.MongoDb
} }
} }
protected FilterDefinitionBuilder<TEntity> Filter protected static FilterDefinitionBuilder<TEntity> Filter
{ {
get get
{ {
@ -62,7 +62,7 @@ namespace Squidex.Infrastructure.MongoDb
} }
} }
protected IndexKeysDefinitionBuilder<TEntity> IndexKeys protected static IndexKeysDefinitionBuilder<TEntity> IndexKeys
{ {
get get
{ {
@ -136,7 +136,7 @@ namespace Squidex.Infrastructure.MongoDb
return Collection.DeleteManyAsync(new BsonDocument()); return Collection.DeleteManyAsync(new BsonDocument());
} }
public async Task<bool> TryDropCollectionAsync() public async Task<bool> DropCollectionIfExistsAsync()
{ {
try try
{ {

2
src/Squidex.Infrastructure.Redis/RedisInfrastructureErrors.cs

@ -10,7 +10,7 @@ using Microsoft.Extensions.Logging;
namespace Squidex.Infrastructure.Redis namespace Squidex.Infrastructure.Redis
{ {
public class RedisInfrastructureErrors public static class RedisInfrastructureErrors
{ {
public static readonly EventId InvalidatingReceivedFailed = new EventId(50001, "InvalidingReceivedFailed"); public static readonly EventId InvalidatingReceivedFailed = new EventId(50001, "InvalidingReceivedFailed");

2
src/Squidex.Infrastructure/CQRS/Commands/AggregateHandler.cs

@ -74,7 +74,7 @@ namespace Squidex.Infrastructure.CQRS.Commands
} }
} }
private IAggregateCommand GetCommand(CommandContext context) private static IAggregateCommand GetCommand(CommandContext context)
{ {
var command = context.Command as IAggregateCommand; var command = context.Command as IAggregateCommand;

11
src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult.cs

@ -8,17 +8,6 @@
namespace Squidex.Infrastructure.CQRS.Commands namespace Squidex.Infrastructure.CQRS.Commands
{ {
public sealed class EntityCreatedResult<T> : EntitySavedResult
{
public T IdOrValue { get; }
public EntityCreatedResult(T idOrValue, long version)
: base(version)
{
IdOrValue = idOrValue;
}
}
public static class EntityCreatedResult public static class EntityCreatedResult
{ {
public static EntityCreatedResult<T> Create<T>(T idOrValue, long version) public static EntityCreatedResult<T> Create<T>(T idOrValue, long version)

2
src/Squidex.Infrastructure/CQRS/Events/CommonHeaders.cs

@ -8,7 +8,7 @@
namespace Squidex.Infrastructure.CQRS.Events namespace Squidex.Infrastructure.CQRS.Events
{ {
public sealed class CommonHeaders public static class CommonHeaders
{ {
public static readonly string AggregateId = "AggregateId"; public static readonly string AggregateId = "AggregateId";

2
src/Squidex.Infrastructure/CollectionExtensions.cs

@ -30,7 +30,7 @@ namespace Squidex.Infrastructure
{ {
if (item != null) if (item != null)
{ {
hashCode = hashCode * 23 + item.GetHashCode(); hashCode = hashCode * 23 + comparer.GetHashCode(item);
} }
} }

2
src/Squidex.Infrastructure/Dispatching/ActionContextDispatcherFactory.cs

@ -13,7 +13,7 @@ using System.Reflection;
namespace Squidex.Infrastructure.Dispatching namespace Squidex.Infrastructure.Dispatching
{ {
internal class ActionContextDispatcherFactory internal static class ActionContextDispatcherFactory
{ {
public static Tuple<Type, Action<TTarget, object, TContext>> CreateActionHandler<TTarget, TContext>(MethodInfo methodInfo) public static Tuple<Type, Action<TTarget, object, TContext>> CreateActionHandler<TTarget, TContext>(MethodInfo methodInfo)
{ {

2
src/Squidex.Infrastructure/Dispatching/ActionDispatcherFactory.cs

@ -13,7 +13,7 @@ using System.Reflection;
namespace Squidex.Infrastructure.Dispatching namespace Squidex.Infrastructure.Dispatching
{ {
internal class ActionDispatcherFactory internal static class ActionDispatcherFactory
{ {
public static Tuple<Type, Action<T, object>> CreateActionHandler<T>(MethodInfo methodInfo) public static Tuple<Type, Action<T, object>> CreateActionHandler<T>(MethodInfo methodInfo)
{ {

12
src/Squidex.Infrastructure/Language.cs

@ -19,7 +19,7 @@ namespace Squidex.Infrastructure
private static readonly Regex CultureRegex = new Regex("([a-z]{2})(\\-[a-z]{2})?"); private static readonly Regex CultureRegex = new Regex("([a-z]{2})(\\-[a-z]{2})?");
private readonly string iso2Code; private readonly string iso2Code;
private readonly string englishName; private readonly string englishName;
private static readonly Dictionary<string, Language> allLanguages = new Dictionary<string, Language>(); private static readonly Dictionary<string, Language> AllLanguagesField = new Dictionary<string, Language>();
public static readonly Language Invariant = AddLanguage("iv", "Invariant"); public static readonly Language Invariant = AddLanguage("iv", "Invariant");
@ -27,7 +27,7 @@ namespace Squidex.Infrastructure
{ {
var language = new Language(iso2Code, englishName); var language = new Language(iso2Code, englishName);
allLanguages[iso2Code] = language; AllLanguagesField[iso2Code] = language;
return language; return language;
} }
@ -38,7 +38,7 @@ namespace Squidex.Infrastructure
try try
{ {
return allLanguages[iso2Code]; return AllLanguagesField[iso2Code];
} }
catch (KeyNotFoundException) catch (KeyNotFoundException)
{ {
@ -48,7 +48,7 @@ namespace Squidex.Infrastructure
public static IEnumerable<Language> AllLanguages public static IEnumerable<Language> AllLanguages
{ {
get { return allLanguages.Values; } get { return AllLanguagesField.Values; }
} }
public string EnglishName public string EnglishName
@ -72,14 +72,14 @@ namespace Squidex.Infrastructure
{ {
Guard.NotNullOrEmpty(iso2Code, nameof(iso2Code)); Guard.NotNullOrEmpty(iso2Code, nameof(iso2Code));
return allLanguages.ContainsKey(iso2Code); return AllLanguagesField.ContainsKey(iso2Code);
} }
public static bool TryGetLanguage(string iso2Code, out Language language) public static bool TryGetLanguage(string iso2Code, out Language language)
{ {
Guard.NotNullOrEmpty(iso2Code, nameof(iso2Code)); Guard.NotNullOrEmpty(iso2Code, nameof(iso2Code));
return allLanguages.TryGetValue(iso2Code, out language); return AllLanguagesField.TryGetValue(iso2Code, out language);
} }
public static Language ParseOrNull(string input) public static Language ParseOrNull(string input)

2
src/Squidex.Infrastructure/Security/OpenIdClaims.cs

@ -8,7 +8,7 @@
namespace Squidex.Infrastructure.Security namespace Squidex.Infrastructure.Security
{ {
public class OpenIdClaims public static class OpenIdClaims
{ {
/// <summary> /// <summary>
/// Unique Identifier for the End-User at the Issuer. /// Unique Identifier for the End-User at the Issuer.

2
src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs

@ -13,6 +13,8 @@ using Squidex.Infrastructure;
using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb;
using Squidex.Read.Apps; using Squidex.Read.Apps;
// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
namespace Squidex.Read.MongoDb.Apps namespace Squidex.Read.MongoDb.Apps
{ {
public sealed class MongoAppEntity : MongoEntity, IAppEntity public sealed class MongoAppEntity : MongoEntity, IAppEntity

13
src/Squidex.Write/Apps/ClientKeyGenerator.cs

@ -16,14 +16,21 @@ namespace Squidex.Write.Apps
{ {
public class ClientKeyGenerator public class ClientKeyGenerator
{ {
private readonly Func<HashAlgorithm> algorithmFactory;
public ClientKeyGenerator()
{
algorithmFactory = SHA256.Create;
}
public virtual string GenerateKey() public virtual string GenerateKey()
{ {
return Sha256(Guid.NewGuid().ToString()); return Hash(Guid.NewGuid().ToString());
} }
private static string Sha256(string input) private string Hash(string input)
{ {
using (var sha = SHA256.Create()) using (var sha = algorithmFactory())
{ {
var bytes = Encoding.UTF8.GetBytes(input); var bytes = Encoding.UTF8.GetBytes(input);
var hash = sha.ComputeHash(bytes); var hash = sha.ComputeHash(bytes);

2
src/Squidex/Config/Constants.cs

@ -8,7 +8,7 @@
namespace Squidex.Config namespace Squidex.Config
{ {
public class Constants public static class Constants
{ {
public static readonly string SecurityDefinition = "oauth-client-auth"; public static readonly string SecurityDefinition = "oauth-client-auth";

2
src/Squidex/Config/Domain/ClusterModule.cs

@ -18,7 +18,7 @@ namespace Squidex.Config.Domain
{ {
public class ClusterModule : Module public class ClusterModule : Module
{ {
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public ClusterModule(IConfiguration configuration) public ClusterModule(IConfiguration configuration)
{ {

2
src/Squidex/Config/Domain/EventStoreModule.cs

@ -19,7 +19,7 @@ namespace Squidex.Config.Domain
{ {
public class EventStoreModule : Module public class EventStoreModule : Module
{ {
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public EventStoreModule(IConfiguration configuration) public EventStoreModule(IConfiguration configuration)
{ {

4
src/Squidex/Config/Domain/InfrastructureModule.cs

@ -20,11 +20,13 @@ using Squidex.Infrastructure.Caching;
using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.CQRS.Commands;
using Squidex.Infrastructure.CQRS.Events; using Squidex.Infrastructure.CQRS.Events;
// ReSharper disable UnusedAutoPropertyAccessor.Local
namespace Squidex.Config.Domain namespace Squidex.Config.Domain
{ {
public class InfrastructureModule : Module public class InfrastructureModule : Module
{ {
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public InfrastructureModule(IConfiguration configuration) public InfrastructureModule(IConfiguration configuration)
{ {

4
src/Squidex/Config/Domain/ReadModule.cs

@ -18,11 +18,13 @@ using Squidex.Read.Schemas;
using Squidex.Read.Schemas.Services; using Squidex.Read.Schemas.Services;
using Squidex.Read.Schemas.Services.Implementations; using Squidex.Read.Schemas.Services.Implementations;
// ReSharper disable UnusedAutoPropertyAccessor.Local
namespace Squidex.Config.Domain namespace Squidex.Config.Domain
{ {
public sealed class ReadModule : Module public sealed class ReadModule : Module
{ {
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public ReadModule(IConfiguration configuration) public ReadModule(IConfiguration configuration)
{ {

8
src/Squidex/Config/Domain/Serializers.cs

@ -20,11 +20,11 @@ namespace Squidex.Config.Domain
{ {
public static class Serializers public static class Serializers
{ {
private static readonly TypeNameRegistry typeNameRegistry = new TypeNameRegistry(); private static readonly TypeNameRegistry TypeNameRegistry = new TypeNameRegistry();
private static JsonSerializerSettings ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling) private static JsonSerializerSettings ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling)
{ {
settings.SerializationBinder = new TypeNameSerializationBinder(typeNameRegistry); settings.SerializationBinder = new TypeNameSerializationBinder(TypeNameRegistry);
settings.ContractResolver = new ConverterContractResolver( settings.ContractResolver = new ConverterContractResolver(
new InstantConverter(), new InstantConverter(),
@ -50,7 +50,7 @@ namespace Squidex.Config.Domain
static Serializers() static Serializers()
{ {
typeNameRegistry.Map(typeof(SquidexEvent).GetTypeInfo().Assembly); TypeNameRegistry.Map(typeof(SquidexEvent).GetTypeInfo().Assembly);
} }
private static JsonSerializerSettings CreateSettings() private static JsonSerializerSettings CreateSettings()
@ -65,7 +65,7 @@ namespace Squidex.Config.Domain
public static IServiceCollection AddMyEventFormatter(this IServiceCollection services) public static IServiceCollection AddMyEventFormatter(this IServiceCollection services)
{ {
services.AddSingleton(t => typeNameRegistry); services.AddSingleton(t => TypeNameRegistry);
services.AddSingleton(t => CreateSettings()); services.AddSingleton(t => CreateSettings());
services.AddSingleton(t => CreateSerializer(t.GetRequiredService<JsonSerializerSettings>())); services.AddSingleton(t => CreateSerializer(t.GetRequiredService<JsonSerializerSettings>()));

2
src/Squidex/Config/Domain/StoreModule.cs

@ -15,7 +15,7 @@ namespace Squidex.Config.Domain
{ {
public class StoreModule : Module public class StoreModule : Module
{ {
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public StoreModule(IConfiguration configuration) public StoreModule(IConfiguration configuration)
{ {

2
src/Squidex/Config/Domain/StoreMongoDbModule.cs

@ -34,7 +34,7 @@ namespace Squidex.Config.Domain
{ {
private const string MongoDatabaseName = "string"; private const string MongoDatabaseName = "string";
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public StoreMongoDbModule(IConfiguration configuration) public StoreMongoDbModule(IConfiguration configuration)
{ {

4
src/Squidex/Config/Domain/WriteModule.cs

@ -15,11 +15,13 @@ using Squidex.Write.Apps;
using Squidex.Write.Contents; using Squidex.Write.Contents;
using Squidex.Write.Schemas; using Squidex.Write.Schemas;
// ReSharper disable UnusedAutoPropertyAccessor.Local
namespace Squidex.Config.Domain namespace Squidex.Config.Domain
{ {
public class WriteModule : Module public class WriteModule : Module
{ {
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public WriteModule(IConfiguration configuration) public WriteModule(IConfiguration configuration)
{ {

3
src/Squidex/Config/Identity/IdentityServices.cs

@ -15,7 +15,6 @@ using IdentityModel;
using IdentityServer4.Models; using IdentityServer4.Models;
using IdentityServer4.Stores; using IdentityServer4.Stores;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity.MongoDB; using Microsoft.AspNetCore.Identity.MongoDB;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -59,7 +58,7 @@ namespace Squidex.Config.Identity
return services; return services;
} }
public static IServiceCollection AddMyIdentityServer(this IServiceCollection services, IHostingEnvironment env) public static IServiceCollection AddMyIdentityServer(this IServiceCollection services)
{ {
X509Certificate2 certificate; X509Certificate2 certificate;

4
src/Squidex/Config/Web/WebModule.cs

@ -10,11 +10,13 @@ using Autofac;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Squidex.Pipeline; using Squidex.Pipeline;
// ReSharper disable UnusedAutoPropertyAccessor.Local
namespace Squidex.Config.Web namespace Squidex.Config.Web
{ {
public class WebModule : Module public class WebModule : Module
{ {
public IConfiguration Configuration { get; } private IConfiguration Configuration { get; }
public WebModule(IConfiguration configuration) public WebModule(IConfiguration configuration)
{ {

6
src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs

@ -20,11 +20,11 @@ namespace Squidex.Pipeline
{ {
public sealed class ApiExceptionFilterAttribute : ActionFilterAttribute, IExceptionFilter public sealed class ApiExceptionFilterAttribute : ActionFilterAttribute, IExceptionFilter
{ {
private static readonly List<Func<Exception, IActionResult>> handlers = new List<Func<Exception, IActionResult>>(); private static readonly List<Func<Exception, IActionResult>> Handlers = new List<Func<Exception, IActionResult>>();
private static void AddHandler<T>(Func<T, IActionResult> handler) where T : Exception private static void AddHandler<T>(Func<T, IActionResult> handler) where T : Exception
{ {
handlers.Add(ex => Handlers.Add(ex =>
{ {
var typed = ex as T; var typed = ex as T;
@ -74,7 +74,7 @@ namespace Squidex.Pipeline
{ {
IActionResult result = null; IActionResult result = null;
foreach (var handler in handlers) foreach (var handler in Handlers)
{ {
result = handler(context.Exception); result = handler(context.Exception);

4
src/Squidex/Pipeline/RandomErrorAttribute.cs

@ -14,11 +14,11 @@ namespace Squidex.Pipeline
{ {
public sealed class RandomErrorAttribute : ActionFilterAttribute public sealed class RandomErrorAttribute : ActionFilterAttribute
{ {
private static readonly Random random = new Random(); private static readonly Random Random = new Random();
public override void OnActionExecuted(ActionExecutedContext context) public override void OnActionExecuted(ActionExecutedContext context)
{ {
if (random.Next(10) < 5) if (Random.Next(10) < 5)
{ {
context.Result = new StatusCodeResult(500); context.Result = new StatusCodeResult(500);
} }

4
src/Squidex/Pipeline/Swagger/SwaggerHelper.cs

@ -19,11 +19,11 @@ namespace Squidex.Pipeline.Swagger
{ {
public static class SwaggerHelper public static class SwaggerHelper
{ {
private static readonly ConcurrentDictionary<string, string> docs = new ConcurrentDictionary<string, string>(); private static readonly ConcurrentDictionary<string, string> Docs = new ConcurrentDictionary<string, string>();
public static string LoadDocs(string name) public static string LoadDocs(string name)
{ {
return docs.GetOrAdd(name, x => return Docs.GetOrAdd(name, x =>
{ {
var assembly = typeof(SwaggerHelper).GetTypeInfo().Assembly; var assembly = typeof(SwaggerHelper).GetTypeInfo().Assembly;

6
src/Squidex/Startup.cs

@ -37,9 +37,9 @@ namespace Squidex
"/account" "/account"
}; };
public IConfigurationRoot Configuration { get; } private IConfigurationRoot Configuration { get; }
public IHostingEnvironment Environment { get; } private IHostingEnvironment Environment { get; }
public Startup(IHostingEnvironment env) public Startup(IHostingEnvironment env)
{ {
@ -60,7 +60,7 @@ namespace Squidex
services.AddMyEventFormatter(); services.AddMyEventFormatter();
services.AddMyDataProtectection(Configuration); services.AddMyDataProtectection(Configuration);
services.AddMyIdentity(); services.AddMyIdentity();
services.AddMyIdentityServer(Environment); services.AddMyIdentityServer();
services.AddMyMvc(); services.AddMyMvc();
services.AddLogging(); services.AddLogging();

Loading…
Cancel
Save