[servicecomb-java-chassis] 02/02: [SCB-1031] fix for the code review

[liubao]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git

commit 90f6d6fdc82ea0d677f7d04d2306835dd5c0e441
Author: weixing <jeho0...@163.com>
AuthorDate: Sat Nov 24 10:36:24 2018 +0800

    [SCB-1031] fix for the code review
---
 .../core/processor/annotation/AnnotationUtils.java | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git 
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java
 
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java
index ddf8f45..2193f8e 100644
--- 
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java
+++ 
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java
@@ -136,25 +136,25 @@ public final class AnnotationUtils {
       return;
     }
     Response response = 
operation.getResponses().get(String.valueOf(responseConfig.getCode()));
-    if (response != null) {
-      Response targetResp = responseConfig.getResponse();
-      if (StringUtils.isNotEmpty(targetResp.getDescription()) && 
StringUtils.isEmpty(response.getDescription())) {
-        response.setDescription(targetResp.getDescription());
-      }
-      if (targetResp.getSchema() != null && response.getSchema() == null) {
-        response.setSchema(targetResp.getSchema());
-      }
-      if (targetResp.getExamples() != null && response.getExamples() == null) {
-        response.setExamples(targetResp.getExamples());
-      }
-      if (targetResp.getHeaders() != null && response.getHeaders() == null) {
-        response.setHeaders(targetResp.getHeaders());
-      }
-      if (targetResp.getVendorExtensions() != null && 
response.getVendorExtensions() == null) {
-        response.setVendorExtensions(targetResp.getVendorExtensions());
-      }
-    } else {
+    if (response == null) {
       operation.response(responseConfig.getCode(), 
responseConfig.getResponse());
+      return;
+    }
+    Response sourceResp = responseConfig.getResponse();
+    if (StringUtils.isNotEmpty(sourceResp.getDescription()) && 
StringUtils.isEmpty(response.getDescription())) {
+      response.setDescription(sourceResp.getDescription());
+    }
+    if (sourceResp.getSchema() != null && response.getSchema() == null) {
+      response.setSchema(sourceResp.getSchema());
+    }
+    if (sourceResp.getExamples() != null && response.getExamples() == null) {
+      response.setExamples(sourceResp.getExamples());
+    }
+    if (sourceResp.getHeaders() != null && response.getHeaders() == null) {
+      response.setHeaders(sourceResp.getHeaders());
+    }
+    if (sourceResp.getVendorExtensions() != null && 
response.getVendorExtensions() == null) {
+      response.setVendorExtensions(sourceResp.getVendorExtensions());
     }
   }