Skip to content

Minor issue #143

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
StuartFerguson merged 2 commits into from
May 27, 2022
Merged

Minor issue #143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3f3cac
Minor issue
StuartFerguson May 27, 2022
8f1d6f0
Merge branch 'master' into task/getconfigsectionasobject
StuartFerguson May 27, 2022
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
34 changes: 27 additions & 7 deletions Shared/General/ConfigurationReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static Uri GetBaseServerUri(String serviceName) {
/// <param name="keyName">Name of the key.</param>
/// <returns></returns>
public static String GetConnectionString(String keyName) {
return ConfigurationReader.GetValueFromSection<String>("ConnectionStrings", keyName);
return ConfigurationReader.GetValueFromSection("ConnectionStrings", keyName);
}

/// <summary>
Expand All @@ -54,7 +54,7 @@ public static String GetConnectionString(String keyName) {
/// <param name="keyName">Name of the key.</param>
/// <returns></returns>
public static String GetValue(String keyName) {
return ConfigurationReader.GetValueFromSection<String>("AppSettings", keyName);
return ConfigurationReader.GetValueFromSection("AppSettings", keyName);
}

/// <summary>
Expand All @@ -65,12 +65,12 @@ public static String GetValue(String keyName) {
/// <returns></returns>
public static String GetValue(String sectionName,
String keyName) {
return ConfigurationReader.GetValueFromSection<String>(sectionName, keyName);
return ConfigurationReader.GetValueFromSection(sectionName, keyName);
}

public static T GetValue<T>(String sectionName,
String keyName) {
return ConfigurationReader.GetValueFromSection<T>(sectionName, keyName);
public static T GetValueFromSection<T>(String sectionName,
String keyName) {
return ConfigurationReader.GetTypedValueFromSection<T>(sectionName, keyName);
}

/// <summary>
Expand All @@ -83,7 +83,27 @@ public static void Initialise(IConfigurationRoot configurationRoot) {
ConfigurationReader.IsInitialised = true;
}

private static T GetValueFromSection<T>(String sectionName,
private static String GetValueFromSection(String sectionName, String keyName)
{
if (!ConfigurationReader.IsInitialised)
{
throw new InvalidOperationException("Configuration Reader has not been initialised");
}
IConfigurationSection section = ConfigurationReader.ConfigurationRoot.GetSection(sectionName);
if (section == null)
{
throw new Exception($"Section [{sectionName}] not found.");
}

if (section[keyName] == null)
{
throw new Exception($"No configuration value was found for key [{sectionName}:{keyName}]");
}

return section[keyName];
}

private static T GetTypedValueFromSection<T>(String sectionName,
String keyName) {
if (!ConfigurationReader.IsInitialised) {
throw new InvalidOperationException("Configuration Reader has not been initialised");
Expand Down