From ec1d602685bee789ee8453edd67582ff08c0ab49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 14:51:11 +0000
Subject: [PATCH 1/5] Bump org.openrewrite.recipe:rewrite-recipe-bom from 3.2.0
to 3.4.0
Bumps [org.openrewrite.recipe:rewrite-recipe-bom](https://github.com/openrewrite/rewrite-recipe-bom) from 3.2.0 to 3.4.0.
- [Release notes](https://github.com/openrewrite/rewrite-recipe-bom/releases)
- [Commits](https://github.com/openrewrite/rewrite-recipe-bom/compare/v3.2.0...v3.4.0)
---
updated-dependencies:
- dependency-name: org.openrewrite.recipe:rewrite-recipe-bom
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 5336d5325c4..8d795f4226f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -403,7 +403,7 @@ dependencies {
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
- rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.2.0"))
+ rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.4.0"))
rewrite("org.openrewrite.recipe:rewrite-static-analysis")
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")
From e81576fa744db0626581b094fced162bfde10458 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 17 Mar 2025 22:31:33 +0100
Subject: [PATCH 2/5] Disable 404 rule
---
rewrite.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rewrite.yml b/rewrite.yml
index e3842701b47..4aa29301320 100644
--- a/rewrite.yml
+++ b/rewrite.yml
@@ -101,7 +101,8 @@ recipeList:
- org.openrewrite.java.migrate.io.ReplaceFileInOrOutputStreamFinalizeWithClose
- org.openrewrite.java.migrate.net.JavaNetAPIs
- - org.openrewrite.java.migrate.net.URLConstructorsToURIRecipes
+ # Got missing: https://rewriteoss.slack.com/archives/C01A843MWG5/p1742246698423949
+ # - org.openrewrite.java.migrate.net.URLConstructorsToURIRecipes
- org.openrewrite.java.migrate.util.OptionalNotEmptyToIsPresent
- org.openrewrite.java.migrate.util.OptionalNotPresentToIsEmpty
- org.openrewrite.java.migrate.util.SequencedCollection
From 77ae3d9a7113c82bf1fa1bdedf9316dcaed1ea07 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 17 Mar 2025 22:32:04 +0100
Subject: [PATCH 3/5] More org.openrewrite.staticanalysis.EqualsAvoidsNull
rewrites
---
.../jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java | 2 +-
src/main/java/org/jabref/logic/importer/AuthorListParser.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index e4c9d13fc04..b51d58053eb 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -235,7 +235,7 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
ButtonType.OK, openHelp);
result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> new HelpAction(HelpFile.SQL_DATABASE_MIGRATION, dialogService, preferences.getExternalApplicationsPreferences()).execute());
- result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
+ result.filter(btn -> ButtonType.OK.equals(btn)).ifPresent(btn -> openSharedDatabase(connectionProperties));
}
loading.set(false);
return false;
diff --git a/src/main/java/org/jabref/logic/importer/AuthorListParser.java b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
index 1b9d9739b05..a6d1218693c 100644
--- a/src/main/java/org/jabref/logic/importer/AuthorListParser.java
+++ b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
@@ -282,13 +282,13 @@ private Optional<Author> getAuthor() {
if (vonStart < 0) {
if (!tokenCase) {
int previousTermToken = (tokens.size() - TOKEN_GROUP_LENGTH - TOKEN_GROUP_LENGTH) + OFFSET_TOKEN_TERM;
- if ((previousTermToken >= 0) && tokens.get(previousTermToken).equals('-')) {
+ if ((previousTermToken >= 0) && '-'.equals(tokens.get(previousTermToken))) {
// We are in a first name which contained a hyphen
break;
}
int thisTermToken = previousTermToken + TOKEN_GROUP_LENGTH;
- if ((thisTermToken >= 0) && tokens.get(thisTermToken).equals('-')) {
+ if ((thisTermToken >= 0) && '-'.equals(tokens.get(thisTermToken))) {
// We are in a name which contained a hyphen
break;
}
From b04aa39765b01f48a4edc1972f2d5199c8d66ee2 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Wed, 19 Mar 2025 21:19:41 +0100
Subject: [PATCH 4/5] Revert "More
org.openrewrite.staticanalysis.EqualsAvoidsNull rewrites"
This reverts commit 77ae3d9a7113c82bf1fa1bdedf9316dcaed1ea07.
---
.../jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java | 2 +-
src/main/java/org/jabref/logic/importer/AuthorListParser.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index b51d58053eb..e4c9d13fc04 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -235,7 +235,7 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
ButtonType.OK, openHelp);
result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> new HelpAction(HelpFile.SQL_DATABASE_MIGRATION, dialogService, preferences.getExternalApplicationsPreferences()).execute());
- result.filter(btn -> ButtonType.OK.equals(btn)).ifPresent(btn -> openSharedDatabase(connectionProperties));
+ result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
}
loading.set(false);
return false;
diff --git a/src/main/java/org/jabref/logic/importer/AuthorListParser.java b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
index a6d1218693c..1b9d9739b05 100644
--- a/src/main/java/org/jabref/logic/importer/AuthorListParser.java
+++ b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
@@ -282,13 +282,13 @@ private Optional<Author> getAuthor() {
if (vonStart < 0) {
if (!tokenCase) {
int previousTermToken = (tokens.size() - TOKEN_GROUP_LENGTH - TOKEN_GROUP_LENGTH) + OFFSET_TOKEN_TERM;
- if ((previousTermToken >= 0) && '-'.equals(tokens.get(previousTermToken))) {
+ if ((previousTermToken >= 0) && tokens.get(previousTermToken).equals('-')) {
// We are in a first name which contained a hyphen
break;
}
int thisTermToken = previousTermToken + TOKEN_GROUP_LENGTH;
- if ((thisTermToken >= 0) && '-'.equals(tokens.get(thisTermToken))) {
+ if ((thisTermToken >= 0) && tokens.get(thisTermToken).equals('-')) {
// We are in a name which contained a hyphen
break;
}
From 54815f22c9c4697104aad982229f1917eab49ea6 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Wed, 19 Mar 2025 21:26:27 +0100
Subject: [PATCH 5/5] Apply recipe
---
rewrite.yml | 4 ++--
.../jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rewrite.yml b/rewrite.yml
index 4aa29301320..527118397ab 100644
--- a/rewrite.yml
+++ b/rewrite.yml
@@ -101,8 +101,8 @@ recipeList:
- org.openrewrite.java.migrate.io.ReplaceFileInOrOutputStreamFinalizeWithClose
- org.openrewrite.java.migrate.net.JavaNetAPIs
- # Got missing: https://rewriteoss.slack.com/archives/C01A843MWG5/p1742246698423949
- # - org.openrewrite.java.migrate.net.URLConstructorsToURIRecipes
+ - org.openrewrite.java.migrate.net.URLConstructorToURICreate
+ - org.openrewrite.java.migrate.net.URLConstructorsToNewURI
- org.openrewrite.java.migrate.util.OptionalNotEmptyToIsPresent
- org.openrewrite.java.migrate.util.OptionalNotPresentToIsEmpty
- org.openrewrite.java.migrate.util.SequencedCollection
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index e4c9d13fc04..b51d58053eb 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -235,7 +235,7 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
ButtonType.OK, openHelp);
result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> new HelpAction(HelpFile.SQL_DATABASE_MIGRATION, dialogService, preferences.getExternalApplicationsPreferences()).execute());
- result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
+ result.filter(btn -> ButtonType.OK.equals(btn)).ifPresent(btn -> openSharedDatabase(connectionProperties));
}
loading.set(false);
return false;