Model enhancement bugfix #3247
Merged
Model enhancement bugfix #3247
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
This was referenced Feb 8, 2020
Codecov Report
@@ Coverage Diff @@
## master #3247 +/- ##
============================================
- Coverage 92.89% 92.88% -0.01%
Complexity 3523 3523
============================================
Files 382 382
Lines 9373 9348 -25
Branches 775 780 +5
============================================
- Hits 8707 8683 -24
+ Misses 477 476 -1
Partials 189 189
|
dilipkrish
reviewed
Feb 16, 2020
| Map<String, Model> currentBranch, | ||
| Map<String, ModelContext> contextMap) { | ||
| public MergingContext(String rootId, Map<String, Set<Model>> typedModelMap, Map<String, String> modelIdToParameterId, | ||
| Map<String, Model> currentBranch, Map<String, ModelContext> contextMap) { |
There was a problem hiding this comment.
We dont want to arrange parameters in this form, because it makes it very difficult to find out what changed. In general prefer, one parameter per line.
There was a problem hiding this comment.
@dilipkrish , I split refactoring and fixes in a few separated commits. Ok, we should discuss formatting and code style. As for me each parameter for a new line will make class file longer. That is sometimes not convenient to debug it.
| this.contextMap, | ||
| this.seenModels); | ||
| return new MergingContext(this.rootId, parametersMatching, dependencies, comparisonConditions, this.typedModelMap, | ||
| this.modelIdToParameterId, this.currentBranch, this.contextMap, this.seenModels); |
There was a problem hiding this comment.
Also here, we want one parameter per line
|
|
||
| import static springfox.documentation.schema.ResolvedTypes.*; | ||
| import static springfox.documentation.schema.ResolvedTypes.modelRefFactory; |
There was a problem hiding this comment.
In general prefer the splatting of static imports.
|
@MaksimOrlov thank you! |
This was referenced Mar 18, 2021
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.
That PR fixes issues after introducing new merging algorithm.
#3014, #3243, #2345, #3211, #3082, #563.
The main issue is when we faced model with nodes (properties) that we already merged, we just skip that model instead of looking for the same models of that type.