Skip to content

fix invalid usage of == operator #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main-cris
Choose a base branch
from
Open

fix invalid usage of == operator #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd4a27c
fix invalid usage of == operator
saschaszott Aug 2, 2024
cb25a77
fix invalid usage of ==
saschaszott Aug 2, 2024
128882a
fix invalid usage of ==
saschaszott Aug 2, 2024
05414b0
Merge branch 'main-cris' into patch-42
saschaszott Mar 11, 2025
961c2f1
resolve merge conflicts in AccountServiceImpl (#5)
saschaszott Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ private Thumbnail retrieveThumbnail(Context context, Item item, String bundle,
Optional<Bitstream> 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 {
Expand Down
12 changes: 0 additions & 12 deletions dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -138,15 +132,9 @@ public void sendRegistrationInfo(Context context, String email, List<UUID> 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
Expand Down
4 changes: 2 additions & 2 deletions dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public String getConstrainMetadataName(String metadataName) {
constrainMetadata = this.metadata.get(metadataName);
if (constrainMetadata == null) {
for (Map.Entry<String,String> entry : metadata.entrySet()) {
if (entry.getValue() == metadataName) {
if (entry.getValue().equals(metadataName)) {
constrainMetadata = entry.getKey();
break;
}
Expand All @@ -77,7 +77,7 @@ public String getConstrainMetadataName(String metadataName) {
public boolean hasConstrain(String metadataName) {
boolean hasConstrain = false;
for (Map.Entry<String,String> entry : metadata.entrySet()) {
if (entry.getKey() == metadataName || entry.getValue() == metadataName) {
if (entry.getKey().equals(metadataName) || entry.getValue().equals(metadataName)) {
hasConstrain = true;
break;
}
Expand Down
Loading