util: Align AdvancedTlsX509{Key and Trust}Manager #11385
Merged
+115
−63
Conversation
This file contains hidden or 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
Contributor
erm-g
commented
Jul 12, 2024
•
erm-g
commented
- Swap key/cert arguments of internal private classes in KeyManager
- Deprecate *FromFile methods in TrustManager in favor of overloaded updateTrustCredentials
- Unit test for Fix AdvancedTlsX509TrustManager to handle client side validation of socket #11352
matthewstevenson88
approved these changes
Jul 12, 2024
ejona86
approved these changes
Jul 16, 2024
| @@ -339,8 +339,8 @@ public void onFileReloadingKeyManagerTrustManagerTest() throws Exception { | |||
| AdvancedTlsX509TrustManager serverTrustManager = AdvancedTlsX509TrustManager.newBuilder() | |||
| .setVerification(Verification.CERTIFICATE_ONLY_VERIFICATION) | |||
| .build(); | |||
| Closeable serverTrustShutdown = serverTrustManager.updateTrustCredentialsFromFile(caCertFile, | |||
| 100, TimeUnit.MILLISECONDS, executor); | |||
| Closeable serverTrustShutdown = serverTrustManager.updateTrustCredentials(caCertFile,100, | |||
There was a problem hiding this comment.
Add a space before 100. Ditto elsewhere.
FWIW, I'll commonly linewrap before the 100, to keep it together with its unit. Although it seems you are purposefully doing the opposite, as late in the file you could have TimeUnit on the same line and you chose not to.
There was a problem hiding this comment.
Oh, missed the spaces because of IDE param name hints:
Will keep it disabled.
I like the idea of having value + unit on the same line, also fixed it.
larry-safran
pushed a commit
to larry-safran/grpc-java
that referenced
this pull request
Aug 13, 2024
* Swap internal key/cert args * Deprecate *FromFile methods * Test for client trusted socket
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.