Skip to content

Refactor TagImporter to remove unnecessary Optional parameters #547

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
redcatbear merged 2 commits into from
Jun 17, 2026
+8 −9
Merged

Refactor TagImporter to remove unnecessary Optional parameters #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
791f681
#545: Refactor TagImporter to avoid Optional parameters (Sonar S3553)
redcatbear Jun 16, 2026
5a779f4
Merge branch 'main' into refactoring/545_tagimporter-avoids-optional-…
redcatbear Jun 17, 2026
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
1 change: 1 addition & 0 deletions doc/changes/changes_4.6.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ We moved some GitHub action permissions from workflow-level to job-level.
## Refactoring

* #546: Replaced `OsDetector` with JUnit5's `EnabledOnOs` annotation.
* #544: Replaced optional parameter with null check
* #543: Made `CliException` a `RuntimeException`
11 changes: 5 additions & 6 deletions importer/tag/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

import org.itsallcode.openfasttrace.api.importer.ImportEventListener;
import org.itsallcode.openfasttrace.api.importer.Importer;
Expand All @@ -25,21 +24,21 @@ class TagImporter implements Importer
this.file = file;
}

static TagImporter create(final Optional<PathConfig> config, final InputFile file,
static TagImporter create(final PathConfig config, final InputFile file,
final ImportEventListener listener)
{
final LineConsumer lineConsumer = createLineConsumer(config, file, listener);
return new TagImporter(lineConsumer, file);
}

private static LineConsumer createLineConsumer(final Optional<PathConfig> config,
final InputFile file, final ImportEventListener listener)
private static LineConsumer createLineConsumer(final PathConfig config, final InputFile file,
final ImportEventListener listener)
{
final List<LineConsumer> importers = new ArrayList<>();
importers.add(new LongTagImportingLineConsumer(file, listener));
if (config.isPresent())
if (config != null)
{
importers.add(new ShortTagImportingLineConsumer(config.get(), file, listener));
importers.add(new ShortTagImportingLineConsumer(config, file, listener));
}
return new DelegatingLineConsumer(importers);
}
Expand Down
2 changes: 1 addition & 1 deletion importer/tag/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public Importer createImporter(final InputFile path, final ImportEventListener l
+ DEFAULT_FILE_REGEX + " and " + getPathConfigs().toList());
}
final Optional<PathConfig> config = findConfig(path);
return TagImporter.create(config, path, listener);
return TagImporter.create(config.orElse(null), path, listener);
}

private Stream<PathConfig> getPathConfigs()
Expand Down
3 changes: 1 addition & 2 deletions ...ag/src/test/java/org/itsallcode/openfasttrace/importer/tag/TestTagImporterWithConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.io.StringReader;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Optional;

import org.itsallcode.openfasttrace.api.core.SpecificationItemId;
import org.itsallcode.openfasttrace.api.importer.ImportEventListener;
Expand Down Expand Up @@ -152,6 +151,6 @@ private void runImport(final String content)
final InputFile file = StreamInput.forReader(FILE,
new BufferedReader(new StringReader(content)));

TagImporter.create(Optional.of(this.configMock), file, this.listenerMock).runImport();
TagImporter.create(this.configMock, file, this.listenerMock).runImport();
}
}
Loading