From bd4a27c1e5fe3278e5b1366e563edf73dce540c3 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Fri, 2 Aug 2024 14:03:19 +0200 Subject: [PATCH 1/4] fix invalid usage of == operator --- .../org/dspace/submit/listener/MetadataListenerConstrain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java b/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java index 37ec63604385..496dab2018cd 100644 --- a/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java +++ b/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java @@ -63,7 +63,7 @@ public String getConstrainMetadataName(String metadataName) { constrainMetadata = this.metadata.get(metadataName); if (constrainMetadata == null) { for (Map.Entry entry : metadata.entrySet()) { - if (entry.getValue() == metadataName) { + if (entry.getValue().equals(metadataName)) { constrainMetadata = entry.getKey(); break; } @@ -77,7 +77,7 @@ public String getConstrainMetadataName(String metadataName) { public boolean hasConstrain(String metadataName) { boolean hasConstrain = false; for (Map.Entry entry : metadata.entrySet()) { - if (entry.getKey() == metadataName || entry.getValue() == metadataName) { + if (entry.getKey().equals(metadataName) || entry.getValue().equals(metadataName)) { hasConstrain = true; break; } From cb25a776c6dc92eb0ab41819d5150bec8bad47a0 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Fri, 2 Aug 2024 15:10:08 +0200 Subject: [PATCH 2/4] fix invalid usage of == --- .../java/org/dspace/app/deduplication/utils/DedupUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java b/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java index b4c29d8780c9..45b021e70ccd 100644 --- a/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java +++ b/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java @@ -267,7 +267,7 @@ public boolean matchExist(Context context, UUID itemID, UUID targetItemID, Integ @Override public boolean rejectAdminDups(Context context, UUID firstId, UUID secondId, Integer type) throws SQLException, AuthorizeException { - if (firstId == secondId) { + if (firstId.equals(secondId)) { return false; } if (!AuthorizeServiceFactory.getInstance().getAuthorizeService().isAdmin(context)) { @@ -327,7 +327,7 @@ public boolean rejectAdminDups(Context context, UUID itemID, String signatureTyp boolean found = false; for (DSpaceObject item : dsi.getItems()) { if (item != null) { - if (item.getID() == itemID) { + if (item.getID().equals(itemID)) { found = true; break; } From 128882a2fc448f0acaec84eebe978c2c113b3375 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Fri, 2 Aug 2024 15:11:46 +0200 Subject: [PATCH 3/4] fix invalid usage of == --- .../src/main/java/org/dspace/content/ItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java index 8e63bf7b71a4..92e7949aa6a9 100644 --- a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java @@ -321,7 +321,7 @@ private Thumbnail retrieveThumbnail(Context context, Item item, String bundle, Optional primaryBitstream = bundles.get(0).getBitstreams().stream().filter(bitstream -> { return bitstream.getMetadata().stream().anyMatch(metadataValue -> { if (metadataField != null) { - return metadataValue.getMetadataField().getID() == metadataField.getID() + return metadataValue.getMetadataField().getID().equals(metadataField.getID()) && metadataValue.getValue() != null && metadataValue.getValue().equalsIgnoreCase(value); } else { @@ -2111,7 +2111,7 @@ protected void moveSingleMetadataValue(Context context, Item dso, int place, Met //Retrieve the applicable relationship Relationship rs = relationshipService.find(context, ((RelationshipMetadataValue) rr).getRelationshipId()); - if (rs.getLeftItem() == dso) { + if (rs.getLeftItem().equals(dso)) { rs.setLeftPlace(place); } else { rs.setRightPlace(place); From 961c2f1e38909ac5a29c6bb05c6901ea3eaf1b2c Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Fri, 14 Mar 2025 21:12:45 +0100 Subject: [PATCH 4/4] resolve merge conflicts in AccountServiceImpl (#5) --- .../java/org/dspace/eperson/AccountServiceImpl.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java index 61941d6181e0..e6f35e7bb7bc 100644 --- a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java @@ -101,15 +101,9 @@ protected AccountServiceImpl() { * * @param context DSpace context * @param email Email address to send the registration email to -<<<<<<< HEAD - * @throws java.sql.SQLException passed through. - * @throws java.io.IOException passed through. - * @throws javax.mail.MessagingException passed through. -======= * @throws java.sql.SQLException passed through. * @throws java.io.IOException passed through. * @throws jakarta.mail.MessagingException passed through. ->>>>>>> dspace-8.0 * @throws org.dspace.authorize.AuthorizeException passed through. */ @Override @@ -138,15 +132,9 @@ public void sendRegistrationInfo(Context context, String email, List group * * @param context DSpace context * @param email Email address to send the forgot-password email to -<<<<<<< HEAD - * @throws java.sql.SQLException passed through. - * @throws java.io.IOException passed through. - * @throws javax.mail.MessagingException passed through. -======= * @throws java.sql.SQLException passed through. * @throws java.io.IOException passed through. * @throws jakarta.mail.MessagingException passed through. ->>>>>>> dspace-8.0 * @throws org.dspace.authorize.AuthorizeException passed through. */ @Override