[servicecomb-java-chassis] branch master updated: [SCB-2554] Avoid null value for Optional Type (#3048)

[li...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 570ab6c40 [SCB-2554] Avoid null value for Optional Type (#3048)
570ab6c40 is described below

commit 570ab6c40ec7e2a34e3d45bf884e34ef5234ead8
Author: TingTing Wang <19...@qq.com>
AuthorDate: Thu Jun 9 08:58:12 2022 +0800

    [SCB-2554] Avoid null value for Optional Type (#3048)
---
 .../servicecomb/core/provider/producer/ProducerBootListener.java       | 1 +
 .../provider/springmvc/reference/CseHttpMessageConverter.java          | 3 +--
 .../org/apache/servicecomb/swagger/generator/core/schema/Schema.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java
index 70f9ad2ce..5ac82a6d3 100644
--- a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java
+++ b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java
@@ -54,6 +54,7 @@ public class ProducerBootListener implements BootListener {
     for (String endpoint : microservice.getInstance().getEndpoints()) {
       if (endpoint.startsWith("rest://") && endpoint.indexOf("sslEnabled=true") > 0) {
         swaggerSchema = "https";
+        break;
       }
     }
 
diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseHttpMessageConverter.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseHttpMessageConverter.java
index a913d5183..018abc9c3 100644
--- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseHttpMessageConverter.java
+++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseHttpMessageConverter.java
@@ -50,8 +50,7 @@ public class CseHttpMessageConverter implements GenericHttpMessageConverter<Obje
   }
 
   @Override
-  public Object read(Class<? extends Object> clazz,
-      HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
+  public Object read(Class<?> clazz, HttpInputMessage inputMessage) throws HttpMessageNotReadableException {
     throw new IllegalStateException("not supported");
   }
 
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java
index 75c580799..bb8c6836a 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java
@@ -178,7 +178,7 @@ public class Schema {
   }
 
   public Optional<String> testOptional() {
-    return null;
+    return Optional.empty();
   }
 
   public CompletableFuture<Optional<String>> testCompletableFutureOptional() {