De-duplicate identical classes and avoid __1
#1655
Open
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
matusfaro
commented
Dec 11, 2024
| @@ -47,6 +50,7 @@ public class RuleFactory { | |||
| private GenerationConfig generationConfig; | |||
| private Annotator annotator; | |||
| private SchemaStore schemaStore; | |||
| private Map<Class<?>, Map<String, ?>> dedupeCache; | |||
There was a problem hiding this comment.
Track duplicates in each RuleFactory instance
| return new ObjectRule(this, new ParcelableHelper(), reflectionHelper); | ||
| Rule<JPackage, JType> rule = new ObjectRule(this, new ParcelableHelper(), reflectionHelper); | ||
| if (generationConfig.isUseDeduplication()) { | ||
| rule = new DeduplicateRule<>(dedupeCache, rule); |
There was a problem hiding this comment.
Wrap specific Rules that require de-duplication.
|
|
||
| public DeduplicateRule(Map<Class<?>, Map<String, ?>> dedupeCacheByRule, Rule<T, R> rule) { | ||
| // noinspection unchecked map is populated by us and guaranteed to be of the correct type | ||
| Map<String, R> dedupeCache = (Map<String, R>) dedupeCacheByRule.get(rule.getClass()); |
There was a problem hiding this comment.
Each Rule has its own individual cache
| * @return same {@code R} instance if a previous schema with the same hash code was already processed | ||
| */ | ||
| @Override | ||
| public R apply(String nodeName, JsonNode node, JsonNode parent, T generatableType, Schema currentSchema) { |
There was a problem hiding this comment.
Performs de-duplication here during rule transformation of Schema to result.
| @@ -75,4 +80,13 @@ public boolean isGenerated() { | |||
| return javaType != null; | |||
| } | |||
|
|
|||
| public String calculateHash() { | |||
There was a problem hiding this comment.
Using SHA-256 of the compact JSON string for de-duplication.
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.
Hello,
Thank you very much for your amazing project!
I know you have previously decided (in #1082) not to support de-duplication of identical classes and instead suggest to use
$refs, but please re-consider.This seems to be an arguably common request: #1562 #1559 #1151 #1192 #1081 #784 #114 #112
Mainly this will solve the case where it's not possible to modify the input and replace
$refs (my case), but it'll also make it friendlier for others not having to refactor their input to use$refs.Take a look at the implementation which is fairly simple. I'd appreciate any feedback on the implementation, even if you don't decide to go ahead with it.
If I still can't change your mind, no problem, I will maintain this change in my fork.