fix(): fix wrong class place & naming

Rawven · Apr 25, 2024 · 73951bd · 73951bd
1 parent e1b4a7f
commit 73951bd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.../rest/filter/CorsHeaderFilterAdapter.java → ...tocol/tri/rest/cors/CorsHeaderFilter.java b/.../rest/filter/CorsHeaderFilterAdapter.java → ...tocol/tri/rest/cors/CorsHeaderFilter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.rpc.protocol.tri.rest.filter;
+package org.apache.dubbo.rpc.protocol.tri.rest.cors;
 
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Activate;
@@ -28,14 +28,14 @@
 import org.apache.dubbo.rpc.RpcInvocation;
 import org.apache.dubbo.rpc.model.FrameworkModel;
 import org.apache.dubbo.rpc.protocol.tri.rest.RestConstants;
-import org.apache.dubbo.rpc.protocol.tri.rest.cors.CorsProcessor;
+import org.apache.dubbo.rpc.protocol.tri.rest.filter.RestHeaderFilterAdapter;
 import org.apache.dubbo.rpc.protocol.tri.rest.mapping.RequestMapping;
 
 @Activate(group = CommonConstants.PROVIDER, order = 1000)
-public class CorsHeaderFilterAdapter extends RestHeaderFilterAdapter {
-    private CorsProcessor corsProcessor;
+public class CorsHeaderFilter extends RestHeaderFilterAdapter {
+    private final CorsProcessor corsProcessor;
 
-    public CorsHeaderFilterAdapter(FrameworkModel frameworkModel) {
+    public CorsHeaderFilter(FrameworkModel frameworkModel) {
         corsProcessor = frameworkModel.getBeanFactory().getOrRegisterBean(CorsProcessor.class);
     }
 

diff --git a/...dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/cors/CorsUtils.java b/...dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/cors/CorsUtils.java
@@ -62,7 +62,7 @@ public static CorsMeta resolveGlobalMeta(Configuration config) {
         meta.setExposedHeaders(parseList(exposeHeaders));
         meta.setMaxAge(maxAge == null ? null : Long.valueOf(maxAge));
         // Return the CorsMeta object.
-        return meta.applyPermitDefaultValues();
+        return meta;
     }
 
     @Nullable

diff --git a/...in/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java b/...in/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java
@@ -61,7 +61,8 @@ public DefaultRequestMappingRegistry(FrameworkModel frameworkModel) {
     public void register(Invoker<?> invoker) {
         Object service = invoker.getUrl().getServiceModel().getProxyObject();
         new MethodWalker().walk(service.getClass(), (classes, consumer) -> {
-            for (RequestMappingResolver resolver : resolvers) {
+            for (int i = 0, size = resolvers.size(); i < size; i++) {
+                RequestMappingResolver resolver = resolvers.get(i);
                 RestToolKit toolKit = resolver.getRestToolKit();
                 ServiceMeta serviceMeta = new ServiceMeta(classes, service, invoker.getUrl(), toolKit);
                 if (!resolver.accept(serviceMeta)) {

diff --git a/...o-rpc-triple/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.HeaderFilter b/...o-rpc-triple/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.HeaderFilter
@@ -1 +1 @@
-rest-cors-extension=org.apache.dubbo.rpc.protocol.tri.rest.filter.CorsHeaderFilterAdapter
+rest-cors=org.apache.dubbo.rpc.protocol.tri.rest.cors.CorsHeaderFilter
diff --git a/...o-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/rest/cors/CorsUtilsTest.java b/...o-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/rest/cors/CorsUtilsTest.java
@@ -57,10 +57,10 @@ void testResolveGlobalMetaWithNullConfig() {
         Mockito.when(config.getString(RestConstants.MAX_AGE)).thenReturn(null);
 
         CorsMeta meta = CorsUtils.resolveGlobalMeta(config);
-        Assertions.assertEquals(CorsMeta.DEFAULT_MAX_AGE, meta.getMaxAge());
-        Assertions.assertEquals(CorsMeta.DEFAULT_PERMIT_ALL, meta.getAllowedOrigins());
-        Assertions.assertEquals(CorsMeta.DEFAULT_PERMIT_METHODS, meta.getAllowedMethods());
-        Assertions.assertEquals(CorsMeta.DEFAULT_PERMIT_ALL, meta.getAllowedHeaders());
+        Assertions.assertNull(meta.getMaxAge());
+        Assertions.assertNull(meta.getAllowedOrigins());
+        Assertions.assertNull(meta.getAllowedMethods());
+        Assertions.assertNull(meta.getAllowedHeaders());
     }
 
     @Test
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		rest-cors-extension=org.apache.dubbo.rpc.protocol.tri.rest.filter.CorsHeaderFilterAdapter
		rest-cors=org.apache.dubbo.rpc.protocol.tri.rest.cors.CorsHeaderFilter