apply checkstyle check during build for neutron-ovsdb

[groupbasedpolicy.git] / neutron-ovsdb / src / main / java / org / opendaylight / groupbasedpolicy / neutron / ovsdb / VxlanTunnelType.java

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java
index c3e7b8756f41af99d212eddfbe400b7dc43ba0ef..786db5ef6a207b92b20168b93cee07988fffd595 100644 (file)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -13,53 +13,53 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeVxlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Options;
 
-
 public class VxlanTunnelType extends AbstractTunnelType {
-    private static final Map<String, String> optsMap;
-    private static final Class<? extends TunnelTypeBase> tunnelType = TunnelTypeVxlan.class;
+
+    private static final Map<String, String> OPTS_MAP;
+    private static final Class<? extends TunnelTypeBase> TUNNEL_TYPE_VXLAN = TunnelTypeVxlan.class;
     private static final Integer VXLAN_PORT_NUMBER = 4789;
     private static final String VXLAN_TUNNEL_PREFIX = "vxlan-";
     private final PortNumber udpTunnelPort;
     private final List<Options> optionsList;
 
-       static {
+    static {
         Map<String, String> opts = new HashMap<String, String>();
         opts.put(VNID_KEY, VNID_VALUE);
         opts.put(REMOTE_IP_KEY, REMOTE_IP_VALUE);
-        optsMap = Collections.unmodifiableMap(opts);
+        OPTS_MAP = Collections.unmodifiableMap(opts);
     }
 
-       public VxlanTunnelType() {
-               optionsList = createOptionsList(optsMap);
-               udpTunnelPort = new PortNumber(VXLAN_PORT_NUMBER);
-       }
+    public VxlanTunnelType() {
+        optionsList = createOptionsList(OPTS_MAP);
+        udpTunnelPort = new PortNumber(VXLAN_PORT_NUMBER);
+    }
 
-       @Override
+    @Override
     public List<Options> getOptions() {
         return optionsList;
     }
 
-       @Override
+    @Override
     public Class<? extends TunnelTypeBase> getTunnelType() {
-        return tunnelType;
+        return TUNNEL_TYPE_VXLAN;
     }
 
-       @Override
+    @Override
     public PortNumber getPortNumber() {
         return udpTunnelPort;
     }
 
-       @Override
+    @Override
     public String getTunnelPrefix() {
         return VXLAN_TUNNEL_PREFIX;
-       }
+    }
 
     /**
      * Check if a TerminationPoint is a tunnel port that meets
@@ -67,15 +67,15 @@ public class VxlanTunnelType extends AbstractTunnelType {
      * setting the VNID and destination Tunnel IP address, and
      * use VXLAN encapsulation.
      *
-     * @param tpAugmentation
+     * @param tpAugmentation the {@link OvsdbTerminationPointAugmentation}
      * @return true if it can be the OfOverlay tunnel port, false if not
      */
-       @Override
+    @Override
     public boolean isValidTunnelPort(OvsdbTerminationPointAugmentation tpAugmentation) {
-        if (hasTunnelOptions(tpAugmentation, optsMap)
+        if (hasTunnelOptions(tpAugmentation, OPTS_MAP)
                 && InterfaceTypeVxlan.class.equals(tpAugmentation.getInterfaceType())
-                && (getDestPort(tpAugmentation) == null
-                || getDestPort(tpAugmentation).equals(VXLAN_PORT_NUMBER.toString()))) {
+                && (getDestPort(tpAugmentation) == null || getDestPort(tpAugmentation).equals(
+                        VXLAN_PORT_NUMBER.toString()))) {
             return true;
         }
         return false;