Skip to content

Commit df03d31

Browse files
committed
refactor(SeriesInfoExtractorServiceImpl.extractCondition): extract common logic.
1 parent ab7604d commit df03d31

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImpl.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,7 @@ public SeriesExtractedInfo extract(String pageUrl, RawParsedDataDto data) {
499499
}
500500

501501
// @todo #1326 SeriesInfoExtractorServiceImpl.extractCondition(): add unit tests
502-
@SuppressWarnings({
503-
"checkstyle:missingswitchdefault",
504-
"PMD.SwitchStmtsShouldHaveDefault"
505-
})
502+
@SuppressWarnings("PMD.AvoidBranchingStatementAsLastInLoop")
506503
/* default */ SeriesCondition extractCondition(String fragment) {
507504
if (StringUtils.isBlank(fragment)) {
508505
return null;
@@ -513,20 +510,24 @@ public SeriesExtractedInfo extract(String pageUrl, RawParsedDataDto data) {
513510
' '
514511
);
515512
for (String candidate : candidates) {
513+
SeriesCondition condition;
516514
switch(candidate) {
517515
case "CTO":
518516
case "MNH":
519517
case "MNHOG":
520518
case "MVLH":
521-
SeriesCondition condition = SeriesCondition.valueOf(candidate);
522-
log.debug("Condition is {}", condition);
523-
return condition;
519+
condition = SeriesCondition.valueOf(candidate);
520+
break;
524521
case "ГАШ":
525522
case "ГАШ.":
526523
case "ГАШЕНЫЕ":
527-
log.debug("Condition is CANCELLED");
528-
return SeriesCondition.CANCELLED;
524+
condition = SeriesCondition.CANCELLED;
525+
break;
526+
default:
527+
continue;
529528
}
529+
log.debug("Condition is {}", condition);
530+
return condition;
530531
}
531532

532533
log.debug("Could not extract condition from a fragment");

0 commit comments

Comments
 (0)