[servicecomb-java-chassis] branch master updated: [SCB-2622] Use math api instead of manual calculate (#3159)

[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


The following commit(s) were added to refs/heads/master by this push:
     new 6e2df7eaf [SCB-2622] Use math api instead of manual calculate (#3159)
6e2df7eaf is described below

commit 6e2df7eafbdcd7609c2e97cb55f0efe4f69ddf45
Author: ZhangJian He <shoot...@gmail.com>
AuthorDate: Thu Jun 30 09:14:37 2022 +0800

    [SCB-2622] Use math api instead of manual calculate (#3159)
---
 .../servicecomb/service/center/client/ServiceCenterClientTest.java   | 1 -
 .../foundation/vertx/stream/OutputStreamToWriteStream.java           | 2 +-
 .../huaweicloud/dashboard/monitor/data/MonitorConstant.java          | 5 +----
 .../apache/servicecomb/transport/common/TransportConfigUtils.java    | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
 
b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
index 79566fed9..0c2abfbd1 100755
--- 
a/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
+++ 
b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
@@ -487,7 +487,6 @@ public class ServiceCenterClientTest {
     boolean result = serviceCenterClient
         .updateServiceSchemaContext("111", new SchemaInfo());
 
-    Assertions.assertNotNull(result);
     Assertions.assertTrue(result);
   }
 }
diff --git 
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/OutputStreamToWriteStream.java
 
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/OutputStreamToWriteStream.java
index 464b1411b..95ea0b507 100644
--- 
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/OutputStreamToWriteStream.java
+++ 
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/OutputStreamToWriteStream.java
@@ -141,7 +141,7 @@ public class OutputStreamToWriteStream implements 
WriteStream<Buffer>, AsyncClos
 
   @Override
   public WriteStream<Buffer> setWriteQueueMaxSize(int maxSize) {
-    this.maxBuffers = maxSize < SMALLEST_MAX_BUFFERS ? SMALLEST_MAX_BUFFERS : 
maxSize;
+    this.maxBuffers = Math.max(maxSize, SMALLEST_MAX_BUFFERS);
     this.drainMark = maxBuffers / 2;
     return this;
   }
diff --git 
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/data/MonitorConstant.java
 
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/data/MonitorConstant.java
index eb3adf4ba..9bf37e298 100644
--- 
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/data/MonitorConstant.java
+++ 
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/data/MonitorConstant.java
@@ -119,10 +119,7 @@ public class MonitorConstant {
     DynamicIntProperty property = DynamicPropertyFactory.getInstance().
         getIntProperty("servicecomb.monitor.client.interval", 
DEFAULT_INTERVAL);
     int val = property.getValue();
-    if (val < MIN_INTERVAL_MILLISECONDS) {
-      return MIN_INTERVAL_MILLISECONDS;
-    }
-    return val;
+    return Math.max(val, MIN_INTERVAL_MILLISECONDS);
   }
 
   public static Boolean isProxyEnable() {
diff --git 
a/transports/transport-common/src/main/java/org/apache/servicecomb/transport/common/TransportConfigUtils.java
 
b/transports/transport-common/src/main/java/org/apache/servicecomb/transport/common/TransportConfigUtils.java
index 2278fb69a..29a7b9533 100644
--- 
a/transports/transport-common/src/main/java/org/apache/servicecomb/transport/common/TransportConfigUtils.java
+++ 
b/transports/transport-common/src/main/java/org/apache/servicecomb/transport/common/TransportConfigUtils.java
@@ -42,7 +42,7 @@ public final class TransportConfigUtils {
     }
 
     // default value
-    count = Runtime.getRuntime().availableProcessors() > 8 ? 8 : 
Runtime.getRuntime().availableProcessors();
+    count = Math.min(Runtime.getRuntime().availableProcessors(), 8);
     LOGGER.info("{} not defined, set to {}.", key, count);
     return count;
   }