Formatter refactoring #3919
Formatter refactoring #3919
Conversation
| if (formatter.isPresent()) { | ||
| return formatter; | ||
| Optional<Formatter> formatter = getAll().stream().filter(f -> f.getKey().equals(modifier)).findAny(); | ||
| if (formatter.isPresent()) { |
There was a problem hiding this comment.
That does not make any sense does it?
The method returns an optional. So you can directly return formatter.
There was a problem hiding this comment.
If no formatter is found, then we still want to try the switch at the end. I now reordered the code a bit and it should be clearer now. Good point.
| new NormalizePagesFormatter(), | ||
| new OrdinalsToSuperscriptFormatter(), | ||
| new ProtectTermsFormatter(protectedTermsLoader), | ||
| new RegexFormatter("(\" \",\"-\")"), |
There was a problem hiding this comment.
I don't want to do nitpkicking but that Regex Formatter indentation is clear off
There was a problem hiding this comment.
Yeah, no idea why there were these @formatter comments that prevented an automatic code formatting...
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("getFormatters") | ||
| public void getNameReturnsNotNull(Formatter formatter) { | ||
| void getNameReturnsNotNull(Formatter formatter) { |
There was a problem hiding this comment.
Why do you remove the public?
Codacy or whatever will complain that you should always use explicit scoping modifiers. I see no harm in using public here. I don't know if this even has to be public to be accessible from gradle
There was a problem hiding this comment.
It's the new convention with JUnit 5 that test classes and their methods are package private. IntellJ even complains if they are marked with public.
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| /** | ||
| * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest} | ||
| */ | ||
| public class RegexFormatterTest { | ||
| class RegexFormatterTest { |
Refactor the regular expression-based formatter. Previously, the regex was sent through a static
setRegexmethod, now it gets passed as a normal constructor argument.