-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Issue #254 migrate smb extension repo into spring integration main repo #3791
Conversation
please, consider to rebase your branch to the latest I will look into this tomorrow then. Thank you! |
…nsion_repo_into_Spring_Integration_main_repo
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple not critical, but useful pointers:
- Why "merge"? Why everyone does "merge", when I am clearly asking to do a
rebase
. Your change might be more actual, than what you pull from themain
. - The commit message is important, at least the first one: https://cbea.ms/git-commit/
- We don't use JUnit asserts any more.
AssertJ
is the library we rely on. I'm not sure if this PR is going to fail against our Checkstyle rules on the matter, but there is an IntelliJ IDEA plugin to migrate smoothly: https://plugins.jetbrains.com/plugin/10345-assertions2assertj - All these classes are new for this project, so their
@since
must be6.0
. Can be done in the new PR if this is a lot of burden for the current one. - The Copyright date must be updated to the current year.
- Did you run
./gradlew clean :spring-integration-smb:check
locally? - We will need a documentation for this new module. Yes, another PR would be better.
I think that's it. As far as this PR is green, I'm merging.
Thank you!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, Checkstyle has just failed:
> Task :spring-integration-smb:checkstyleTest FAILED
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTests.java:19:31: Using a static member import should be avoided - org.junit.Assert.assertNotNull. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTests.java:20:31: Using a static member import should be avoided - org.junit.Assert.assertTrue. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java:19:31: Using a static member import should be avoided - org.junit.Assert.assertEquals. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java:19:36: Using a static member import should be avoided - org.hamcrest.Matchers.instanceOf. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java:20:31: Using a static member import should be avoided - org.junit.Assert.assertEquals. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java:21:31: Using a static member import should be avoided - org.junit.Assert.assertNotNull. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java:22:31: Using a static member import should be avoided - org.junit.Assert.assertThat. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java:23:31: Using a static member import should be avoided - org.junit.Assert.assertTrue. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java:19:31: Using a static member import should be avoided - org.junit.Assert.assertTrue. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java:19:31: Using a static member import should be avoided - org.junit.Assert.assertEquals. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java:20:31: Using a static member import should be avoided - org.junit.Assert.assertNotNull. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java:21:31: Using a static member import should be avoided - org.junit.Assert.assertSame. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java:22:31: Using a static member import should be avoided - org.junit.Assert.assertTrue. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java:20:31: Using a static member import should be avoided - org.junit.Assert.assertNotNull. [AvoidStaticImport]
Error: eckstyle] [ERROR] /home/runner/work/spring-integration/spring-integration/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionTests.java:19:31: Using a static member import should be avoided - org.junit.Assert.assertEquals. [AvoidStaticImport]
Please, consider to migrate to AssertJ as I explained before.
Hi Artem, Thanks for the review.
|
You can find docs in the But as I said: separate PR and so on. |
Ok np, working on the changes now for AssertJ and the others... Thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Pulling locally for final review, clean up and merge.
Merged as 7ad71d3. thank you again for contribution; feel free to go ahead with the docs PR! |
@artembilan as discussed in Spring Integration Extensions repo for Issue spring-projects/spring-integration-extensions#254