SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaces usage of ConfigFileApplicationListener with a subclass.

Browse Source 
BootstrapConfigFileApplicationListener.java overrides the onApplicationEvent() method to not throw an exception.
This commit is contained in:
spencergibb
2020-08-06 14:17:40 -04:00
parent a183bc709f
commit 08ca4105ab
3 changed files with 39 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1006
spring-cloud-context/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View File

File diff suppressed because it is too large Load Diff

37
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright 2013-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://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.springframework.cloud.bootstrap;
import org.springframework.boot.context.config.ConfigFileApplicationListener;
import org.springframework.context.ApplicationEvent;
/**
* Overrides ConfigFileApplicationListener to disable exception.
*
* @author Spencer Gibb
* @since 3.0.0
*/
@SuppressWarnings("deprecation")
public class BootstrapConfigFileApplicationListener
extends ConfigFileApplicationListener {
@Override
public void onApplicationEvent(ApplicationEvent event) {
// do nothing, overrides exception thrown.
}
}

4
spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java
View File

@@ -21,8 +21,8 @@ import java.util.Arrays;
import org.springframework.boot.Banner;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.config.ConfigFileApplicationListener;
import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
import org.springframework.cloud.bootstrap.BootstrapConfigFileApplicationListener;
import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.MutablePropertySources;
@@ -60,7 +60,7 @@ public class LegacyContextRefresher extends ContextRefresher {
// listener because it has side effects)
builder.application()
.setListeners(Arrays.asList(new BootstrapApplicationListener(),
new ConfigFileApplicationListener()));
new BootstrapConfigFileApplicationListener()));
capture = builder.run();
if (environment.getPropertySources().contains(REFRESH_ARGS_PROPERTY_SOURCE)) {
environment.getPropertySources().remove(REFRESH_ARGS_PROPERTY_SOURCE);