Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant code in ServiceConfig#checkAndUpdateSubConfigs method #8036

Merged
merged 2 commits into from Jun 15, 2021
Merged

Remove redundant code in ServiceConfig#checkAndUpdateSubConfigs method #8036

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdc13b5
Remove redundant code in ServiceConfig#checkAndUpdateSubConfigs method
BurningCN Jun 11, 2021
8a3b631
Remove unused import
BurningCN Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 1 addition & 31 deletions dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConfigUtils;
import org.apache.dubbo.common.utils.NamedThreadFactory;
Expand Down Expand Up @@ -294,36 +293,7 @@ private void checkAndUpdateSubConfigs() {
checkRef();
generic = FALSE_VALUE;
}
if (local != null) {
if (TRUE_VALUE.equals(local)) {
local = interfaceName + LOCAL_SUFFIX;
}
Class<?> localClass;
try {
localClass = ClassUtils.forNameWithThreadContextClassLoader(local);
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
if (!interfaceClass.isAssignableFrom(localClass)) {
throw new IllegalStateException(
"The local implementation class " + localClass.getName() + " not implement interface " + interfaceName);
}
}
if (stub != null) {
if (TRUE_VALUE.equals(stub)) {
stub = interfaceName + STUB_SUFFIX;
}
Class<?> stubClass;
try {
stubClass = ClassUtils.forNameWithThreadContextClassLoader(stub);
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
if (!interfaceClass.isAssignableFrom(stubClass)) {
throw new IllegalStateException(
"The stub implementation class " + stubClass.getName() + " not implement interface " + interfaceName);
}
}

checkStubAndLocal(interfaceClass);
ConfigValidationUtils.checkMock(interfaceClass, this);
ConfigValidationUtils.validateServiceConfig(this);
Expand Down