> store;
+
+ /**
+ * Taken URL as an argument to create an instance of ThreadLocalCache. In this version of implementation constructor
+ * argument is not getting used in the scope of this class.
+ * @param url
+ */
+ public ThreadLocalCache(URL url) {
+ this.store = ThreadLocal.withInitial(HashMap::new);
+ }
+
+ /**
+ * API to store value against a key in the calling thread scope.
+ * @param key Unique identifier for the object being store.
+ * @param value Value getting store
+ */
+ @Override
+ public void put(Object key, Object value) {
+ store.get().put(key, value);
+ }
+
+ /**
+ * API to return stored value using a key against the calling thread specific store.
+ * @param key Unique identifier for cache lookup
+ * @return Return stored object against key
+ */
+ @Override
+ public Object get(Object key) {
+ return store.get().get(key);
+ }
+
+}
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java
index bde16f63bd..cdda6cf3e4 100644
--- a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java
+++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java
@@ -1,43 +1,43 @@
-/*
- * 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.
- */
-package org.apache.dubbo.cache.support.threadlocal;
-
-import org.apache.dubbo.cache.Cache;
-import org.apache.dubbo.cache.support.AbstractCacheFactory;
-import org.apache.dubbo.common.URL;
-
-/**
- * Implement {@link org.apache.dubbo.cache.CacheFactory} by extending {@link AbstractCacheFactory} and provide
- * instance of new {@link ThreadLocalCache}. Note about this class is, each thread does not have a local copy of factory.
- *
- * @see AbstractCacheFactory
- * @see ThreadLocalCache
- * @see Cache
- */
-public class ThreadLocalCacheFactory extends AbstractCacheFactory {
-
- /**
- * Takes url as an method argument and return new instance of cache store implemented by ThreadLocalCache.
- * @param url url of the method
- * @return ThreadLocalCache instance of cache
- */
- @Override
- protected Cache createCache(URL url) {
- return new ThreadLocalCache(url);
- }
-
-}
+/*
+ * 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.
+ */
+package org.apache.dubbo.cache.support.threadlocal;
+
+import org.apache.dubbo.cache.Cache;
+import org.apache.dubbo.cache.support.AbstractCacheFactory;
+import org.apache.dubbo.common.URL;
+
+/**
+ * Implement {@link org.apache.dubbo.cache.CacheFactory} by extending {@link AbstractCacheFactory} and provide
+ * instance of new {@link ThreadLocalCache}. Note about this class is, each thread does not have a local copy of factory.
+ *
+ * @see AbstractCacheFactory
+ * @see ThreadLocalCache
+ * @see Cache
+ */
+public class ThreadLocalCacheFactory extends AbstractCacheFactory {
+
+ /**
+ * Takes url as an method argument and return new instance of cache store implemented by ThreadLocalCache.
+ * @param url url of the method
+ * @return ThreadLocalCache instance of cache
+ */
+ @Override
+ protected Cache createCache(URL url) {
+ return new ThreadLocalCache(url);
+ }
+
+}
diff --git a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory
index c849461da1..1ea180adf5 100644
--- a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory
+++ b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory
@@ -1,4 +1,4 @@
-threadlocal=org.apache.dubbo.cache.support.threadlocal.ThreadLocalCacheFactory
-lru=org.apache.dubbo.cache.support.lru.LruCacheFactory
-jcache=org.apache.dubbo.cache.support.jcache.JCacheFactory
+threadlocal=org.apache.dubbo.cache.support.threadlocal.ThreadLocalCacheFactory
+lru=org.apache.dubbo.cache.support.lru.LruCacheFactory
+jcache=org.apache.dubbo.cache.support.jcache.JCacheFactory
expiring=org.apache.dubbo.cache.support.expiring.ExpiringCacheFactory
\ No newline at end of file
diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml
index 164653e52c..933f1c97be 100644
--- a/dubbo-filter/dubbo-filter-validation/pom.xml
+++ b/dubbo-filter/dubbo-filter-validation/pom.xml
@@ -19,8 +19,7 @@
org.apache.dubbo
dubbo-filter
- ${revision}
- ../pom.xml
+ 2.7.7-SNAPSHOT
dubbo-filter-validation
jar
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java
index 281346c2ec..73c4cd8cdc 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java
@@ -1,39 +1,39 @@
-/*
- * 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.
- */
-package org.apache.dubbo.validation;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.extension.Adaptive;
-import org.apache.dubbo.common.extension.SPI;
-
-import static org.apache.dubbo.common.constants.FilterConstants.VALIDATION_KEY;
-
-/**
- * Instance of Validation interface provide instance of {@link Validator} based on the value of validation attribute.
- */
-@SPI("jvalidation")
-public interface Validation {
-
- /**
- * Return the instance of {@link Validator} for a given url.
- * @param url Invocation url
- * @return Instance of {@link Validator}
- */
- @Adaptive(VALIDATION_KEY)
- Validator getValidator(URL url);
-
-}
+/*
+ * 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.
+ */
+package org.apache.dubbo.validation;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Adaptive;
+import org.apache.dubbo.common.extension.SPI;
+
+import static org.apache.dubbo.common.constants.FilterConstants.VALIDATION_KEY;
+
+/**
+ * Instance of Validation interface provide instance of {@link Validator} based on the value of validation attribute.
+ */
+@SPI("jvalidation")
+public interface Validation {
+
+ /**
+ * Return the instance of {@link Validator} for a given url.
+ * @param url Invocation url
+ * @return Instance of {@link Validator}
+ */
+ @Adaptive(VALIDATION_KEY)
+ Validator getValidator(URL url);
+
+}
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java
index b1565ba4b6..c78c62a116 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java
@@ -1,27 +1,27 @@
-/*
- * 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.
- */
-package org.apache.dubbo.validation;
-
-/**
- * Instance of validator class is an extension to perform validation on method input parameter before the actual method invocation.
- *
- */
-public interface Validator {
-
- void validate(String methodName, Class[] parameterTypes, Object[] arguments) throws Exception;
-
-}
+/*
+ * 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.
+ */
+package org.apache.dubbo.validation;
+
+/**
+ * Instance of validator class is an extension to perform validation on method input parameter before the actual method invocation.
+ *
+ */
+public interface Validator {
+
+ void validate(String methodName, Class[] parameterTypes, Object[] arguments) throws Exception;
+
+}
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java
index 774b1debb5..0df27526e1 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java
@@ -1,104 +1,104 @@
-/*
- * 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.
- */
-package org.apache.dubbo.validation.filter;
-
-import org.apache.dubbo.common.extension.Activate;
-import org.apache.dubbo.common.utils.ConfigUtils;
-import org.apache.dubbo.rpc.AsyncRpcResult;
-import org.apache.dubbo.rpc.Filter;
-import org.apache.dubbo.rpc.Invocation;
-import org.apache.dubbo.rpc.Invoker;
-import org.apache.dubbo.rpc.Result;
-import org.apache.dubbo.rpc.RpcException;
-import org.apache.dubbo.validation.Validation;
-import org.apache.dubbo.validation.Validator;
-
-import javax.validation.ValidationException;
-
-import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
-import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
-import static org.apache.dubbo.common.constants.FilterConstants.VALIDATION_KEY;
-
-/**
- * ValidationFilter invoke the validation by finding the right {@link Validator} instance based on the
- * configured validation attribute value of invoker url before the actual method invocation.
- *
- *
- * e.g. <dubbo:method name="save" validation="jvalidation" />
- * In the above configuration a validation has been configured of type jvalidation. On invocation of method save
- * dubbo will invoke {@link org.apache.dubbo.validation.support.jvalidation.JValidator}
- *
- *
- * To add a new type of validation
- *
- * e.g. <dubbo:method name="save" validation="special" />
- * where "special" is representing a validator for special character.
- *
- *
- * developer needs to do
- *
- * 1)Implement a SpecialValidation.java class (package name xxx.yyy.zzz) either by implementing {@link Validation} or extending {@link org.apache.dubbo.validation.support.AbstractValidation}
- * 2)Implement a SpecialValidator.java class (package name xxx.yyy.zzz)
- * 3)Add an entry special=xxx.yyy.zzz.SpecialValidation under META-INF folders org.apache.dubbo.validation.Validation file.
- *
- * @see Validation
- * @see Validator
- * @see Filter
- * @see org.apache.dubbo.validation.support.AbstractValidation
- */
-@Activate(group = {CONSUMER, PROVIDER}, value = VALIDATION_KEY, order = 10000)
-public class ValidationFilter implements Filter {
-
- private Validation validation;
-
- /**
- * Sets the validation instance for ValidationFilter
- * @param validation Validation instance injected by dubbo framework based on "validation" attribute value.
- */
- public void setValidation(Validation validation) {
- this.validation = validation;
- }
-
- /**
- * Perform the validation of before invoking the actual method based on validation attribute value.
- * @param invoker service
- * @param invocation invocation.
- * @return Method invocation result
- * @throws RpcException Throws RpcException if validation failed or any other runtime exception occurred.
- */
- @Override
- public Result invoke(Invoker invoker, Invocation invocation) throws RpcException {
- if (validation != null && !invocation.getMethodName().startsWith("$")
- && ConfigUtils.isNotEmpty(invoker.getUrl().getMethodParameter(invocation.getMethodName(), VALIDATION_KEY))) {
- try {
- Validator validator = validation.getValidator(invoker.getUrl());
- if (validator != null) {
- validator.validate(invocation.getMethodName(), invocation.getParameterTypes(), invocation.getArguments());
- }
- } catch (RpcException e) {
- throw e;
- } catch (ValidationException e) {
- // only use exception's message to avoid potential serialization issue
- return AsyncRpcResult.newDefaultAsyncResult(new ValidationException(e.getMessage()), invocation);
- } catch (Throwable t) {
- return AsyncRpcResult.newDefaultAsyncResult(t, invocation);
- }
- }
- return invoker.invoke(invocation);
- }
-
-}
+/*
+ * 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.
+ */
+package org.apache.dubbo.validation.filter;
+
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.common.utils.ConfigUtils;
+import org.apache.dubbo.rpc.AsyncRpcResult;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.validation.Validation;
+import org.apache.dubbo.validation.Validator;
+
+import javax.validation.ValidationException;
+
+import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
+import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
+import static org.apache.dubbo.common.constants.FilterConstants.VALIDATION_KEY;
+
+/**
+ * ValidationFilter invoke the validation by finding the right {@link Validator} instance based on the
+ * configured validation attribute value of invoker url before the actual method invocation.
+ *
+ *
+ * e.g. <dubbo:method name="save" validation="jvalidation" />
+ * In the above configuration a validation has been configured of type jvalidation. On invocation of method save
+ * dubbo will invoke {@link org.apache.dubbo.validation.support.jvalidation.JValidator}
+ *
+ *
+ * To add a new type of validation
+ *
+ * e.g. <dubbo:method name="save" validation="special" />
+ * where "special" is representing a validator for special character.
+ *
+ *
+ * developer needs to do
+ *
+ * 1)Implement a SpecialValidation.java class (package name xxx.yyy.zzz) either by implementing {@link Validation} or extending {@link org.apache.dubbo.validation.support.AbstractValidation}
+ * 2)Implement a SpecialValidator.java class (package name xxx.yyy.zzz)
+ * 3)Add an entry special=xxx.yyy.zzz.SpecialValidation under META-INF folders org.apache.dubbo.validation.Validation file.
+ *
+ * @see Validation
+ * @see Validator
+ * @see Filter
+ * @see org.apache.dubbo.validation.support.AbstractValidation
+ */
+@Activate(group = {CONSUMER, PROVIDER}, value = VALIDATION_KEY, order = 10000)
+public class ValidationFilter implements Filter {
+
+ private Validation validation;
+
+ /**
+ * Sets the validation instance for ValidationFilter
+ * @param validation Validation instance injected by dubbo framework based on "validation" attribute value.
+ */
+ public void setValidation(Validation validation) {
+ this.validation = validation;
+ }
+
+ /**
+ * Perform the validation of before invoking the actual method based on validation attribute value.
+ * @param invoker service
+ * @param invocation invocation.
+ * @return Method invocation result
+ * @throws RpcException Throws RpcException if validation failed or any other runtime exception occurred.
+ */
+ @Override
+ public Result invoke(Invoker invoker, Invocation invocation) throws RpcException {
+ if (validation != null && !invocation.getMethodName().startsWith("$")
+ && ConfigUtils.isNotEmpty(invoker.getUrl().getMethodParameter(invocation.getMethodName(), VALIDATION_KEY))) {
+ try {
+ Validator validator = validation.getValidator(invoker.getUrl());
+ if (validator != null) {
+ validator.validate(invocation.getMethodName(), invocation.getParameterTypes(), invocation.getArguments());
+ }
+ } catch (RpcException e) {
+ throw e;
+ } catch (ValidationException e) {
+ // only use exception's message to avoid potential serialization issue
+ return AsyncRpcResult.newDefaultAsyncResult(new ValidationException(e.getMessage()), invocation);
+ } catch (Throwable t) {
+ return AsyncRpcResult.newDefaultAsyncResult(t, invocation);
+ }
+ }
+ return invoker.invoke(invocation);
+ }
+
+}
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java
index be161a94d7..a6f9c8eda3 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java
@@ -1,51 +1,51 @@
-/*
- * 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.
- */
-package org.apache.dubbo.validation.support;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.validation.Validation;
-import org.apache.dubbo.validation.Validator;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * AbstractValidation is abstract class for Validation interface. It helps low level Validation implementation classes
- * by performing common task e.g. key formation, storing instance of validation class to avoid creation of unnecessary
- * copy of validation instance and faster execution.
- *
- * @see Validation
- * @see Validator
- */
-public abstract class AbstractValidation implements Validation {
-
- private final ConcurrentMap validators = new ConcurrentHashMap<>();
-
- @Override
- public Validator getValidator(URL url) {
- String key = url.toFullString();
- Validator validator = validators.get(key);
- if (validator == null) {
- validators.put(key, createValidator(url));
- validator = validators.get(key);
- }
- return validator;
- }
-
- protected abstract Validator createValidator(URL url);
-
-}
+/*
+ * 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.
+ */
+package org.apache.dubbo.validation.support;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.validation.Validation;
+import org.apache.dubbo.validation.Validator;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * AbstractValidation is abstract class for Validation interface. It helps low level Validation implementation classes
+ * by performing common task e.g. key formation, storing instance of validation class to avoid creation of unnecessary
+ * copy of validation instance and faster execution.
+ *
+ * @see Validation
+ * @see Validator
+ */
+public abstract class AbstractValidation implements Validation {
+
+ private final ConcurrentMap validators = new ConcurrentHashMap<>();
+
+ @Override
+ public Validator getValidator(URL url) {
+ String key = url.toFullString();
+ Validator validator = validators.get(key);
+ if (validator == null) {
+ validators.put(key, createValidator(url));
+ validator = validators.get(key);
+ }
+ return validator;
+ }
+
+ protected abstract Validator createValidator(URL url);
+
+}
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java
index e0859897f1..e8b48cf1d0 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java
@@ -1,40 +1,40 @@
-/*
- * 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.
- */
-package org.apache.dubbo.validation.support.jvalidation;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.validation.Validator;
-import org.apache.dubbo.validation.support.AbstractValidation;
-
-/**
- * Creates a new instance of {@link Validator} using input argument url.
- * @see AbstractValidation
- * @see Validator
- */
-public class JValidation extends AbstractValidation {
-
- /**
- * Return new instance of {@link JValidator}
- * @param url Valid URL instance
- * @return Instance of JValidator
- */
- @Override
- protected Validator createValidator(URL url) {
- return new JValidator(url);
- }
-
+/*
+ * 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.
+ */
+package org.apache.dubbo.validation.support.jvalidation;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.validation.Validator;
+import org.apache.dubbo.validation.support.AbstractValidation;
+
+/**
+ * Creates a new instance of {@link Validator} using input argument url.
+ * @see AbstractValidation
+ * @see Validator
+ */
+public class JValidation extends AbstractValidation {
+
+ /**
+ * Return new instance of {@link JValidator}
+ * @param url Valid URL instance
+ * @return Instance of JValidator
+ */
+ @Override
+ protected Validator createValidator(URL url) {
+ return new JValidator(url);
+ }
+
}
\ No newline at end of file
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
index e3978c6c13..ea8c6dbd4a 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java
@@ -1,330 +1,330 @@
-/*
- * 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.
- */
-package org.apache.dubbo.validation.support.jvalidation;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.bytecode.ClassGenerator;
-import org.apache.dubbo.common.logger.Logger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.ReflectUtils;
-import org.apache.dubbo.validation.MethodValidated;
-import org.apache.dubbo.validation.Validator;
-
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtField;
-import javassist.CtNewConstructor;
-import javassist.Modifier;
-import javassist.NotFoundException;
-import javassist.bytecode.AnnotationsAttribute;
-import javassist.bytecode.ClassFile;
-import javassist.bytecode.ConstPool;
-import javassist.bytecode.annotation.ArrayMemberValue;
-import javassist.bytecode.annotation.BooleanMemberValue;
-import javassist.bytecode.annotation.ByteMemberValue;
-import javassist.bytecode.annotation.CharMemberValue;
-import javassist.bytecode.annotation.ClassMemberValue;
-import javassist.bytecode.annotation.DoubleMemberValue;
-import javassist.bytecode.annotation.EnumMemberValue;
-import javassist.bytecode.annotation.FloatMemberValue;
-import javassist.bytecode.annotation.IntegerMemberValue;
-import javassist.bytecode.annotation.LongMemberValue;
-import javassist.bytecode.annotation.MemberValue;
-import javassist.bytecode.annotation.ShortMemberValue;
-import javassist.bytecode.annotation.StringMemberValue;
-
-import javax.validation.Constraint;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.groups.Default;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Implementation of JValidation. JValidation is invoked if configuration validation attribute value is 'jvalidation'.
- *
- * e.g. <dubbo:method name="save" validation="jvalidation" />
- *
- */
-public class JValidator implements Validator {
-
- private static final Logger logger = LoggerFactory.getLogger(JValidator.class);
-
- private final Class clazz;
-
- private final Map methodClassMap;
-
- private final javax.validation.Validator validator;
-
- @SuppressWarnings({"unchecked", "rawtypes"})
- public JValidator(URL url) {
- this.clazz = ReflectUtils.forName(url.getServiceInterface());
- String jvalidation = url.getParameter("jvalidation");
- ValidatorFactory factory;
- if (jvalidation != null && jvalidation.length() > 0) {
- factory = Validation.byProvider((Class) ReflectUtils.forName(jvalidation)).configure().buildValidatorFactory();
- } else {
- factory = Validation.buildDefaultValidatorFactory();
- }
- this.validator = factory.getValidator();
- this.methodClassMap = new ConcurrentHashMap<>();
- }
-
- private static Object getMethodParameterBean(Class clazz, Method method, Object[] args) {
- if (!hasConstraintParameter(method)) {
- return null;
- }
- try {
- String parameterClassName = generateMethodParameterClassName(clazz, method);
- Class parameterClass;
- try {
- parameterClass = Class.forName(parameterClassName, true, clazz.getClassLoader());
- } catch (ClassNotFoundException e) {
- parameterClass = generateMethodParameterClass(clazz, method, parameterClassName);
- }
- Object parameterBean = parameterClass.newInstance();
- for (int i = 0; i < args.length; i++) {
- Field field = parameterClass.getField(method.getName() + "Argument" + i);
- field.set(parameterBean, args[i]);
- }
- return parameterBean;
- } catch (Throwable e) {
- logger.warn(e.getMessage(), e);
- return null;
- }
- }
-
- /**
- * try to generate methodParameterClass.
- *
- * @param clazz interface class
- * @param method invoke method
- * @param parameterClassName generated parameterClassName
- * @return Class generated methodParameterClass
- * @throws Exception
- */
- private static Class generateMethodParameterClass(Class clazz, Method method, String parameterClassName)
- throws Exception {
- ClassPool pool = ClassGenerator.getClassPool(clazz.getClassLoader());
- synchronized (parameterClassName.intern()) {
- CtClass ctClass = null;
- try {
- ctClass = pool.getCtClass(parameterClassName);
- } catch (NotFoundException ignore) {
- }
-
- if (null == ctClass) {
- ctClass = pool.makeClass(parameterClassName);
- ClassFile classFile = ctClass.getClassFile();
- classFile.setVersionToJava5();
- ctClass.addConstructor(CtNewConstructor.defaultConstructor(pool.getCtClass(parameterClassName)));
- // parameter fields
- Class[] parameterTypes = method.getParameterTypes();
- Annotation[][] parameterAnnotations = method.getParameterAnnotations();
- for (int i = 0; i < parameterTypes.length; i++) {
- Class type = parameterTypes[i];
- Annotation[] annotations = parameterAnnotations[i];
- AnnotationsAttribute attribute = new AnnotationsAttribute(classFile.getConstPool(), AnnotationsAttribute.visibleTag);
- for (Annotation annotation : annotations) {
- if (annotation.annotationType().isAnnotationPresent(Constraint.class)) {
- javassist.bytecode.annotation.Annotation ja = new javassist.bytecode.annotation.Annotation(
- classFile.getConstPool(), pool.getCtClass(annotation.annotationType().getName()));
- Method[] members = annotation.annotationType().getMethods();
- for (Method member : members) {
- if (Modifier.isPublic(member.getModifiers())
- && member.getParameterTypes().length == 0
- && member.getDeclaringClass() == annotation.annotationType()) {
- Object value = member.invoke(annotation);
- if (null != value) {
- MemberValue memberValue = createMemberValue(
- classFile.getConstPool(), pool.get(member.getReturnType().getName()), value);
- ja.addMemberValue(member.getName(), memberValue);
- }
- }
- }
- attribute.addAnnotation(ja);
- }
- }
- String fieldName = method.getName() + "Argument" + i;
- CtField ctField = CtField.make("public " + type.getCanonicalName() + " " + fieldName + ";", pool.getCtClass(parameterClassName));
- ctField.getFieldInfo().addAttribute(attribute);
- ctClass.addField(ctField);
- }
- return ctClass.toClass(clazz.getClassLoader(), null);
- } else {
- return Class.forName(parameterClassName, true, clazz.getClassLoader());
- }
- }
- }
-
- private static String generateMethodParameterClassName(Class clazz, Method method) {
- StringBuilder builder = new StringBuilder().append(clazz.getName())
- .append("_")
- .append(toUpperMethodName(method.getName()))
- .append("Parameter");
-
- Class[] parameterTypes = method.getParameterTypes();
- for (Class parameterType : parameterTypes) {
- builder.append("_").append(parameterType.getName());
- }
-
- return builder.toString();
- }
-
- private static boolean hasConstraintParameter(Method method) {
- Annotation[][] parameterAnnotations = method.getParameterAnnotations();
- if (parameterAnnotations != null && parameterAnnotations.length > 0) {
- for (Annotation[] annotations : parameterAnnotations) {
- for (Annotation annotation : annotations) {
- if (annotation.annotationType().isAnnotationPresent(Constraint.class)) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- private static String toUpperMethodName(String methodName) {
- return methodName.substring(0, 1).toUpperCase() + methodName.substring(1);
- }
-
- // Copy from javassist.bytecode.annotation.Annotation.createMemberValue(ConstPool, CtClass);
- private static MemberValue createMemberValue(ConstPool cp, CtClass type, Object value) throws NotFoundException {
- MemberValue memberValue = javassist.bytecode.annotation.Annotation.createMemberValue(cp, type);
- if (memberValue instanceof BooleanMemberValue) {
- ((BooleanMemberValue) memberValue).setValue((Boolean) value);
- } else if (memberValue instanceof ByteMemberValue) {
- ((ByteMemberValue) memberValue).setValue((Byte) value);
- } else if (memberValue instanceof CharMemberValue) {
- ((CharMemberValue) memberValue).setValue((Character) value);
- } else if (memberValue instanceof ShortMemberValue) {
- ((ShortMemberValue) memberValue).setValue((Short) value);
- } else if (memberValue instanceof IntegerMemberValue) {
- ((IntegerMemberValue) memberValue).setValue((Integer) value);
- } else if (memberValue instanceof LongMemberValue) {
- ((LongMemberValue) memberValue).setValue((Long) value);
- } else if (memberValue instanceof FloatMemberValue) {
- ((FloatMemberValue) memberValue).setValue((Float) value);
- } else if (memberValue instanceof DoubleMemberValue) {
- ((DoubleMemberValue) memberValue).setValue((Double) value);
- } else if (memberValue instanceof ClassMemberValue) {
- ((ClassMemberValue) memberValue).setValue(((Class) value).getName());
- } else if (memberValue instanceof StringMemberValue) {
- ((StringMemberValue) memberValue).setValue((String) value);
- } else if (memberValue instanceof EnumMemberValue) {
- ((EnumMemberValue) memberValue).setValue(((Enum) value).name());
- }
- /* else if (memberValue instanceof AnnotationMemberValue) */
- else if (memberValue instanceof ArrayMemberValue) {
- CtClass arrayType = type.getComponentType();
- int len = Array.getLength(value);
- MemberValue[] members = new MemberValue[len];
- for (int i = 0; i < len; i++) {
- members[i] = createMemberValue(cp, arrayType, Array.get(value, i));
- }
- ((ArrayMemberValue) memberValue).setValue(members);
- }
- return memberValue;
- }
-
- @Override
- public void validate(String methodName, Class[] parameterTypes, Object[] arguments) throws Exception {
- List> groups = new ArrayList<>();
- Class methodClass = methodClass(methodName);
- if (methodClass != null) {
- groups.add(methodClass);
- }
- Set> violations = new HashSet<>();
- Method method = clazz.getMethod(methodName, parameterTypes);
- Class[] methodClasses;
- if (method.isAnnotationPresent(MethodValidated.class)){
- methodClasses = method.getAnnotation(MethodValidated.class).value();
- groups.addAll(Arrays.asList(methodClasses));
- }
- // add into default group
- groups.add(0, Default.class);
- groups.add(1, clazz);
-
- // convert list to array
- Class[] classgroups = groups.toArray(new Class[groups.size()]);
-
- Object parameterBean = getMethodParameterBean(clazz, method, arguments);
- if (parameterBean != null) {
- violations.addAll(validator.validate(parameterBean, classgroups ));
- }
-
- for (Object arg : arguments) {
- validate(violations, arg, classgroups);
- }
-
- if (!violations.isEmpty()) {
- logger.error("Failed to validate service: " + clazz.getName() + ", method: " + methodName + ", cause: " + violations);
- throw new ConstraintViolationException("Failed to validate service: " + clazz.getName() + ", method: " + methodName + ", cause: " + violations, violations);
- }
- }
-
- private Class methodClass(String methodName) {
- Class methodClass = null;
- String methodClassName = clazz.getName() + "$" + toUpperMethodName(methodName);
- Class cached = methodClassMap.get(methodClassName);
- if (cached != null) {
- return cached == clazz ? null : cached;
- }
- try {
- methodClass = Class.forName(methodClassName, false, Thread.currentThread().getContextClassLoader());
- methodClassMap.put(methodClassName, methodClass);
- } catch (ClassNotFoundException e) {
- methodClassMap.put(methodClassName, clazz);
- }
- return methodClass;
- }
-
- private void validate(Set> violations, Object arg, Class... groups) {
- if (arg != null && !ReflectUtils.isPrimitives(arg.getClass())) {
- if (arg instanceof Object[]) {
- for (Object item : (Object[]) arg) {
- validate(violations, item, groups);
- }
- } else if (arg instanceof Collection) {
- for (Object item : (Collection) arg) {
- validate(violations, item, groups);
- }
- } else if (arg instanceof Map) {
- for (Map.Entry entry : ((Map) arg).entrySet()) {
- validate(violations, entry.getKey(), groups);
- validate(violations, entry.getValue(), groups);
- }
- } else {
- violations.addAll(validator.validate(arg, groups));
- }
- }
- }
-
-}
+/*
+ * 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.
+ */
+package org.apache.dubbo.validation.support.jvalidation;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.bytecode.ClassGenerator;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.ReflectUtils;
+import org.apache.dubbo.validation.MethodValidated;
+import org.apache.dubbo.validation.Validator;
+
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtNewConstructor;
+import javassist.Modifier;
+import javassist.NotFoundException;
+import javassist.bytecode.AnnotationsAttribute;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.annotation.ArrayMemberValue;
+import javassist.bytecode.annotation.BooleanMemberValue;
+import javassist.bytecode.annotation.ByteMemberValue;
+import javassist.bytecode.annotation.CharMemberValue;
+import javassist.bytecode.annotation.ClassMemberValue;
+import javassist.bytecode.annotation.DoubleMemberValue;
+import javassist.bytecode.annotation.EnumMemberValue;
+import javassist.bytecode.annotation.FloatMemberValue;
+import javassist.bytecode.annotation.IntegerMemberValue;
+import javassist.bytecode.annotation.LongMemberValue;
+import javassist.bytecode.annotation.MemberValue;
+import javassist.bytecode.annotation.ShortMemberValue;
+import javassist.bytecode.annotation.StringMemberValue;
+
+import javax.validation.Constraint;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validation;
+import javax.validation.ValidatorFactory;
+import javax.validation.groups.Default;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Implementation of JValidation. JValidation is invoked if configuration validation attribute value is 'jvalidation'.
+ *
+ * e.g. <dubbo:method name="save" validation="jvalidation" />
+ *
+ */
+public class JValidator implements Validator {
+
+ private static final Logger logger = LoggerFactory.getLogger(JValidator.class);
+
+ private final Class clazz;
+
+ private final Map methodClassMap;
+
+ private final javax.validation.Validator validator;
+
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public JValidator(URL url) {
+ this.clazz = ReflectUtils.forName(url.getServiceInterface());
+ String jvalidation = url.getParameter("jvalidation");
+ ValidatorFactory factory;
+ if (jvalidation != null && jvalidation.length() > 0) {
+ factory = Validation.byProvider((Class) ReflectUtils.forName(jvalidation)).configure().buildValidatorFactory();
+ } else {
+ factory = Validation.buildDefaultValidatorFactory();
+ }
+ this.validator = factory.getValidator();
+ this.methodClassMap = new ConcurrentHashMap<>();
+ }
+
+ private static Object getMethodParameterBean(Class clazz, Method method, Object[] args) {
+ if (!hasConstraintParameter(method)) {
+ return null;
+ }
+ try {
+ String parameterClassName = generateMethodParameterClassName(clazz, method);
+ Class parameterClass;
+ try {
+ parameterClass = Class.forName(parameterClassName, true, clazz.getClassLoader());
+ } catch (ClassNotFoundException e) {
+ parameterClass = generateMethodParameterClass(clazz, method, parameterClassName);
+ }
+ Object parameterBean = parameterClass.newInstance();
+ for (int i = 0; i < args.length; i++) {
+ Field field = parameterClass.getField(method.getName() + "Argument" + i);
+ field.set(parameterBean, args[i]);
+ }
+ return parameterBean;
+ } catch (Throwable e) {
+ logger.warn(e.getMessage(), e);
+ return null;
+ }
+ }
+
+ /**
+ * try to generate methodParameterClass.
+ *
+ * @param clazz interface class
+ * @param method invoke method
+ * @param parameterClassName generated parameterClassName
+ * @return Class generated methodParameterClass
+ * @throws Exception
+ */
+ private static Class generateMethodParameterClass(Class clazz, Method method, String parameterClassName)
+ throws Exception {
+ ClassPool pool = ClassGenerator.getClassPool(clazz.getClassLoader());
+ synchronized (parameterClassName.intern()) {
+ CtClass ctClass = null;
+ try {
+ ctClass = pool.getCtClass(parameterClassName);
+ } catch (NotFoundException ignore) {
+ }
+
+ if (null == ctClass) {
+ ctClass = pool.makeClass(parameterClassName);
+ ClassFile classFile = ctClass.getClassFile();
+ classFile.setVersionToJava5();
+ ctClass.addConstructor(CtNewConstructor.defaultConstructor(pool.getCtClass(parameterClassName)));
+ // parameter fields
+ Class[] parameterTypes = method.getParameterTypes();
+ Annotation[][] parameterAnnotations = method.getParameterAnnotations();
+ for (int i = 0; i < parameterTypes.length; i++) {
+ Class type = parameterTypes[i];
+ Annotation[] annotations = parameterAnnotations[i];
+ AnnotationsAttribute attribute = new AnnotationsAttribute(classFile.getConstPool(), AnnotationsAttribute.visibleTag);
+ for (Annotation annotation : annotations) {
+ if (annotation.annotationType().isAnnotationPresent(Constraint.class)) {
+ javassist.bytecode.annotation.Annotation ja = new javassist.bytecode.annotation.Annotation(
+ classFile.getConstPool(), pool.getCtClass(annotation.annotationType().getName()));
+ Method[] members = annotation.annotationType().getMethods();
+ for (Method member : members) {
+ if (Modifier.isPublic(member.getModifiers())
+ && member.getParameterTypes().length == 0
+ && member.getDeclaringClass() == annotation.annotationType()) {
+ Object value = member.invoke(annotation);
+ if (null != value) {
+ MemberValue memberValue = createMemberValue(
+ classFile.getConstPool(), pool.get(member.getReturnType().getName()), value);
+ ja.addMemberValue(member.getName(), memberValue);
+ }
+ }
+ }
+ attribute.addAnnotation(ja);
+ }
+ }
+ String fieldName = method.getName() + "Argument" + i;
+ CtField ctField = CtField.make("public " + type.getCanonicalName() + " " + fieldName + ";", pool.getCtClass(parameterClassName));
+ ctField.getFieldInfo().addAttribute(attribute);
+ ctClass.addField(ctField);
+ }
+ return ctClass.toClass(clazz.getClassLoader(), null);
+ } else {
+ return Class.forName(parameterClassName, true, clazz.getClassLoader());
+ }
+ }
+ }
+
+ private static String generateMethodParameterClassName(Class clazz, Method method) {
+ StringBuilder builder = new StringBuilder().append(clazz.getName())
+ .append("_")
+ .append(toUpperMethoName(method.getName()))
+ .append("Parameter");
+
+ Class[] parameterTypes = method.getParameterTypes();
+ for (Class parameterType : parameterTypes) {
+ builder.append("_").append(parameterType.getName());
+ }
+
+ return builder.toString();
+ }
+
+ private static boolean hasConstraintParameter(Method method) {
+ Annotation[][] parameterAnnotations = method.getParameterAnnotations();
+ if (parameterAnnotations != null && parameterAnnotations.length > 0) {
+ for (Annotation[] annotations : parameterAnnotations) {
+ for (Annotation annotation : annotations) {
+ if (annotation.annotationType().isAnnotationPresent(Constraint.class)) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ private static String toUpperMethoName(String methodName) {
+ return methodName.substring(0, 1).toUpperCase() + methodName.substring(1);
+ }
+
+ // Copy from javassist.bytecode.annotation.Annotation.createMemberValue(ConstPool, CtClass);
+ private static MemberValue createMemberValue(ConstPool cp, CtClass type, Object value) throws NotFoundException {
+ MemberValue memberValue = javassist.bytecode.annotation.Annotation.createMemberValue(cp, type);
+ if (memberValue instanceof BooleanMemberValue) {
+ ((BooleanMemberValue) memberValue).setValue((Boolean) value);
+ } else if (memberValue instanceof ByteMemberValue) {
+ ((ByteMemberValue) memberValue).setValue((Byte) value);
+ } else if (memberValue instanceof CharMemberValue) {
+ ((CharMemberValue) memberValue).setValue((Character) value);
+ } else if (memberValue instanceof ShortMemberValue) {
+ ((ShortMemberValue) memberValue).setValue((Short) value);
+ } else if (memberValue instanceof IntegerMemberValue) {
+ ((IntegerMemberValue) memberValue).setValue((Integer) value);
+ } else if (memberValue instanceof LongMemberValue) {
+ ((LongMemberValue) memberValue).setValue((Long) value);
+ } else if (memberValue instanceof FloatMemberValue) {
+ ((FloatMemberValue) memberValue).setValue((Float) value);
+ } else if (memberValue instanceof DoubleMemberValue) {
+ ((DoubleMemberValue) memberValue).setValue((Double) value);
+ } else if (memberValue instanceof ClassMemberValue) {
+ ((ClassMemberValue) memberValue).setValue(((Class) value).getName());
+ } else if (memberValue instanceof StringMemberValue) {
+ ((StringMemberValue) memberValue).setValue((String) value);
+ } else if (memberValue instanceof EnumMemberValue) {
+ ((EnumMemberValue) memberValue).setValue(((Enum) value).name());
+ }
+ /* else if (memberValue instanceof AnnotationMemberValue) */
+ else if (memberValue instanceof ArrayMemberValue) {
+ CtClass arrayType = type.getComponentType();
+ int len = Array.getLength(value);
+ MemberValue[] members = new MemberValue[len];
+ for (int i = 0; i < len; i++) {
+ members[i] = createMemberValue(cp, arrayType, Array.get(value, i));
+ }
+ ((ArrayMemberValue) memberValue).setValue(members);
+ }
+ return memberValue;
+ }
+
+ @Override
+ public void validate(String methodName, Class[] parameterTypes, Object[] arguments) throws Exception {
+ List> groups = new ArrayList<>();
+ Class methodClass = methodClass(methodName);
+ if (methodClass != null) {
+ groups.add(methodClass);
+ }
+ Set> violations = new HashSet<>();
+ Method method = clazz.getMethod(methodName, parameterTypes);
+ Class[] methodClasses;
+ if (method.isAnnotationPresent(MethodValidated.class)){
+ methodClasses = method.getAnnotation(MethodValidated.class).value();
+ groups.addAll(Arrays.asList(methodClasses));
+ }
+ // add into default group
+ groups.add(0, Default.class);
+ groups.add(1, clazz);
+
+ // convert list to array
+ Class[] classgroups = groups.toArray(new Class[groups.size()]);
+
+ Object parameterBean = getMethodParameterBean(clazz, method, arguments);
+ if (parameterBean != null) {
+ violations.addAll(validator.validate(parameterBean, classgroups ));
+ }
+
+ for (Object arg : arguments) {
+ validate(violations, arg, classgroups);
+ }
+
+ if (!violations.isEmpty()) {
+ logger.error("Failed to validate service: " + clazz.getName() + ", method: " + methodName + ", cause: " + violations);
+ throw new ConstraintViolationException("Failed to validate service: " + clazz.getName() + ", method: " + methodName + ", cause: " + violations, violations);
+ }
+ }
+
+ private Class methodClass(String methodName) {
+ Class methodClass = null;
+ String methodClassName = clazz.getName() + "$" + toUpperMethoName(methodName);
+ Class cached = methodClassMap.get(methodClassName);
+ if (cached != null) {
+ return cached == clazz ? null : cached;
+ }
+ try {
+ methodClass = Class.forName(methodClassName, false, Thread.currentThread().getContextClassLoader());
+ methodClassMap.put(methodClassName, methodClass);
+ } catch (ClassNotFoundException e) {
+ methodClassMap.put(methodClassName, clazz);
+ }
+ return methodClass;
+ }
+
+ private void validate(Set> violations, Object arg, Class... groups) {
+ if (arg != null && !ReflectUtils.isPrimitives(arg.getClass())) {
+ if (arg instanceof Object[]) {
+ for (Object item : (Object[]) arg) {
+ validate(violations, item, groups);
+ }
+ } else if (arg instanceof Collection) {
+ for (Object item : (Collection) arg) {
+ validate(violations, item, groups);
+ }
+ } else if (arg instanceof Map) {
+ for (Map.Entry entry : ((Map) arg).entrySet()) {
+ validate(violations, entry.getKey(), groups);
+ validate(violations, entry.getValue(), groups);
+ }
+ } else {
+ violations.addAll(validator.validate(arg, groups));
+ }
+ }
+ }
+
+}
diff --git a/dubbo-metadata/dubbo-metadata-report-consul/pom.xml b/dubbo-metadata/dubbo-metadata-report-consul/pom.xml
deleted file mode 100644
index 8a01b72d49..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-consul/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
- org.apache.dubbo
- dubbo-metadata
- ${revision}
- ../pom.xml
-
- 4.0.0
-
- dubbo-metadata-report-consul
-
-
-
- org.apache.dubbo
- dubbo-metadata-api
- ${project.parent.version}
-
-
- org.apache.dubbo
- dubbo-configcenter-consul
- ${project.parent.version}
-
-
- com.ecwid.consul
- consul-api
-
-
-
-
diff --git a/dubbo-metadata/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReport.java b/dubbo-metadata/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReport.java
deleted file mode 100644
index e6b7054261..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReport.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.dubbo.metadata.store.consul;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.StringUtils;
-import org.apache.dubbo.metadata.report.identifier.BaseMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
-import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
-import org.apache.dubbo.metadata.report.support.AbstractMetadataReport;
-import org.apache.dubbo.metadata.report.support.ConfigCenterBasedMetadataReport;
-import org.apache.dubbo.rpc.RpcException;
-
-import com.ecwid.consul.v1.ConsulClient;
-import com.ecwid.consul.v1.Response;
-import com.ecwid.consul.v1.kv.model.GetValue;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * metadata report impl for consul
- *
- * @deprecated 2.7.8 This class will be removed in the future, {@link ConfigCenterBasedMetadataReport} as a substitute.
- */
-@Deprecated
-public class ConsulMetadataReport extends AbstractMetadataReport {
- private static final Logger logger = LoggerFactory.getLogger(ConsulMetadataReport.class);
- private static final int DEFAULT_PORT = 8500;
-
- private ConsulClient client;
-
- public ConsulMetadataReport(URL url) {
- super(url);
-
- String host = url.getHost();
- int port = url.getPort() != 0 ? url.getPort() : DEFAULT_PORT;
- client = new ConsulClient(host, port);
- }
-
- @Override
- protected void doStoreProviderMetadata(MetadataIdentifier providerMetadataIdentifier, String serviceDefinitions) {
- this.storeMetadata(providerMetadataIdentifier, serviceDefinitions);
- }
-
- @Override
- protected void doStoreConsumerMetadata(MetadataIdentifier consumerMetadataIdentifier, String value) {
- this.storeMetadata(consumerMetadataIdentifier, value);
- }
-
- @Override
- protected void doSaveMetadata(ServiceMetadataIdentifier serviceMetadataIdentifier, URL url) {
- this.storeMetadata(serviceMetadataIdentifier, URL.encode(url.toFullString()));
- }
-
- @Override
- protected void doRemoveMetadata(ServiceMetadataIdentifier serviceMetadataIdentifier) {
- this.deleteMetadata(serviceMetadataIdentifier);
- }
-
- @Override
- protected List doGetExportedURLs(ServiceMetadataIdentifier metadataIdentifier) {
- //todo encode and decode
- String content = getMetadata(metadataIdentifier);
- if (StringUtils.isEmpty(content)) {
- return Collections.emptyList();
- }
- return new ArrayList(Arrays.asList(URL.decode(content)));
- }
-
- @Override
- protected void doSaveSubscriberData(SubscriberMetadataIdentifier subscriberMetadataIdentifier, String urlListStr) {
- this.storeMetadata(subscriberMetadataIdentifier, urlListStr);
- }
-
- @Override
- protected String doGetSubscribedURLs(SubscriberMetadataIdentifier subscriberMetadataIdentifier) {
- return getMetadata(subscriberMetadataIdentifier);
- }
-
- private void storeMetadata(BaseMetadataIdentifier identifier, String v) {
- try {
- client.setKVValue(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), v);
- } catch (Throwable t) {
- logger.error("Failed to put " + identifier + " to consul " + v + ", cause: " + t.getMessage(), t);
- throw new RpcException("Failed to put " + identifier + " to consul " + v + ", cause: " + t.getMessage(), t);
- }
- }
-
- private void deleteMetadata(BaseMetadataIdentifier identifier) {
- try {
- client.deleteKVValue(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY));
- } catch (Throwable t) {
- logger.error("Failed to delete " + identifier + " from consul , cause: " + t.getMessage(), t);
- throw new RpcException("Failed to delete " + identifier + " from consul , cause: " + t.getMessage(), t);
- }
- }
-
- private String getMetadata(BaseMetadataIdentifier identifier) {
- try {
- Response value = client.getKVValue(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY));
- //FIXME CHECK
- if (value != null && value.getValue() != null) {
- //todo check decode value and value diff
- return value.getValue().getValue();
- }
- return null;
- } catch (Throwable t) {
- logger.error("Failed to get " + identifier + " from consul , cause: " + t.getMessage(), t);
- throw new RpcException("Failed to get " + identifier + " from consul , cause: " + t.getMessage(), t);
- }
- }
-
- @Override
- public String getServiceDefinition(MetadataIdentifier metadataIdentifier) {
- return getMetadata(metadataIdentifier);
- }
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReportFactory.java b/dubbo-metadata/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReportFactory.java
deleted file mode 100644
index 7f5f1901e7..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReportFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.dubbo.metadata.store.consul;
-
-import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
-import org.apache.dubbo.metadata.report.support.ConfigCenterBasedMetadataReportFactory;
-
-/**
- * metadata report factory impl for consul
- */
-public class ConsulMetadataReportFactory extends ConfigCenterBasedMetadataReportFactory {
-
- public ConsulMetadataReportFactory() {
- super(KeyTypeEnum.UNIQUE_KEY);
- }
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-consul/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory b/dubbo-metadata/dubbo-metadata-report-consul/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
deleted file mode 100644
index 1f27535d44..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-consul/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
+++ /dev/null
@@ -1 +0,0 @@
-consul=org.apache.dubbo.metadata.store.consul.ConsulMetadataReportFactory
diff --git a/dubbo-metadata/dubbo-metadata-report-etcd/pom.xml b/dubbo-metadata/dubbo-metadata-report-etcd/pom.xml
deleted file mode 100644
index 747dc2a2e0..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-etcd/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
- org.apache.dubbo
- dubbo-metadata
- ${revision}
- ../pom.xml
-
- 4.0.0
-
- dubbo-metadata-report-etcd
-
-
- true
-
-
-
-
- org.apache.dubbo
- dubbo-metadata-api
- ${project.parent.version}
-
-
- org.apache.dubbo
- dubbo-remoting-etcd3
- ${project.parent.version}
-
-
- io.etcd
- jetcd-launcher
- test
-
-
- org.testcontainers
- testcontainers
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- ${skipIntegrationTests}
-
-
-
-
-
diff --git a/dubbo-metadata/dubbo-metadata-report-etcd/src/main/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReport.java b/dubbo-metadata/dubbo-metadata-report-etcd/src/main/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReport.java
deleted file mode 100644
index a80c6e83dd..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-etcd/src/main/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReport.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * 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.
- */
-
-/*
- * 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.
- */
-package org.apache.dubbo.metadata.store.etcd;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.StringUtils;
-import org.apache.dubbo.metadata.report.identifier.BaseMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
-import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
-import org.apache.dubbo.metadata.report.support.AbstractMetadataReport;
-import org.apache.dubbo.remoting.etcd.jetcd.JEtcdClient;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
-import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
-
-/**
- * Report Metadata to Etcd
- */
-public class EtcdMetadataReport extends AbstractMetadataReport {
-
- private final static Logger logger = LoggerFactory.getLogger(EtcdMetadataReport.class);
-
- private final String root;
-
- /**
- * The etcd client
- */
- private final JEtcdClient etcdClient;
-
- public EtcdMetadataReport(URL url) {
- super(url);
- if (url.isAnyHost()) {
- throw new IllegalStateException("registry address == null");
- }
- String group = url.getParameter(GROUP_KEY, DEFAULT_ROOT);
- if (!group.startsWith(PATH_SEPARATOR)) {
- group = PATH_SEPARATOR + group;
- }
- this.root = group;
- etcdClient = new JEtcdClient(url);
- }
-
- @Override
- protected void doStoreProviderMetadata(MetadataIdentifier providerMetadataIdentifier, String serviceDefinitions) {
- storeMetadata(providerMetadataIdentifier, serviceDefinitions);
- }
-
- @Override
- protected void doStoreConsumerMetadata(MetadataIdentifier consumerMetadataIdentifier, String value) {
- storeMetadata(consumerMetadataIdentifier, value);
- }
-
- @Override
- protected void doSaveMetadata(ServiceMetadataIdentifier serviceMetadataIdentifier, URL url) {
- String key = getNodeKey(serviceMetadataIdentifier);
- if (!etcdClient.put(key, URL.encode(url.toFullString()))) {
- logger.error("Failed to put " + serviceMetadataIdentifier + " to etcd, value: " + url);
- }
- }
-
- @Override
- protected void doRemoveMetadata(ServiceMetadataIdentifier serviceMetadataIdentifier) {
- etcdClient.delete(getNodeKey(serviceMetadataIdentifier));
- }
-
- @Override
- protected List doGetExportedURLs(ServiceMetadataIdentifier metadataIdentifier) {
- String content = etcdClient.getKVValue(getNodeKey(metadataIdentifier));
- if (StringUtils.isEmpty(content)) {
- return Collections.emptyList();
- }
- return new ArrayList(Arrays.asList(URL.decode(content)));
- }
-
- @Override
- protected void doSaveSubscriberData(SubscriberMetadataIdentifier subscriberMetadataIdentifier, String urlListStr) {
- String key = getNodeKey(subscriberMetadataIdentifier);
- if (!etcdClient.put(key, urlListStr)) {
- logger.error("Failed to put " + subscriberMetadataIdentifier + " to etcd, value: " + urlListStr);
- }
- }
-
- @Override
- protected String doGetSubscribedURLs(SubscriberMetadataIdentifier subscriberMetadataIdentifier) {
- return etcdClient.getKVValue(getNodeKey(subscriberMetadataIdentifier));
- }
-
- @Override
- public String getServiceDefinition(MetadataIdentifier metadataIdentifier) {
- return etcdClient.getKVValue(getNodeKey(metadataIdentifier));
- }
-
- private void storeMetadata(MetadataIdentifier identifier, String v) {
- String key = getNodeKey(identifier);
- if (!etcdClient.put(key, v)) {
- logger.error("Failed to put " + identifier + " to etcd, value: " + v);
- }
- }
-
- String getNodeKey(BaseMetadataIdentifier identifier) {
- return toRootDir() + identifier.getUniqueKey(KeyTypeEnum.PATH);
- }
-
- String toRootDir() {
- if (root.equals(PATH_SEPARATOR)) {
- return root;
- }
- return root + PATH_SEPARATOR;
- }
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-etcd/src/main/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReportFactory.java b/dubbo-metadata/dubbo-metadata-report-etcd/src/main/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReportFactory.java
deleted file mode 100644
index 3bb9e92d3e..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-etcd/src/main/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReportFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-/*
- * 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.
- */
-package org.apache.dubbo.metadata.store.etcd;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.metadata.report.MetadataReport;
-import org.apache.dubbo.metadata.report.support.AbstractMetadataReportFactory;
-
-/**
- * MetadataReportFactory to create an Etcd based {@link MetadataReport}.
- */
-public class EtcdMetadataReportFactory extends AbstractMetadataReportFactory {
-
- @Override
- public MetadataReport createMetadataReport(URL url) {
- return new EtcdMetadataReport(url);
- }
-
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-etcd/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory b/dubbo-metadata/dubbo-metadata-report-etcd/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
deleted file mode 100644
index 9a3c98c82a..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-etcd/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
+++ /dev/null
@@ -1 +0,0 @@
-etcd=org.apache.dubbo.metadata.store.etcd.EtcdMetadataReportFactory
diff --git a/dubbo-metadata/dubbo-metadata-report-etcd/src/test/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadata4TstService.java b/dubbo-metadata/dubbo-metadata-report-etcd/src/test/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadata4TstService.java
deleted file mode 100644
index 1de21ce565..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-etcd/src/test/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadata4TstService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.dubbo.metadata.store.etcd;
-
-/**
- * Test interface for Etcd metadata report
- */
-public interface EtcdMetadata4TstService {
-
- int getCounter();
-
- void printResult(String var);
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-etcd/src/test/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReportTest.java b/dubbo-metadata/dubbo-metadata-report-etcd/src/test/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReportTest.java
deleted file mode 100644
index 2d2efd5a0e..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-etcd/src/test/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReportTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.dubbo.metadata.store.etcd;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.utils.NetUtils;
-import org.apache.dubbo.metadata.definition.ServiceDefinitionBuilder;
-import org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
-import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
-
-import com.google.gson.Gson;
-import io.etcd.jetcd.ByteSequence;
-import io.etcd.jetcd.Client;
-import io.etcd.jetcd.kv.GetResponse;
-import io.etcd.jetcd.launcher.EtcdCluster;
-import io.etcd.jetcd.launcher.EtcdClusterFactory;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
-import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
-
-/**
- * Unit test for etcd metadata report
- */
-public class EtcdMetadataReportTest {
-
- private static final String TEST_SERVICE = "org.apache.dubbo.metadata.store.etcd.EtcdMetadata4TstService";
-
- private EtcdCluster etcdCluster = EtcdClusterFactory.buildCluster(getClass().getSimpleName(), 1, false, false);
- private Client etcdClientForTest;
- private EtcdMetadataReport etcdMetadataReport;
- private URL registryUrl;
- private EtcdMetadataReportFactory etcdMetadataReportFactory;
-
- @BeforeEach
- public void setUp() {
- etcdCluster.start();
- etcdClientForTest = Client.builder().endpoints(etcdCluster.getClientEndpoints()).build();
- List clientEndPoints = etcdCluster.getClientEndpoints();
- this.registryUrl = URL.valueOf("etcd://" + clientEndPoints.get(0).getHost() + ":" + clientEndPoints.get(0).getPort());
- etcdMetadataReportFactory = new EtcdMetadataReportFactory();
- this.etcdMetadataReport = (EtcdMetadataReport) etcdMetadataReportFactory.createMetadataReport(registryUrl);
- }
-
- @AfterEach
- public void tearDown() throws Exception {
- etcdCluster.close();
- }
-
- @Test
- public void testStoreProvider() throws Exception {
- String version = "1.0.0";
- String group = null;
- String application = "etcd-metdata-report-test";
-
- String r = etcdMetadataReport.getServiceDefinition(new MetadataIdentifier(TEST_SERVICE, version, group, "provider", application));
- Assertions.assertNull(r);
- MetadataIdentifier providerIdentifier =
- storeProvider(etcdMetadataReport, TEST_SERVICE, version, group, application);
-
- CompletableFuture response = etcdClientForTest.getKVClient().get(ByteSequence.from(
- etcdMetadataReport.getNodeKey(providerIdentifier), StandardCharsets.UTF_8));
- String fileContent = response.get().getKvs().get(0).getValue().toString(StandardCharsets.UTF_8);
- Assertions.assertNotNull(fileContent);
-
- Gson gson = new Gson();
- FullServiceDefinition fullServiceDefinition = gson.fromJson(fileContent, FullServiceDefinition.class);
- Assertions.assertEquals(fullServiceDefinition.getParameters().get("paramTest"), "etcdTest");
-
- r = etcdMetadataReport.getServiceDefinition(new MetadataIdentifier(TEST_SERVICE, version, group, "provider", application));
- Assertions.assertNotNull(r);
- }
-
- @Test
- public void testStoreConsumer() throws Exception {
- String version = "1.0.0";
- String group = null;
- String application = "etc-metadata-report-consumer-test";
- MetadataIdentifier consumerIdentifier = storeConsumer(etcdMetadataReport, TEST_SERVICE, version, group, application);
-
- CompletableFuture response = etcdClientForTest.getKVClient().get(ByteSequence.from(
- etcdMetadataReport.getNodeKey(consumerIdentifier), StandardCharsets.UTF_8));
- String fileContent = response.get().getKvs().get(0).getValue().toString(StandardCharsets.UTF_8);
- Assertions.assertNotNull(fileContent);
- Assertions.assertEquals(fileContent, "{\"paramConsumerTest\":\"etcdConsumer\"}");
- }
-
- @Test
- public void testDoSaveMetadata() throws ExecutionException, InterruptedException {
- String version = "1.0.0";
- String group = null;
- String application = "etc-metadata-report-consumer-test";
- String revision = "90980";
- String protocol = "xxx";
- URL url = generateURL(TEST_SERVICE, version, group, application);
- ServiceMetadataIdentifier serviceMetadataIdentifier = new ServiceMetadataIdentifier(TEST_SERVICE, version,
- group, "provider", revision, protocol);
- etcdMetadataReport.doSaveMetadata(serviceMetadataIdentifier, url);
-
- CompletableFuture response = etcdClientForTest.getKVClient().get(ByteSequence.from(
- etcdMetadataReport.getNodeKey(serviceMetadataIdentifier), StandardCharsets.UTF_8));
- String fileContent = response.get().getKvs().get(0).getValue().toString(StandardCharsets.UTF_8);
- Assertions.assertNotNull(fileContent);
-
- Assertions.assertEquals(fileContent, URL.encode(url.toFullString()));
- }
-
- @Test
- public void testDoRemoveMetadata() throws ExecutionException, InterruptedException {
- String version = "1.0.0";
- String group = null;
- String application = "etc-metadata-report-consumer-test";
- String revision = "90980";
- String protocol = "xxx";
- URL url = generateURL(TEST_SERVICE, version, group, application);
- ServiceMetadataIdentifier serviceMetadataIdentifier = new ServiceMetadataIdentifier(TEST_SERVICE, version,
- group, "provider", revision, protocol);
- etcdMetadataReport.doSaveMetadata(serviceMetadataIdentifier, url);
- CompletableFuture response = etcdClientForTest.getKVClient().get(ByteSequence.from(
- etcdMetadataReport.getNodeKey(serviceMetadataIdentifier), StandardCharsets.UTF_8));
- String fileContent = response.get().getKvs().get(0).getValue().toString(StandardCharsets.UTF_8);
- Assertions.assertNotNull(fileContent);
-
-
- etcdMetadataReport.doRemoveMetadata(serviceMetadataIdentifier);
-
- response = etcdClientForTest.getKVClient().get(ByteSequence.from(
- etcdMetadataReport.getNodeKey(serviceMetadataIdentifier), StandardCharsets.UTF_8));
- Assertions.assertTrue(response.get().getKvs().isEmpty());
- }
-
- @Test
- public void testDoGetExportedURLs() throws ExecutionException, InterruptedException {
- String version = "1.0.0";
- String group = null;
- String application = "etc-metadata-report-consumer-test";
- String revision = "90980";
- String protocol = "xxx";
- URL url = generateURL(TEST_SERVICE, version, group, application);
- ServiceMetadataIdentifier serviceMetadataIdentifier = new ServiceMetadataIdentifier(TEST_SERVICE, version,
- group, "provider", revision, protocol);
- etcdMetadataReport.doSaveMetadata(serviceMetadataIdentifier, url);
-
- List r = etcdMetadataReport.doGetExportedURLs(serviceMetadataIdentifier);
- Assertions.assertTrue(r.size() == 1);
-
- String fileContent = r.get(0);
- Assertions.assertNotNull(fileContent);
-
- Assertions.assertEquals(fileContent, url.toFullString());
- }
-
- @Test
- public void testDoSaveSubscriberData() throws ExecutionException, InterruptedException {
- String version = "1.0.0";
- String group = null;
- String application = "etc-metadata-report-consumer-test";
- String revision = "90980";
- String protocol = "xxx";
- URL url = generateURL(TEST_SERVICE, version, group, application);
- SubscriberMetadataIdentifier subscriberMetadataIdentifier = new SubscriberMetadataIdentifier(application, revision);
- Gson gson = new Gson();
- String r = gson.toJson(Arrays.asList(url));
- etcdMetadataReport.doSaveSubscriberData(subscriberMetadataIdentifier, r);
-
- CompletableFuture response = etcdClientForTest.getKVClient().get(ByteSequence.from(
- etcdMetadataReport.getNodeKey(subscriberMetadataIdentifier), StandardCharsets.UTF_8));
- String fileContent = response.get().getKvs().get(0).getValue().toString(StandardCharsets.UTF_8);
- Assertions.assertNotNull(fileContent);
-
- Assertions.assertEquals(fileContent, r);
- }
-
- @Test
- public void testDoGetSubscribedURLs() throws ExecutionException, InterruptedException {
- String version = "1.0.0";
- String group = null;
- String application = "etc-metadata-report-consumer-test";
- String revision = "90980";
- String protocol = "xxx";
- URL url = generateURL(TEST_SERVICE, version, group, application);
- SubscriberMetadataIdentifier subscriberMetadataIdentifier = new SubscriberMetadataIdentifier(application, revision);
- Gson gson = new Gson();
- String r = gson.toJson(Arrays.asList(url));
- etcdMetadataReport.doSaveSubscriberData(subscriberMetadataIdentifier, r);
-
- CompletableFuture response = etcdClientForTest.getKVClient().get(ByteSequence.from(
- etcdMetadataReport.getNodeKey(subscriberMetadataIdentifier), StandardCharsets.UTF_8));
- String fileContent = etcdMetadataReport.doGetSubscribedURLs(subscriberMetadataIdentifier);
- Assertions.assertNotNull(fileContent);
-
- Assertions.assertEquals(fileContent, r);
- }
-
- private MetadataIdentifier storeProvider(EtcdMetadataReport etcdMetadataReport, String interfaceName, String version,
- String group, String application)
- throws ClassNotFoundException, InterruptedException {
- URL url = URL.valueOf("xxx://" + NetUtils.getLocalAddress().getHostName() + ":4444/" + interfaceName +
- "?paramTest=etcdTest&version=" + version + "&application="
- + application + (group == null ? "" : "&group=" + group));
-
- MetadataIdentifier providerMetadataIdentifier =
- new MetadataIdentifier(interfaceName, version, group, PROVIDER_SIDE, application);
- Class interfaceClass = Class.forName(interfaceName);
- FullServiceDefinition fullServiceDefinition =
- ServiceDefinitionBuilder.buildFullDefinition(interfaceClass, url.getParameters());
-
- etcdMetadataReport.storeProviderMetadata(providerMetadataIdentifier, fullServiceDefinition);
- Thread.sleep(1000);
- return providerMetadataIdentifier;
- }
-
- private URL generateURL(String interfaceName, String version, String group, String application) {
- URL url = URL.valueOf("xxx://" + NetUtils.getLocalAddress().getHostName() + ":8989/" + interfaceName +
- "?paramTest=etcdTest&version=" + version + "&application="
- + application + (group == null ? "" : "&group=" + group));
- return url;
- }
-
- private MetadataIdentifier storeConsumer(EtcdMetadataReport etcdMetadataReport, String interfaceName,
- String version, String group, String application) throws InterruptedException {
-
- MetadataIdentifier consumerIdentifier = new MetadataIdentifier(interfaceName, version, group, CONSUMER_SIDE, application);
- Map tmp = new HashMap<>();
- tmp.put("paramConsumerTest", "etcdConsumer");
- etcdMetadataReport.storeConsumerMetadata(consumerIdentifier, tmp);
- Thread.sleep(1000);
- return consumerIdentifier;
- }
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-nacos/pom.xml b/dubbo-metadata/dubbo-metadata-report-nacos/pom.xml
deleted file mode 100644
index 03211e02ec..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-nacos/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
- org.apache.dubbo
- dubbo-metadata
- ${revision}
- ../pom.xml
-
- 4.0.0
-
- dubbo-metadata-report-nacos
-
-
-
- org.apache.dubbo
- dubbo-metadata-api
- ${project.parent.version}
-
-
-
- org.apache.dubbo
- dubbo-configcenter-nacos
- ${project.parent.version}
-
-
-
-
diff --git a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java b/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java
deleted file mode 100644
index 5c413d8fb0..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.dubbo.metadata.store.nacos;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
-import org.apache.dubbo.common.logger.Logger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.StringUtils;
-import org.apache.dubbo.metadata.report.identifier.BaseMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
-import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
-import org.apache.dubbo.metadata.report.support.AbstractMetadataReport;
-import org.apache.dubbo.metadata.report.support.ConfigCenterBasedMetadataReport;
-import org.apache.dubbo.rpc.RpcException;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-/**
- * metadata report impl for nacos
- *
- * @deprecated 2.7.8 This class will be removed in the future, {@link ConfigCenterBasedMetadataReport} as a substitute.
- */
-@Deprecated
-public class NacosMetadataReport extends AbstractMetadataReport {
-
- private static final Logger logger = LoggerFactory.getLogger(NacosMetadataReport.class);
-
- private final DynamicConfiguration dynamicConfiguration;
-
- /**
- * The group used to store metadata in Nacos
- */
- private String group;
-
- public NacosMetadataReport(URL url, DynamicConfiguration dynamicConfiguration) {
- super(url);
- this.dynamicConfiguration = dynamicConfiguration;
- }
-
- @Override
- protected void doStoreProviderMetadata(MetadataIdentifier providerMetadataIdentifier, String serviceDefinitions) {
- this.storeMetadata(providerMetadataIdentifier, serviceDefinitions);
- }
-
- @Override
- protected void doStoreConsumerMetadata(MetadataIdentifier consumerMetadataIdentifier, String value) {
- this.storeMetadata(consumerMetadataIdentifier, value);
- }
-
- @Override
- protected void doSaveMetadata(ServiceMetadataIdentifier serviceMetadataIdentifier, URL url) {
- storeMetadata(serviceMetadataIdentifier, URL.encode(url.toFullString()));
- }
-
- @Override
- protected void doRemoveMetadata(ServiceMetadataIdentifier serviceMetadataIdentifier) {
- deleteMetadata(serviceMetadataIdentifier);
- }
-
- @Override
- protected List doGetExportedURLs(ServiceMetadataIdentifier metadataIdentifier) {
- String content = getConfig(metadataIdentifier);
- if (StringUtils.isEmpty(content)) {
- return Collections.emptyList();
- }
- return new ArrayList(Arrays.asList(URL.decode(content)));
- }
-
- @Override
- protected void doSaveSubscriberData(SubscriberMetadataIdentifier subscriberMetadataIdentifier, String urlListStr) {
- storeMetadata(subscriberMetadataIdentifier, urlListStr);
- }
-
- @Override
- protected String doGetSubscribedURLs(SubscriberMetadataIdentifier subscriberMetadataIdentifier) {
- return getConfig(subscriberMetadataIdentifier);
- }
-
- @Override
- public String getServiceDefinition(MetadataIdentifier metadataIdentifier) {
- return getConfig(metadataIdentifier);
- }
-
- @Override
- public boolean saveExportedURLs(String serviceName, String exportedServicesRevision, String exportedURLsContent) {
- return dynamicConfiguration.publishConfig(serviceName, exportedServicesRevision, exportedURLsContent);
- }
-
- @Override
- public String getExportedURLsContent(String serviceName, String exportedServicesRevision) {
- return dynamicConfiguration.getConfig(serviceName, exportedServicesRevision, SECONDS.toMillis(3));
- }
-
- private void storeMetadata(BaseMetadataIdentifier identifier, String value) {
- try {
- boolean publishResult = dynamicConfiguration.publishConfig(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), group, value);
- if (!publishResult) {
- throw new RuntimeException("publish nacos metadata failed");
- }
- } catch (Throwable t) {
- logger.error("Failed to put " + identifier + " to nacos " + value + ", cause: " + t.getMessage(), t);
- throw new RpcException("Failed to put " + identifier + " to nacos " + value + ", cause: " + t.getMessage(), t);
- }
- }
-
- private void deleteMetadata(BaseMetadataIdentifier identifier) {
- try {
- boolean publishResult = dynamicConfiguration.removeConfig(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), group);
- if (!publishResult) {
- throw new RuntimeException("remove nacos metadata failed");
- }
- } catch (Throwable t) {
- logger.error("Failed to remove " + identifier + " from nacos , cause: " + t.getMessage(), t);
- throw new RpcException("Failed to remove " + identifier + " from nacos , cause: " + t.getMessage(), t);
- }
- }
-
- private String getConfig(BaseMetadataIdentifier identifier) {
- try {
- return dynamicConfiguration.getConfig(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), group, 300);
- } catch (Throwable t) {
- logger.error("Failed to get " + identifier + " from nacos , cause: " + t.getMessage(), t);
- throw new RpcException("Failed to get " + identifier + " from nacos , cause: " + t.getMessage(), t);
- }
- }
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportFactory.java b/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportFactory.java
deleted file mode 100644
index 8c8d5a2efa..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.dubbo.metadata.store.nacos;
-
-import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
-import org.apache.dubbo.metadata.report.support.ConfigCenterBasedMetadataReportFactory;
-
-/**
- * metadata report factory impl for nacos
- */
-public class NacosMetadataReportFactory extends ConfigCenterBasedMetadataReportFactory {
-
- public NacosMetadataReportFactory() {
- super(KeyTypeEnum.UNIQUE_KEY);
- }
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory b/dubbo-metadata/dubbo-metadata-report-nacos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
deleted file mode 100644
index de3b50a4b4..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
+++ /dev/null
@@ -1 +0,0 @@
-nacos=org.apache.dubbo.metadata.store.nacos.NacosMetadataReportFactory
diff --git a/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/NacosMetadata4TstService.java b/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/NacosMetadata4TstService.java
deleted file mode 100644
index e84efc529c..0000000000
--- a/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/NacosMetadata4TstService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.dubbo.metadata.store.nacos;
-
-/**
- * Test interface for Nacos metadata report
- */
-public interface NacosMetadata4TstService {
-
- int getCounter();
-
- void printResult(String var);
-}
diff --git a/dubbo-metadata/dubbo-metadata-report-redis/pom.xml b/dubbo-metadata/dubbo-metadata-report-redis/pom.xml
index f42424bea5..70bd32d363 100644
--- a/dubbo-metadata/dubbo-metadata-report-redis/pom.xml
+++ b/dubbo-metadata/dubbo-metadata-report-redis/pom.xml
@@ -18,8 +18,7 @@
org.apache.dubbo
dubbo-metadata
- ${revision}
- ../pom.xml
+ 2.7.7-SNAPSHOT
4.0.0
diff --git a/dubbo-metadata/pom.xml b/dubbo-metadata/pom.xml
index a11277960b..9119e09488 100644
--- a/dubbo-metadata/pom.xml
+++ b/dubbo-metadata/pom.xml
@@ -29,13 +29,10 @@
pom
dubbo-metadata-api
-
+ dubbo-metadata-definition-protobuf
+ dubbo-metadata-processor
dubbo-metadata-report-zookeeper
-
-
-
-
-
+ dubbo-metadata-report-redis