This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new fdb9dd148 Upgrade autowire samples (#1082)
fdb9dd148 is described below
commit fdb9dd148f9e3db9aeff1541e9c52d63ec54476f
Author: herry_01 <[email protected]>
AuthorDate: Mon Mar 18 23:35:19 2024 +0800
Upgrade autowire samples (#1082)
---
.../dubbo-samples-autowire-consumer/pom.xml | 23 +-
.../autowire/consumer/ConsumerBootstrap.java | 4 +-
.../autowire/consumer/HelloServiceConsumer.java | 4 +-
.../dubbo-samples-autowire-provider/pom.xml | 29 +-
.../autowire/provider/EmbeddedZooKeeper.java | 309 ---------------------
.../autowire/provider/HelloServiceImpl.java | 4 +-
.../autowire/provider/ProviderBootstrap.java | 2 -
2-advanced/dubbo-samples-autowire/pom.xml | 25 +-
8 files changed, 45 insertions(+), 355 deletions(-)
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/pom.xml
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/pom.xml
index faf39885a..66d5d30b7 100644
--- a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/pom.xml
+++ b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/pom.xml
@@ -41,6 +41,17 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <exclusions>
+ <!-- Exclude SLF4J Provider -->
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- spring starter -->
@@ -59,11 +70,6 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -71,13 +77,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/ConsumerBootstrap.java
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/ConsumerBootstrap.java
index a313abdf1..1c0148b47 100644
---
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/ConsumerBootstrap.java
+++
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/ConsumerBootstrap.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.samples.autowire.consumer;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.samples.autowire.api.HelloService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/HelloServiceConsumer.java
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/HelloServiceConsumer.java
index 4eb42f4ba..ca1a91c05 100644
---
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/HelloServiceConsumer.java
+++
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/main/java/org/apache/dubbo/samples/autowire/consumer/HelloServiceConsumer.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.samples.autowire.consumer;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.samples.autowire.api.HelloService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
import org.springframework.stereotype.Component;
@Component
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/pom.xml
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/pom.xml
index dd5dde217..4bc1d787f 100644
--- a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/pom.xml
+++ b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/pom.xml
@@ -41,6 +41,17 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <exclusions>
+ <!-- Exclude SLF4J Provider -->
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- spring starter -->
@@ -54,17 +65,6 @@
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
- <!-- Embedded Zookeeper Server Dependencies -->
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>4.1.12.1</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>1.1.10.5</version>
- </dependency>
</dependencies>
<build>
@@ -72,13 +72,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/EmbeddedZooKeeper.java
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/EmbeddedZooKeeper.java
deleted file mode 100644
index f949e753e..000000000
---
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/EmbeddedZooKeeper.java
+++ /dev/null
@@ -1,309 +0,0 @@
-
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.dubbo.samples.autowire.provider;
-
-import org.apache.zookeeper.server.ServerConfig;
-import org.apache.zookeeper.server.ZooKeeperServerMain;
-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.SmartLifecycle;
-import org.springframework.util.ErrorHandler;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.ServerSocket;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-/**
- * from:
https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java
- * <p>
- * Helper class to start an embedded instance of standalone (non clustered)
ZooKeeper.
- * <p>
- * NOTE: at least an external standalone server (if not an ensemble) are
recommended, even for
- * {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication}
- *
- * @author Patrick Peralta
- * @author Mark Fisher
- * @author David Turanski
- */
-public class EmbeddedZooKeeper implements SmartLifecycle {
-
- private static final Random RANDOM = new Random();
-
- /**
- * Logger.
- */
- private static final Logger logger =
LoggerFactory.getLogger(EmbeddedZooKeeper.class);
-
- /**
- * ZooKeeper client port. This will be determined dynamically upon startup.
- */
- private final int clientPort;
-
- /**
- * Whether to auto-start. Default is true.
- */
- private boolean autoStartup = true;
-
- /**
- * Lifecycle phase. Default is 0.
- */
- private int phase = 0;
-
- /**
- * Thread for running the ZooKeeper server.
- */
- private volatile Thread zkServerThread;
-
- /**
- * ZooKeeper server.
- */
- private volatile ZooKeeperServerMain zkServer;
-
- /**
- * {@link ErrorHandler} to be invoked if an Exception is thrown from the
ZooKeeper server thread.
- */
- private ErrorHandler errorHandler;
-
- private boolean daemon = true;
-
- /**
- * Construct an EmbeddedZooKeeper with a random port.
- */
- public EmbeddedZooKeeper() {
- clientPort = findRandomPort(30000, 65535);
- }
-
- /**
- * Construct an EmbeddedZooKeeper with the provided port.
- *
- * @param clientPort port for ZooKeeper server to bind to
- */
- public EmbeddedZooKeeper(int clientPort, boolean daemon) {
- this.clientPort = clientPort;
- this.daemon = daemon;
- }
-
- /**
- * Returns the port that clients should use to connect to this embedded
server.
- *
- * @return dynamically determined client port
- */
- public int getClientPort() {
- return this.clientPort;
- }
-
- /**
- * Specify whether to start automatically. Default is true.
- *
- * @param autoStartup whether to start automatically
- */
- public void setAutoStartup(boolean autoStartup) {
- this.autoStartup = autoStartup;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isAutoStartup() {
- return this.autoStartup;
- }
-
- /**
- * Specify the lifecycle phase for the embedded server.
- *
- * @param phase the lifecycle phase
- */
- public void setPhase(int phase) {
- this.phase = phase;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getPhase() {
- return this.phase;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isRunning() {
- return (zkServerThread != null);
- }
-
- /**
- * Start the ZooKeeper server in a background thread.
- * <p>
- * Register an error handler via {@link #setErrorHandler} in order to
handle
- * any exceptions thrown during startup or execution.
- */
- @Override
- public synchronized void start() {
- if (zkServerThread == null) {
- zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper
Server Starter");
- zkServerThread.setDaemon(daemon);
- zkServerThread.start();
- }
- }
-
- /**
- * Shutdown the ZooKeeper server.
- */
- @Override
- public synchronized void stop() {
- if (zkServerThread != null) {
- // The shutdown method is protected...thus this hack to invoke it.
- // This will log an exception on shutdown; see
- // https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for
details.
- try {
- Method shutdown =
ZooKeeperServerMain.class.getDeclaredMethod("shutdown");
- shutdown.setAccessible(true);
- shutdown.invoke(zkServer);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- // It is expected that the thread will exit after
- // the server is shutdown; this will block until
- // the shutdown is complete.
- try {
- zkServerThread.join(5000);
- zkServerThread = null;
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- logger.warn("Interrupted while waiting for embedded ZooKeeper
to exit");
- // abandoning zk thread
- zkServerThread = null;
- }
- }
- }
-
- /**
- * Stop the server if running and invoke the callback when complete.
- */
- @Override
- public void stop(Runnable callback) {
- stop();
- callback.run();
- }
-
- /**
- * Provide an {@link ErrorHandler} to be invoked if an Exception is thrown
from the ZooKeeper server thread. If none
- * is provided, only error-level logging will occur.
- *
- * @param errorHandler the {@link ErrorHandler} to be invoked
- */
- public void setErrorHandler(ErrorHandler errorHandler) {
- this.errorHandler = errorHandler;
- }
-
- /**
- * Runnable implementation that starts the ZooKeeper server.
- */
- private class ServerRunnable implements Runnable {
-
- @Override
- public void run() {
- try {
- Properties properties = new Properties();
- File file = new File(System.getProperty("java.io.tmpdir")
- + File.separator + UUID.randomUUID());
- file.deleteOnExit();
- properties.setProperty("dataDir", file.getAbsolutePath());
- properties.setProperty("clientPort",
String.valueOf(clientPort));
-
- QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
- quorumPeerConfig.parseProperties(properties);
-
- zkServer = new ZooKeeperServerMain();
- ServerConfig configuration = new ServerConfig();
- configuration.readFrom(quorumPeerConfig);
-
- System.setProperty("zookeeper.admin.enableServer", "false");
-
- zkServer.runFromConfig(configuration);
- } catch (Exception e) {
- if (errorHandler != null) {
- errorHandler.handleError(e);
- } else {
- logger.error("Exception running embedded ZooKeeper", e);
- }
- }
- }
- }
-
- /**
- * Workaround for SocketUtils.findRandomPort() deprecation.
- *
- * @param min min port
- * @param max max port
- * @return a random generated available port
- */
- private static int findRandomPort(int min, int max) {
- if (min < 1024) {
- throw new IllegalArgumentException("Max port shouldn't be less
than 1024.");
- }
-
- if (max > 65535) {
- throw new IllegalArgumentException("Max port shouldn't be greater
than 65535.");
- }
-
- if (min > max) {
- throw new IllegalArgumentException("Min port shouldn't be greater
than max port.");
- }
-
- int port = 0;
- int counter = 0;
-
- // Workaround for legacy JDK doesn't support Random.nextInt(min, max).
- List<Integer> randomInts = RANDOM.ints(min, max + 1)
- .limit(max - min)
- .mapToObj(Integer::valueOf)
- .collect(Collectors.toList());
-
- do {
- if (counter > max - min) {
- throw new IllegalStateException("Unable to find a port between
" + min + "-" + max);
- }
-
- port = randomInts.get(counter);
- counter++;
- } while (isPortInUse(port));
-
- return port;
- }
-
- private static boolean isPortInUse(int port) {
- try (ServerSocket ignored = new ServerSocket(port)) {
- return false;
- } catch (IOException e) {
- // continue
- }
- return true;
- }
-}
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/HelloServiceImpl.java
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/HelloServiceImpl.java
index 7544a335b..6b7d2a28b 100644
---
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/HelloServiceImpl.java
+++
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/HelloServiceImpl.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.samples.autowire.provider;
import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.samples.autowire.api.HelloService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
@DubboService(token = "true")
public class HelloServiceImpl implements HelloService {
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/ProviderBootstrap.java
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/ProviderBootstrap.java
index b7fa733d1..3fd52410f 100644
---
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/ProviderBootstrap.java
+++
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-provider/src/main/java/org/apache/dubbo/samples/autowire/provider/ProviderBootstrap.java
@@ -21,14 +21,12 @@ import
org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import java.util.concurrent.CountDownLatch;
@SpringBootApplication
@EnableDubbo
public class ProviderBootstrap {
public static void main(String[] args) throws InterruptedException {
- new EmbeddedZooKeeper(2181, false).start();
SpringApplication.run(ProviderBootstrap.class, args);
}
diff --git a/2-advanced/dubbo-samples-autowire/pom.xml
b/2-advanced/dubbo-samples-autowire/pom.xml
index a228c7783..94be10a55 100644
--- a/2-advanced/dubbo-samples-autowire/pom.xml
+++ b/2-advanced/dubbo-samples-autowire/pom.xml
@@ -48,7 +48,8 @@
<dubbo.version>3.3.0-beta.1</dubbo.version>
<spring-boot.version>3.2.3</spring-boot.version>
- <junit.version>4.13.1</junit.version>
+ <junit5.version>5.10.1</junit5.version>
+ <junit.platform>1.9.3</junit.platform>
</properties>
<dependencyManagement>
@@ -81,16 +82,17 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
@@ -98,6 +100,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
