Improve unique class naming strategy by appending an incrementing number instead of adding more and more underscores #476
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
Using a number with two underscore '__' instead of adding underscore to the class name when the class already exists.
|
I like this. It's quite a major change to the generated types (for some projects) but I think it's a good one. I think we should include this and bump to 0.5.0. |
…eClassName Conflicts: jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ObjectRule.java
|
@joelittlejohn should we include this in 1.0.0-alpha2? |
| public static String makeUnique(String className) { | ||
| String returnClassName = className; | ||
| // Last character is a digit and there is 2 underscore in the className | ||
| if (Character.isDigit(className.charAt(className.length() - 1)) && StringUtils.contains(className, "__")) { |
There was a problem hiding this comment.
I think this check is a little too flexible. I think we should replace this with a regex like .+\_\_(\d+)$, and use the capture group to pull out the current number.
joelittlejohn
changed the title
joelittlejohn
added a commit
that referenced
this pull request
Feb 4, 2018
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.
Problem
If a class already exists with the same name when generating we add a underscore to the name '_'. Using a weirdly formatted jsonSchema, adp, I hit a limitation from the OS on the name length.
Attempted solution
Using a number with two underscore '__' instead of adding underscore to the class name when the class already exists. If the class already ends with a number and has two underscore we search for the number and add a number.
I did the modification to work with ADP crazy repeating schema. Could be useful for others.