Skip to content

Commit aac98af

Browse files
authored
Rename the ODF validation rules
1 parent 447a458 commit aac98af

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/ByteGuard.FileValidator/Configuration/FileValidatorConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class FileTypeRules
4444
/// <summary>
4545
/// OpenDocument Format validation rules.
4646
/// </summary>
47-
public OdfValidationRules OdfRules { get; set; } = new();
47+
public OdfRules OdfRules { get; set; } = new();
4848

4949
/// <summary>
5050
/// Open XML validation rules.

src/ByteGuard.FileValidator/Configuration/FileValidatorConfigurationBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public class FileValidatorConfigurationBuilder
1010
private readonly List<string> supportedFileTypes = new List<string>();
1111
private bool throwOnInvalidFiles = true;
1212
private long fileSizeLimit = ByteSize.MegaBytes(25);
13-
14-
private OdfValidationRules odfValidationRules = new();
13+
14+
private OdfRules odfValidationRules = new();
1515
private OpenXmlRules openXmlRules = new();
1616

1717
/// <summary>
@@ -50,7 +50,7 @@ public FileValidatorConfigurationBuilder SetFileSizeLimit(long inFileSizeLimit)
5050
/// Configure the OpenDocument Format validation rules.
5151
/// </summary>
5252
/// <param name="configure">Configuration action.</param>
53-
public FileValidatorConfigurationBuilder ConfigureOdfValidationRules(Action<OdfValidationRules> configure)
53+
public FileValidatorConfigurationBuilder ConfigureOdfValidationRules(Action<OdfRules> configure)
5454
{
5555
configure.Invoke(odfValidationRules);
5656
return this;

src/ByteGuard.FileValidator/Configuration/Rules/OdfValidationConfiguration.cs renamed to src/ByteGuard.FileValidator/Configuration/Rules/OdfRules.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/// <summary>
44
/// Validation rules for OpenDocument Format files.
55
/// </summary>
6-
public class OdfValidationRules
6+
public class OdfRules
77
{
88
/// <summary>
99
/// Whether a valid mimetype file is required in the ODF package. Defaults to <c>true</c>.

src/ByteGuard.FileValidator/Validators/OpenDocumentFormatValidator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal static class OpenDocumentFormatValidator
3232
/// <param name="rules">ODF validation rules.</param>
3333
/// <returns><c>true</c> if valid, <c>false</c> otherwise.</returns>
3434
/// <throws cref="ArgumentNullException">Thrown if the provided <paramref name="stream"/> is <c>null</c> or empty.</throws>
35-
internal static bool IsValidOpenDocumentFormatFile(string fileName, Stream stream, OdfValidationRules rules)
35+
internal static bool IsValidOpenDocumentFormatFile(string fileName, Stream stream, OdfRules rules)
3636
{
3737
if (stream == null || stream.Length == 0)
3838
{
@@ -52,7 +52,7 @@ internal static bool IsValidOpenDocumentFormatFile(string fileName, Stream strea
5252
/// <param name="archive">ODF ZIP archive.</param>
5353
/// <param name="rules">ODF validation rules.</param>
5454
/// <returns><c>true</c> if valid, <c>false</c> otherwise.</returns>
55-
private static bool PerformOdfValidation(string fileName, ZipArchive archive, OdfValidationRules rules)
55+
private static bool PerformOdfValidation(string fileName, ZipArchive archive, OdfRules rules)
5656
{
5757
var fileExtension = Path.GetExtension(fileName);
5858
if (!OdfMimetypeMappings.ContainsKey(fileExtension))
@@ -96,7 +96,7 @@ private static bool PerformOdfValidation(string fileName, ZipArchive archive, Od
9696
/// <param name="archive">ODF ZIP archive.</param>
9797
/// <param name="rules">ODF validation rules.</param>
9898
/// <returns><c>true</c> if valid, <c>false</c> otherwise.</returns>
99-
private static bool IsValidMimetype(string fileName, ZipArchive archive, OdfValidationRules rules)
99+
private static bool IsValidMimetype(string fileName, ZipArchive archive, OdfRules rules)
100100
{
101101
var mimetypeEntry = archive.GetEntry(MimetypeEntryName);
102102
if (mimetypeEntry is null)

0 commit comments

Comments
 (0)