Rework association mapping hierarchy #10681
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
Instead of ensuring every mapping array has a mappedBy and an inversedBy field, let us do the opposite, and remove them when they are null. Likewise if there is a joinColumns field, it is useless if null or empty.
greg0ire
force-pushed
the
rework-class-hierarchy
branch
3 times, most recently
from
e901331
to
e650ed1
Compare
|
@mpdude please review :) |
derrabus
reviewed
May 7, 2023
- Each type is now either final, abstract or an interface. - The mappedBy attribute is no longer nullable and moved down the hierarchy. - The inversedBy attribute is still nullable and also moved down the hierarchy. - Code common to ManyToOneAssociationMapping and OneToOneOwningSideMapping is de-duplicated and moved up the hierarchy - Code inside ToManyInverseSideMapping and ToManyOwningSideMapping comes from a trait to avoid duplication.
greg0ire
force-pushed
the
rework-class-hierarchy
branch
from
e650ed1
to
e18b80c
Compare
derrabus
approved these changes
May 7, 2023
|
Let's hope that future merge-ups will not be too much of a headache with these changes. 🤞🏻 |
|
Not much more than previous ones I think… I'm mostly reworking new classes here 🙂 |
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.
Please review #10682 before this one.
Before
Classes
classDiagram AssociationMapping <|-- ToManyAssociationMapping ToManyAssociationMapping <|-- ManyToManyAssociationMapping ManyToManyAssociationMapping <|-- ManyToManyOwningSideMapping AssociationMapping <|-- ToOneAssociationMapping ToOneAssociationMapping <|-- ManyToOneAssociationMapping ToManyAssociationMapping <|-- OneToManyAssociationMapping ToOneAssociationMapping <|-- OneToOneAssociationMapping OneToOneAssociationMapping <|-- OneToOneOwningSideMappingInterfaces
classDiagram AssociationOwningSideMapping <|.. OneToOneOwningSideMapping AssociationOwningSideMapping <|.. ManyToManyOwningSideMapping AssociationOwningSideMapping <|.. ManyToOneAssociationMappingAfter
Classes
classDiagram AssociationMapping <|-- InverseSideMapping AssociationMapping <|-- OwningSideMapping InverseSideMapping <|-- ToManyInverseSideMapping OwningSideMapping <|-- ToManyOwningSideMapping ToManyInverseSideMapping <|-- ManyToManyInverseSideMapping ToManyOwningSideMapping <|-- ManyToManyOwningSideMapping OwningSideMapping <|-- ToOneOwningSideMapping ToOneOwningSideMapping <|-- ManyToOneOwningSideMapping ToManyInverseSideMapping <|-- OneToManyAssociationMapping InverseSideMapping <|-- ToOneInverseSideMapping ToOneInverseSideMapping <|-- OneToOneInverseSideMapping ToOneOwningSideMapping <|-- OneToOneOwningSideMappingInterfaces
classDiagram ToManyAssociationMapping <|.. ManyToManyAssociationMapping ManyToManyAssociationMapping <|.. ManyToManyInverseSideMapping ManyToManyAssociationMapping <|.. ManyToManyOwningSideMapping ToOneAssociationMapping <|.. OneToOneAssociationMapping OneToOneAssociationMapping <|.. OneToOneInverseSideMapping OneToOneAssociationMapping <|.. OneToOneOwningSideMappingToManyAssociationMappingImplementationTraitclassDiagram AssociationMapping <|-- InverseSideMapping AssociationMapping <|-- OwningSideMapping InverseSideMapping <|-- ToManyInverseSideMapping OwningSideMapping <|-- ToManyOwningSideMapping ToManyAssociationMappingImplementation <|-- ToManyInverseSideMapping ToManyAssociationMappingImplementation <|-- ToManyOwningSideMapping