Skip to content

Allow input and setting files on command line #848

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

Closed
lilinus wants to merge 3 commits into from
Closed

Allow input and setting files on command line #848

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a7e82c
Fix input validation
lilinus Dec 18, 2025
c21a44b
Update SettingsValidator.cs
lilinus Dec 18, 2025
057bb32
Merge branch 'christianhelle:main' into oas-and-setting-files-fix
lilinus Dec 22, 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
28 changes: 16 additions & 12 deletions src/Refitter/SettingsValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,26 @@ public static class SettingsValidator
{
public static ValidationResult Validate(Settings settings)
{
if (BothSettingsFilesAreEmpty(settings) || BothSettingsFilesArePresent(settings))
if (string.IsNullOrWhiteSpace(settings.OpenApiPath) &&
string.IsNullOrWhiteSpace(settings.SettingsFilePath))
{
return GetValidationErrorForSettingsFiles();
return GetValidationErrorForNoInputNoSettings();
}

return !string.IsNullOrWhiteSpace(settings.SettingsFilePath)
? ValidateFilePath(settings)
: ValidateOperationNameAndUrl(settings);
}

private static bool BothSettingsFilesAreEmpty(Settings settings)
private static ValidationResult GetValidationErrorForNoInputNoSettings()
{
return string.IsNullOrWhiteSpace(settings.OpenApiPath) &&
string.IsNullOrWhiteSpace(settings.SettingsFilePath);
return ValidationResult.Error(
"You should specify an input URL/file directly " +
"or use specify it in 'openApiPath' from the settings file");
}

private static bool BothSettingsFilesArePresent(Settings settings)
{
return !string.IsNullOrWhiteSpace(settings.OpenApiPath) &&
!string.IsNullOrWhiteSpace(settings.SettingsFilePath);
}

private static ValidationResult GetValidationErrorForSettingsFiles()
private static ValidationResult GetValidationErrorForTwoInputFiles()
{
return ValidationResult.Error(
"You should either specify an input URL/file directly " +
Expand All @@ -41,7 +38,6 @@ private static ValidationResult ValidateFilePath(Settings settings)
{
var json = File.ReadAllText(settings.SettingsFilePath!);
var refitGeneratorSettings = Serializer.Deserialize<RefitGeneratorSettings>(json);
settings.OpenApiPath = refitGeneratorSettings.OpenApiPath;

return ValidateFileAndOutputSettings(settings, refitGeneratorSettings);
}
Expand All @@ -50,6 +46,14 @@ private static ValidationResult ValidateFileAndOutputSettings(
Settings settings,
RefitGeneratorSettings refitGeneratorSettings)
{
if (!string.IsNullOrWhiteSpace(settings.OpenApiPath) &&
!string.IsNullOrWhiteSpace(refitGeneratorSettings.OpenApiPath))
{
return GetValidationErrorForTwoInputFiles();
}

settings.OpenApiPath = refitGeneratorSettings.OpenApiPath;

if (string.IsNullOrWhiteSpace(refitGeneratorSettings.OpenApiPath))
{
return GetValidationErrorForOpenApiPath();
Expand Down
Loading