[spring-extensions] 03/03: IDP-1047 add @ParameterName annotation.

[Rod Widdowson]

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

rdw 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=91f816f46b61286832608a2acac9318e74d74a0c

commit 91f816f46b61286832608a2acac9318e74d74a0c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Sep 23 11:04:15 2016 +0100

    IDP-1047 add @ParameterName annotation.
    
    https://issues.shibboleth.net/jira/browse/IDP-1047
    
    By way of a sample add annotations to the class which generate the "no annotation" warnings.
---
 .../spring/resource/FileBackedHTTPResource.java    | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java b/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
index 0a1d7cb..dd8757c 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
@@ -26,6 +26,7 @@ import java.net.URL;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -61,8 +62,9 @@ public class FileBackedHTTPResource extends HTTPResource {
      * @param resource the file to use as backing store
      * @throws IOException if the URL was badly formed
      * @deprecated use {@link #FileBackedHTTPResource(String, HttpClient, String)     */
-    @Deprecated public FileBackedHTTPResource(@Nonnull final HttpClient client, @NotEmpty @Nonnull final String url,
-            @Nonnull final Resource resource) throws IOException {
+    @Deprecated public FileBackedHTTPResource(@Nonnull @ParameterName(name="client") final HttpClient client, 
+            @NotEmpty @Nonnull @ParameterName(name="url") final String url,
+            @Nonnull  @ParameterName(name="resource") final Resource resource) throws IOException {
         super(client, url);
         backingResource = Constraint.isNotNull(resource, "Backing resource must not be null");
         if (null == resource.getFile()) {
@@ -80,8 +82,10 @@ public class FileBackedHTTPResource extends HTTPResource {
      * @param resource the file to use as backing store
      * @throws IOException if the URL was badly formed
      * @deprecated use {@link #FileBackedHTTPResource(String, HttpClient, URL)     */
-    @Deprecated public FileBackedHTTPResource(@Nonnull final HttpClient client, @Nonnull final URL url,
-            @Nonnull final Resource resource) throws IOException {
+    @Deprecated public FileBackedHTTPResource(@Nonnull @ParameterName(name="client") final HttpClient client, 
+            @Nonnull @NotEmpty @ParameterName(name="url") final URL url, 
+            @Nonnull @ParameterName(name="resource") final Resource resource)
+            throws IOException {
         super(client, url);
         backingResource = Constraint.isNotNull(resource, "Backing resource must not be null");
         if (null == resource.getFile()) {
@@ -97,8 +101,9 @@ public class FileBackedHTTPResource extends HTTPResource {
      * @param url URL to the remote data
      * @throws IOException if the URL was badly formed
      */
-    public FileBackedHTTPResource(@Nonnull final String backingFile, @Nonnull final HttpClient client, 
-            @NotEmpty @Nonnull final String url) throws IOException {
+    public FileBackedHTTPResource(@Nonnull @ParameterName(name="backingFile") final String backingFile,
+            @Nonnull @ParameterName(name="client") final HttpClient client, 
+            @NotEmpty @Nonnull @ParameterName(name="url") final String url) throws IOException {
         super(client, url);
         Constraint.isNotNull(backingFile, "File Name must not be null");
         final File file = new File(backingFile);
@@ -113,8 +118,10 @@ public class FileBackedHTTPResource extends HTTPResource {
      * @param url URL to the remote data
      * @throws IOException if the URL was badly formed
      */
-    public FileBackedHTTPResource(@Nonnull final String backingFile, @Nonnull final HttpClient client,
-            @Nonnull final URL url) throws IOException {
+    public FileBackedHTTPResource(@Nonnull  @ParameterName(name="backingFile") final String backingFile, 
+            @Nonnull @ParameterName(name="client") final HttpClient client,
+            @Nonnull  @ParameterName(name="url") final URL url)
+            throws IOException {
         super(client, url);
         Constraint.isNotNull(backingFile, "File Name must not be null");
         final File file = new File(backingFile);

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