Skip to content

Refactor dubbo spring boot structure #14794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CrazyHZM merged 6 commits into from
Oct 31, 2024
Merged

Refactor dubbo spring boot structure #14794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2306c1e
Refactor dubbo spring boot structure
CrazyHZM Oct 18, 2024
1f66713
Merge branch 'refs/heads/3.3' into feat/refactor-spring-boot
CrazyHZM Oct 18, 2024
6e4543a
Merge branch 'refs/heads/3.3' into feat/refactor-spring-boot
CrazyHZM Oct 26, 2024
ec09922
Remove repeated dependency
CrazyHZM Oct 30, 2024
d5d6075
Merge branch 'refs/heads/3.3' into feat/refactor-spring-boot
CrazyHZM Oct 30, 2024
21d9b5b
Change actuator dependency
CrazyHZM Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .artifacts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,13 @@ dubbo-serialization-fastjson2
dubbo-serialization-hessian2
dubbo-spring-boot
dubbo-spring-boot-actuator
dubbo-spring-boot-actuator-autoconfigure
dubbo-spring-boot-actuator-compatible
dubbo-spring-boot-autoconfigure
dubbo-spring-boot-3-autoconfigure
dubbo-spring-boot-autoconfigure-compatible
dubbo-spring-boot-actuator-autoconfigure-compatible
dubbo-spring-boot-compatible
dubbo-observability-spring-boot-starters
dubbo-tracing-brave-zipkin-spring-boot-starter
dubbo-tracing-otel-zipkin-spring-boot-starter
dubbo-tracing-otel-otlp-spring-boot-starter
Expand Down
55 changes: 55 additions & 0 deletions dubbo-dependencies-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@
<open_feign_version>3.1.9</open_feign_version>
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
<jaxb-runtime.version>2.4.0-b180830.0438</jaxb-runtime.version>
<spring-boot.version>2.7.18</spring-boot.version>
<!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version -->
<byte-buddy.version>1.15.1</byte-buddy.version>
<prometheus-client.version>0.16.0</prometheus-client.version>

<revision>3.3.2-SNAPSHOT</revision>
</properties>
Expand Down Expand Up @@ -215,6 +219,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
Expand Down Expand Up @@ -243,6 +248,50 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_bom</artifactId>
<version>${prometheus-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
<exclusions>
<exclusion>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
Expand Down Expand Up @@ -689,6 +738,12 @@
<version>${junit_platform_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>${junit_platform_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
Expand Down
16 changes: 10 additions & 6 deletions dubbo-distribution/dubbo-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,11 @@
<artifactId>dubbo-spring-boot-actuator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-actuator-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
Expand All @@ -493,7 +498,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-actuator-compatible</artifactId>
<artifactId>dubbo-spring-boot-actuator-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -503,23 +508,22 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<artifactId>dubbo-spring-boot-actuator-autoconfigure-compatible</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-interceptor</artifactId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starters</artifactId>
<artifactId>dubbo-spring-boot</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-observability-spring-boot-starters</artifactId>
<artifactId>dubbo-spring-boot-starters</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
Expand Down
0 ...dubbo-spring-boot-3-autoconfigure/pom.xml → ...dubbo-spring-boot-3-autoconfigure/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...figure/DubboTriple3AutoConfiguration.java → ...figure/DubboTriple3AutoConfiguration.java
View file
Open in desktop
File renamed without changes.
0 ...t/autoconfigure/SpringBoot3Condition.java → ...t/autoconfigure/SpringBoot3Condition.java
View file
Open in desktop
File renamed without changes.
0 .../main/resources/META-INF/spring.factories → .../main/resources/META-INF/spring.factories
View file
Open in desktop
File renamed without changes.
0 ...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
File renamed without changes.
150 changes: 150 additions & 0 deletions dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-parent</artifactId>
<version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>dubbo-spring-boot-actuator-autoconfigure</artifactId>
<description>Apache Dubbo Spring Boot Actuator Autoconfigure</description>

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-actuator</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<optional>true</optional>
</dependency>

<!-- Dubbo autoconfigure -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>

<!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-actuator-autoconfigure-compatible</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-config-spring</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-dubbo</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-qos</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<scope>test</scope>
</dependency>

<!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test-check</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
0 ...oEndpointAnnotationAutoConfiguration.java → ...oEndpointAnnotationAutoConfiguration.java
View file
Open in desktop
File renamed without changes.
0 ...bboEndpointMetadataAutoConfiguration.java → ...bboEndpointMetadataAutoConfiguration.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...boExtensionEndpointAutoConfiguration.java → ...boExtensionEndpointAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.dubbo.spring.boot.actuate.autoconfigure;

import org.apache.dubbo.spring.boot.actuate.endpoint.configuration.DubboActuatorProperties;
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboActuatorProperties;

import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand Down
0 ...ubboHealthIndicatorAutoConfiguration.java → ...ubboHealthIndicatorAutoConfiguration.java
View file
Open in desktop
File renamed without changes.
0 ...figure/DubboMetricsAutoConfiguration.java → ...figure/DubboMetricsAutoConfiguration.java
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions .../main/resources/META-INF/spring.factories → .../main/resources/META-INF/spring.factories
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration,\
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration,\
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfiguration,\
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboMetricsAutoConfiguration
3 changes: 2 additions & 1 deletion ...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfiguration
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboExtensionEndpointAutoConfiguration
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfiguration
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboMetricsAutoConfiguration
0 ...pointAnnotationAutoConfigurationTest.java → ...pointAnnotationAutoConfigurationTest.java
View file
Open in desktop
File renamed without changes.
0 ...uate/health/DubboHealthIndicatorTest.java → ...uate/health/DubboHealthIndicatorTest.java
View file
Open in desktop
File renamed without changes.
0 ...tuator/src/test/resources/log4j2-test.xml → ...figure/src/test/resources/log4j2-test.xml
View file
Open in desktop
File renamed without changes.
0 ...ring-boot-actuator/JMX_HealthEndpoint.png → ...ring-boot-actuator/JMX_HealthEndpoint.png
View file
Open in desktop
File renamed without changes
0 ...boot/dubbo-spring-boot-actuator/README.md → ...ject/dubbo-spring-boot-actuator/README.md
View file
Open in desktop
File renamed without changes.
19 changes: 3 additions & 16 deletions ...g-boot/dubbo-spring-boot-actuator/pom.xml → ...roject/dubbo-spring-boot-actuator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot</artifactId>
<artifactId>dubbo-parent</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>dubbo-spring-boot-actuator</artifactId>
Expand All @@ -30,12 +30,6 @@

<dependencies>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-actuator-compatible</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -49,16 +43,9 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<optional>true</optional>
</dependency>

<!-- Dubbo autoconfigure -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
<artifactId>dubbo-spring-boot</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion ...onfiguration/DubboActuatorProperties.java → ...ate/endpoint/DubboActuatorProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dubbo.spring.boot.actuate.endpoint.configuration;
package org.apache.dubbo.spring.boot.actuate.endpoint;

import java.util.Map;

Expand Down
0 ...ndpoint/DubboConfigsMetadataEndpoint.java → ...ndpoint/DubboConfigsMetadataEndpoint.java
View file
Open in desktop
File renamed without changes.
0 ...oint/DubboPropertiesMetadataEndpoint.java → ...oint/DubboPropertiesMetadataEndpoint.java
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion ...t/actuate/endpoint/DubboQosEndpoints.java → ...t/actuate/endpoint/DubboQosEndpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import org.apache.dubbo.qos.command.ActuatorExecutor;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.spring.boot.actuate.endpoint.configuration.DubboActuatorProperties;
import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboMetadata;

import java.util.Map;
Expand Down
0 ...oint/DubboReferencesMetadataEndpoint.java → ...oint/DubboReferencesMetadataEndpoint.java
View file
Open in desktop
File renamed without changes.
0 ...dpoint/DubboServicesMetadataEndpoint.java → ...dpoint/DubboServicesMetadataEndpoint.java
View file
Open in desktop
File renamed without changes.
0 ...tuate/endpoint/DubboShutdownEndpoint.java → ...tuate/endpoint/DubboShutdownEndpoint.java
View file
Open in desktop
File renamed without changes.
0 ...mpatibleConditionalOnEnabledEndpoint.java → ...mpatibleConditionalOnEnabledEndpoint.java
View file
Open in desktop
File renamed without changes.
0 ...CompatibleOnEnabledEndpointCondition.java → ...CompatibleOnEnabledEndpointCondition.java
View file
Open in desktop
File renamed without changes.
0 ...point/metadata/AbstractDubboMetadata.java → ...point/metadata/AbstractDubboMetadata.java
View file
Open in desktop
File renamed without changes.
0 ...dpoint/metadata/DubboConfigsMetadata.java → ...dpoint/metadata/DubboConfigsMetadata.java
View file
Open in desktop
File renamed without changes.
0 ...uate/endpoint/metadata/DubboMetadata.java → ...uate/endpoint/metadata/DubboMetadata.java
View file
Open in desktop
File renamed without changes.
0 ...int/metadata/DubboPropertiesMetadata.java → ...int/metadata/DubboPropertiesMetadata.java
View file
Open in desktop
File renamed without changes.
0 ...int/metadata/DubboReferencesMetadata.java → ...int/metadata/DubboReferencesMetadata.java
View file
Open in desktop
File renamed without changes.
0 ...point/metadata/DubboServicesMetadata.java → ...point/metadata/DubboServicesMetadata.java
View file
Open in desktop
File renamed without changes.
0 ...point/metadata/DubboShutdownMetadata.java → ...point/metadata/DubboShutdownMetadata.java
View file
Open in desktop
File renamed without changes.
0 .../actuate/health/DubboHealthIndicator.java → .../actuate/health/DubboHealthIndicator.java
View file
Open in desktop
File renamed without changes.
0 ...ealth/DubboHealthIndicatorProperties.java → ...ealth/DubboHealthIndicatorProperties.java
View file
Open in desktop
File renamed without changes.
0 ...t/actuate/mertics/DubboMetricsBinder.java → ...t/actuate/mertics/DubboMetricsBinder.java
View file
Open in desktop
File renamed without changes.
0 ...TA-INF/dubbo-endpoints-default.properties → ...TA-INF/dubbo-endpoints-default.properties
View file
Open in desktop
File renamed without changes.
0 ...t/actuate/endpoint/DubboEndpointTest.java → ...t/actuate/endpoint/DubboEndpointTest.java
View file
Open in desktop
File renamed without changes.
0 ...figure/src/test/resources/log4j2-test.xml → ...tuator/src/test/resources/log4j2-test.xml
View file
Open in desktop
File renamed without changes.
0 ...dubbo-spring-boot-autoconfigure/README.md → ...dubbo-spring-boot-autoconfigure/README.md
View file
Open in desktop
File renamed without changes.
0 ...oot-autoconfigure/config-popup-window.png → ...oot-autoconfigure/config-popup-window.png
View file
Open in desktop
File renamed without changes
0 ...ot-autoconfigure/mconfig-popup-window.png → ...ot-autoconfigure/mconfig-popup-window.png
View file
Open in desktop
File renamed without changes
Loading