SWC-7040 - Bump Java version to 11 #5500
Merged
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
Also bump Guice to 6, Mockito to 2, and lock guice-assistedinject to 6 to override Gin. Migrate many tests to be compatible with Mockito 2. The main reason tests had to change was because `anyString()` and `any(Foo.class)` matchers do not allow `null` as a valid match in v2, but they do in v1. In these cases, just use `any()`
nickgros
commented
Aug 28, 2024
| "dev:codeserver": "mvn gwt:run-codeserver -Dgwt.compiler.skip=true -Dnoserver=true -Dwar=/$(pwd)/target/portal-develop-SNAPSHOT -Dstyle=PRETTY", | ||
| "dev": "concurrently -k -n \"CODESERVER,TOMCAT\" -c \"auto,auto\" \"yarn dev:codeserver\" \"yarn dev:tomcat\"", | ||
| "dev:codeserver": "mvn clean gwt:run-codeserver", | ||
| "dev:tomcat": "wait-on tcp:9876 && docker pull tomcat:9.0; docker run --name swc-dev --rm -p 8888:8080 -v \"/$(pwd)/target/portal-develop-SNAPSHOT/:/usr/local/tomcat/webapps/ROOT/\" -v \"/$HOME/.m2/settings.xml\":/root/.m2/settings.xml tomcat:9.0", |
There was a problem hiding this comment.
wait-on will prevent Tomcat from launching until the code server is ready
nickgros
commented
Aug 28, 2024
| @@ -138,7 +138,7 @@ | |||
| import org.sagebionetworks.web.shared.exceptions.UnauthorizedException; | |||
| import org.sagebionetworks.web.shared.exceptions.UnknownErrorException; | |||
|
|
|||
| @RunWith(MockitoJUnitRunner.class) | |||
| @RunWith(MockitoJUnitRunner.Silent.class) | |||
There was a problem hiding this comment.
Without Silent, mockito fails tests that have mocks that are not called. Which is great, but a ton of unnecessary work to fix.
nickgros
commented
Aug 28, 2024
| when( | ||
| mockRequestBuilder.sendRequest(anyString(), any(RequestCallback.class)) | ||
| ) | ||
| when(mockRequestBuilder.sendRequest(any(), any(RequestCallback.class))) |
There was a problem hiding this comment.
For nearly all of these test changes, the mock was called where the matcher received null. In Mockito v1, anyString() matched null. In Mockito v2, it does not. Replace it with any().
There was a problem hiding this comment.
Ah, now I understand why my newly checked in test with anyLong() may fail :)
nickgros
changed the title
jay-hodgson
approved these changes
Aug 28, 2024
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.
Also bump Guice to 6, Mockito to 2, and lock guice-assistedinject to 6 to override Gin.
Migrate many tests to be compatible with Mockito 2. The main reason tests had to change was because
anyString()andany(Foo.class)matchers do not allownullas a valid match in v2, but they do in v1. In these cases, just useany()Also fix the dev scripts so now
yarn devshould launch the GWT Codeserver and a Tomcat 9 container that will re-compile on refresh if there's a source code change.We should be able to upgrade to Java 17 at a later date just by upgrading the JDK and compile target.