[java-metadata-aggregator] 01/02: Remove redundant null checks

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch main
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=d0d5296f138dcf3a2c094dbc2a29a51a822f8021

commit d0d5296f138dcf3a2c094dbc2a29a51a822f8021
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Sep 11 11:31:26 2020 +0100

    Remove redundant null checks
---
 .../net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
index cf61506..d10f4bf 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
@@ -43,10 +43,7 @@ public class DeduplicatingItemIdMergeStrategy implements CollectionMergeStrategy
         final HashSet<ItemId> presentItemIds = new HashSet<>();
 
         for (final Item<T> item : target) {
-            final var itemIds = item.getItemMetadata().get(ItemId.class);
-            if (itemIds != null) {
-                presentItemIds.addAll(itemIds);
-            }
+            presentItemIds.addAll(item.getItemMetadata().get(ItemId.class));
         }
 
         for (final List<Item<T>> source : sources) {
@@ -69,7 +66,7 @@ public class DeduplicatingItemIdMergeStrategy implements CollectionMergeStrategy
             @Nonnull @NonnullElements final List<Item<T>> sourceItems) {
         for (final Item<T> sourceItem : sourceItems) {
             final var itemIds = sourceItem.getItemMetadata().get(ItemId.class);
-            if (itemIds == null || itemIds.isEmpty()) {
+            if (itemIds.isEmpty()) {
                 target.add(sourceItem);
                 continue;
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.