Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
dhcpservice: drop nullToEmpty and reqNonNullOrElse
[netvirt.git]
/
dhcpservice
/
impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
dhcpservice
/
DhcpPktHandler.java
diff --git
a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
index 443d120160f9572dd2ed62e121681aa8023b9b16..47cbdac5d7f4e984d2cbe0b100b4185e7a5053a3 100644
(file)
--- a/
dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
+++ b/
dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
@@
-7,8
+7,6
@@
*/
package org.opendaylight.netvirt.dhcpservice;
*/
package org.opendaylight.netvirt.dhcpservice;
-import static org.opendaylight.netvirt.dhcpservice.api.DHCPUtils.nullToEmpty;
-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@
-385,7
+383,7
@@
public class DhcpPktHandler implements PacketProcessingListener {
@Nullable
private static String getIpv4Address(Port port) {
@Nullable
private static String getIpv4Address(Port port) {
- for (FixedIps fixedIp :
nullToEmpty(port.getFixedIps()
)) {
+ for (FixedIps fixedIp :
port.nonnullFixedIps(
)) {
if (isIpv4Address(fixedIp.getIpAddress())) {
return fixedIp.getIpAddress().getIpv4Address().getValue();
}
if (isIpv4Address(fixedIp.getIpAddress())) {
return fixedIp.getIpAddress().getIpv4Address().getValue();
}