LOXI-55: IPAddressWithMask should have a contains that can take any IPAddress #287
Conversation
|
That is a great idea. I'm upset I didn't think of that. |
|
JENKINS-RETRY |
|
Test PASSed. |
| @@ -81,4 +81,17 @@ public static IPv4AddressWithMask of(final String string) { | |||
| } | |||
| } | |||
|
|
|||
| @Override | |||
| public boolean contains(IPAddress<?> ip) { | |||
| if (ip == null) { | |||
There was a problem hiding this comment.
since you're using Preconditions.checkNotNull above, it would make sense to use it here too (also in the IPv6 version)
There was a problem hiding this comment.
The reason was because I thought that the Preconditions dependency was only available in my workspace and I forgot to remove this one. Now that I see this library is available I will fix these files.
There was a problem hiding this comment.
Yeah, we definitely have guava in openflowj-loxi (we use ImmutableList et.al.
all over the place)
On Wed, Jun 25, 2014 at 6:31 PM, Jason Parraga notifications@github.com
wrote:
In
java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/IPv4AddressWithMask.java:@@ -81,4 +81,17 @@ public static IPv4AddressWithMask of(final String string) {
}
}
- @OverRide
- public boolean contains(IPAddress<?> ip) {
if (ip == null) {The reason was because I thought that the Preconditions dependency was
only available in my workspace and I forgot to remove this one. Now that I
see this library is available I will fix these files.—
Reply to this email directly or view it on GitHub
https://github.com/floodlight/loxigen/pull/287/files#r14221998.
|
Done - just a nit. Feel free to SELF-ACK |
|
JENKINS-RETRY |
|
Test PASSed. |
|
SELF-ACK |
|
ABAT: START_MERGE: Log file at http://vss1/abat/2014.06.27.1826-m.loxigen.master/abat.log |
Loxigen Head commit floodlight/loxigen@0377adb commit 0377adb1d21737eba2604864a4913894e8f5fc9f Merge: a6678c7 9dfc1ef Author: abat <abat@bigswitch.com> Date: Fri Jun 27 11:26:22 2014 -0700 Merge into master from pull request #287: LOXI-55: IPAddressWithMask should have a contains that can take any IPAddress (floodlight/loxigen#287) commit 9dfc1ef046b1f4629420b6960e28a38138b01e16 Author: Sovietaced <Sovietaced@gmail.com> Date: Fri Jun 27 11:13:57 2014 -0700 use preconditions commit 77d99491b26e61294af69e5cb209ea2a1a66a4a4 Author: Sovietaced <Sovietaced@gmail.com> Date: Tue Jun 24 12:58:47 2014 -0700 return false for incompatible ip versions commit 07cc8eb32c4bb3f77ac57765370f5c607aa4cb7a Author: Sovietaced <Sovietaced@gmail.com> Date: Tue Jun 24 11:55:26 2014 -0700 fix null NPE catch commit 30a1cee0aeed7ccd02c0f81b16157e08717b09b7 Author: Sovietaced <Sovietaced@gmail.com> Date: Mon Jun 16 23:04:40 2014 -0700 add exception test commit 88e74ecb223b2ad756f6f11c8a1a6e803bfa11ec Author: Sovietaced <Sovietaced@gmail.com> Date: Mon Jun 16 23:02:45 2014 -0700 IPAddressWithMask should have a contains method taht can take any IPAddress
|
ABAT: ACCEPT: Successfully merged In case you want to see the build log, check out : |
LOXI-55: IPAddressWithMask should have a contains that can take any IPAddress (#287)
Reviewer: @gregor-bsn @andi-bigswitch