[spring-extensions] branch master updated: Checkstyle fixes

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=ab056845a998fa43e4cff94922d0fc39a12c7b16

The following commit(s) were added to refs/heads/master by this push:
       new  ab05684   Checkstyle fixes
ab05684 is described below

commit ab056845a998fa43e4cff94922d0fc39a12c7b16
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Mar 6 12:11:53 2018 -0600

    Checkstyle fixes
---
 .../ext/spring/factory/FileCachingHttpClientFactoryBean.java          | 4 ++--
 .../java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java | 4 ++--
 .../ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java      | 4 ++--
 .../net/shibboleth/ext/spring/util/ApplicationContextBuilder.java     | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java
index b639489..1efd3a5 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java
@@ -27,13 +27,13 @@ import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 import org.apache.http.client.HttpClient;
 
 /**
- * @deprecated
- * 
  * Factory bean to accumulate the parameters into a {@link FileCachingHttpClientBuilder} 
  * and to then emit a {@link org.apache.http.client.HttpClient}.
  * 
  * <p>This class will likely either be removed or moved into an implementation package.
  * Use {@link FileCachingHttpClientBuilder} instead.</p>
+ * 
+ * @deprecated
  */
 public class FileCachingHttpClientFactoryBean extends HttpClientFactoryBean {
     
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java
index d2356ae..3025d76 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java
@@ -26,12 +26,12 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 
 /**
- * @deprecated
- * 
  * Factory bean to accumulate the parameters into a {@link HttpClientBuilder} and to then emit a {@link HttpClient}.
  * 
  * <p>This class will likely either be removed or moved into an implementation package.
  * Use {@link HttpClientBuilder} instead.</p>
+ * 
+ * @deprecated
  */
 public class HttpClientFactoryBean extends AbstractComponentAwareFactoryBean<HttpClient> {
 
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java
index c162ae5..2bc552d 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java
@@ -21,13 +21,13 @@ import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 import net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder;
 
 /**
- * @deprecated
- * 
  * Factory bean to accumulate the parameters into a {@link InMemoryCachingHttpClientBuilder} and to then emit a
  * {@link org.apache.http.client.HttpClient}.
  * 
  * <p>This class will likely either be removed or moved into an implementation package.
  * Use {@link InMemoryCachingHttpClientBuilder} instead.</p>
+ * 
+ * @deprecated
  */
 public class InMemoryCachingHttpClientFactoryBean extends HttpClientFactoryBean {
 
diff --git a/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java b/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
index 43e92a5..3df801e 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
@@ -33,7 +33,6 @@ import net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter;
 import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
 import net.shibboleth.ext.spring.config.StringToResourceConverter;
 import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
 import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.