LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Use Objects.equals where possible 

Former-commit-id: 68f5b47da6
restapi
Jens Pelzetter 2020-06-06 17:59:58 +02:00
parent acfa6b7b5b
commit a549db6035
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ccm-core/src/main/java/org/libreccm/api/admin/categorization/DomainsApi.java
View File

@ -36,6 +36,7 @@ import java.time.Instant;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAccessor;
import java.util.Date; import java.util.Date;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
@ -155,7 +156,9 @@ public class DomainsApi {
boolean updated = false; boolean updated = false;
if (!domainData.getDescription().equals(domain.getDescription())) { if (!Objects.equals(
domainData.getDescription(), domain.getDescription()
)) {
domain.setDescription(domainData.getDescription()); domain.setDescription(domainData.getDescription());
updated = true; updated = true;
} }
@ -163,7 +166,7 @@ public class DomainsApi {
final String domainReleased = DateTimeFormatter.ISO_DATE_TIME.format( final String domainReleased = DateTimeFormatter.ISO_DATE_TIME.format(
domain.getReleased().toInstant() domain.getReleased().toInstant()
); );
if (!domainData.getReleased().equals(domainReleased)) { if (!Objects.equals(domainData.getReleased(), domainReleased)) {
final TemporalAccessor released = DateTimeFormatter.ISO_DATE_TIME final TemporalAccessor released = DateTimeFormatter.ISO_DATE_TIME
.parse(domainData.getReleased()); .parse(domainData.getReleased());
final Instant relasedInstant = Instant.from(released); final Instant relasedInstant = Instant.from(released);
@ -171,12 +174,12 @@ public class DomainsApi {
updated = true; updated = true;
} }
if (!domainData.getTitle().equals(domain.getTitle())) { if (!Objects.equals(domainData.getTitle(), domain.getTitle())) {
domain.setTitle(domainData.getTitle()); domain.setTitle(domainData.getTitle());
updated = true; updated = true;
} }
if (!domainData.getVersion().equals(domain.getVersion())) { if (!Objects.equals(domainData.getVersion(), domain.getVersion())) {
domain.setVersion(domainData.getVersion()); domain.setVersion(domainData.getVersion());
updated = true; updated = true;
} }

8
ccm-core/src/main/java/org/libreccm/api/admin/security/UsersApi.java
View File

@ -24,7 +24,6 @@ import org.libreccm.api.admin.security.dto.PartyRoleMembership;
import org.libreccm.api.dto.ListView; import org.libreccm.api.dto.ListView;
import org.libreccm.core.CoreConstants; import org.libreccm.core.CoreConstants;
import java.net.URI;
import java.util.List; import java.util.List;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
@ -53,6 +52,7 @@ import org.libreccm.security.User;
import org.libreccm.security.UserManager; import org.libreccm.security.UserManager;
import org.libreccm.security.UserRepository; import org.libreccm.security.UserRepository;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
@ -258,14 +258,12 @@ public class UsersApi {
final User user = repository.findUser(userIdentifier); final User user = repository.findUser(userIdentifier);
boolean updated = false; boolean updated = false;
if (userData.getFamilyName() != null if (!Objects.equals(userData.getFamilyName(), user.getFamilyName())) {
&& !userData.getFamilyName().equals(user.getFamilyName())) {
user.setFamilyName(userData.getFamilyName()); user.setFamilyName(userData.getFamilyName());
updated = true; updated = true;
} }
if (userData.getGivenName() != null if (!Objects.equals(userData.getGivenName(), user.getGivenName())) {
&& !userData.getGivenName().equals(user.getGivenName())) {
user.setGivenName(userData.getGivenName()); user.setGivenName(userData.getGivenName());
updated = true; updated = true;
} }