| commit | ef7e290e208f16ab77e37fe4ffde7be2f1ec2252 | [log] [tgz] |
|---|---|---|
| author | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Fri Feb 12 18:38:29 2016 -0800 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Wed Feb 17 00:38:48 2016 +0000 |
| tree | 693e3bcdd7778cc70e47412aafdb88ad893df6ab | |
| parent | 003ed3273e1c7965cbfec61cb9896ba8dbfff8a6 [diff] [blame] |
Make use of Optional more idiomatic Change-Id: I42b3261169e7cb8408f46c5831f72115f77fd779
diff --git a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java index 53a9a68..c16f558 100644 --- a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java +++ b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
@@ -148,7 +148,7 @@ .filter(d -> matches(d, mfr, hw, sw)).findFirst(); // If no matching driver is found, return default. - return optional.isPresent() ? optional.get() : drivers.get(DEFAULT); + return optional.orElse(drivers.get(DEFAULT)); } // Matches the given driver using ERE matching against the given criteria.