Skip to content

NONCRIT: Refactorings #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
levtoji merged 3 commits into from
Nov 21, 2025
Merged

NONCRIT: Refactorings #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6125f8b
Update langversion
levtoji Oct 2, 2025
4079b63
explicit type for primitives
levtoji Oct 2, 2025
505a920
Merge branch 'master' into refactorings
levtoji Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions EDIFileLoader/AzureStorageLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,20 @@ var blobPage in _container
{
foreach (var blob in blobPage.Values)
{
if (blob.IsBlob)
if (!blob.IsBlob)
{
var blockBlob = _container.GetBlobClient(
blob.Blob.Name
);
// if this stream reader failes, because the blockBlob comes without a ByteOrderMark, then use new UTF8Encoding(false) as encoding
var text = await new StreamReader(
(await blockBlob.DownloadAsync()).Value.Content,
Encoding.UTF8
).ReadToEndAsync();
text = EDIHelper.RemoveByteOrderMark(text);
Cache[prefix.Prefix.TrimEnd('/')]
.TryAdd(blob.Blob.Name, text);
continue;
}

var blockBlob = _container.GetBlobClient(blob.Blob.Name);
// if this stream reader fails, because the blockBlob comes without a ByteOrderMark, then use new UTF8Encoding(false) as encoding
string text = await new StreamReader(
(await blockBlob.DownloadAsync()).Value.Content,
Encoding.UTF8
).ReadToEndAsync();
text = EDIHelper.RemoveByteOrderMark(text);
Cache[prefix.Prefix.TrimEnd('/')]
.TryAdd(blob.Blob.Name, text);
}
}
}
Expand Down Expand Up @@ -141,7 +141,7 @@ public async Task<string> LoadEDITemplate(EDIFileInfo info, string type)
info.Format.ToString() + info.Version + "." + type
)
);
var text = await new StreamReader(
string text = await new StreamReader(
(await blockBlob.DownloadAsync()).Value.Content,
Encoding.UTF8
).ReadToEndAsync();
Expand All @@ -158,7 +158,7 @@ public Task<string> LoadJSONTemplate(string fileName)
public async Task<string> LoadJSONTemplate(string formatPackage, string fileName)
{
var format = Enum.Parse<EdifactFormat>(formatPackage.Split("|").First());
var version = formatPackage.Split("|").Last();
string version = formatPackage.Split("|").Last();
return await LoadJSONTemplate(format, version, fileName);
}

Expand All @@ -182,7 +182,7 @@ string fileName
Path.Combine(version.Replace("/", ""), fileName).Replace("\\", "/")
);

var text = await new StreamReader(
string text = await new StreamReader(
(await blockBlob.DownloadAsync()).Value.Content,
Encoding.UTF8
).ReadToEndAsync();
Expand Down Expand Up @@ -216,7 +216,7 @@ string pid
Path.Combine("maus", version.ToString(), format.ToString(), pid + "_maus.json")
);

var text = await new StreamReader(
string text = await new StreamReader(
(await blockBlob.DownloadAsync()).Value.Content,
Encoding.UTF8
).ReadToEndAsync();
Expand Down
2 changes: 1 addition & 1 deletion EDIFileLoader/EDIFileLoader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Optional: Declare that the Repository URL can be published to NuSpec -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RepositoryUrl>https://github.com/Hochfrequenz/EDILibrary</RepositoryUrl>
<TargetFrameworks>net8.0;net9.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net9.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.26.0" />
Expand Down
16 changes: 9 additions & 7 deletions EDIFileLoader/StorageNetLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,13 @@ var blob in await Storage.ListAsync(
)
)
{
if (blob.IsFile)
if (!blob.IsFile)
{
var text = await GetUTF8TextFromPath(blob.FullPath);
Cache[folder.Name.TrimEnd('/')].TryAdd(blob.Name, text);
continue;
}

string text = await GetUTF8TextFromPath(blob.FullPath);
Cache[folder.Name.TrimEnd('/')].TryAdd(blob.Name, text);
}
}
})
Expand Down Expand Up @@ -146,7 +148,7 @@ public async Task<string> LoadEDITemplate(EDIFileInfo info, string type)
}
try
{
var text = await GetUTF8TextFromPath(
string text = await GetUTF8TextFromPath(
Path.Combine(
Root != "/" ? Root : "",
"edi",
Expand Down Expand Up @@ -196,7 +198,7 @@ public Task<string> LoadJSONTemplate(string fileName)
public async Task<string> LoadJSONTemplate(string formatPackage, string fileName)
{
var format = Enum.Parse<EdifactFormat>(formatPackage.Split("|").First());
var version = formatPackage.Split("|").Last();
string version = formatPackage.Split("|").Last();
return await LoadJSONTemplate(format, version, fileName);
}

Expand All @@ -223,7 +225,7 @@ string fileName
}
try
{
var text = await GetUTF8TextFromPath(
string text = await GetUTF8TextFromPath(
Path.Combine(Root != "/" ? Root : "", version.Replace("/", ""), fileName)
.Replace("\\", "/")
);
Expand Down Expand Up @@ -277,7 +279,7 @@ string pid
}
try
{
var text = await GetUTF8TextFromPath(
string text = await GetUTF8TextFromPath(
Path.Combine(
Root != "/" ? Root : "",
"maus",
Expand Down
22 changes: 11 additions & 11 deletions EDILibrary/CSVMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ public class CSVMapper
{
protected static void ParseStep(JObject step, StringBuilder builder)
{
var stepName = step.Property("name").Value.Value<string>();
string stepName = step.Property("name").Value.Value<string>();
foreach (JObject group in step.Property("groups").Value as JArray)
{
var groupName = group.Property("key").Value.Value<string>();
string groupName = group.Property("key").Value.Value<string>();
if (group.Property("fields") != null)
{
foreach (JObject field in @group.Property("fields").Value as JArray)
Expand All @@ -32,7 +32,7 @@ var subStep in (
}
else
{
var fieldName = field.Property("key").Value.Value<string>();
string fieldName = field.Property("key").Value.Value<string>();
builder.Append(string.Format("{0}/{1};", groupName, fieldName));
}
}
Expand All @@ -53,7 +53,7 @@ var subStep in (field.Property("steps").Value as JObject).Properties()
}
else
{
var fieldName = field.Property("key").Value.Value<string>();
string fieldName = field.Property("key").Value.Value<string>();
builder.Append(string.Format("{0};", fieldName));
}
}
Expand Down Expand Up @@ -141,8 +141,8 @@ JObject localRoot
{
if (segment.Contains("|"))
{
var segmentParts = segment.Split('|');
var newSegment = string.Join("|", segmentParts.Skip(1));
string[] segmentParts = segment.Split('|');
string newSegment = string.Join("|", segmentParts.Skip(1));
if (localRoot.Property(segmentParts[0]) == null)
{
var newChilds = new JArray(new JObject());
Expand All @@ -169,16 +169,16 @@ public static List<string> CreateJSONFromCSV(string csv)
{
//first split header line from content lines
var lines = csv.LowMemSplit(Environment.NewLine);
var segments = lines[0].Split(new[] { ";" }, StringSplitOptions.None);
string[] segments = lines[0].Split(new[] { ";" }, StringSplitOptions.None);
var returnList = new List<string>();
foreach (var line in lines.Skip(1))
foreach (string line in lines.Skip(1))
{
var lineSegments = line.Split(new[] { ";" }, StringSplitOptions.None);
var index = 0;
string[] lineSegments = line.Split(new[] { ";" }, StringSplitOptions.None);
int index = 0;
var lineObject = new JObject();
var nachrichtObject = new JObject { { "Nachricht", new JArray(lineObject) } };
var dokumentObject = new JObject { { "Dokument", new JArray(nachrichtObject) } };
foreach (var segment in segments)
foreach (string segment in segments)
{
BuildObjectFromSegment(segment, lineSegments[index], lineObject);
index++;
Expand Down
8 changes: 4 additions & 4 deletions EDILibrary/EDIFACTEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static string GetDescription(string name)
var fields = typeof(EDIEnums).GetRuntimeFields().ToArray();
foreach (var field in fields)
{
var att = field
object att = field
.GetCustomAttributes(typeof(DescriptionAttribute), false)
.FirstOrDefault();
if (att != null)
Expand All @@ -62,7 +62,7 @@ public static string GetDescription(string name)

public static string GetAPERAKDescription(EDIEnums enumValue)
{
var name = enumValue.ToString();
string name = enumValue.ToString();
var attrs =
(IEnumerable<Attribute>)
enumValue
Expand All @@ -82,7 +82,7 @@ public static string GetAPERAKDescription(EDIEnums enumValue)

public static string GetEDIDescription(EDIEnums enumValue)
{
var name = enumValue.ToString();
string name = enumValue.ToString();
var attrs =
(IEnumerable<Attribute>)
enumValue
Expand All @@ -102,7 +102,7 @@ public static string GetEDIDescription(EDIEnums enumValue)

public static string GetDescription(EDIEnums enumValue)
{
var name = enumValue.ToString();
string name = enumValue.ToString();
var attrs =
(IEnumerable<Attribute>)
enumValue
Expand Down
21 changes: 12 additions & 9 deletions EDILibrary/EDIHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ private static EdifactSpecialChars GetSpecialChars(string edi)
{
if (edi.StartsWith("UNA"))
{
var una = edi[..9];
var segmentDelimiter = una.Substring(8, 1);
string una = edi[..9];
string segmentDelimiter = una.Substring(8, 1);
// ReSharper disable once MergeIntoLogicalPattern (wegen abwärtskompatibilität)
if (segmentDelimiter == "U" || segmentDelimiter == "\n" || segmentDelimiter == "\r")
{
Expand Down Expand Up @@ -283,7 +283,7 @@ public static string NormalizeEDIHeader(string edi)

edi = RemoveBOM(edi); // todo: check why RemoveBOM is still used and RemoveByteOrderMark does not work
var specialChars = GetSpecialChars(edi);
var message = GetActualMessage(edi, specialChars);
string message = GetActualMessage(edi, specialChars);
if (specialChars.EscapeChar != DefaultEscapeChar)
{
if (specialChars.ElementDelimiter != DefaultElementDelimiter)
Expand Down Expand Up @@ -321,9 +321,12 @@ public static EDIFileInfo GetEdiFileInfo(string edi, bool maskUTILMDX = true)
{
edi = RemoveBOM(edi); // todo: check why RemoveBOM is still used and RemoveByteOrderMark does not work
var specialChars = GetSpecialChars(edi);
var message = GetActualMessage(edi, specialChars);
var segments = message.LowMemSplit(specialChars.SegmentDelimiter).Take(2).ToArray();
var unb = segments[0];
string message = GetActualMessage(edi, specialChars);
string[] segments = message
.LowMemSplit(specialChars.SegmentDelimiter)
.Take(2)
.ToArray();
string unb = segments[0];
string unh;
try
{
Expand All @@ -337,8 +340,8 @@ public static EDIFileInfo GetEdiFileInfo(string edi, bool maskUTILMDX = true)
);
}

var unbParts = unb.Split(specialChars.GroupDelimiter.ToCharArray());
var unhParts = unh.Split(specialChars.GroupDelimiter.ToCharArray());
string[] unbParts = unb.Split(specialChars.GroupDelimiter.ToCharArray());
string[] unhParts = unh.Split(specialChars.GroupDelimiter.ToCharArray());

var sender = new EDIPartner
{
Expand All @@ -356,7 +359,7 @@ public static EDIFileInfo GetEdiFileInfo(string edi, bool maskUTILMDX = true)
: "500",
ID = unbParts[3].Split(specialChars.ElementDelimiter.ToCharArray())[0],
};
var version = unhParts[2].Split(specialChars.ElementDelimiter.ToCharArray())[4];
string version = unhParts[2].Split(specialChars.ElementDelimiter.ToCharArray())[4];
var format = Enum.Parse<EdifactFormat>(
unhParts[2].Split(specialChars.ElementDelimiter.ToCharArray())[0]
);
Expand Down
Loading
Loading