GBP ofoverlay.sf test improvements

[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / sf / ClassifierTestUtils.java

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/ClassifierTestUtils.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/ClassifierTestUtils.java
old mode 100644 (file)
new mode 100755 (executable)
index 0b8f4a7..b8a3dc3
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/ClassifierTestUtils.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/ClassifierTestUtils.java
@@ -2,6 +2,7 @@ package org.opendaylight.groupbasedpolicy.renderer.ofoverlay.sf;
 
 import java.util.Map;
 
+import com.google.common.collect.ImmutableMap;
 import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.subject.feature.instance.ParameterValue;
@@ -19,79 +20,53 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.TcpMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.UdpMatchBuilder;
 
-import com.google.common.collect.ImmutableMap;
-
 public class ClassifierTestUtils {
 
     static final EthernetType IPV4_ETH_TYPE = new EthernetTypeBuilder().setType(new EtherType(FlowUtils.IPv4)).build();
     static final EthernetType IPV6_ETH_TYPE = new EthernetTypeBuilder().setType(new EtherType(FlowUtils.IPv6)).build();
 
-    static final Long TCP = Long.valueOf(6);
-    static final Long UDP = Long.valueOf(17);
-    static final Long SCTP = Long.valueOf(132);
+    static final Long TCP = 6L;
+    static final Long UDP = 17L;
+    static final Long SCTP = 132L;
 
     static Map<String, ParameterValue> createRangeValueParam(String paramName, long min, long max) {
-        return ImmutableMap.<String, ParameterValue> of(paramName,
-                new ParameterValueBuilder()
-                        .setRangeValue(new RangeValueBuilder()
-                                .setMin(min)
-                                .setMax(max)
-                                .build())
-                        .build());
+        return ImmutableMap.of(paramName, new ParameterValueBuilder()
+            .setRangeValue(new RangeValueBuilder().setMin(min).setMax(max).build()).build());
     }
 
     static Map<String, ParameterValue> createIntValueParam(String paramName, long value) {
-        return ImmutableMap.<String, ParameterValue> of(paramName,
-                new ParameterValueBuilder()
-                        .setIntValue(value)
-                        .build());
+        return ImmutableMap.of(paramName, new ParameterValueBuilder().setIntValue(value).build());
     }
 
-    static final EthernetMatch createEthernetMatch(EthernetType ethType) {
-        return new EthernetMatchBuilder()
-                .setEthernetType(ethType)
-                .build();
+    static EthernetMatch createEthernetMatch(EthernetType ethType) {
+        return new EthernetMatchBuilder().setEthernetType(ethType).build();
     }
 
-    static final IpMatch createIpMatch(short ipProtoValue) {
-        return new IpMatchBuilder()
-        .setIpProtocol(ipProtoValue)
-        .build();
+    static IpMatch createIpMatch(short ipProtoValue) {
+        return new IpMatchBuilder().setIpProtocol(ipProtoValue).build();
     }
 
-    static final Layer4Match createUdpDstPort(int portNumber) {
-        return new UdpMatchBuilder()
-                .setUdpDestinationPort(new PortNumber(portNumber))
-                .build();
+    static Layer4Match createUdpDstPort(int portNumber) {
+        return new UdpMatchBuilder().setUdpDestinationPort(new PortNumber(portNumber)).build();
     }
 
-    static final Layer4Match createUdpSrcPort(int portNumber) {
-        return new UdpMatchBuilder()
-                .setUdpSourcePort(new PortNumber(portNumber))
-                .build();
+    static Layer4Match createUdpSrcPort(int portNumber) {
+        return new UdpMatchBuilder().setUdpSourcePort(new PortNumber(portNumber)).build();
     }
 
-    final Layer4Match createTcpDstPort(int portNumber) {
-        return new TcpMatchBuilder()
-                .setTcpDestinationPort(new PortNumber(portNumber))
-                .build();
+    static Layer4Match createTcpDstPort(int portNumber) {
+        return new TcpMatchBuilder().setTcpDestinationPort(new PortNumber(portNumber)).build();
     }
 
-    final Layer4Match createTcpSrcPort(int portNumber) {
-        return new TcpMatchBuilder()
-                .setTcpSourcePort(new PortNumber(portNumber))
-                .build();
+    static Layer4Match createTcpSrcPort(int portNumber) {
+        return new TcpMatchBuilder().setTcpSourcePort(new PortNumber(portNumber)).build();
     }
 
-    final static Layer4Match createSctpDstPort(int portNumber) {
-        return new SctpMatchBuilder()
-                .setSctpDestinationPort(new PortNumber(portNumber))
-                .build();
+    static Layer4Match createSctpDstPort(int portNumber) {
+        return new SctpMatchBuilder().setSctpDestinationPort(new PortNumber(portNumber)).build();
     }
 
-    final static Layer4Match createSctpSrcPort(int portNumber) {
-        return new SctpMatchBuilder()
-                .setSctpSourcePort(new PortNumber(portNumber))
-                .build();
+    static Layer4Match createSctpSrcPort(int portNumber) {
+        return new SctpMatchBuilder().setSctpSourcePort(new PortNumber(portNumber)).build();
     }
-}
\ No newline at end of file
+}