diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java index 9646dcde09..c9e9719971 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java @@ -42,9 +42,9 @@ import org.springframework.social.facebook.connect.FacebookConnectionFactory; import org.springframework.web.servlet.View; /** - * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity - * with Facebook. - * + * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with + * Facebook. + * * @author Craig Walls * @since 1.1.0 */ @@ -56,32 +56,37 @@ public class FacebookAutoConfiguration { @Configuration @EnableSocial @ConditionalOnWebApplication - protected static class FacebookAutoConfigurationAdapter extends SocialConfigurerAdapter implements EnvironmentAware { + protected static class FacebookAutoConfigurationAdapter extends + SocialConfigurerAdapter implements EnvironmentAware { private String appId; private String appSecret; @Override 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.appSecret = propertyResolver.getRequiredProperty("facebook.appSecret"); } - + @Override - public void addConnectionFactories(ConnectionFactoryConfigurer config, Environment env) { - config.addConnectionFactory(new FacebookConnectionFactory(appId, appSecret)); + public void addConnectionFactories(ConnectionFactoryConfigurer config, + Environment env) { + config.addConnectionFactory(new FacebookConnectionFactory(this.appId, + this.appSecret)); } @Bean @ConditionalOnMissingBean(Facebook.class) - @Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES) + @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES) public Facebook facebook(ConnectionRepository repository) { - Connection connection = repository.findPrimaryConnection(Facebook.class); + Connection connection = repository + .findPrimaryConnection(Facebook.class); 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}") public View facebookConnectView() { return new GenericConnectionStatusView("facebook", "Facebook"); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java index a3bf0dd2cd..da95ee8cbc 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java @@ -41,9 +41,9 @@ import org.springframework.social.linkedin.connect.LinkedInConnectionFactory; import org.springframework.web.servlet.View; /** - * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity - * with LinkedIn. - * + * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with + * LinkedIn. + * * @author Craig Walls * @since 1.1.0 */ @@ -55,32 +55,37 @@ public class LinkedInAutoConfiguration { @Configuration @EnableSocial @ConditionalOnWebApplication - protected static class LinkedInAutoConfigurationAdapter extends SocialConfigurerAdapter implements EnvironmentAware { + protected static class LinkedInAutoConfigurationAdapter extends + SocialConfigurerAdapter implements EnvironmentAware { private String appId; private String appSecret; @Override 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.appSecret = propertyResolver.getRequiredProperty("linkedin.appSecret"); } - + @Override - public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig, Environment env) { - cfConfig.addConnectionFactory(new LinkedInConnectionFactory(appId, appSecret)); + public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig, + Environment env) { + cfConfig.addConnectionFactory(new LinkedInConnectionFactory(this.appId, + this.appSecret)); } @Bean @ConditionalOnMissingBean(LinkedInConnectionFactory.class) - @Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES) + @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES) public LinkedIn linkedin(ConnectionRepository repository) { - Connection connection = repository.findPrimaryConnection(LinkedIn.class); + Connection connection = repository + .findPrimaryConnection(LinkedIn.class); 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}") public View linkedInConnectView() { return new GenericConnectionStatusView("linkedin", "LinkedIn"); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java index 97326ef285..c98998e0ca 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java @@ -35,8 +35,9 @@ import org.springframework.web.servlet.ViewResolver; 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 * @since 1.1.0 */ @@ -52,10 +53,11 @@ public class SocialWebAutoConfiguration { @Bean @ConditionalOnMissingBean(ConnectController.class) public ConnectController connectController( - ConnectionFactoryLocator connectionFactoryLocator, ConnectionRepository connectionRepository) { + ConnectionFactoryLocator connectionFactoryLocator, + ConnectionRepository connectionRepository) { return new ConnectController(connectionFactoryLocator, connectionRepository); } - + @Bean @ConditionalOnMissingBean(BeanNameViewResolver.class) @ConditionalOnExpression("${spring.social.auto_connection_views:false}") @@ -64,7 +66,7 @@ public class SocialWebAutoConfiguration { bnvr.setOrder(Integer.MIN_VALUE); return bnvr; } - + @Override public UserIdSource getUserIdSource() { return new UserIdSource() { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfiguration.java index bee82300fa..a1dbadff2e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfiguration.java @@ -42,9 +42,9 @@ import org.springframework.social.twitter.connect.TwitterConnectionFactory; import org.springframework.web.servlet.View; /** - * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity - * with Twitter. - * + * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with + * Twitter. + * * @author Craig Walls * @since 1.1.0 */ @@ -56,32 +56,38 @@ public class TwitterAutoConfiguration { @Configuration @EnableSocial @ConditionalOnWebApplication - protected static class TwitterAutoConfigurationAdapter extends SocialConfigurerAdapter implements EnvironmentAware { + protected static class TwitterAutoConfigurationAdapter extends + SocialConfigurerAdapter implements EnvironmentAware { private String appId; private String appSecret; @Override 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.appSecret = propertyResolver.getRequiredProperty("twitter.appSecret"); } - + @Override - public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig, Environment env) { - cfConfig.addConnectionFactory(new TwitterConnectionFactory(appId, appSecret)); + public void addConnectionFactories(ConnectionFactoryConfigurer cfConfig, + Environment env) { + cfConfig.addConnectionFactory(new TwitterConnectionFactory(this.appId, + this.appSecret)); } @Bean @ConditionalOnMissingBean(TwitterConnectionFactory.class) - @Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES) + @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES) public Twitter twitter(ConnectionRepository repository) { - Connection connection = repository.findPrimaryConnection(Twitter.class); - return connection != null ? connection.getApi() : new TwitterTemplate(appId, appSecret); + Connection connection = repository + .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}") public View twitterConnectView() { return new GenericConnectionStatusView("twitter", "Twitter"); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java index bd41ec5807..6a20b61d46 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.autoconfigure.social; -import static org.junit.Assert.*; - import org.junit.After; import org.junit.Test; import org.springframework.boot.test.EnvironmentTestUtils; @@ -28,9 +26,11 @@ import org.springframework.social.connect.UsersConnectionRepository; import org.springframework.social.facebook.api.Facebook; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import static org.junit.Assert.assertNotNull; + /** * Tests for {@link FacebookAutoConfiguration}. - * + * * @author Craig Walls */ public class FacebookAutoConfigurationTests { @@ -47,8 +47,10 @@ public class FacebookAutoConfigurationTests { @Test public void expectedSocialBeansCreated() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "spring.social.facebook.appId:12345"); - EnvironmentTestUtils.addEnvironment(this.context, "spring.social.facebook.appSecret:secret"); + EnvironmentTestUtils.addEnvironment(this.context, + "spring.social.facebook.appId:12345"); + EnvironmentTestUtils.addEnvironment(this.context, + "spring.social.facebook.appSecret:secret"); this.context.register(SocialWebAutoConfiguration.class); this.context.register(FacebookAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java index 3e831a8622..d1f57909a0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.autoconfigure.social; -import static org.junit.Assert.*; - import org.junit.After; import org.junit.Test; import org.springframework.boot.test.EnvironmentTestUtils; @@ -28,9 +26,11 @@ import org.springframework.social.connect.UsersConnectionRepository; import org.springframework.social.linkedin.api.LinkedIn; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import static org.junit.Assert.assertNotNull; + /** * Tests for {@link LinkedInAutoConfiguration}. - * + * * @author Craig Walls */ public class LinkedInAutoConfigurationTests { @@ -47,8 +47,10 @@ public class LinkedInAutoConfigurationTests { @Test public void expectedSocialBeansCreated() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "spring.social.linkedin.appId:12345"); - EnvironmentTestUtils.addEnvironment(this.context, "spring.social.linkedin.appSecret:secret"); + EnvironmentTestUtils.addEnvironment(this.context, + "spring.social.linkedin.appId:12345"); + EnvironmentTestUtils.addEnvironment(this.context, + "spring.social.linkedin.appSecret:secret"); this.context.register(SocialWebAutoConfiguration.class); this.context.register(LinkedInAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java index a06868fe82..09988cea4c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.autoconfigure.social; -import static org.junit.Assert.*; - import org.junit.After; import org.junit.Test; import org.springframework.boot.test.EnvironmentTestUtils; @@ -28,9 +26,11 @@ import org.springframework.social.connect.UsersConnectionRepository; import org.springframework.social.twitter.api.Twitter; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import static org.junit.Assert.assertNotNull; + /** * Tests for {@link TwitterAutoConfiguration}. - * + * * @author Craig Walls */ public class TwitterAutoConfigurationTests { @@ -47,8 +47,10 @@ public class TwitterAutoConfigurationTests { @Test public void expectedSocialBeansCreated() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "spring.social.twitter.appId:12345"); - EnvironmentTestUtils.addEnvironment(this.context, "spring.social.twitter.appSecret:secret"); + EnvironmentTestUtils.addEnvironment(this.context, + "spring.social.twitter.appId:12345"); + EnvironmentTestUtils.addEnvironment(this.context, + "spring.social.twitter.appSecret:secret"); this.context.register(SocialWebAutoConfiguration.class); this.context.register(TwitterAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialFacebookCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialFacebookCompilerAutoConfiguration.java index a0246844c8..37fe98393c 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialFacebookCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialFacebookCompilerAutoConfiguration.java @@ -25,11 +25,12 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Social Facebook. - * + * * @author Craig Walls * @since 1.1.0 */ -public class SpringSocialFacebookCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringSocialFacebookCompilerAutoConfiguration extends + CompilerAutoConfiguration { @Override public boolean matches(ClassNode classNode) { @@ -39,9 +40,9 @@ public class SpringSocialFacebookCompilerAutoConfiguration extends CompilerAutoC @Override public void applyDependencies(DependencyCustomizer dependencies) throws CompilationFailedException { - dependencies - .ifAnyMissingClasses("org.springframework.social.facebook.api.Facebook") - .add("spring-boot-starter-social-facebook"); + dependencies.ifAnyMissingClasses( + "org.springframework.social.facebook.api.Facebook").add( + "spring-boot-starter-social-facebook"); } @Override diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialLinkedInCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialLinkedInCompilerAutoConfiguration.java index c1e97fcf53..1f2763bd6b 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialLinkedInCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialLinkedInCompilerAutoConfiguration.java @@ -25,11 +25,12 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Social LinkedIn. - * + * * @author Craig Walls * @since 1.1.0 */ -public class SpringSocialLinkedInCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringSocialLinkedInCompilerAutoConfiguration extends + CompilerAutoConfiguration { @Override public boolean matches(ClassNode classNode) { @@ -39,9 +40,9 @@ public class SpringSocialLinkedInCompilerAutoConfiguration extends CompilerAutoC @Override public void applyDependencies(DependencyCustomizer dependencies) throws CompilationFailedException { - dependencies - .ifAnyMissingClasses("org.springframework.social.linkedin.api.LinkedIn") - .add("spring-boot-starter-social-linkedin"); + dependencies.ifAnyMissingClasses( + "org.springframework.social.linkedin.api.LinkedIn").add( + "spring-boot-starter-social-linkedin"); } @Override diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialTwitterCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialTwitterCompilerAutoConfiguration.java index f66b405e5d..84a73538a6 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialTwitterCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSocialTwitterCompilerAutoConfiguration.java @@ -25,11 +25,12 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Social Twitter. - * + * * @author Craig Walls * @since 1.1.0 */ -public class SpringSocialTwitterCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringSocialTwitterCompilerAutoConfiguration extends + CompilerAutoConfiguration { @Override public boolean matches(ClassNode classNode) { @@ -40,8 +41,8 @@ public class SpringSocialTwitterCompilerAutoConfiguration extends CompilerAutoCo public void applyDependencies(DependencyCustomizer dependencies) throws CompilationFailedException { dependencies - .ifAnyMissingClasses("org.springframework.social.twitter.api.Twitter") - .add("spring-boot-starter-social-twitter"); + .ifAnyMissingClasses("org.springframework.social.twitter.api.Twitter") + .add("spring-boot-starter-social-twitter"); } @Override