Do not add message about not-found components if none has been detected Change-Id: Iea95db12b60cc956e6059ed8b01a18a3562665e5 Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
diff --git a/src/main/java/io/fd/maintainer/plugin/util/CommonTasks.java b/src/main/java/io/fd/maintainer/plugin/util/CommonTasks.java index aed5e96..ef08b7b 100644 --- a/src/main/java/io/fd/maintainer/plugin/util/CommonTasks.java +++ b/src/main/java/io/fd/maintainer/plugin/util/CommonTasks.java
@@ -20,7 +20,6 @@ import static io.fd.maintainer.plugin.service.ComponentReviewInfo.ComponentReviewInfoState.COMPONENT_FOUND; import static io.fd.maintainer.plugin.service.ComponentReviewInfo.ComponentReviewInfoState.COMPONENT_NOT_FOUND; import static java.lang.String.format; -import static java.util.Objects.nonNull; import static java.util.stream.Collectors.toMap; import com.google.common.collect.LinkedListMultimap; @@ -92,15 +91,14 @@ LINE_SEPARATOR, formatFiles(componentToAffectedFileIndex.get(key)), LINE_SEPARATOR)) .collect(Collectors.joining(LINE_SEPARATOR)); + if (componentNotFoundReviewInfos.isEmpty()) { + return messageComponentsFound; + } + final String messageComponentsNotFound = format("No component found for following files%s%s", LINE_SEPARATOR, formatFilesWithNoComponent(componentNotFoundReviewInfos)); - - if (nonNull(messageComponentsNotFound)) { - return messageComponentsFound.concat(LINE_SEPARATOR).concat(messageComponentsNotFound); - } else { - return messageComponentsFound; - } + return messageComponentsFound.concat(LINE_SEPARATOR).concat(messageComponentsNotFound); } static String formatFilesWithNoComponent(final List<ComponentReviewInfo> componentNotFoundReviewInfos) {