Migrate stray Guava Optional

Upstream is migrating, adjust to that.

Change-Id: Ief7b7b9c363502cc2581eb4a587909fa2fb5dbf6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index 959aec77ba3687ee1c805f7270ce8b2c38a8975b..4c953490c9ce2cab370c1bd1fb3a8e6431eae9ab 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -24,11 +24,6 @@
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: neutron :: ${project.artifactId}</name>
 
-  <properties>
-    <!-- FIXME: Remove this -->
-    <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java
index 985469f5bfd77c393a4c0884d63bab05eda68f6b..05adaa151ae80b711603c9e3462a41bc65c96dcf 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.neutron.northbound.impl;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.ws.rs.core.MultivaluedHashMap;