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.

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

Fix to fetch command line argument #372

Merged
merged 12 commits into from
Mar 8, 2019
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void assemblyLogSetting(ConfigurableEnvironment environment) {
StreamSupport.stream(environment.getPropertySources().spliterator(), false)
.filter(propertySource -> propertySource instanceof EnumerablePropertySource)
.map(propertySource -> Arrays
.asList(((MapPropertySource) propertySource).getPropertyNames()))
.asList(((EnumerablePropertySource) propertySource).getPropertyNames()))
.flatMap(Collection::stream).filter(LogEnvUtils::filterAllLogConfig)
.forEach((key) -> HIGH_PRIORITY_CONFIG.getSource().put(key, environment.getProperty(key)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ public class SofaBootWebSpringBootApplication {
public static void main(String[] args) {
SpringApplication springApplication = new SpringApplication(
SofaBootWebSpringBootApplication.class);
springApplication.run(args);
springApplication.run();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* 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 com.alipay.sofa.infra.config.spring;

import org.junit.Assert;
import org.junit.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;

/**
* @author qilong.zql
* @since 3.1.2
*/
public class SofaBootstrapTest {

@Test
public void commandLineArgsTest() {
Throwable throwable = null;
try {
SpringApplication springApplication = new SpringApplication(EmptyConfiguration.class);
String[] args = { "-A=B" };
springApplication.run(args);
} catch (Throwable t) {
throwable = t;
}
Assert.assertNull(throwable);
}

@EnableAutoConfiguration
@Configuration
public static class EmptyConfiguration {

}
}