From cd9752090fb4848ecd766dbb1fc5d767016445f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awek=20Zatorski?= <zatorski@gmail.com>
Date: Mon, 16 Dec 2024 22:59:05 +0100
Subject: [PATCH] fix nullpointer

---
 .../com/sasiedzi/event/domain/TransactionItemComparator.java   | 3 ++-
 .../java/com/sasiedzi/event/domain/UserAccountComparator.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java b/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java
index c3b8b1b..8412113 100644
--- a/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java
+++ b/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java
@@ -1,6 +1,7 @@
 package com.sasiedzi.event.domain;
 
 import java.util.Comparator;
+import java.util.Objects;
 
 public class TransactionItemComparator implements Comparator<TransactionItem> {
 
@@ -11,7 +12,7 @@ public class TransactionItemComparator implements Comparator<TransactionItem> {
         if (item1 == null && item2 == null) return 0;
         if (item1 == null) return -1;
         if (item2 == null) return 1;
-        if (item1.getId().equals(item2.getId())) return 0;
+        if (Objects.equals(item1.getId(), item2.getId())) return 0;
 
         // Teraz porównujemy pola userAccount
         return compareUserAccounts(item1.getUserAccount(), item2.getUserAccount());
diff --git a/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java b/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java
index 800eb6b..2d97047 100644
--- a/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java
+++ b/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java
@@ -4,6 +4,7 @@ import com.sasiedzi.event.service.Account;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Objects;
 
 public class UserAccountComparator implements Comparator<UserAccount> {
 
@@ -22,7 +23,7 @@ public class UserAccountComparator implements Comparator<UserAccount> {
         if (ua1 == null && ua2 == null) return 0;
         if (ua1 == null) return -1;
         if (ua2 == null) return 1;
-        if (ua1.getId().equals(ua2.getId())) return 0;
+        if (Objects.equals(ua1.getId(), ua2.getId())) return 0;
 
         String name1 = ua1.getName();
         String name2 = ua2.getName();