[java-opensaml] branch master updated: IDP-1244 Clarify some deprecations

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=b33c70ccfc34043417057257db3ca7c68cbbf10d

The following commit(s) were added to refs/heads/master by this push:
       new  b33c70c   IDP-1244 Clarify some deprecations
b33c70c is described below

commit b33c70ccfc34043417057257db3ca7c68cbbf10d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon May 7 15:15:30 2018 +0100

    IDP-1244 Clarify some deprecations
    
    https://issues.shibboleth.net/jira/browse/IDP-1244
    
    Logging changes mostly
---
 .../java/org/opensaml/profile/logic/IPRangePredicate.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
index b4179b0..812924f 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
@@ -25,12 +25,6 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.net.IPRange;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
 import org.opensaml.messaging.context.BaseContext;
 
 import com.google.common.base.Predicate;
@@ -39,6 +33,12 @@ import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
 import com.google.common.net.InetAddresses;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.net.IPRange;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+
 /**
  * A {@link Predicate} that checks if a request is from a set of one or more {@link IPRange}s.
  */
@@ -68,7 +68,7 @@ public class IPRangePredicate implements Predicate<BaseContext> {
     @Deprecated
     public void setAddressRanges(@Nonnull @NonnullElements final Iterable<IPRange> ranges) {
         DeprecationSupport.warn(ObjectType.METHOD, getClass().getName() + ".setAddressRanges(Iterable)", null,
-                "setAddressRanges(Collection)");
+                "setRanges(Collection)");
 
         Constraint.isNotNull(ranges, "Address range collection cannot be null");
         
@@ -101,6 +101,7 @@ public class IPRangePredicate implements Predicate<BaseContext> {
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean apply(@Nullable final BaseContext input) {
         final String address = httpRequest != null ? httpRequest.getRemoteAddr() : null;
         if (address == null || !InetAddresses.isInetAddress(address)) {

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