Browse Source

Auto properties

pull/332/head
Sebastian Stehle 8 years ago
parent
commit
41398ac199
  1. 33
      src/Squidex.Domain.Apps.Core.Model/Apps/AppClient.cs
  2. 33
      src/Squidex.Domain.Apps.Core.Model/Apps/AppPattern.cs
  3. 10
      src/Squidex.Domain.Apps.Core.Model/Apps/LanguageConfig.cs
  4. 23
      src/Squidex.Domain.Apps.Core.Model/Apps/Named.cs
  5. 12
      src/Squidex.Domain.Apps.Core.Model/Apps/Role.cs
  6. 4
      src/Squidex.Domain.Apps.Core.Model/Comments/Comment.cs
  7. 22
      src/Squidex.Infrastructure/Commands/CommandContext.cs
  8. 16
      src/Squidex.Infrastructure/Language.cs
  9. 1
      src/Squidex.Infrastructure/Queries/FilterValue.cs
  10. 9
      src/Squidex/Pipeline/FileCallbackResult.cs

33
src/Squidex.Domain.Apps.Core.Model/Apps/AppClient.cs

@ -10,36 +10,21 @@ using Squidex.Infrastructure;
namespace Squidex.Domain.Apps.Core.Apps namespace Squidex.Domain.Apps.Core.Apps
{ {
public sealed class AppClient public sealed class AppClient : Named
{ {
private readonly string name; public string Role { get; }
private readonly string secret;
private readonly string role;
public string Name public string Secret { get; }
{
get { return name; }
}
public string Secret
{
get { return secret; }
}
public string Role
{
get { return role; }
}
public AppClient(string name, string secret, string role) public AppClient(string name, string secret, string role)
: base(name)
{ {
Guard.NotNullOrEmpty(name, nameof(name));
Guard.NotNullOrEmpty(secret, nameof(secret)); Guard.NotNullOrEmpty(secret, nameof(secret));
Guard.NotNullOrEmpty(role, nameof(role)); Guard.NotNullOrEmpty(role, nameof(role));
Role = role;
this.name = name; Secret = secret;
this.role = role;
this.secret = secret;
} }
[Pure] [Pure]
@ -47,7 +32,7 @@ namespace Squidex.Domain.Apps.Core.Apps
{ {
Guard.NotNullOrEmpty(newRole, nameof(newRole)); Guard.NotNullOrEmpty(newRole, nameof(newRole));
return new AppClient(name, secret, newRole); return new AppClient(Name, Secret, newRole);
} }
[Pure] [Pure]
@ -55,7 +40,7 @@ namespace Squidex.Domain.Apps.Core.Apps
{ {
Guard.NotNullOrEmpty(newName, nameof(newName)); Guard.NotNullOrEmpty(newName, nameof(newName));
return new AppClient(newName, secret, role); return new AppClient(newName, Secret, Role);
} }
} }
} }

33
src/Squidex.Domain.Apps.Core.Model/Apps/AppPattern.cs

@ -10,41 +10,26 @@ using Squidex.Infrastructure;
namespace Squidex.Domain.Apps.Core.Apps namespace Squidex.Domain.Apps.Core.Apps
{ {
public sealed class AppPattern public sealed class AppPattern : Named
{ {
private readonly string name; public string Pattern { get; }
private readonly string pattern;
private readonly string message;
public string Name public string Message { get; }
{
get { return name; }
}
public string Pattern
{
get { return pattern; }
}
public string Message
{
get { return message; }
}
public AppPattern(string name, string pattern, string message = null) public AppPattern(string name, string pattern, string message = null)
: base(name)
{ {
Guard.NotNullOrEmpty(name, nameof(name));
Guard.NotNullOrEmpty(pattern, nameof(pattern)); Guard.NotNullOrEmpty(pattern, nameof(pattern));
Pattern = pattern;
this.name = name; Message = message;
this.pattern = pattern;
this.message = message;
} }
[Pure] [Pure]
public AppPattern Update(string name, string pattern, string message) public AppPattern Update(string newName, string newPattern, string newMessage)
{ {
return new AppPattern(name, pattern, message); return new AppPattern(newName, newPattern, newMessage);
} }
} }
} }

10
src/Squidex.Domain.Apps.Core.Model/Apps/LanguageConfig.cs

@ -13,14 +13,12 @@ namespace Squidex.Domain.Apps.Core.Apps
{ {
public sealed class LanguageConfig : IFieldPartitionItem public sealed class LanguageConfig : IFieldPartitionItem
{ {
private static readonly Language[] DefaultFallback = new Language[0];
private readonly Language language; private readonly Language language;
private readonly Language[] languageFallbacks; private readonly Language[] languageFallbacks;
private readonly bool isOptional; private readonly bool isOptional;
public bool IsOptional public bool IsOptional { get; }
{
get { return isOptional; }
}
public Language Language public Language Language
{ {
@ -56,10 +54,10 @@ namespace Squidex.Domain.Apps.Core.Apps
{ {
Guard.NotNull(language, nameof(language)); Guard.NotNull(language, nameof(language));
this.isOptional = isOptional; IsOptional = isOptional;
this.language = language; this.language = language;
this.languageFallbacks = fallback ?? new Language[0]; this.languageFallbacks = fallback ?? DefaultFallback;
} }
} }
} }

23
src/Squidex.Domain.Apps.Core.Model/Apps/Named.cs

@ -0,0 +1,23 @@
// ==========================================================================
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschränkt)
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using Squidex.Infrastructure;
namespace Squidex.Domain.Apps.Core.Apps
{
public abstract class Named
{
public string Name { get; }
protected Named(string name)
{
Guard.NotNullOrEmpty(name, nameof(name));
Name = name;
}
}
}

12
src/Squidex.Domain.Apps.Core.Model/Apps/Role.cs

@ -12,7 +12,7 @@ using P = Squidex.Shared.Permissions;
namespace Squidex.Domain.Apps.Core.Apps namespace Squidex.Domain.Apps.Core.Apps
{ {
public sealed class Role public sealed class Role : Named
{ {
public const string Editor = "Editor"; public const string Editor = "Editor";
public const string Developer = "Developer"; public const string Developer = "Developer";
@ -27,17 +27,13 @@ namespace Squidex.Domain.Apps.Core.Apps
Reader Reader
}; };
public string Name { get; }
public PermissionSet Permissions { get; } public PermissionSet Permissions { get; }
public Role(string name, PermissionSet permissions) public Role(string name, PermissionSet permissions)
: base(name)
{ {
Guard.NotNullOrEmpty(name, nameof(name));
Guard.NotNull(permissions, nameof(permissions)); Guard.NotNull(permissions, nameof(permissions));
Name = name;
Permissions = permissions; Permissions = permissions;
} }
@ -60,9 +56,9 @@ namespace Squidex.Domain.Apps.Core.Apps
public static Role CreateEditor(string app) public static Role CreateEditor(string app)
{ {
return new Role(Editor, return new Role(Editor,
P.ForApp(P.AppAssets, app),
P.ForApp(P.AppCommon, app), P.ForApp(P.AppCommon, app),
P.ForApp(P.AppContents, app), P.ForApp(P.AppContents, app));
P.ForApp(P.AppAssets, app));
} }
public static Role CreateReader(string app) public static Role CreateReader(string app)

4
src/Squidex.Domain.Apps.Core.Model/Comments/Comment.cs

@ -23,6 +23,10 @@ namespace Squidex.Domain.Apps.Core.Comments
public Comment(Guid id, Instant time, RefToken user, string text) public Comment(Guid id, Instant time, RefToken user, string text)
{ {
Guard.NotEmpty(id, nameof(id));
Guard.NotNull(user, nameof(user));
Guard.NotNull(text, nameof(text));
Id = id; Id = id;
Time = time; Time = time;

22
src/Squidex.Infrastructure/Commands/CommandContext.cs

@ -11,25 +11,13 @@ namespace Squidex.Infrastructure.Commands
{ {
public sealed class CommandContext public sealed class CommandContext
{ {
private readonly ICommand command;
private readonly ICommandBus commandBus;
private readonly Guid contextId = Guid.NewGuid();
private Tuple<object> result; private Tuple<object> result;
public ICommand Command public Guid ContextId { get; } = Guid.NewGuid();
{
get { return command; }
}
public ICommandBus CommandBus public ICommand Command { get; }
{
get { return commandBus; }
}
public Guid ContextId public ICommandBus CommandBus { get; }
{
get { return contextId; }
}
public bool IsCompleted public bool IsCompleted
{ {
@ -41,8 +29,8 @@ namespace Squidex.Infrastructure.Commands
Guard.NotNull(command, nameof(command)); Guard.NotNull(command, nameof(command));
Guard.NotNull(commandBus, nameof(commandBus)); Guard.NotNull(commandBus, nameof(commandBus));
this.command = command; Command = command;
this.commandBus = commandBus; CommandBus = commandBus;
} }
public CommandContext Complete(object resultValue = null) public CommandContext Complete(object resultValue = null)

16
src/Squidex.Infrastructure/Language.cs

@ -15,8 +15,6 @@ namespace Squidex.Infrastructure
{ {
private static readonly Regex CultureRegex = new Regex("^([a-z]{2})(\\-[a-z]{2})?$", RegexOptions.IgnoreCase); private static readonly Regex CultureRegex = new Regex("^([a-z]{2})(\\-[a-z]{2})?$", RegexOptions.IgnoreCase);
private static readonly Dictionary<string, Language> AllLanguagesField = new Dictionary<string, Language>(StringComparer.OrdinalIgnoreCase); private static readonly Dictionary<string, Language> AllLanguagesField = new Dictionary<string, Language>(StringComparer.OrdinalIgnoreCase);
private readonly string iso2Code;
private readonly string englishName;
private static Language AddLanguage(string iso2Code, string englishName) private static Language AddLanguage(string iso2Code, string englishName)
{ {
@ -42,21 +40,15 @@ namespace Squidex.Infrastructure
get { return AllLanguagesField.Values; } get { return AllLanguagesField.Values; }
} }
public string EnglishName public string EnglishName { get; }
{
get { return englishName; }
}
public string Iso2Code public string Iso2Code { get; }
{
get { return iso2Code; }
}
private Language(string iso2Code, string englishName) private Language(string iso2Code, string englishName)
{ {
this.iso2Code = iso2Code; Iso2Code = iso2Code;
this.englishName = englishName; EnglishName = englishName;
} }
public static bool IsValidLanguage(string iso2Code) public static bool IsValidLanguage(string iso2Code)

1
src/Squidex.Infrastructure/Queries/FilterValue.cs

@ -20,6 +20,7 @@ namespace Squidex.Infrastructure.Queries
public object Value { get; } public object Value { get; }
public FilterValueType ValueType { get; } public FilterValueType ValueType { get; }
public bool IsList { get; } public bool IsList { get; }
public FilterValue(Guid value) public FilterValue(Guid value)

9
src/Squidex/Pipeline/FileCallbackResult.cs

@ -15,19 +15,14 @@ namespace Squidex.Pipeline
{ {
public class FileCallbackResult : FileResult public class FileCallbackResult : FileResult
{ {
private readonly Func<Stream, Task> callback; public Func<Stream, Task> Callback { get; }
public Func<Stream, Task> Callback
{
get { return callback; }
}
public FileCallbackResult(string contentType, string name, Func<Stream, Task> callback) public FileCallbackResult(string contentType, string name, Func<Stream, Task> callback)
: base(contentType) : base(contentType)
{ {
FileDownloadName = name; FileDownloadName = name;
this.callback = callback; Callback = callback;
} }
public override Task ExecuteResultAsync(ActionContext context) public override Task ExecuteResultAsync(ActionContext context)

Loading…
Cancel
Save