From 301b7925997e1f936b1239fb9a5cab0e330ffb54 Mon Sep 17 00:00:00 2001 From: Seraphym-Tuhai Date: Thu, 20 Apr 2023 13:45:25 +0300 Subject: [PATCH] refactoring --- .../msa/ui/base/AbstractDriverBaseTest.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java index a03d742a5f..a1d5b27c37 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java @@ -48,7 +48,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.time.Duration; import java.util.List; -import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -138,23 +137,15 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest { } public static RuleChain getRuleChainByName(String name) { - Optional ruleChain = testRestClient.getRuleChains(pageLink).getData().stream() + return testRestClient.getRuleChains(pageLink).getData().stream() .filter(s -> s.getName().equals(name)) - .findFirst(); - return ruleChain.orElseGet(() -> { - log.error("No rule chains found with name: " + name); - return null; - }); + .findFirst().orElse(null); } public List getRuleChainsByName(String name) { - List ruleChains = testRestClient.getRuleChains(pageLink).getData().stream() + return testRestClient.getRuleChains(pageLink).getData().stream() .filter(s -> s.getName().equals(name)) .collect(Collectors.toList()); - if (ruleChains.isEmpty()) { - log.error("No rule chains found with name: " + name); - } - return ruleChains; } public static Customer getCustomerByName(String name) {