SCB-2017 Fixed the issue of inconsistent false positives after re-ser… #2014
Conversation
…ialization using swagger to parse different JDK versions.
| public boolean isIgnoreSwaggerDifferent() { | ||
| DynamicBooleanProperty property = | ||
| DynamicPropertyFactory.getInstance() | ||
| .getBooleanProperty("servicecomb.service.registry.instance.ignoreSwaggerDifferent", |
There was a problem hiding this comment.
Thanks for your suggestion.
service-registry/pom.xml
Outdated
| <dependency> | ||
| <groupId>io.swagger</groupId> | ||
| <artifactId>swagger-models</artifactId> | ||
| <version>1.5.22</version> |
There was a problem hiding this comment.
do not add version, use dependency management if neccessary
| } | ||
|
|
||
| private boolean isIllegalValue(String context) { | ||
| if (context == null || context == "" || context.isEmpty()) { |
There was a problem hiding this comment.
use StringUtils.isEmpty from commons lang 3
| || ServiceRegistryConfig.INSTANCE.isAlwaysOverrideSchema(); | ||
| } | ||
|
|
||
| private boolean isIllegalValue(String context) { |
There was a problem hiding this comment.
delete this method because should be is valid value
| scSchemaContent, | ||
| localSchemaContent); | ||
| } | ||
| return false; |
| localSchemaEntry.getKey(), | ||
| scSchemaContent, | ||
| localSchemaContent); | ||
| } |
There was a problem hiding this comment.
This block should executed when not equals.
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.servicecomb</groupId> | ||
| <artifactId>swagger-generator-core</artifactId> |
There was a problem hiding this comment.
Thanks for your suggestions
| if (ServiceRegistryConfig.INSTANCE.isIgnoreSwaggerDifference()) { | ||
| LOGGER.warn( | ||
| "service center schema and local schema both are different:\n service center schema:\n[{}]\n local schema:\n[{}]" | ||
| + "\nYou need to increment microservice version before deploying. " |
There was a problem hiding this comment.
service center schema and local schema both are different:\n service center schema:\n[{}]\n local schema:\n[{}]"
+ "\nYou have configured to ignore difference check. It's recommented to increment microservice version before deploying when shcema change.
| if (scSwagger.equals(localSwagger)) { | ||
| return true; | ||
| } | ||
| if (ServiceRegistryConfig.INSTANCE.isIgnoreSwaggerDifference()) { |
There was a problem hiding this comment.
put if (ServiceRegistryConfig.INSTANCE.isIgnoreSwaggerDifference()) { outside of
if (!StringUtils.isEmpty(scSchemaContent) && !StringUtils.isEmpty(localSchemaContent)) {
block.
There was a problem hiding this comment.
done. I have put it behind EQUALS block.
…ialization using swagger to parse different JDK versions.
Follow this checklist to help us incorporate your contribution quickly and easily:
[SCB-XXX] Fixes bug in ApproximateQuantiles, where you replaceSCB-XXXwith the appropriate JIRA issue.mvn clean install -Pitto make sure basic checks pass. A more thorough check will be performed on your pull request automatically.