Enable modernizer in openflow-protocol-impl

Modernizer is only flagging a misuse of MoreObjects.firstNonNull(),
replace the call sites with Objects.requireNonNull() and flip
enforcement on.

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

diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml
index 86dbeb87aaea10e7c503f3f5716f2c6d12809008..0c997388f2e4a43611c62767b828cae0e10f4988 100644 (file)
--- a/openflowjava/openflow-protocol-impl/pom.xml
+++ b/openflowjava/openflow-protocol-impl/pom.xml
@@ -17,11 +17,6 @@
       <tag>HEAD</tag>
     </scm>
 
-    <properties>
-        <!-- FIXME: Remove this -->
-        <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>
-    </properties>
-
     <build>
         <plugins>
             <plugin>

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java
index 584bef3a87b981be6111bfd0f2dbad97ec13fcb6..2ea22ad9950da3cdbff0ba6c51f94ea677f793e7 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.core;
 
-import com.google.common.base.MoreObjects;
+import static java.util.Objects.requireNonNull;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
@@ -84,49 +85,49 @@ public class SwitchConnectionProviderFactoryImpl implements SwitchConnectionProv
             return new TlsConfiguration() {
                 @Override
                 public KeystoreType getTlsTruststoreType() {
-                    return MoreObjects.firstNonNull(tlsConfig.getTruststoreType(), null);
+                    return requireNonNull(tlsConfig.getTruststoreType());
                 }
 
                 @Override
                 public String getTlsTruststore() {
-                    return MoreObjects.firstNonNull(tlsConfig.getTruststore(), null);
+                    return requireNonNull(tlsConfig.getTruststore());
                 }
 
                 @Override
                 public KeystoreType getTlsKeystoreType() {
-                    return MoreObjects.firstNonNull(tlsConfig.getKeystoreType(), null);
+                    return requireNonNull(tlsConfig.getKeystoreType());
                 }
 
                 @Override
                 public String getTlsKeystore() {
-                    return MoreObjects.firstNonNull(tlsConfig.getKeystore(), null);
+                    return requireNonNull(tlsConfig.getKeystore());
                 }
 
                 @Override
                 public org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType
                         getTlsKeystorePathType() {
-                    return MoreObjects.firstNonNull(tlsConfig.getKeystorePathType(), null);
+                    return requireNonNull(tlsConfig.getKeystorePathType());
                 }
 
                 @Override
                 public org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType
                         getTlsTruststorePathType() {
-                    return MoreObjects.firstNonNull(tlsConfig.getTruststorePathType(), null);
+                    return requireNonNull(tlsConfig.getTruststorePathType());
                 }
 
                 @Override
                 public String getKeystorePassword() {
-                    return MoreObjects.firstNonNull(tlsConfig.getKeystorePassword(), null);
+                    return requireNonNull(tlsConfig.getKeystorePassword());
                 }
 
                 @Override
                 public String getCertificatePassword() {
-                    return MoreObjects.firstNonNull(tlsConfig.getCertificatePassword(), null);
+                    return requireNonNull(tlsConfig.getCertificatePassword());
                 }
 
                 @Override
                 public String getTruststorePassword() {
-                    return MoreObjects.firstNonNull(tlsConfig.getTruststorePassword(), null);
+                    return requireNonNull(tlsConfig.getTruststorePassword());
                 }
 
                 @Override