Skip to content
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

Added config interceptor for in-memory server #1000

Merged
merged 4 commits into from
Apr 3, 2025
Merged

Added config interceptor for in-memory server #1000

merged 4 commits into from
Apr 3, 2025
+262 −48

Conversation

etrandafir93
Copy link
Contributor

Closes #938

@etrandafir93 etrandafir93 mentioned this pull request Feb 9, 2025
Closed
@jzheaux jzheaux self-assigned this Feb 11, 2025
jzheaux
jzheaux requested changes Feb 12, 2025
View reviewed changes
Copy link
Collaborator

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Thanks, @etrandafir93! It's nice to have you contributing.

I've left some feedback inline. Also as a general note, will you please add JavaDoc to any new methods or classes that you create and in those JavaDoc ensure that you have the following:

@since 3.3

@jzheaux
Copy link
Collaborator

jzheaux commented Feb 12, 2025

Sorry about the DCO failure. I'll ping @rwinch and see if it is something on our side.

@jzheaux jzheaux added this to the 3.3.x milestone Feb 12, 2025
@jzheaux
Copy link
Collaborator

jzheaux commented Feb 12, 2025

@etrandafir93, I wonder if it is because the identifiers don't agree.

On your commit, it shows the email as:

Author: emanueltrandafir1993 <emanueltrandafir1993@gmail.com>

But the Signed-Off-By is:

Signed-off-by: Emanuel Trandafir <emanuel.trandafir1993@gmail.com>

@jzheaux
Copy link
Collaborator

jzheaux commented Feb 12, 2025 •
edited
Loading

Here is the error message when clicking the Details link:

Commit sha: [0760e19](https://github.com/spring-projects/spring-ldap/pull/1000/commits/0760e1941d75993b81db828bc8b661427ba7f67f), Author: emanueltrandafir1993, Committer: emanueltrandafir1993; Expected "emanueltrandafir1993 [emanueltrandafir1993@gmail.com](mailto:emanueltrandafir1993@gmail.com)", but got "Emanuel Trandafir [emanuel.trandafir1993@gmail.com](mailto:emanuel.trandafir1993@gmail.com)".

So I believe that may be the case.

@etrandafir93 etrandafir93 mentioned this pull request Feb 18, 2025
Closed
@etrandafir93 etrandafir93 force-pushed the dev/938-embedded_test_servers branch 4 times, most recently from 7798068 to be9de0b Compare March 16, 2025 13:17
@etrandafir93 etrandafir93 force-pushed the dev/938-embedded_test_servers branch 2 times, most recently from 538e0e0 to 3b610b0 Compare March 16, 2025 14:25
@etrandafir93
Copy link
Contributor Author

hey @jzheaux - I have now rebased and accommodated your suggestions.
Let me know what you think :)

jzheaux
jzheaux requested changes Mar 20, 2025
View reviewed changes
Copy link
Collaborator

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Thanks for the updates, @etrandafir93! I've left some feedback inline about the changes.

@etrandafir93 etrandafir93 force-pushed the dev/938-embedded_test_servers branch 2 times, most recently from 37d2385 to bcd479c Compare March 21, 2025 07:52
@etrandafir93
Copy link
Contributor Author

Thanks for the updates, @etrandafir93! I've left some feedback inline about the changes.

thanks for the insightful feedback, @jzheaux!

I have applied your suggestions, let me know what you think :)

@etrandafir93 etrandafir93 force-pushed the dev/938-embedded_test_servers branch from bcd479c to 543e15a Compare March 21, 2025 07:58
@jzheaux jzheaux modified the milestones: 3.3.x, 3.3.0-RC1 Mar 23, 2025
jzheaux
jzheaux requested changes Mar 23, 2025
View reviewed changes
Copy link
Collaborator

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Great, @etrandafir93! This is shaping up nicely. I've left some feedback inline.

At this point, I'd also recommend squashing your commits. There should be two: one for the polish to CONTRIBUTING.adoc and one for the feature.

@etrandafir93 etrandafir93 force-pushed the dev/938-embedded_test_servers branch 2 times, most recently from 97cc5b7 to 3d64543 Compare March 23, 2025 08:58
@etrandafir93
Copy link
Contributor Author

Great, @etrandafir93! This is shaping up nicely. I've left some feedback inline.

At this point, I'd also recommend squashing your commits. There should be two: one for the polish to CONTRIBUTING.adoc and one for the feature.

I applied your latest suggestions and squashed the commits.
I think this is ready for your final review :)

@etrandafir93
Copy link
Contributor Author

also, how would you feel about migrating this module to junit5?
(as part of a different issue of course)

jzheaux
jzheaux requested changes Mar 24, 2025
View reviewed changes
Copy link
Collaborator

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Nearly there, @etrandafir93! I've left a bit more feedback inline.

Also, it would help me if your commit messages used Closes gh-938 only for the feature commit. Since the contribution page commit doesn't "close" that ticket, please leave that line out of that final commit.

test-support/src/main/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServer.java
public static EmbeddedLdapServer newEmbeddedServer(String defaultPartitionName, String defaultPartitionSuffix,
int port) throws Exception {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Sorry that I didn't catch this earlier. We can't remove checked exceptions from signatures as this can break some forms of compatibility. Please see https://wiki.eclipse.org/Evolving_Java-based_APIs_2 and look specifically for "Delete checked exceptions thrown".

@etrandafir93
EmbeddedLdapServer builder

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
Loading
Loading status checks…
7435738 
Closes spring-projects#938

Signed-off-by: Emanuel Trandafir <emanueltrandafir1993@gmail.com>
Signed-off-by: etrandafir93 <emanueltrandafir1993@gmail.com>
@etrandafir93 etrandafir93 force-pushed the dev/938-embedded_test_servers branch 2 times, most recently from d1c520c to 033f8de Compare March 27, 2025 19:22
@etrandafir93
Polish EmbeddedLdapServer Tests
Loading
Loading status checks…
c7ea7f6 
Issue spring-projects#938

Signed-off-by: etrandafir93 <emanueltrandafir1993@gmail.com>
@etrandafir93 etrandafir93 force-pushed the dev/938-embedded_test_servers branch from 033f8de to c7ea7f6 Compare March 27, 2025 19:23
@etrandafir93
Polish contributing.adoc
Loading
Loading status checks…
40a5d2e 
Issue spring-projects#938

Signed-off-by: etrandafir93 <emanueltrandafir1993@gmail.com>
@etrandafir93
Copy link
Contributor Author

Nearly there, @etrandafir93! I've left a bit more feedback inline.

Also, it would help me if your commit messages used Closes gh-938 only for the feature commit. Since the contribution page commit doesn't "close" that ticket, please leave that line out of that final commit.

@jzheaux I think it should be ok now:
1 commit for the fix + 2 separated commits to polish the tests and contirbuting.adoc

Can you please take another look?

@jzheaux
Restore Missing Exception
Loading
Loading status checks…
5899c14 
In order to remain binary compatible, we cannot remove checked exceptions
from signatures. And since this method is deprecated anyway, there is little
to be gained from changing its signature.

Issue spring-projectsgh-938
@jzheaux jzheaux merged commit 33bd8bc into spring-projects:main Apr 3, 2025
2 checks passed
@jzheaux
Copy link
Collaborator

jzheaux commented Apr 3, 2025

Thanks, @etrandafir93! This is now merged into main.

Note that I restored the exception in the newEmbeddedServer method as we can't remove checked exceptions and maintain binary compatibility.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jzheaux jzheaux

Assignees

@jzheaux jzheaux

Labels
None yet
Projects
Spring Security Team
Status: No status
Milestone
3.3.0-RC1
Development

Successfully merging this pull request may close these issues.

Simplify Configuring Operational Attributes in Embedded Test Servers
2 participants
@etrandafir93 @jzheaux