Skip to content

[SHRINKRES-327] Resolve probable bugs #191

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

Jump to bottom
Merged
petrberan merged 2 commits into from
Apr 16, 2024
Merged

[SHRINKRES-327] Resolve probable bugs #191

petrberan merged 2 commits into from
Apr 16, 2024

Conversation

@petrberan
Copy link
Member

@petrberan petrberan commented Dec 1, 2023

@petrberan petrberan requested a review from xstefank March 4, 2024 15:28
xstefank
xstefank requested changes Mar 8, 2024
View reviewed changes
...c/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/MavenImporterImpl.java
InvalidConfigurationFileException {
this.session = LoadPomTask.loadPomFromFile(pomFile).execute(session);
this.session = LoadPomDependenciesTask.INSTANCE.execute(session);
LoadPomDependenciesTask.INSTANCE.execute(session);
Copy link
Member

@xstefank xstefank Mar 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change.

...n/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/packaging/WarPackagingProcessor.java
}

// add dependencies
this.session = AddAllDeclaredDependenciesTask.INSTANCE.execute(session);
Copy link
Member

@xstefank xstefank Mar 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto, don't understand reasoning for this

...n/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/MavenSettingsBuilder.java
settings = decryptPasswords(settings);
enrichWithLocalRepository(settings);
enrichWithOfflineMode(settings);
decryptPasswords(settings);
Copy link
Member

@xstefank xstefank Mar 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm almost sure you're loosing state (if the methods didn't change since this code was written)

@petrberan petrberan force-pushed the SHRINKRES-327 branch 2 times, most recently from 2d54703 to fc5437c Compare March 13, 2024 14:53
@petrberan
Copy link
Member Author

petrberan commented Mar 13, 2024

All the execute methods in the PR as well as those modifying settings in MavenSettingsBuilder.java are modifying the same assigned variable instance they are assigning the result to. The modification happens regardless of whether the variable is assigned again or not and all executes and the "settings-modifying" methods could in fact return void.

Perhaps more importantly - syntax wise - the repeated assignment of the variable could indicate that the methods return different instance, which is not the case.

@petrberan petrberan requested a review from xstefank March 13, 2024 15:31
@xstefank
Copy link
Member

xstefank commented Mar 29, 2024

@petrberan needs rebase

@petrberan petrberan merged commit 1ed152d into shrinkwrap:master Apr 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xstefank xstefank xstefank approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@petrberan @xstefank