ensuring connection timeouts get wrapped by MavenDownloadingException #4081
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sing tests to fail with latest changes
nmck257
commented
Mar 6, 2024
| @@ -769,8 +771,6 @@ public MavenRepository normalizeRepository(MavenRepository originalRepository, M | |||
| repository.getSnapshots(), | |||
| repository.getUsername(), | |||
| repository.getPassword()); | |||
| } else if (!e.isClientSideException()) { | |||
| return originalRepository; | |||
There was a problem hiding this comment.
removing this feels a little cryptic, but I'm pretty sure it's no longer relevant?
eg, when it was written, the e.isServerReached call a few lines earlier did not exist:
3bcafba#diff-a39c7415cc78264a78509aaaba13d76b4eeea28cdc5723e15615b7a8add5b325
There was a problem hiding this comment.
that said, tests pass -- ready for review @timtebeek
timtebeek
reviewed
Mar 7, 2024
rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java
Outdated
Show resolved
Hide resolved
|
Two new test failures with the new approach: https://ge.openrewrite.org/s/p33d2lkyakx4u/tests/overview?outcome=FAILED
|
|
pushed further changes, focused on 1) fixing those test failures and 2) using specific checked exception types instead of |
timtebeek
approved these changes
Mar 8, 2024
motu55
pushed a commit
to motu55/rewrite
that referenced
this pull request
Mar 14, 2024
…openrewrite#4081) * ensuring connection timeouts get wrapped by MavenDownloadingException * polish * removed a condition which I believe no longer made sense, and was causing tests to fail with latest changes * Apply suggestions from code review * adjusting so that IOExceptions can get caught and wrapped into MavenDownloadingException * clarifying checked exception types for `sendRequest` and related methods --------- Co-authored-by: Tim te Beek <tim@moderne.io>
sambsnyd
added a commit
that referenced
this pull request
Apr 1, 2024
…ti module maven projects (#4074) * fix find maven dependencies for multi module maven projects * revert to see if build is succesfull * Defensive copy in addClasspathEntry so that it won't attempt to add an element to a read-only list * Make `JavaParser.Builder#addClasspathEntry()` public * Basic JSP support (#4075) * Improve `UsesField` * Improve `UsesField` a bit more * Fix RenameVariable for variables referenced through type casts (#4082) * Fix RenameVariable for variables referenced through type casts * Add unit test * Be explicit about null handling and types --------- Co-authored-by: Tim te Beek <tim@moderne.io> * Java version equality should not be based on id. Plugins create a JavaVersion per source set, but if they have the same fields excluding id they should be considered equal. * `MethodMatcher`: Improve construction time performance Avoid expensive regular expressions for simple and common cases. * `MethodMatcher`: Optimize performance of common argument matching * `XPathMatcher`: Implement attribute value conditions like `/a[@b='c']` (#4084) Fixes: #4083 * Fix class cast exception in MarkIndividualDependency * Add table and version matcher to Maven FindProperties (#4085) The valuePattern allows use as DevCenter measurement, while the table enables custom visualizations. Target use is the `<jenkins.version>` used in Jenkins plugins. * ensuring connection timeouts get wrapped by MavenDownloadingException (#4081) * ensuring connection timeouts get wrapped by MavenDownloadingException * polish * removed a condition which I believe no longer made sense, and was causing tests to fail with latest changes * Apply suggestions from code review * adjusting so that IOExceptions can get caught and wrapped into MavenDownloadingException * clarifying checked exception types for `sendRequest` and related methods --------- Co-authored-by: Tim te Beek <tim@moderne.io> * HasMiniumJavaVersion * Remove explicit `Properties.File#getContent()` method While indeed the LST should not be modified by modifying a `List` returned by a getter, it is also not right for a getter to return a new list every time (e.g. by wrapping an internal field using `Collections.unmodifiableList()`. This commit removes the explicit getter and wither and instead has these generated by Lombok. Further, the initial contents, as populated by the parser, are now wrapped using `Collections.unmodifiableList()` to avoid any situations, where the contents are directly modified. * Add dependency now works with empty maven projects (#4006) * Printable Recipe Datatables (#4087) * Added method to export datatable information as csv to RecipeRun class * Wrapped column value in quotes to escape commas in value * Refactored streams to iterative loops. Log exceptions through Execution Context error handler * Added formatCsv method. Added logic to ensure directories exist before creating files * Refactored export logic to be more testable. Added test for csv printing logic * Failing test cases for Quarkus version matching using `metadataPattern`s * Add another test case. * Get the new tests passing * License headers * Optimize `JavaParser.Builder#addClasspathEntry()` * Allow null argument to CommitMessage.message() * Fix precondition application in UpgradeDependencyVersion. I'm a bit confused as to how this recipe succeeded before I made this change. The whole visitor, not just the precondition, was wrapped in Preconditions.or(). * Refresh resolved dependencies if possible --------- Co-authored-by: U808771 <U808771@mobi.ch> Co-authored-by: Sam Snyder <sam@moderne.io> Co-authored-by: Knut Wannheden <knut@moderne.io> Co-authored-by: Jonathan Schnéider <jkschneider@gmail.com> Co-authored-by: René Grob <rene.grob76@gmail.com> Co-authored-by: Tim te Beek <tim@moderne.io> Co-authored-by: Nick McKinney <mckinneynicholas@gmail.com> Co-authored-by: Adriano Machado <60320+ammachado@users.noreply.github.com> Co-authored-by: Ryan Hudson <43145457+ryan-hudson@users.noreply.github.com>
sambsnyd
added a commit
that referenced
this pull request
Apr 29, 2024
…ti module maven projects (#4074) * fix find maven dependencies for multi module maven projects * revert to see if build is succesfull * Defensive copy in addClasspathEntry so that it won't attempt to add an element to a read-only list * Make `JavaParser.Builder#addClasspathEntry()` public * Basic JSP support (#4075) * Improve `UsesField` * Improve `UsesField` a bit more * Fix RenameVariable for variables referenced through type casts (#4082) * Fix RenameVariable for variables referenced through type casts * Add unit test * Be explicit about null handling and types --------- Co-authored-by: Tim te Beek <tim@moderne.io> * Java version equality should not be based on id. Plugins create a JavaVersion per source set, but if they have the same fields excluding id they should be considered equal. * `MethodMatcher`: Improve construction time performance Avoid expensive regular expressions for simple and common cases. * `MethodMatcher`: Optimize performance of common argument matching * `XPathMatcher`: Implement attribute value conditions like `/a[@b='c']` (#4084) Fixes: #4083 * Fix class cast exception in MarkIndividualDependency * Add table and version matcher to Maven FindProperties (#4085) The valuePattern allows use as DevCenter measurement, while the table enables custom visualizations. Target use is the `<jenkins.version>` used in Jenkins plugins. * ensuring connection timeouts get wrapped by MavenDownloadingException (#4081) * ensuring connection timeouts get wrapped by MavenDownloadingException * polish * removed a condition which I believe no longer made sense, and was causing tests to fail with latest changes * Apply suggestions from code review * adjusting so that IOExceptions can get caught and wrapped into MavenDownloadingException * clarifying checked exception types for `sendRequest` and related methods --------- Co-authored-by: Tim te Beek <tim@moderne.io> * HasMiniumJavaVersion * Remove explicit `Properties.File#getContent()` method While indeed the LST should not be modified by modifying a `List` returned by a getter, it is also not right for a getter to return a new list every time (e.g. by wrapping an internal field using `Collections.unmodifiableList()`. This commit removes the explicit getter and wither and instead has these generated by Lombok. Further, the initial contents, as populated by the parser, are now wrapped using `Collections.unmodifiableList()` to avoid any situations, where the contents are directly modified. * Add dependency now works with empty maven projects (#4006) * Printable Recipe Datatables (#4087) * Added method to export datatable information as csv to RecipeRun class * Wrapped column value in quotes to escape commas in value * Refactored streams to iterative loops. Log exceptions through Execution Context error handler * Added formatCsv method. Added logic to ensure directories exist before creating files * Refactored export logic to be more testable. Added test for csv printing logic * Failing test cases for Quarkus version matching using `metadataPattern`s * Add another test case. * Get the new tests passing * License headers * Optimize `JavaParser.Builder#addClasspathEntry()` * Allow null argument to CommitMessage.message() * Fix precondition application in UpgradeDependencyVersion. I'm a bit confused as to how this recipe succeeded before I made this change. The whole visitor, not just the precondition, was wrapped in Preconditions.or(). * Refresh resolved dependencies if possible --------- Co-authored-by: U808771 <U808771@mobi.ch> Co-authored-by: Sam Snyder <sam@moderne.io> Co-authored-by: Knut Wannheden <knut@moderne.io> Co-authored-by: Jonathan Schnéider <jkschneider@gmail.com> Co-authored-by: René Grob <rene.grob76@gmail.com> Co-authored-by: Tim te Beek <tim@moderne.io> Co-authored-by: Nick McKinney <mckinneynicholas@gmail.com> Co-authored-by: Adriano Machado <60320+ammachado@users.noreply.github.com> Co-authored-by: Ryan Hudson <43145457+ryan-hudson@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #4080.
Might take a couple iterations in Actions; I wrote/tested this in a weird network environment. Fingers crossed.
Checklist