From d5c373e420d50820c40796a55f5802e889429c9b Mon Sep 17 00:00:00 2001 From: Bondar Bogdan <36962546+bogdan-bondar@users.noreply.github.com> Date: Thu, 23 May 2019 09:12:42 +0200 Subject: [PATCH] fixed conditions evaluations, that always resulted in true (#844) Signed-off-by: Bogdan Bondar --- .../org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java | 2 +- .../detailslayout/DistributionSetMetadataDetailsLayout.java | 2 +- .../ui/common/detailslayout/TargetMetadataDetailsLayout.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java index 8e6f84f06..6692f2fb3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java @@ -340,7 +340,7 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst } return null; })); - } while (tenants.hasNext() && (query = tenants.nextPageable()) != null); + } while ((query = tenants.nextPageable()) != Pageable.unpaged()); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadataDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadataDetailsLayout.java index d6b55ce1a..138483d79 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadataDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadataDetailsLayout.java @@ -66,7 +66,7 @@ public class DistributionSetMetadataDetailsLayout extends AbstractMetadataDetail selectedDistSetId = distributionSet.getId(); final List dsMetadataList = distributionSetManagement .findMetaDataByDistributionSetId(PageRequest.of(0, MAX_METADATA_QUERY), selectedDistSetId).getContent(); - if (null != dsMetadataList && !dsMetadataList.isEmpty()) { + if (!dsMetadataList.isEmpty()) { dsMetadataList.forEach(this::setMetadataProperties); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java index aae34d46f..f5821c9e7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java @@ -66,7 +66,7 @@ public class TargetMetadataDetailsLayout extends AbstractMetadataDetailsLayout { final List targetMetadataList = targetManagement .findMetaDataByControllerId(PageRequest.of(0, MAX_METADATA_QUERY), target.getControllerId()) .getContent(); - if (targetMetadataList != null && !targetMetadataList.isEmpty()) { + if (!targetMetadataList.isEmpty()) { targetMetadataList.forEach(this::setMetadataProperties); } }