This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new c6a3f94118 Fix code style for 3.2 (#11020)
c6a3f94118 is described below
commit c6a3f94118653ad74b8a96ca59b0ef143e2dd0a5
Author: Albumen Kevin <[email protected]>
AuthorDate: Fri Nov 25 14:05:03 2022 +0800
Fix code style for 3.2 (#11020)
---
.../main/java/org/apache/dubbo/rpc/cluster/RouterChain.java | 6 ++++--
.../java/org/apache/dubbo/config/DubboShutdownHook.java | 1 +
.../bootstrap/builders/InternalServiceConfigBuilder.java | 2 +-
.../dubbo/config/deploy/DefaultMetricsServiceExporter.java | 13 ++++++++++---
.../main/java/org/apache/dubbo/remoting/utils/UrlUtils.java | 4 ++--
5 files changed, 18 insertions(+), 8 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
index 696785371b..a5fa88fc63 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
@@ -129,7 +129,8 @@ public class RouterChain<T> {
try {
Thread.sleep(1);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ logger.error(INTERNAL_INTERRUPTED, "", "", "Interrupted when
waiting router chain.", e);
+ Thread.currentThread().interrupt();
}
// 7. switch chain
@@ -156,8 +157,9 @@ public class RouterChain<T> {
// long time wait
Thread.sleep(1);
}
- } catch (Throwable t) {
+ } catch (InterruptedException t) {
logger.error(INTERNAL_INTERRUPTED, "Wait router to interrupted",
"", "Wait router to interrupted.");
+ Thread.currentThread().interrupt();
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
index 988ad616df..37882db95b 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
@@ -111,6 +111,7 @@ public class DubboShutdownHook extends Thread {
}
} catch (InterruptedException e) {
logger.warn(e.getMessage(), e);
+ Thread.currentThread().interrupt();
}
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java
index a2ea837736..a0b27cdbf8 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java
@@ -304,7 +304,7 @@ public class InternalServiceConfigBuilder<T> {
}
private ApplicationConfig getApplicationConfig() {
- return
applicationModel.getApplicationConfigManager().getApplication().get();
+ return
applicationModel.getApplicationConfigManager().getApplicationOrElseThrow();
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
index 07359bb252..7db9961bfd 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
@@ -16,8 +16,6 @@
*/
package org.apache.dubbo.config.deploy;
-import static
org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMETHEUS;
-
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.metrics.service.MetricsService;
@@ -28,6 +26,10 @@ import
org.apache.dubbo.config.bootstrap.builders.InternalServiceConfigBuilder;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ScopeModelAware;
+import java.util.Optional;
+
+import static
org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMETHEUS;
+
/**
* Export metrics service
*/
@@ -104,7 +106,12 @@ public class DefaultMetricsServiceExporter implements
MetricsServiceExporter, Sc
}
private MetricsConfig getMetricsConfig() {
- return
applicationModel.getApplicationConfigManager().getMetrics().get();
+ Optional<MetricsConfig> metricsConfig =
applicationModel.getApplicationConfigManager().getMetrics();
+ if (metricsConfig.isPresent()) {
+ return metricsConfig.get();
+ } else {
+ throw new IllegalStateException("There's no MetricsConfig
specified.");
+ }
}
private boolean isExported() {
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
index b1cc64f4a0..983b5b1927 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
@@ -23,7 +23,6 @@ import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.remoting.Constants;
import org.apache.dubbo.remoting.transport.CodecSupport;
-
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
@@ -82,7 +81,8 @@ public class UrlUtils {
*/
public static String serializationOrDefault(URL url) {
//noinspection OptionalGetWithoutIsPresent
- return allSerializations(url).stream().findFirst().get();
+ Optional<String> serializations =
allSerializations(url).stream().findFirst();
+ return
serializations.orElseGet(DefaultSerializationSelector::getDefaultRemotingSerialization);
}
/**
