Fix social property binding
Update Spring Social auto-configurations to read properties using the `dashed` notation and with the appropriate prefixes. This allows properties to be specified in any of the relaxed forms. Also minor refactor to extract common logic to a new SocialAutoConfigurerAdapter base class. See gh-941pull/1016/head
Phillip Webb
11 years ago
parent
5df52d3e94
commit
7fd26a556d
@ -0,0 +1,58 @@
|
||||
/*
|
||||
* Copyright 2012-2014 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
|
||||
*
|
||||
* 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.springframework.boot.autoconfigure.social;
|
||||
|
||||
import org.springframework.boot.bind.RelaxedPropertyResolver;
|
||||
import org.springframework.context.EnvironmentAware;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.social.config.annotation.ConnectionFactoryConfigurer;
|
||||
import org.springframework.social.config.annotation.SocialConfigurerAdapter;
|
||||
import org.springframework.social.connect.ConnectionFactory;
|
||||
|
||||
/**
|
||||
* Base class for auto-configured {@link SocialConfigurerAdapter}s.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Craig Walls
|
||||
* @since 1.1.0
|
||||
*/
|
||||
abstract class SocialAutoConfigurerAdapter extends SocialConfigurerAdapter implements
|
||||
EnvironmentAware {
|
||||
|
||||
private RelaxedPropertyResolver properties;
|
||||
|
||||
@Override
|
||||
public void setEnvironment(Environment environment) {
|
||||
this.properties = new RelaxedPropertyResolver(environment, getPropertyPrefix());
|
||||
}
|
||||
|
||||
protected abstract String getPropertyPrefix();
|
||||
|
||||
@Override
|
||||
public void addConnectionFactories(ConnectionFactoryConfigurer configurer,
|
||||
Environment environment) {
|
||||
configurer.addConnectionFactory(createConnectionFactory(this.properties));
|
||||
}
|
||||
|
||||
protected final RelaxedPropertyResolver getProperties() {
|
||||
return this.properties;
|
||||
}
|
||||
|
||||
protected abstract ConnectionFactory<?> createConnectionFactory(
|
||||
RelaxedPropertyResolver properties);
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue