From b1c5dc774e3b1d6f575cfd07596f4f1609fc78f6 Mon Sep 17 00:00:00 2001 From: zhuoguang <1336317033@qq.com> Date: Mon, 10 Jul 2023 14:03:24 +0800 Subject: [PATCH] For #10734,delete the ConnectionSetupRequestParamExtractor --- .../ConnectionSetupRequestParamExtractor.java | 42 ----------------- ....core.paramcheck.AbstractRpcParamExtractor | 1 - ...nectionSetupRequestParamExtractorTest.java | 46 ------------------- 3 files changed, 89 deletions(-) delete mode 100644 core/src/main/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractor.java delete mode 100644 core/src/test/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractorTest.java diff --git a/core/src/main/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractor.java b/core/src/main/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractor.java deleted file mode 100644 index 5e5bceb3b6d..00000000000 --- a/core/src/main/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractor.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 1999-2023 Alibaba Group Holding Ltd. - * - * 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 com.alibaba.nacos.core.paramcheck.impl; - -import com.alibaba.nacos.api.remote.request.ConnectionSetupRequest; -import com.alibaba.nacos.api.remote.request.Request; -import com.alibaba.nacos.common.paramcheck.ParamCheckUtils; -import com.alibaba.nacos.core.paramcheck.AbstractRpcParamExtractor; - -/** - * Param extractor for {@link ConnectionSetupRequest}. - * - * @author zhuoguang - */ -public class ConnectionSetupRequestParamExtractor extends AbstractRpcParamExtractor { - - @Override - public void init() { - addTargetRequest(ConnectionSetupRequest.class.getSimpleName()); - } - - @Override - public void extractParamAndCheck(Request request) throws Exception { - ConnectionSetupRequest req = (ConnectionSetupRequest) request; - String tenant = req.getTenant(); - ParamCheckUtils.checkNamespaceIdFormat(tenant); - } -} diff --git a/core/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractRpcParamExtractor b/core/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractRpcParamExtractor index fb3524b4d4c..9410d161628 100644 --- a/core/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractRpcParamExtractor +++ b/core/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractRpcParamExtractor @@ -18,7 +18,6 @@ com.alibaba.nacos.core.paramcheck.impl.SubscribeServiceRequestParamExtractor com.alibaba.nacos.core.paramcheck.impl.ServiceQueryRequestParamExtractor com.alibaba.nacos.core.paramcheck.impl.ServiceListRequestParamExtractor com.alibaba.nacos.core.paramcheck.impl.InstanceRequestParamExtractor -com.alibaba.nacos.core.paramcheck.impl.ConnectionSetupRequestParamExtractor com.alibaba.nacos.core.paramcheck.impl.ConfigRequestParamExtractor com.alibaba.nacos.core.paramcheck.impl.ConfigBatchListenRequestParamExtractor com.alibaba.nacos.core.paramcheck.impl.BatchInstanceRequestParamExtractor \ No newline at end of file diff --git a/core/src/test/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractorTest.java b/core/src/test/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractorTest.java deleted file mode 100644 index 962a73798a8..00000000000 --- a/core/src/test/java/com/alibaba/nacos/core/paramcheck/impl/ConnectionSetupRequestParamExtractorTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 1999-2023 Alibaba Group Holding Ltd. - * - * 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 com.alibaba.nacos.core.paramcheck.impl; - -import com.alibaba.nacos.api.remote.request.ConnectionSetupRequest; -import com.alibaba.nacos.core.paramcheck.AbstractRpcParamExtractor; -import com.alibaba.nacos.core.paramcheck.RpcParamExtractorManager; -import org.junit.BeforeClass; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class ConnectionSetupRequestParamExtractorTest { - - private static ConnectionSetupRequest req; - - @BeforeClass - public static void initConnectionSetupRequest() { - req = new ConnectionSetupRequest(); - } - - /** - * Test extract param and check. - */ - @Test - public void testExtractParamAndCheck() throws Exception { - RpcParamExtractorManager paramExtractorManager = RpcParamExtractorManager.getInstance(); - AbstractRpcParamExtractor extractor = paramExtractorManager.getExtractor(req.getClass().getSimpleName()); - assertEquals(extractor.getClass().getSimpleName(), ConnectionSetupRequestParamExtractor.class.getSimpleName()); - extractor.extractParamAndCheck(req); - } -} \ No newline at end of file