File tree Expand file tree Collapse file tree 9 files changed +19
-17
lines changed
dubbo-config/dubbo-config-api
dubbo-demo/dubbo-demo-native
dubbo-demo-native-consumer
dubbo-demo-native-provider
dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs
dubbo-rpc/dubbo-rpc-triple/src/test/groovy/org/apache/dubbo/rpc/protocol/tri/rest/mapping
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2 Expand file tree Collapse file tree 9 files changed +19
-17
lines changed Original file line number Diff line number Diff line change 237
237
<dependency >
238
238
<groupId >org.testcontainers</groupId >
239
239
<artifactId >testcontainers</artifactId >
240
- <version >1.20.2 </version >
240
+ <version >1.20.3 </version >
241
241
<scope >test</scope >
242
242
</dependency >
243
243
Original file line number Diff line number Diff line change 152
152
<dependency >
153
153
<groupId >ch.qos.logback</groupId >
154
154
<artifactId >logback-core</artifactId >
155
- <version >1.5.11 </version >
155
+ <version >1.5.12 </version >
156
156
<scope >compile</scope >
157
157
</dependency >
158
158
</dependencies >
Original file line number Diff line number Diff line change 152
152
<dependency >
153
153
<groupId >ch.qos.logback</groupId >
154
154
<artifactId >logback-core</artifactId >
155
- <version >1.5.11 </version >
155
+ <version >1.5.12 </version >
156
156
<scope >compile</scope >
157
157
</dependency >
158
158
</dependencies >
Original file line number Diff line number Diff line change 90
90
<!-- Common libs -->
91
91
<!-- <spring_version>4.3.30.RELEASE</spring_version> -->
92
92
<spring_version >5.3.39</spring_version >
93
- <spring_security_version >5.8.14 </spring_security_version >
93
+ <spring_security_version >5.8.15 </spring_security_version >
94
94
<javassist_version >3.30.2-GA</javassist_version >
95
- <byte-buddy_version >1.15.5 </byte-buddy_version >
95
+ <byte-buddy_version >1.15.7 </byte-buddy_version >
96
96
<netty_version >3.2.10.Final</netty_version >
97
97
<netty4_version >4.1.114.Final</netty4_version >
98
98
<netty_http3_version >0.0.28.Final</netty_http3_version >
154
154
<groovy_version >4.0.23</groovy_version >
155
155
156
156
<!-- Test libs -->
157
- <junit_jupiter_version >5.11.2 </junit_jupiter_version >
158
- <junit_platform_version >1.11.2 </junit_platform_version >
157
+ <junit_jupiter_version >5.11.3 </junit_jupiter_version >
158
+ <junit_platform_version >1.11.3 </junit_platform_version >
159
159
<junit_version >4.13.2</junit_version >
160
160
<awaitility_version >4.2.2</awaitility_version >
161
161
<hamcrest_version >2.2</hamcrest_version >
166
166
167
167
<jaxb_version >2.2.7</jaxb_version >
168
168
<activation_version >1.2.0</activation_version >
169
- <test_container_version >1.20.2 </test_container_version >
169
+ <test_container_version >1.20.3 </test_container_version >
170
170
<hessian_lite_version >4.0.3</hessian_lite_version >
171
171
<swagger_version >1.6.14</swagger_version >
172
172
Original file line number Diff line number Diff line change 56
56
<dependency >
57
57
<groupId >org.apache.maven.plugin-tools</groupId >
58
58
<artifactId >maven-plugin-annotations</artifactId >
59
- <version >3.15.0 </version >
59
+ <version >3.15.1 </version >
60
60
<scope >provided</scope >
61
61
</dependency >
62
62
111
111
<plugin >
112
112
<groupId >org.apache.maven.plugins</groupId >
113
113
<artifactId >maven-plugin-plugin</artifactId >
114
- <version >3.15.0 </version >
114
+ <version >3.15.1 </version >
115
115
<configuration >
116
116
<goalPrefix >dubbo</goalPrefix >
117
117
</configuration >
Original file line number Diff line number Diff line change 29
29
import org .apache .dubbo .rpc .protocol .tri .rest .mapping .meta .ServiceMeta ;
30
30
import org .apache .dubbo .rpc .protocol .tri .rest .util .RestToolKit ;
31
31
32
- @ Activate (onClass = "javax.ws.rs.Path" )
32
+ @ Activate (onClass = { "javax.ws.rs.Path" , "javax.ws.rs.container.ContainerRequestContext" } )
33
33
public class JaxrsRequestMappingResolver implements RequestMappingResolver {
34
34
35
35
private final FrameworkModel frameworkModel ;
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ class RadixTreeTest extends Specification {
65
65
tree. addPath(" /update/{ruleId}" , " a" )
66
66
tree. addPath(" /update/{ruleId}/state" , " b" )
67
67
expect :
68
- tree. match(path). first . value == result
68
+ tree. match(path). get( 0 ) . value == result
69
69
where :
70
70
path | result
71
71
' /update/1222222' | ' a'
Original file line number Diff line number Diff line change @@ -67,6 +67,10 @@ protected Serializer getDefaultSerializer(Class cl) {
67
67
68
68
@ Override
69
69
protected Deserializer getDefaultDeserializer (Class cl ) {
70
+ if (InputStream .class .equals (cl )) {
71
+ return InputStreamDeserializer .DESER ;
72
+ }
73
+
70
74
try {
71
75
// pre-check if class is allow
72
76
defaultSerializeClassChecker .loadClass (getClassLoader (), cl .getName ());
@@ -76,9 +80,7 @@ protected Deserializer getDefaultDeserializer(Class cl) {
76
80
77
81
checkSerializable (cl );
78
82
79
- if (InputStream .class .equals (cl )) {
80
- return InputStreamDeserializer .DESER ;
81
- } else if (RecordUtil .isRecord (cl )) {
83
+ if (RecordUtil .isRecord (cl )) {
82
84
return new RecordDeserializer (cl , getFieldDeserializerFactory ());
83
85
} else {
84
86
if (isEnableUnsafeSerializer ()) {
Original file line number Diff line number Diff line change 134
134
<maven_source_version >3.3.1</maven_source_version >
135
135
<maven_javadoc_version >3.10.1</maven_javadoc_version >
136
136
<maven_jetty_version >9.4.56.v20240826</maven_jetty_version >
137
- <maven_checkstyle_version >3.5 .0</maven_checkstyle_version >
137
+ <maven_checkstyle_version >3.6 .0</maven_checkstyle_version >
138
138
<maven_jacoco_version >0.8.12</maven_jacoco_version >
139
139
<maven_flatten_version >1.6.0</maven_flatten_version >
140
140
<maven_enforce_version >3.5.0</maven_enforce_version >
252
252
</plugin >
253
253
<plugin >
254
254
<artifactId >maven-dependency-plugin</artifactId >
255
- <version >3.8.0 </version >
255
+ <version >3.8.1 </version >
256
256
</plugin >
257
257
<plugin >
258
258
<!-- Do NOT upgrade -->
You can’t perform that action at this time.
0 commit comments