Commit 47e3a723 authored by Andy Wilkinson's avatar Andy Wilkinson

Source code formatting

parent 5e191357
...@@ -42,8 +42,8 @@ import org.springframework.social.facebook.connect.FacebookConnectionFactory; ...@@ -42,8 +42,8 @@ import org.springframework.social.facebook.connect.FacebookConnectionFactory;
import org.springframework.web.servlet.View; import org.springframework.web.servlet.View;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with
* with Facebook. * Facebook.
* *
* @author Craig Walls * @author Craig Walls
* @since 1.1.0 * @since 1.1.0
...@@ -56,32 +56,37 @@ public class FacebookAutoConfiguration { ...@@ -56,32 +56,37 @@ public class FacebookAutoConfiguration {
@Configuration @Configuration
@EnableSocial @EnableSocial
@ConditionalOnWebApplication @ConditionalOnWebApplication
protected static class FacebookAutoConfigurationAdapter extends SocialConfigurerAdapter implements EnvironmentAware { protected static class FacebookAutoConfigurationAdapter extends
SocialConfigurerAdapter implements EnvironmentAware {
private String appId; private String appId;
private String appSecret; private String appSecret;
@Override @Override
public void setEnvironment(Environment env) { public void setEnvironment(Environment env) {
RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(env, "spring.social."); RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(env,
"spring.social.");
this.appId = propertyResolver.getRequiredProperty("facebook.appId"); this.appId = propertyResolver.getRequiredProperty("facebook.appId");
this.appSecret = propertyResolver.getRequiredProperty("facebook.appSecret"); this.appSecret = propertyResolver.getRequiredProperty("facebook.appSecret");
} }
@Override @Override
public void addConnectionFactories(ConnectionFactoryConfigurer config, Environment env) { public void addConnectionFactories(ConnectionFactoryConfigurer config,
config.addConnectionFactory(new FacebookConnectionFactory(appId, appSecret)); Environment env) {
config.addConnectionFactory(new FacebookConnectionFactory(this.appId,
this.appSecret));
} }
@Bean @Bean
@ConditionalOnMissingBean(Facebook.class) @ConditionalOnMissingBean(Facebook.class)
@Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES) @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
public Facebook facebook(ConnectionRepository repository) { public Facebook facebook(ConnectionRepository repository) {
Connection<Facebook> connection = repository.findPrimaryConnection(Facebook.class); Connection<Facebook> connection = repository
.findPrimaryConnection(Facebook.class);
return connection != null ? connection.getApi() : new FacebookTemplate(); return connection != null ? connection.getApi() : new FacebookTemplate();
} }
@Bean(name={"connect/facebookConnect", "connect/facebookConnected"}) @Bean(name = { "connect/facebookConnect", "connect/facebookConnected" })
@ConditionalOnExpression("${spring.social.auto_connection_views:false}") @ConditionalOnExpression("${spring.social.auto_connection_views:false}")
public View facebookConnectView() { public View facebookConnectView() {
return new GenericConnectionStatusView("facebook", "Facebook"); return new GenericConnectionStatusView("facebook", "Facebook");
......
...@@ -41,8 +41,8 @@ import org.springframework.social.linkedin.connect.LinkedInConnectionFactory; ...@@ -41,8 +41,8 @@ import org.springframework.social.linkedin.connect.LinkedInConnectionFactory;
import org.springframework.web.servlet.View; import org.springframework.web.servlet.View;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with
* with LinkedIn. * LinkedIn.
* *
* @author Craig Walls * @author Craig Walls
* @since 1.1.0 * @since 1.1.0
...@@ -55,32 +55,37 @@ public class LinkedInAutoConfiguration { ...@@ -55,32 +55,37 @@ public class LinkedInAutoConfiguration {
@Configuration @Configuration
@EnableSocial @EnableSocial
@ConditionalOnWebApplication @ConditionalOnWebApplication
protected static class LinkedInAutoConfigurationAdapter extends SocialConfigurerAdapter implements EnvironmentAware { protected static class LinkedInAutoConfigurationAdapter extends
SocialConfigurerAdapter implements EnvironmentAware {
private String appId; private String appId;
private String appSecret; private String appSecret;
@Override @Override
public void setEnvironment(Environment env) { public void setEnvironment(Environment env) {
RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(env, "spring.social."); RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(env,
"spring.social.");
this.appId = propertyResolver.getRequiredProperty("linkedin.appId"); this.appId = propertyResolver.getRequiredProperty("linkedin.appId");
this.appSecret = propertyResolver.getRequiredProperty("linkedin.appSecret"); this.appSecret = propertyResolver.getRequiredProperty("linkedin.appSecret");
} }
@Override @Override
public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig, Environment env) { public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig,
cfConfig.addConnectionFactory(new LinkedInConnectionFactory(appId, appSecret)); Environment env) {
cfConfig.addConnectionFactory(new LinkedInConnectionFactory(this.appId,
this.appSecret));
} }
@Bean @Bean
@ConditionalOnMissingBean(LinkedInConnectionFactory.class) @ConditionalOnMissingBean(LinkedInConnectionFactory.class)
@Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES) @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
public LinkedIn linkedin(ConnectionRepository repository) { public LinkedIn linkedin(ConnectionRepository repository) {
Connection<LinkedIn> connection = repository.findPrimaryConnection(LinkedIn.class); Connection<LinkedIn> connection = repository
.findPrimaryConnection(LinkedIn.class);
return connection != null ? connection.getApi() : null; return connection != null ? connection.getApi() : null;
} }
@Bean(name={"connect/linkedinConnect", "connect/linkedinConnected"}) @Bean(name = { "connect/linkedinConnect", "connect/linkedinConnected" })
@ConditionalOnExpression("${spring.social.auto_connection_views:false}") @ConditionalOnExpression("${spring.social.auto_connection_views:false}")
public View linkedInConnectView() { public View linkedInConnectView() {
return new GenericConnectionStatusView("linkedin", "LinkedIn"); return new GenericConnectionStatusView("linkedin", "LinkedIn");
......
...@@ -35,7 +35,8 @@ import org.springframework.web.servlet.ViewResolver; ...@@ -35,7 +35,8 @@ import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.view.BeanNameViewResolver; import org.springframework.web.servlet.view.BeanNameViewResolver;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Social's web connection support. * {@link EnableAutoConfiguration Auto-configuration} for Spring Social's web connection
* support.
* *
* @author Craig Walls * @author Craig Walls
* @since 1.1.0 * @since 1.1.0
...@@ -52,7 +53,8 @@ public class SocialWebAutoConfiguration { ...@@ -52,7 +53,8 @@ public class SocialWebAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(ConnectController.class) @ConditionalOnMissingBean(ConnectController.class)
public ConnectController connectController( public ConnectController connectController(
ConnectionFactoryLocator connectionFactoryLocator, ConnectionRepository connectionRepository) { ConnectionFactoryLocator connectionFactoryLocator,
ConnectionRepository connectionRepository) {
return new ConnectController(connectionFactoryLocator, connectionRepository); return new ConnectController(connectionFactoryLocator, connectionRepository);
} }
......
...@@ -42,8 +42,8 @@ import org.springframework.social.twitter.connect.TwitterConnectionFactory; ...@@ -42,8 +42,8 @@ import org.springframework.social.twitter.connect.TwitterConnectionFactory;
import org.springframework.web.servlet.View; import org.springframework.web.servlet.View;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with
* with Twitter. * Twitter.
* *
* @author Craig Walls * @author Craig Walls
* @since 1.1.0 * @since 1.1.0
...@@ -56,32 +56,38 @@ public class TwitterAutoConfiguration { ...@@ -56,32 +56,38 @@ public class TwitterAutoConfiguration {
@Configuration @Configuration
@EnableSocial @EnableSocial
@ConditionalOnWebApplication @ConditionalOnWebApplication
protected static class TwitterAutoConfigurationAdapter extends SocialConfigurerAdapter implements EnvironmentAware { protected static class TwitterAutoConfigurationAdapter extends
SocialConfigurerAdapter implements EnvironmentAware {
private String appId; private String appId;
private String appSecret; private String appSecret;
@Override @Override
public void setEnvironment(Environment env) { public void setEnvironment(Environment env) {
RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(env, "spring.social."); RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(env,
"spring.social.");
this.appId = propertyResolver.getRequiredProperty("twitter.appId"); this.appId = propertyResolver.getRequiredProperty("twitter.appId");
this.appSecret = propertyResolver.getRequiredProperty("twitter.appSecret"); this.appSecret = propertyResolver.getRequiredProperty("twitter.appSecret");
} }
@Override @Override
public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig, Environment env) { public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig,
cfConfig.addConnectionFactory(new TwitterConnectionFactory(appId, appSecret)); Environment env) {
cfConfig.addConnectionFactory(new TwitterConnectionFactory(this.appId,
this.appSecret));
} }
@Bean @Bean
@ConditionalOnMissingBean(TwitterConnectionFactory.class) @ConditionalOnMissingBean(TwitterConnectionFactory.class)
@Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES) @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
public Twitter twitter(ConnectionRepository repository) { public Twitter twitter(ConnectionRepository repository) {
Connection<Twitter> connection = repository.findPrimaryConnection(Twitter.class); Connection<Twitter> connection = repository
return connection != null ? connection.getApi() : new TwitterTemplate(appId, appSecret); .findPrimaryConnection(Twitter.class);
return connection != null ? connection.getApi() : new TwitterTemplate(
this.appId, this.appSecret);
} }
@Bean(name={"connect/twitterConnect", "connect/twitterConnected"}) @Bean(name = { "connect/twitterConnect", "connect/twitterConnected" })
@ConditionalOnExpression("${spring.social.auto_connection_views:false}") @ConditionalOnExpression("${spring.social.auto_connection_views:false}")
public View twitterConnectView() { public View twitterConnectView() {
return new GenericConnectionStatusView("twitter", "Twitter"); return new GenericConnectionStatusView("twitter", "Twitter");
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package org.springframework.boot.autoconfigure.social; package org.springframework.boot.autoconfigure.social;
import static org.junit.Assert.*;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.boot.test.EnvironmentTestUtils;
...@@ -28,6 +26,8 @@ import org.springframework.social.connect.UsersConnectionRepository; ...@@ -28,6 +26,8 @@ import org.springframework.social.connect.UsersConnectionRepository;
import org.springframework.social.facebook.api.Facebook; import org.springframework.social.facebook.api.Facebook;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import static org.junit.Assert.assertNotNull;
/** /**
* Tests for {@link FacebookAutoConfiguration}. * Tests for {@link FacebookAutoConfiguration}.
* *
...@@ -47,8 +47,10 @@ public class FacebookAutoConfigurationTests { ...@@ -47,8 +47,10 @@ public class FacebookAutoConfigurationTests {
@Test @Test
public void expectedSocialBeansCreated() throws Exception { public void expectedSocialBeansCreated() throws Exception {
this.context = new AnnotationConfigWebApplicationContext(); this.context = new AnnotationConfigWebApplicationContext();
EnvironmentTestUtils.addEnvironment(this.context, "spring.social.facebook.appId:12345"); EnvironmentTestUtils.addEnvironment(this.context,
EnvironmentTestUtils.addEnvironment(this.context, "spring.social.facebook.appSecret:secret"); "spring.social.facebook.appId:12345");
EnvironmentTestUtils.addEnvironment(this.context,
"spring.social.facebook.appSecret:secret");
this.context.register(SocialWebAutoConfiguration.class); this.context.register(SocialWebAutoConfiguration.class);
this.context.register(FacebookAutoConfiguration.class); this.context.register(FacebookAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package org.springframework.boot.autoconfigure.social; package org.springframework.boot.autoconfigure.social;
import static org.junit.Assert.*;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.boot.test.EnvironmentTestUtils;
...@@ -28,6 +26,8 @@ import org.springframework.social.connect.UsersConnectionRepository; ...@@ -28,6 +26,8 @@ import org.springframework.social.connect.UsersConnectionRepository;
import org.springframework.social.linkedin.api.LinkedIn; import org.springframework.social.linkedin.api.LinkedIn;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import static org.junit.Assert.assertNotNull;
/** /**
* Tests for {@link LinkedInAutoConfiguration}. * Tests for {@link LinkedInAutoConfiguration}.
* *
...@@ -47,8 +47,10 @@ public class LinkedInAutoConfigurationTests { ...@@ -47,8 +47,10 @@ public class LinkedInAutoConfigurationTests {
@Test @Test
public void expectedSocialBeansCreated() throws Exception { public void expectedSocialBeansCreated() throws Exception {
this.context = new AnnotationConfigWebApplicationContext(); this.context = new AnnotationConfigWebApplicationContext();
EnvironmentTestUtils.addEnvironment(this.context, "spring.social.linkedin.appId:12345"); EnvironmentTestUtils.addEnvironment(this.context,
EnvironmentTestUtils.addEnvironment(this.context, "spring.social.linkedin.appSecret:secret"); "spring.social.linkedin.appId:12345");
EnvironmentTestUtils.addEnvironment(this.context,
"spring.social.linkedin.appSecret:secret");
this.context.register(SocialWebAutoConfiguration.class); this.context.register(SocialWebAutoConfiguration.class);
this.context.register(LinkedInAutoConfiguration.class); this.context.register(LinkedInAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package org.springframework.boot.autoconfigure.social; package org.springframework.boot.autoconfigure.social;
import static org.junit.Assert.*;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.boot.test.EnvironmentTestUtils;
...@@ -28,6 +26,8 @@ import org.springframework.social.connect.UsersConnectionRepository; ...@@ -28,6 +26,8 @@ import org.springframework.social.connect.UsersConnectionRepository;
import org.springframework.social.twitter.api.Twitter; import org.springframework.social.twitter.api.Twitter;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import static org.junit.Assert.assertNotNull;
/** /**
* Tests for {@link TwitterAutoConfiguration}. * Tests for {@link TwitterAutoConfiguration}.
* *
...@@ -47,8 +47,10 @@ public class TwitterAutoConfigurationTests { ...@@ -47,8 +47,10 @@ public class TwitterAutoConfigurationTests {
@Test @Test
public void expectedSocialBeansCreated() throws Exception { public void expectedSocialBeansCreated() throws Exception {
this.context = new AnnotationConfigWebApplicationContext(); this.context = new AnnotationConfigWebApplicationContext();
EnvironmentTestUtils.addEnvironment(this.context, "spring.social.twitter.appId:12345"); EnvironmentTestUtils.addEnvironment(this.context,
EnvironmentTestUtils.addEnvironment(this.context, "spring.social.twitter.appSecret:secret"); "spring.social.twitter.appId:12345");
EnvironmentTestUtils.addEnvironment(this.context,
"spring.social.twitter.appSecret:secret");
this.context.register(SocialWebAutoConfiguration.class); this.context.register(SocialWebAutoConfiguration.class);
this.context.register(TwitterAutoConfiguration.class); this.context.register(TwitterAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
......
...@@ -29,7 +29,8 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer; ...@@ -29,7 +29,8 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer;
* @author Craig Walls * @author Craig Walls
* @since 1.1.0 * @since 1.1.0
*/ */
public class SpringSocialFacebookCompilerAutoConfiguration extends CompilerAutoConfiguration { public class SpringSocialFacebookCompilerAutoConfiguration extends
CompilerAutoConfiguration {
@Override @Override
public boolean matches(ClassNode classNode) { public boolean matches(ClassNode classNode) {
...@@ -39,9 +40,9 @@ public class SpringSocialFacebookCompilerAutoConfiguration extends CompilerAutoC ...@@ -39,9 +40,9 @@ public class SpringSocialFacebookCompilerAutoConfiguration extends CompilerAutoC
@Override @Override
public void applyDependencies(DependencyCustomizer dependencies) public void applyDependencies(DependencyCustomizer dependencies)
throws CompilationFailedException { throws CompilationFailedException {
dependencies dependencies.ifAnyMissingClasses(
.ifAnyMissingClasses("org.springframework.social.facebook.api.Facebook") "org.springframework.social.facebook.api.Facebook").add(
.add("spring-boot-starter-social-facebook"); "spring-boot-starter-social-facebook");
} }
@Override @Override
......
...@@ -29,7 +29,8 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer; ...@@ -29,7 +29,8 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer;
* @author Craig Walls * @author Craig Walls
* @since 1.1.0 * @since 1.1.0
*/ */
public class SpringSocialLinkedInCompilerAutoConfiguration extends CompilerAutoConfiguration { public class SpringSocialLinkedInCompilerAutoConfiguration extends
CompilerAutoConfiguration {
@Override @Override
public boolean matches(ClassNode classNode) { public boolean matches(ClassNode classNode) {
...@@ -39,9 +40,9 @@ public class SpringSocialLinkedInCompilerAutoConfiguration extends CompilerAutoC ...@@ -39,9 +40,9 @@ public class SpringSocialLinkedInCompilerAutoConfiguration extends CompilerAutoC
@Override @Override
public void applyDependencies(DependencyCustomizer dependencies) public void applyDependencies(DependencyCustomizer dependencies)
throws CompilationFailedException { throws CompilationFailedException {
dependencies dependencies.ifAnyMissingClasses(
.ifAnyMissingClasses("org.springframework.social.linkedin.api.LinkedIn") "org.springframework.social.linkedin.api.LinkedIn").add(
.add("spring-boot-starter-social-linkedin"); "spring-boot-starter-social-linkedin");
} }
@Override @Override
......
...@@ -29,7 +29,8 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer; ...@@ -29,7 +29,8 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer;
* @author Craig Walls * @author Craig Walls
* @since 1.1.0 * @since 1.1.0
*/ */
public class SpringSocialTwitterCompilerAutoConfiguration extends CompilerAutoConfiguration { public class SpringSocialTwitterCompilerAutoConfiguration extends
CompilerAutoConfiguration {
@Override @Override
public boolean matches(ClassNode classNode) { public boolean matches(ClassNode classNode) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment