-
Notifications
You must be signed in to change notification settings - Fork 26.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enhancement and Bugfix in 2.7.1 ( Part 1 ) (#3670)
* Polish /#3429 : Fix The NPE issue * Polish /#3615 : SpringStatusChecker execute errors on non-XML Spring configuration * Polish /#3193 : Change the default behavior of @EnableDubboConfig.multiple()
- Loading branch information
1 parent
cb11ce0
commit bce2f44
Showing
10 changed files
with
138 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
195 changes: 101 additions & 94 deletions
195
...onfig-spring/src/main/java/org/apache/dubbo/config/spring/status/SpringStatusChecker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,101 @@ | ||
| /* | ||
| * 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.config.spring.status; | ||
|
|
||
| import org.apache.dubbo.common.extension.Activate; | ||
| import org.apache.dubbo.common.logger.Logger; | ||
| import org.apache.dubbo.common.logger.LoggerFactory; | ||
| import org.apache.dubbo.common.status.Status; | ||
| import org.apache.dubbo.common.status.StatusChecker; | ||
| import org.apache.dubbo.config.spring.extension.SpringExtensionFactory; | ||
|
|
||
| import org.springframework.context.ApplicationContext; | ||
| import org.springframework.context.Lifecycle; | ||
|
|
||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * SpringStatusChecker | ||
| */ | ||
| @Activate | ||
| public class SpringStatusChecker implements StatusChecker { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(SpringStatusChecker.class); | ||
|
|
||
| @Override | ||
| public Status check() { | ||
| ApplicationContext context = null; | ||
| for (ApplicationContext c : SpringExtensionFactory.getContexts()) { | ||
| if (c != null) { | ||
| context = c; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (context == null) { | ||
| return new Status(Status.Level.UNKNOWN); | ||
| } | ||
|
|
||
| Status.Level level = Status.Level.OK; | ||
| if (context instanceof Lifecycle) { | ||
| if (((Lifecycle) context).isRunning()) { | ||
| level = Status.Level.OK; | ||
| } else { | ||
| level = Status.Level.ERROR; | ||
| } | ||
| } else { | ||
| level = Status.Level.UNKNOWN; | ||
| } | ||
| StringBuilder buf = new StringBuilder(); | ||
| try { | ||
| Class<?> cls = context.getClass(); | ||
| Method method = null; | ||
| while (cls != null && method == null) { | ||
| try { | ||
| method = cls.getDeclaredMethod("getConfigLocations", new Class<?>[0]); | ||
| } catch (NoSuchMethodException t) { | ||
| cls = cls.getSuperclass(); | ||
| } | ||
| } | ||
| if (method != null) { | ||
| if (!method.isAccessible()) { | ||
| method.setAccessible(true); | ||
| } | ||
| String[] configs = (String[]) method.invoke(context, new Object[0]); | ||
| if (configs != null && configs.length > 0) { | ||
| for (String config : configs) { | ||
| if (buf.length() > 0) { | ||
| buf.append(","); | ||
| } | ||
| buf.append(config); | ||
| } | ||
| } | ||
| } | ||
| } catch (Throwable t) { | ||
| logger.warn(t.getMessage(), t); | ||
| } | ||
| return new Status(level, buf.toString()); | ||
| } | ||
|
|
||
| } | ||
| /* | ||
| * 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.config.spring.status; | ||
|
|
||
| import org.apache.dubbo.common.extension.Activate; | ||
| import org.apache.dubbo.common.logger.Logger; | ||
| import org.apache.dubbo.common.logger.LoggerFactory; | ||
| import org.apache.dubbo.common.status.Status; | ||
| import org.apache.dubbo.common.status.StatusChecker; | ||
| import org.apache.dubbo.config.spring.extension.SpringExtensionFactory; | ||
|
|
||
| import org.springframework.context.ApplicationContext; | ||
| import org.springframework.context.Lifecycle; | ||
| import org.springframework.web.context.support.GenericWebApplicationContext; | ||
|
|
||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * SpringStatusChecker | ||
| */ | ||
| @Activate | ||
| public class SpringStatusChecker implements StatusChecker { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(SpringStatusChecker.class); | ||
|
|
||
| @Override | ||
| public Status check() { | ||
| ApplicationContext context = null; | ||
| for (ApplicationContext c : SpringExtensionFactory.getContexts()) { | ||
| // [Issue] SpringStatusChecker execute errors on non-XML Spring configuration | ||
| // issue : https://github.com/apache/incubator-dubbo/issues/3615 | ||
| if(c instanceof GenericWebApplicationContext) { // ignore GenericXmlApplicationContext | ||
| continue; | ||
| } | ||
|
|
||
| if (c != null) { | ||
| context = c; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (context == null) { | ||
| return new Status(Status.Level.UNKNOWN); | ||
| } | ||
|
|
||
| Status.Level level = Status.Level.OK; | ||
| if (context instanceof Lifecycle) { | ||
| if (((Lifecycle) context).isRunning()) { | ||
| level = Status.Level.OK; | ||
| } else { | ||
| level = Status.Level.ERROR; | ||
| } | ||
| } else { | ||
| level = Status.Level.UNKNOWN; | ||
| } | ||
| StringBuilder buf = new StringBuilder(); | ||
| try { | ||
| Class<?> cls = context.getClass(); | ||
| Method method = null; | ||
| while (cls != null && method == null) { | ||
| try { | ||
| method = cls.getDeclaredMethod("getConfigLocations", new Class<?>[0]); | ||
| } catch (NoSuchMethodException t) { | ||
| cls = cls.getSuperclass(); | ||
| } | ||
| } | ||
| if (method != null) { | ||
| if (!method.isAccessible()) { | ||
| method.setAccessible(true); | ||
| } | ||
| String[] configs = (String[]) method.invoke(context, new Object[0]); | ||
| if (configs != null && configs.length > 0) { | ||
| for (String config : configs) { | ||
| if (buf.length() > 0) { | ||
| buf.append(","); | ||
| } | ||
| buf.append(config); | ||
| } | ||
| } | ||
| } | ||
| } catch (Throwable t) { | ||
| logger.warn(t.getMessage(), t); | ||
| } | ||
| return new Status(level, buf.toString()); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters