Skip to content

Commit 6dcf7ab

Browse files
oxseanoxsean
committed
Refine
1 parent 69fe8bb commit 6dcf7ab

File tree

108 files changed

+4111
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+4111
-187
lines changed

‎.artifacts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,6 @@ dubbo-xds
112112
dubbo-plugin-loom
113113
dubbo-rest-jaxrs
114114
dubbo-rest-spring
115-
dubbo-rest-swagger
115+
dubbo-rest-openapi
116116
dubbo-triple-servlet
117117
dubbo-triple-websocket

‎LICENSE

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,3 +287,11 @@ This product contains a modified portion of 'Istio', an open platform to connect
287287
under a "Apache License 2.0" license, see https://github.com/istio/api/blob/master/LICENSE:
288288

289289
* security/v1alpha1/ca.proto
290+
291+
For the file dubbo-plugin/dubbo-rest-openapi/src/main/resources/META-INF/resources/swagger-ui/index.html:
292+
293+
Under a "Apache License 2.0" license, see https://github.com/swagger-api/swagger-ui/blob/master/LICENSE
294+
295+
For the file dubbo-plugin/dubbo-rest-openapi/src/main/resources/META-INF/resources/redoc/index.html:
296+
297+
Under a "MIT License" license, see https://github.com/Redocly/redoc/blob/main/LICENSE

‎dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionAccessor.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ default <T> T getDefaultExtension(Class<T> type) {
4646
return extensionLoader != null ? extensionLoader.getDefaultExtension() : null;
4747
}
4848

49+
default <T> T getDefaultExtensionOrNull(Class<T> type) {
50+
ExtensionLoader<T> extensionLoader = getExtensionLoader(type);
51+
if (extensionLoader == null) {
52+
return null;
53+
}
54+
return extensionLoader.getExtension(extensionLoader.getDefaultExtensionName(), true);
55+
}
56+
4957
default <T> List<T> getActivateExtensions(Class<T> type) {
5058
ExtensionLoader<T> extensionLoader = getExtensionLoader(type);
5159
return extensionLoader != null ? extensionLoader.getActivateExtensions() : Collections.emptyList();

‎dubbo-common/src/main/java/org/apache/dubbo/config/nested/RestConfig.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ public class RestConfig implements Serializable {
3434
public static final boolean DEFAULT_CASE_SENSITIVE_MATCH = true;
3535
public static final String DEFAULT_FORMAT_PARAMETER_NAME = "format";
3636

37+
/**
38+
* Whether to enable rest support
39+
* <p>The default value is 'true'.
40+
*/
41+
private Boolean enabled;
42+
43+
/**
44+
* Whether to enable the default mapping '/{interfaceName}/{methodName}'.
45+
* <p>The default value is 'true'.
46+
*/
47+
private Boolean enableDefaultMapping;
48+
3749
/**
3850
* Whether path matching should be match paths with a trailing slash.
3951
* If enabled, a method mapped to "/users" also matches to "/users/".
@@ -90,6 +102,22 @@ public class RestConfig implements Serializable {
90102
*/
91103
private Map<String, OpenAPIConfig> openapis;
92104

105+
public Boolean getEnabled() {
106+
return enabled;
107+
}
108+
109+
public void setEnabled(Boolean enabled) {
110+
this.enabled = enabled;
111+
}
112+
113+
public Boolean getEnableDefaultMapping() {
114+
return enableDefaultMapping;
115+
}
116+
117+
public void setEnableDefaultMapping(Boolean enableDefaultMapping) {
118+
this.enableDefaultMapping = enableDefaultMapping;
119+
}
120+
93121
public Boolean getTrailingSlashMatch() {
94122
return trailingSlashMatch;
95123
}

‎dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-servlet/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
<artifactId>dubbo-registry-zookeeper</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
35+
<dependency>
36+
<groupId>org.apache.dubbo</groupId>
37+
<artifactId>dubbo-qos</artifactId>
38+
<version>${project.version}</version>
39+
</dependency>
3540
<dependency>
3641
<groupId>org.apache.dubbo</groupId>
3742
<artifactId>dubbo-rpc-triple</artifactId>
@@ -54,7 +59,7 @@
5459
</dependency>
5560
<dependency>
5661
<groupId>org.apache.dubbo</groupId>
57-
<artifactId>dubbo-rest-swagger</artifactId>
62+
<artifactId>dubbo-rest-openapi</artifactId>
5863
<version>${project.version}</version>
5964
</dependency>
6065
<dependency>

‎dubbo-distribution/dubbo-all-shaded/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
</dependency>
279279
<dependency>
280280
<groupId>org.apache.dubbo</groupId>
281-
<artifactId>dubbo-rest-swagger</artifactId>
281+
<artifactId>dubbo-rest-openapi</artifactId>
282282
<version>${project.version}</version>
283283
<scope>compile</scope>
284284
<optional>true</optional>
@@ -531,7 +531,7 @@
531531
<include>org.apache.dubbo:dubbo-rpc-triple</include>
532532
<include>org.apache.dubbo:dubbo-rest-jaxrs</include>
533533
<include>org.apache.dubbo:dubbo-rest-spring</include>
534-
<include>org.apache.dubbo:dubbo-rest-swagger</include>
534+
<include>org.apache.dubbo:dubbo-rest-openapi</include>
535535
<include>org.apache.dubbo:dubbo-triple-servlet</include>
536536
<include>org.apache.dubbo:dubbo-triple-websocket</include>
537537
<include>org.apache.dubbo:dubbo-serialization-api</include>
@@ -889,6 +889,9 @@
889889
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
890890
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.tri.rest.mapping.RequestMappingResolver</resource>
891891
</transformer>
892+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
893+
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.http12.rest.OpenAPIService</resource>
894+
</transformer>
892895
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
893896
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.tri.rest.openapi.OpenAPIExtension</resource>
894897
</transformer>

‎dubbo-distribution/dubbo-all/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
</dependency>
279279
<dependency>
280280
<groupId>org.apache.dubbo</groupId>
281-
<artifactId>dubbo-rest-swagger</artifactId>
281+
<artifactId>dubbo-rest-openapi</artifactId>
282282
<version>${project.version}</version>
283283
<scope>compile</scope>
284284
<optional>true</optional>
@@ -530,7 +530,7 @@
530530
<include>org.apache.dubbo:dubbo-rpc-triple</include>
531531
<include>org.apache.dubbo:dubbo-rest-jaxrs</include>
532532
<include>org.apache.dubbo:dubbo-rest-spring</include>
533-
<include>org.apache.dubbo:dubbo-rest-swagger</include>
533+
<include>org.apache.dubbo:dubbo-rest-openapi</include>
534534
<include>org.apache.dubbo:dubbo-triple-servlet</include>
535535
<include>org.apache.dubbo:dubbo-triple-websocket</include>
536536
<include>org.apache.dubbo:dubbo-serialization-api</include>
@@ -887,6 +887,9 @@
887887
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
888888
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.tri.rest.mapping.RequestMappingResolver</resource>
889889
</transformer>
890+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
891+
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.http12.rest.OpenAPIService</resource>
892+
</transformer>
890893
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
891894
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.tri.rest.openapi.OpenAPIExtension</resource>
892895
</transformer>

‎dubbo-distribution/dubbo-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
</dependency>
304304
<dependency>
305305
<groupId>org.apache.dubbo</groupId>
306-
<artifactId>dubbo-rest-swagger</artifactId>
306+
<artifactId>dubbo-rest-openapi</artifactId>
307307
<version>${project.version}</version>
308308
</dependency>
309309
<dependency>

‎dubbo-distribution/dubbo-core-spi/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,9 @@
483483
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
484484
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.tri.rest.mapping.RequestMappingResolver</resource>
485485
</transformer>
486+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
487+
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.http12.rest.OpenAPIService</resource>
488+
</transformer>
486489
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
487490
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.tri.rest.openapi.OpenAPIExtension</resource>
488491
</transformer>

‎dubbo-metadata/dubbo-metadata-api/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
<version>${project.parent.version}</version>
6363
<scope>compile</scope>
6464
</dependency>
65+
<dependency>
66+
<groupId>com.google.protobuf</groupId>
67+
<artifactId>protobuf-java</artifactId>
68+
</dependency>
6569

6670
<dependency>
6771
<groupId>org.apache.dubbo</groupId>
@@ -81,4 +85,13 @@
8185
<version>${project.parent.version}</version>
8286
</dependency>
8387
</dependencies>
88+
89+
<build>
90+
<plugins>
91+
<!-- <plugin>
92+
<groupId>org.apache.dubbo</groupId>
93+
<artifactId>dubbo-maven-plugin</artifactId>
94+
</plugin>-->
95+
</plugins>
96+
</build>
8497
</project>

0 commit comments

Comments
 (0)