Revert "Bug 5377: Support configuring cipher suites to use for SSLEngine"

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / yang / gen / v1 / urn / opendaylight / params / xml / ns / yang / openflow / _switch / connection / provider / impl / rev140328 / SwitchConnectionProviderModule.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java
index 95674fec6cc821c08d6551883d4b605b3233f8bf..6077c787017ae0e26376fea066764f7641c3cb0f 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java
@@ -9,9 +9,9 @@
 */
 package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.impl.rev140328;
 
+import com.google.common.base.MoreObjects;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionConfiguration;
 import org.opendaylight.openflowjava.protocol.api.connection.ThreadConfiguration;
 import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
@@ -22,14 +22,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.T
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Objects;
-
 /**
 *
 */
 public final class SwitchConnectionProviderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.impl.rev140328.AbstractSwitchConnectionProviderModule
  {
-    
+
     private static Logger LOG = LoggerFactory
             .getLogger(SwitchConnectionProviderModule.class);
 
@@ -37,7 +35,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
      * @param identifier
      * @param dependencyResolver
      */
-    public SwitchConnectionProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+    public SwitchConnectionProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
@@ -47,8 +45,8 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
      * @param oldModule
      * @param oldInstance
      */
-    public SwitchConnectionProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            SwitchConnectionProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public SwitchConnectionProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+            final SwitchConnectionProviderModule oldModule, final java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
@@ -60,11 +58,11 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
     @Override
     public java.lang.AutoCloseable createInstance() {
         LOG.info("SwitchConnectionProvider started.");
-        SwitchConnectionProviderImpl switchConnectionProviderImpl = new SwitchConnectionProviderImpl();
+        final SwitchConnectionProviderImpl switchConnectionProviderImpl = new SwitchConnectionProviderImpl();
         try {
-            ConnectionConfiguration connConfiguration = createConnectionConfiguration();
+            final ConnectionConfiguration connConfiguration = createConnectionConfiguration();
             switchConnectionProviderImpl.setConfiguration(connConfiguration);
-        } catch (UnknownHostException e) {
+        } catch (final UnknownHostException e) {
             throw new IllegalArgumentException(e.getMessage(), e);
         }
         return switchConnectionProviderImpl;
@@ -72,7 +70,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
 
     /**
      * @return instance configuration object
-     * @throws UnknownHostException 
+     * @throws UnknownHostException
      */
     private ConnectionConfiguration createConnectionConfiguration() throws UnknownHostException {
         final InetAddress address = extractIpAddressBin(getAddress());
@@ -80,8 +78,9 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
         final long switchIdleTimeout = getSwitchIdleTimeout();
         final Tls tlsConfig = getTls();
         final Threads threads = getThreads();
+        final Boolean useBarrier = getUseBarrier();
         final TransportProtocol transportProtocol = getTransportProtocol();
-        
+
         return new ConnectionConfiguration() {
             @Override
             public InetAddress getAddress() {
@@ -103,39 +102,39 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
                 return new TlsConfiguration() {
                     @Override
                     public KeystoreType getTlsTruststoreType() {
-                        return Objects.firstNonNull(tlsConfig.getTruststoreType(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getTruststoreType(), null);
                     }
                     @Override
                     public String getTlsTruststore() {
-                        return Objects.firstNonNull(tlsConfig.getTruststore(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getTruststore(), null);
                     }
                     @Override
                     public KeystoreType getTlsKeystoreType() {
-                        return Objects.firstNonNull(tlsConfig.getKeystoreType(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getKeystoreType(), null);
                     }
                     @Override
                     public String getTlsKeystore() {
-                        return Objects.firstNonNull(tlsConfig.getKeystore(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getKeystore(), null);
                     }
                     @Override
                     public org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType getTlsKeystorePathType() {
-                        return Objects.firstNonNull(tlsConfig.getKeystorePathType(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getKeystorePathType(), null);
                     }
                     @Override
                     public org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType getTlsTruststorePathType() {
-                        return Objects.firstNonNull(tlsConfig.getTruststorePathType(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getTruststorePathType(), null);
                     }
                     @Override
                     public String getKeystorePassword() {
-                        return Objects.firstNonNull(tlsConfig.getKeystorePassword(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getKeystorePassword(), null);
                     }
                     @Override
                     public String getCertificatePassword() {
-                        return Objects.firstNonNull(tlsConfig.getCertificatePassword(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getCertificatePassword(), null);
                     }
                     @Override
                     public String getTruststorePassword() {
-                        return Objects.firstNonNull(tlsConfig.getTruststorePassword(), null);
+                        return MoreObjects.firstNonNull(tlsConfig.getTruststorePassword(), null);
                     }
                 };
             }
@@ -154,27 +153,32 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
                     return null;
                 }
                 return new ThreadConfiguration() {
-                    
+
                     @Override
                     public int getWorkerThreadCount() {
                         return threads.getWorkerThreads();
                     }
-                    
+
                     @Override
                     public int getBossThreadCount() {
                         return threads.getBossThreads();
                     }
                 };
             }
+
+            @Override
+            public boolean useBarrier() {
+                return useBarrier;
+            }
         };
     }
 
     /**
      * @param address
      * @return
-     * @throws UnknownHostException 
+     * @throws UnknownHostException
      */
-    private static InetAddress extractIpAddressBin(IpAddress address) throws UnknownHostException {
+    private static InetAddress extractIpAddressBin(final IpAddress address) throws UnknownHostException {
         byte[] addressBin = null;
         if (address != null) {
             if (address.getIpv4Address() != null) {
@@ -183,7 +187,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
                 addressBin = address2bin(address.getIpv6Address().getValue());
             }
         }
-        
+
         if (addressBin == null) {
             return null;
         } else {
@@ -195,7 +199,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
      * @param value
      * @return
      */
-    private static byte[] address2bin(String value) {
+    private static byte[] address2bin(final String value) {
         //TODO: translate ipv4 or ipv6 into byte[]
         return null;
     }