Remove unnecessary generic types

[netvirt.git] / vpnservice / bgpmanager / bgpmanager-impl / src / main / java / org / opendaylight / netvirt / bgpmanager / thrift / gen / BgpConfigurator.java

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java
index 89a751e99878921de2c6f038d2a96c8df7974a8b..db53c41a3f571591955c191961931aa587940440 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java
@@ -13,6 +13,7 @@ import org.apache.thrift.scheme.StandardScheme;
 
 import org.apache.thrift.scheme.TupleScheme;
 import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
 import org.apache.thrift.async.AsyncMethodCallback;
@@ -22,9 +23,13 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.EnumSet;
 import java.util.Collections;
 import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,87 +37,81 @@ public class BgpConfigurator {
 
   public interface Iface {
 
-    int startBgp(int asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime,
-                 boolean announceFbit) throws org.apache.thrift.TException;
+    public int startBgp(long asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFlush) throws org.apache.thrift.TException;
 
-    int stopBgp(int asNumber) throws org.apache.thrift.TException;
+    public int stopBgp(long asNumber) throws org.apache.thrift.TException;
 
-    int createPeer(String ipAddress, int asNumber) throws org.apache.thrift.TException;
+    public int createPeer(String ipAddress, long asNumber) throws org.apache.thrift.TException;
 
-    int deletePeer(String ipAddress) throws org.apache.thrift.TException;
+    public int deletePeer(String ipAddress) throws org.apache.thrift.TException;
 
-    int addVrf(String rd, List<String> irts, List<String> erts) throws org.apache.thrift.TException;
+    public int addVrf(String rd, List<String> irts, List<String> erts) throws org.apache.thrift.TException;
 
-    int delVrf(String rd) throws org.apache.thrift.TException;
+    public int delVrf(String rd) throws org.apache.thrift.TException;
 
-    int pushRoute(String prefix, String nexthop, String rd, int label) throws org.apache.thrift.TException;
+    public int pushRoute(String prefix, String nexthop, String rd, int label) throws org.apache.thrift.TException;
 
-    int withdrawRoute(String prefix, String rd) throws org.apache.thrift.TException;
+    public int withdrawRoute(String prefix, String rd) throws org.apache.thrift.TException;
 
-    int setEbgpMultihop(String peerIp, int nHops) throws org.apache.thrift.TException;
+    public int setEbgpMultihop(String peerIp, int nHops) throws org.apache.thrift.TException;
 
-    int unsetEbgpMultihop(String peerIp) throws org.apache.thrift.TException;
+    public int unsetEbgpMultihop(String peerIp) throws org.apache.thrift.TException;
 
-    int setUpdateSource(String peerIp, String srcIp) throws org.apache.thrift.TException;
+    public int setUpdateSource(String peerIp, String srcIp) throws org.apache.thrift.TException;
 
-    int unsetUpdateSource(String peerIp) throws org.apache.thrift.TException;
+    public int unsetUpdateSource(String peerIp) throws org.apache.thrift.TException;
 
-    int enableAddressFamily(String peerIp, af_afi afi, af_safi safi) throws org.apache.thrift.TException;
+    public int enableAddressFamily(String peerIp, af_afi afi, af_safi safi) throws org.apache.thrift.TException;
 
-    int disableAddressFamily(String peerIp, af_afi afi, af_safi safi) throws org.apache.thrift.TException;
+    public int disableAddressFamily(String peerIp, af_afi afi, af_safi safi) throws org.apache.thrift.TException;
 
-    int setLogConfig(String logFileName, String logLevel) throws org.apache.thrift.TException;
+    public int setLogConfig(String logFileName, String logLevel) throws org.apache.thrift.TException;
 
-    int enableGracefulRestart(int stalepathTime) throws org.apache.thrift.TException;
+    public int enableGracefulRestart(int stalepathTime) throws org.apache.thrift.TException;
 
-    int disableGracefulRestart() throws org.apache.thrift.TException;
+    public int disableGracefulRestart() throws org.apache.thrift.TException;
 
-    Routes getRoutes(int optype, int winSize) throws org.apache.thrift.TException;
+    public Routes getRoutes(int optype, int winSize) throws org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    void startBgp(int asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime,
-                  boolean announceFbit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void startBgp(long asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFlush, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void stopBgp(int asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void stopBgp(long asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void createPeer(String ipAddress, int asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void createPeer(String ipAddress, long asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void deletePeer(String ipAddress, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void deletePeer(String ipAddress, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void addVrf(String rd, List<String> irts, List<String> erts,
-                org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void addVrf(String rd, List<String> irts, List<String> erts, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void delVrf(String rd, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void delVrf(String rd, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void pushRoute(String prefix, String nexthop, String rd, int label,
-                   org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void pushRoute(String prefix, String nexthop, String rd, int label, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void withdrawRoute(String prefix, String rd, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void withdrawRoute(String prefix, String rd, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void setEbgpMultihop(String peerIp, int nHops, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setEbgpMultihop(String peerIp, int nHops, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void unsetEbgpMultihop(String peerIp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void unsetEbgpMultihop(String peerIp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void setUpdateSource(String peerIp, String srcIp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setUpdateSource(String peerIp, String srcIp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void unsetUpdateSource(String peerIp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void unsetUpdateSource(String peerIp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void enableAddressFamily(String peerIp, af_afi afi, af_safi safi,
-                             org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void enableAddressFamily(String peerIp, af_afi afi, af_safi safi, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void disableAddressFamily(String peerIp, af_afi afi, af_safi safi,
-                              org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void disableAddressFamily(String peerIp, af_afi afi, af_safi safi, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void setLogConfig(String logFileName, String logLevel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setLogConfig(String logFileName, String logLevel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void enableGracefulRestart(int stalepathTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void enableGracefulRestart(int stalepathTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void disableGracefulRestart(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void disableGracefulRestart(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    void getRoutes(int optype, int winSize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getRoutes(int optype, int winSize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -136,13 +135,13 @@ public class BgpConfigurator {
       super(iprot, oprot);
     }
 
-    public int startBgp(int asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFbit) throws org.apache.thrift.TException
+    public int startBgp(long asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFlush) throws org.apache.thrift.TException
     {
-      send_startBgp(asNumber, routerId, port, holdTime, keepAliveTime, stalepathTime, announceFbit);
+      send_startBgp(asNumber, routerId, port, holdTime, keepAliveTime, stalepathTime, announceFlush);
       return recv_startBgp();
     }
 
-    public void send_startBgp(int asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFbit) throws org.apache.thrift.TException
+    public void send_startBgp(long asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFlush) throws org.apache.thrift.TException
     {
       startBgp_args args = new startBgp_args();
       args.setAsNumber(asNumber);
@@ -151,7 +150,7 @@ public class BgpConfigurator {
       args.setHoldTime(holdTime);
       args.setKeepAliveTime(keepAliveTime);
       args.setStalepathTime(stalepathTime);
-      args.setAnnounceFbit(announceFbit);
+      args.setAnnounceFlush(announceFlush);
       sendBase("startBgp", args);
     }
 
@@ -165,13 +164,13 @@ public class BgpConfigurator {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startBgp failed: unknown result");
     }
 
-    public int stopBgp(int asNumber) throws org.apache.thrift.TException
+    public int stopBgp(long asNumber) throws org.apache.thrift.TException
     {
       send_stopBgp(asNumber);
       return recv_stopBgp();
     }
 
-    public void send_stopBgp(int asNumber) throws org.apache.thrift.TException
+    public void send_stopBgp(long asNumber) throws org.apache.thrift.TException
     {
       stopBgp_args args = new stopBgp_args();
       args.setAsNumber(asNumber);
@@ -188,13 +187,13 @@ public class BgpConfigurator {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "stopBgp failed: unknown result");
     }
 
-    public int createPeer(String ipAddress, int asNumber) throws org.apache.thrift.TException
+    public int createPeer(String ipAddress, long asNumber) throws org.apache.thrift.TException
     {
       send_createPeer(ipAddress, asNumber);
       return recv_createPeer();
     }
 
-    public void send_createPeer(String ipAddress, int asNumber) throws org.apache.thrift.TException
+    public void send_createPeer(String ipAddress, long asNumber) throws org.apache.thrift.TException
     {
       createPeer_args args = new createPeer_args();
       args.setIpAddress(ipAddress);
@@ -588,22 +587,22 @@ public class BgpConfigurator {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void startBgp(int asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFbit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void startBgp(long asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFlush, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      startBgp_call method_call = new startBgp_call(asNumber, routerId, port, holdTime, keepAliveTime, stalepathTime, announceFbit, resultHandler, this, ___protocolFactory, ___transport);
+      startBgp_call method_call = new startBgp_call(asNumber, routerId, port, holdTime, keepAliveTime, stalepathTime, announceFlush, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class startBgp_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private int asNumber;
+      private long asNumber;
       private String routerId;
       private int port;
       private int holdTime;
       private int keepAliveTime;
       private int stalepathTime;
-      private boolean announceFbit;
-      public startBgp_call(int asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFbit, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private boolean announceFlush;
+      public startBgp_call(long asNumber, String routerId, int port, int holdTime, int keepAliveTime, int stalepathTime, boolean announceFlush, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.asNumber = asNumber;
         this.routerId = routerId;
@@ -611,7 +610,7 @@ public class BgpConfigurator {
         this.holdTime = holdTime;
         this.keepAliveTime = keepAliveTime;
         this.stalepathTime = stalepathTime;
-        this.announceFbit = announceFbit;
+        this.announceFlush = announceFlush;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -623,7 +622,7 @@ public class BgpConfigurator {
         args.setHoldTime(holdTime);
         args.setKeepAliveTime(keepAliveTime);
         args.setStalepathTime(stalepathTime);
-        args.setAnnounceFbit(announceFbit);
+        args.setAnnounceFlush(announceFlush);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -638,7 +637,7 @@ public class BgpConfigurator {
       }
     }
 
-    public void stopBgp(int asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void stopBgp(long asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       stopBgp_call method_call = new stopBgp_call(asNumber, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -646,8 +645,8 @@ public class BgpConfigurator {
     }
 
     public static class stopBgp_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private int asNumber;
-      public stopBgp_call(int asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private long asNumber;
+      public stopBgp_call(long asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.asNumber = asNumber;
       }
@@ -670,7 +669,7 @@ public class BgpConfigurator {
       }
     }
 
-    public void createPeer(String ipAddress, int asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void createPeer(String ipAddress, long asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       createPeer_call method_call = new createPeer_call(ipAddress, asNumber, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -679,8 +678,8 @@ public class BgpConfigurator {
 
     public static class createPeer_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String ipAddress;
-      private int asNumber;
-      public createPeer_call(String ipAddress, int asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private long asNumber;
+      public createPeer_call(String ipAddress, long asNumber, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.ipAddress = ipAddress;
         this.asNumber = asNumber;
@@ -1229,7 +1228,7 @@ public class BgpConfigurator {
   public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
     private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new HashMap<>()));
     }
 
     protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
@@ -1273,7 +1272,7 @@ public class BgpConfigurator {
 
       public startBgp_result getResult(I iface, startBgp_args args) throws org.apache.thrift.TException {
         startBgp_result result = new startBgp_result();
-        result.success = iface.startBgp(args.asNumber, args.routerId, args.port, args.holdTime, args.keepAliveTime, args.stalepathTime, args.announceFbit);
+        result.success = iface.startBgp(args.asNumber, args.routerId, args.port, args.holdTime, args.keepAliveTime, args.stalepathTime, args.announceFlush);
         result.setSuccessIsSet(true);
         return result;
       }
@@ -1640,7 +1639,7 @@ public class BgpConfigurator {
   public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
     private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new HashMap<>()));
     }
 
     protected AsyncProcessor(I iface, Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
@@ -1680,7 +1679,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             startBgp_result result = new startBgp_result();
             result.success = o;
@@ -1717,7 +1716,7 @@ public class BgpConfigurator {
       }
 
       public void start(I iface, startBgp_args args, org.apache.thrift.async.AsyncMethodCallback<Integer> resultHandler) throws TException {
-        iface.startBgp(args.asNumber, args.routerId, args.port, args.holdTime, args.keepAliveTime, args.stalepathTime, args.announceFbit,resultHandler);
+        iface.startBgp(args.asNumber, args.routerId, args.port, args.holdTime, args.keepAliveTime, args.stalepathTime, args.announceFlush,resultHandler);
       }
     }
 
@@ -1732,7 +1731,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             stopBgp_result result = new stopBgp_result();
             result.success = o;
@@ -1784,7 +1783,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             createPeer_result result = new createPeer_result();
             result.success = o;
@@ -1836,7 +1835,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             deletePeer_result result = new deletePeer_result();
             result.success = o;
@@ -1888,7 +1887,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             addVrf_result result = new addVrf_result();
             result.success = o;
@@ -1940,7 +1939,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             delVrf_result result = new delVrf_result();
             result.success = o;
@@ -1992,7 +1991,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             pushRoute_result result = new pushRoute_result();
             result.success = o;
@@ -2044,7 +2043,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             withdrawRoute_result result = new withdrawRoute_result();
             result.success = o;
@@ -2096,7 +2095,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             setEbgpMultihop_result result = new setEbgpMultihop_result();
             result.success = o;
@@ -2148,7 +2147,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             unsetEbgpMultihop_result result = new unsetEbgpMultihop_result();
             result.success = o;
@@ -2200,7 +2199,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             setUpdateSource_result result = new setUpdateSource_result();
             result.success = o;
@@ -2252,7 +2251,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             unsetUpdateSource_result result = new unsetUpdateSource_result();
             result.success = o;
@@ -2304,7 +2303,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             enableAddressFamily_result result = new enableAddressFamily_result();
             result.success = o;
@@ -2356,7 +2355,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             disableAddressFamily_result result = new disableAddressFamily_result();
             result.success = o;
@@ -2408,7 +2407,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             setLogConfig_result result = new setLogConfig_result();
             result.success = o;
@@ -2460,7 +2459,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             enableGracefulRestart_result result = new enableGracefulRestart_result();
             result.success = o;
@@ -2512,7 +2511,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
+        return new AsyncMethodCallback<Integer>() {
           public void onComplete(Integer o) {
             disableGracefulRestart_result result = new disableGracefulRestart_result();
             result.success = o;
@@ -2564,7 +2563,7 @@ public class BgpConfigurator {
 
       public AsyncMethodCallback<Routes> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Routes>() { 
+        return new AsyncMethodCallback<Routes>() {
           public void onComplete(Routes o) {
             getRoutes_result result = new getRoutes_result();
             result.success = o;
@@ -2609,27 +2608,27 @@ public class BgpConfigurator {
   public static class startBgp_args implements org.apache.thrift.TBase<startBgp_args, startBgp_args._Fields>, java.io.Serializable, Cloneable, Comparable<startBgp_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startBgp_args");
 
-    private static final org.apache.thrift.protocol.TField AS_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("asNumber", org.apache.thrift.protocol.TType.I32, (short)1);
+    private static final org.apache.thrift.protocol.TField AS_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("asNumber", org.apache.thrift.protocol.TType.I64, (short)1);
     private static final org.apache.thrift.protocol.TField ROUTER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("routerId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)3);
     private static final org.apache.thrift.protocol.TField HOLD_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("holdTime", org.apache.thrift.protocol.TType.I32, (short)4);
     private static final org.apache.thrift.protocol.TField KEEP_ALIVE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("keepAliveTime", org.apache.thrift.protocol.TType.I32, (short)5);
     private static final org.apache.thrift.protocol.TField STALEPATH_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("stalepathTime", org.apache.thrift.protocol.TType.I32, (short)6);
-    private static final org.apache.thrift.protocol.TField ANNOUNCE_FBIT_FIELD_DESC = new org.apache.thrift.protocol.TField("announceFbit", org.apache.thrift.protocol.TType.BOOL, (short)7);
+    private static final org.apache.thrift.protocol.TField ANNOUNCE_FLUSH_FIELD_DESC = new org.apache.thrift.protocol.TField("announceFlush", org.apache.thrift.protocol.TType.BOOL, (short)7);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new startBgp_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new startBgp_argsTupleSchemeFactory());
     }
 
-    public int asNumber; // required
+    public long asNumber; // required
     public String routerId; // required
     public int port; // required
     public int holdTime; // required
     public int keepAliveTime; // required
     public int stalepathTime; // required
-    public boolean announceFbit; // required
+    public boolean announceFlush; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -2639,9 +2638,9 @@ public class BgpConfigurator {
       HOLD_TIME((short)4, "holdTime"),
       KEEP_ALIVE_TIME((short)5, "keepAliveTime"),
       STALEPATH_TIME((short)6, "stalepathTime"),
-      ANNOUNCE_FBIT((short)7, "announceFbit");
+      ANNOUNCE_FLUSH((short)7, "announceFlush");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -2666,8 +2665,8 @@ public class BgpConfigurator {
             return KEEP_ALIVE_TIME;
           case 6: // STALEPATH_TIME
             return STALEPATH_TIME;
-          case 7: // ANNOUNCE_FBIT
-            return ANNOUNCE_FBIT;
+          case 7: // ANNOUNCE_FLUSH
+            return ANNOUNCE_FLUSH;
           default:
             return null;
         }
@@ -2713,25 +2712,25 @@ public class BgpConfigurator {
     private static final int __HOLDTIME_ISSET_ID = 2;
     private static final int __KEEPALIVETIME_ISSET_ID = 3;
     private static final int __STALEPATHTIME_ISSET_ID = 4;
-    private static final int __ANNOUNCEFBIT_ISSET_ID = 5;
+    private static final int __ANNOUNCEFLUSH_ISSET_ID = 5;
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.AS_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("asNumber", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      tmpMap.put(_Fields.ROUTER_ID, new org.apache.thrift.meta_data.FieldMetaData("routerId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      tmpMap.put(_Fields.HOLD_TIME, new org.apache.thrift.meta_data.FieldMetaData("holdTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      tmpMap.put(_Fields.KEEP_ALIVE_TIME, new org.apache.thrift.meta_data.FieldMetaData("keepAliveTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      tmpMap.put(_Fields.STALEPATH_TIME, new org.apache.thrift.meta_data.FieldMetaData("stalepathTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      tmpMap.put(_Fields.ANNOUNCE_FBIT, new org.apache.thrift.meta_data.FieldMetaData("announceFbit", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.AS_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("asNumber", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.ROUTER_ID, new org.apache.thrift.meta_data.FieldMetaData("routerId", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.HOLD_TIME, new org.apache.thrift.meta_data.FieldMetaData("holdTime", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.KEEP_ALIVE_TIME, new org.apache.thrift.meta_data.FieldMetaData("keepAliveTime", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.STALEPATH_TIME, new org.apache.thrift.meta_data.FieldMetaData("stalepathTime", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.ANNOUNCE_FLUSH, new org.apache.thrift.meta_data.FieldMetaData("announceFlush", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startBgp_args.class, metaDataMap);
     }
@@ -2740,13 +2739,13 @@ public class BgpConfigurator {
     }
 
     public startBgp_args(
-      int asNumber,
-      String routerId,
-      int port,
-      int holdTime,
-      int keepAliveTime,
-      int stalepathTime,
-      boolean announceFbit)
+            long asNumber,
+            String routerId,
+            int port,
+            int holdTime,
+            int keepAliveTime,
+            int stalepathTime,
+            boolean announceFlush)
     {
       this();
       this.asNumber = asNumber;
@@ -2760,8 +2759,8 @@ public class BgpConfigurator {
       setKeepAliveTimeIsSet(true);
       this.stalepathTime = stalepathTime;
       setStalepathTimeIsSet(true);
-      this.announceFbit = announceFbit;
-      setAnnounceFbitIsSet(true);
+      this.announceFlush = announceFlush;
+      setAnnounceFlushIsSet(true);
     }
 
     /**
@@ -2777,7 +2776,7 @@ public class BgpConfigurator {
       this.holdTime = other.holdTime;
       this.keepAliveTime = other.keepAliveTime;
       this.stalepathTime = other.stalepathTime;
-      this.announceFbit = other.announceFbit;
+      this.announceFlush = other.announceFlush;
     }
 
     public startBgp_args deepCopy() {
@@ -2797,15 +2796,15 @@ public class BgpConfigurator {
       this.keepAliveTime = 0;
       setStalepathTimeIsSet(false);
       this.stalepathTime = 0;
-      setAnnounceFbitIsSet(false);
-      this.announceFbit = false;
+      setAnnounceFlushIsSet(false);
+      this.announceFlush = false;
     }
 
-    public int getAsNumber() {
+    public long getAsNumber() {
       return this.asNumber;
     }
 
-    public startBgp_args setAsNumber(int asNumber) {
+    public startBgp_args setAsNumber(long asNumber) {
       this.asNumber = asNumber;
       setAsNumberIsSet(true);
       return this;
@@ -2940,112 +2939,112 @@ public class BgpConfigurator {
       __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STALEPATHTIME_ISSET_ID, value);
     }
 
-    public boolean isAnnounceFbit() {
-      return this.announceFbit;
+    public boolean isAnnounceFlush() {
+      return this.announceFlush;
     }
 
-    public startBgp_args setAnnounceFbit(boolean announceFbit) {
-      this.announceFbit = announceFbit;
-      setAnnounceFbitIsSet(true);
+    public startBgp_args setAnnounceFlush(boolean announceFlush) {
+      this.announceFlush = announceFlush;
+      setAnnounceFlushIsSet(true);
       return this;
     }
 
-    public void unsetAnnounceFbit() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ANNOUNCEFBIT_ISSET_ID);
+    public void unsetAnnounceFlush() {
+      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ANNOUNCEFLUSH_ISSET_ID);
     }
 
-    /** Returns true if field announceFbit is set (has been assigned a value) and false otherwise */
-    public boolean isSetAnnounceFbit() {
-      return EncodingUtils.testBit(__isset_bitfield, __ANNOUNCEFBIT_ISSET_ID);
+    /** Returns true if field announceFlush is set (has been assigned a value) and false otherwise */
+    public boolean isSetAnnounceFlush() {
+      return EncodingUtils.testBit(__isset_bitfield, __ANNOUNCEFLUSH_ISSET_ID);
     }
 
-    public void setAnnounceFbitIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ANNOUNCEFBIT_ISSET_ID, value);
+    public void setAnnounceFlushIsSet(boolean value) {
+      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ANNOUNCEFLUSH_ISSET_ID, value);
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case AS_NUMBER:
-        if (value == null) {
-          unsetAsNumber();
-        } else {
-          setAsNumber((Integer)value);
-        }
-        break;
+        case AS_NUMBER:
+          if (value == null) {
+            unsetAsNumber();
+          } else {
+            setAsNumber((Long)value);
+          }
+          break;
 
-      case ROUTER_ID:
-        if (value == null) {
-          unsetRouterId();
-        } else {
-          setRouterId((String)value);
-        }
-        break;
+        case ROUTER_ID:
+          if (value == null) {
+            unsetRouterId();
+          } else {
+            setRouterId((String)value);
+          }
+          break;
 
-      case PORT:
-        if (value == null) {
-          unsetPort();
-        } else {
-          setPort((Integer)value);
-        }
-        break;
+        case PORT:
+          if (value == null) {
+            unsetPort();
+          } else {
+            setPort((Integer)value);
+          }
+          break;
 
-      case HOLD_TIME:
-        if (value == null) {
-          unsetHoldTime();
-        } else {
-          setHoldTime((Integer)value);
-        }
-        break;
+        case HOLD_TIME:
+          if (value == null) {
+            unsetHoldTime();
+          } else {
+            setHoldTime((Integer)value);
+          }
+          break;
 
-      case KEEP_ALIVE_TIME:
-        if (value == null) {
-          unsetKeepAliveTime();
-        } else {
-          setKeepAliveTime((Integer)value);
-        }
-        break;
+        case KEEP_ALIVE_TIME:
+          if (value == null) {
+            unsetKeepAliveTime();
+          } else {
+            setKeepAliveTime((Integer)value);
+          }
+          break;
 
-      case STALEPATH_TIME:
-        if (value == null) {
-          unsetStalepathTime();
-        } else {
-          setStalepathTime((Integer)value);
-        }
-        break;
+        case STALEPATH_TIME:
+          if (value == null) {
+            unsetStalepathTime();
+          } else {
+            setStalepathTime((Integer)value);
+          }
+          break;
 
-      case ANNOUNCE_FBIT:
-        if (value == null) {
-          unsetAnnounceFbit();
-        } else {
-          setAnnounceFbit((Boolean)value);
-        }
-        break;
+        case ANNOUNCE_FLUSH:
+          if (value == null) {
+            unsetAnnounceFlush();
+          } else {
+            setAnnounceFlush((Boolean)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case AS_NUMBER:
-        return Integer.valueOf(getAsNumber());
+        case AS_NUMBER:
+          return Long.valueOf(getAsNumber());
 
-      case ROUTER_ID:
-        return getRouterId();
+        case ROUTER_ID:
+          return getRouterId();
 
-      case PORT:
-        return Integer.valueOf(getPort());
+        case PORT:
+          return Integer.valueOf(getPort());
 
-      case HOLD_TIME:
-        return Integer.valueOf(getHoldTime());
+        case HOLD_TIME:
+          return Integer.valueOf(getHoldTime());
 
-      case KEEP_ALIVE_TIME:
-        return Integer.valueOf(getKeepAliveTime());
+        case KEEP_ALIVE_TIME:
+          return Integer.valueOf(getKeepAliveTime());
 
-      case STALEPATH_TIME:
-        return Integer.valueOf(getStalepathTime());
+        case STALEPATH_TIME:
+          return Integer.valueOf(getStalepathTime());
 
-      case ANNOUNCE_FBIT:
-        return Boolean.valueOf(isAnnounceFbit());
+        case ANNOUNCE_FLUSH:
+          return Boolean.valueOf(isAnnounceFlush());
 
       }
       throw new IllegalStateException();
@@ -3058,20 +3057,20 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case AS_NUMBER:
-        return isSetAsNumber();
-      case ROUTER_ID:
-        return isSetRouterId();
-      case PORT:
-        return isSetPort();
-      case HOLD_TIME:
-        return isSetHoldTime();
-      case KEEP_ALIVE_TIME:
-        return isSetKeepAliveTime();
-      case STALEPATH_TIME:
-        return isSetStalepathTime();
-      case ANNOUNCE_FBIT:
-        return isSetAnnounceFbit();
+        case AS_NUMBER:
+          return isSetAsNumber();
+        case ROUTER_ID:
+          return isSetRouterId();
+        case PORT:
+          return isSetPort();
+        case HOLD_TIME:
+          return isSetHoldTime();
+        case KEEP_ALIVE_TIME:
+          return isSetKeepAliveTime();
+        case STALEPATH_TIME:
+          return isSetStalepathTime();
+        case ANNOUNCE_FLUSH:
+          return isSetAnnounceFlush();
       }
       throw new IllegalStateException();
     }
@@ -3143,12 +3142,12 @@ public class BgpConfigurator {
           return false;
       }
 
-      boolean this_present_announceFbit = true;
-      boolean that_present_announceFbit = true;
-      if (this_present_announceFbit || that_present_announceFbit) {
-        if (!(this_present_announceFbit && that_present_announceFbit))
+      boolean this_present_announceFlush = true;
+      boolean that_present_announceFlush = true;
+      if (this_present_announceFlush || that_present_announceFlush) {
+        if (!(this_present_announceFlush && that_present_announceFlush))
           return false;
-        if (this.announceFbit != that.announceFbit)
+        if (this.announceFlush != that.announceFlush)
           return false;
       }
 
@@ -3228,12 +3227,12 @@ public class BgpConfigurator {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAnnounceFbit()).compareTo(other.isSetAnnounceFbit());
+      lastComparison = Boolean.valueOf(isSetAnnounceFlush()).compareTo(other.isSetAnnounceFlush());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetAnnounceFbit()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.announceFbit, other.announceFbit);
+      if (isSetAnnounceFlush()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.announceFlush, other.announceFlush);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3286,8 +3285,8 @@ public class BgpConfigurator {
       sb.append(this.stalepathTime);
       first = false;
       if (!first) sb.append(", ");
-      sb.append("announceFbit:");
-      sb.append(this.announceFbit);
+      sb.append("announceFlush:");
+      sb.append(this.announceFlush);
       first = false;
       sb.append(")");
       return sb.toString();
@@ -3330,15 +3329,15 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
             case 1: // AS_NUMBER
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.asNumber = iprot.readI32();
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.asNumber = iprot.readI64();
                 struct.setAsNumberIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -3346,7 +3345,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.routerId = iprot.readString();
                 struct.setRouterIdIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -3354,7 +3353,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.port = iprot.readI32();
                 struct.setPortIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -3362,7 +3361,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.holdTime = iprot.readI32();
                 struct.setHoldTimeIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -3370,7 +3369,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.keepAliveTime = iprot.readI32();
                 struct.setKeepAliveTimeIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -3378,15 +3377,15 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.stalepathTime = iprot.readI32();
                 struct.setStalepathTimeIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 7: // ANNOUNCE_FBIT
+            case 7: // ANNOUNCE_FLUSH
               if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.announceFbit = iprot.readBool();
-                struct.setAnnounceFbitIsSet(true);
-              } else { 
+                struct.announceFlush = iprot.readBool();
+                struct.setAnnounceFlushIsSet(true);
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -3406,7 +3405,7 @@ public class BgpConfigurator {
 
         oprot.writeStructBegin(STRUCT_DESC);
         oprot.writeFieldBegin(AS_NUMBER_FIELD_DESC);
-        oprot.writeI32(struct.asNumber);
+        oprot.writeI64(struct.asNumber);
         oprot.writeFieldEnd();
         if (struct.routerId != null) {
           oprot.writeFieldBegin(ROUTER_ID_FIELD_DESC);
@@ -3425,8 +3424,8 @@ public class BgpConfigurator {
         oprot.writeFieldBegin(STALEPATH_TIME_FIELD_DESC);
         oprot.writeI32(struct.stalepathTime);
         oprot.writeFieldEnd();
-        oprot.writeFieldBegin(ANNOUNCE_FBIT_FIELD_DESC);
-        oprot.writeBool(struct.announceFbit);
+        oprot.writeFieldBegin(ANNOUNCE_FLUSH_FIELD_DESC);
+        oprot.writeBool(struct.announceFlush);
         oprot.writeFieldEnd();
         oprot.writeFieldStop();
         oprot.writeStructEnd();
@@ -3464,12 +3463,12 @@ public class BgpConfigurator {
         if (struct.isSetStalepathTime()) {
           optionals.set(5);
         }
-        if (struct.isSetAnnounceFbit()) {
+        if (struct.isSetAnnounceFlush()) {
           optionals.set(6);
         }
         oprot.writeBitSet(optionals, 7);
         if (struct.isSetAsNumber()) {
-          oprot.writeI32(struct.asNumber);
+          oprot.writeI64(struct.asNumber);
         }
         if (struct.isSetRouterId()) {
           oprot.writeString(struct.routerId);
@@ -3486,8 +3485,8 @@ public class BgpConfigurator {
         if (struct.isSetStalepathTime()) {
           oprot.writeI32(struct.stalepathTime);
         }
-        if (struct.isSetAnnounceFbit()) {
-          oprot.writeBool(struct.announceFbit);
+        if (struct.isSetAnnounceFlush()) {
+          oprot.writeBool(struct.announceFlush);
         }
       }
 
@@ -3496,7 +3495,7 @@ public class BgpConfigurator {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(7);
         if (incoming.get(0)) {
-          struct.asNumber = iprot.readI32();
+          struct.asNumber = iprot.readI64();
           struct.setAsNumberIsSet(true);
         }
         if (incoming.get(1)) {
@@ -3520,8 +3519,8 @@ public class BgpConfigurator {
           struct.setStalepathTimeIsSet(true);
         }
         if (incoming.get(6)) {
-          struct.announceFbit = iprot.readBool();
-          struct.setAnnounceFbitIsSet(true);
+          struct.announceFlush = iprot.readBool();
+          struct.setAnnounceFlushIsSet(true);
         }
       }
     }
@@ -3533,7 +3532,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new startBgp_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new startBgp_resultTupleSchemeFactory());
@@ -3545,7 +3544,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -3604,9 +3603,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startBgp_result.class, metaDataMap);
     }
@@ -3615,7 +3614,7 @@ public class BgpConfigurator {
     }
 
     public startBgp_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -3665,21 +3664,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -3692,8 +3691,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -3759,7 +3758,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -3810,7 +3809,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -3818,7 +3817,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -3885,21 +3884,21 @@ public class BgpConfigurator {
   public static class stopBgp_args implements org.apache.thrift.TBase<stopBgp_args, stopBgp_args._Fields>, java.io.Serializable, Cloneable, Comparable<stopBgp_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("stopBgp_args");
 
-    private static final org.apache.thrift.protocol.TField AS_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("asNumber", org.apache.thrift.protocol.TType.I32, (short)1);
+    private static final org.apache.thrift.protocol.TField AS_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("asNumber", org.apache.thrift.protocol.TType.I64, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new stopBgp_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new stopBgp_argsTupleSchemeFactory());
     }
 
-    public int asNumber; // required
+    public long asNumber; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AS_NUMBER((short)1, "asNumber");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -3958,9 +3957,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.AS_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("asNumber", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.AS_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("asNumber", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(stopBgp_args.class, metaDataMap);
     }
@@ -3969,7 +3968,7 @@ public class BgpConfigurator {
     }
 
     public stopBgp_args(
-      int asNumber)
+            long asNumber)
     {
       this();
       this.asNumber = asNumber;
@@ -3994,11 +3993,11 @@ public class BgpConfigurator {
       this.asNumber = 0;
     }
 
-    public int getAsNumber() {
+    public long getAsNumber() {
       return this.asNumber;
     }
 
-    public stopBgp_args setAsNumber(int asNumber) {
+    public stopBgp_args setAsNumber(long asNumber) {
       this.asNumber = asNumber;
       setAsNumberIsSet(true);
       return this;
@@ -4019,21 +4018,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case AS_NUMBER:
-        if (value == null) {
-          unsetAsNumber();
-        } else {
-          setAsNumber((Integer)value);
-        }
-        break;
+        case AS_NUMBER:
+          if (value == null) {
+            unsetAsNumber();
+          } else {
+            setAsNumber((Long)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case AS_NUMBER:
-        return Integer.valueOf(getAsNumber());
+        case AS_NUMBER:
+          return Long.valueOf(getAsNumber());
 
       }
       throw new IllegalStateException();
@@ -4046,8 +4045,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case AS_NUMBER:
-        return isSetAsNumber();
+        case AS_NUMBER:
+          return isSetAsNumber();
       }
       throw new IllegalStateException();
     }
@@ -4164,15 +4163,15 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
             case 1: // AS_NUMBER
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.asNumber = iprot.readI32();
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.asNumber = iprot.readI64();
                 struct.setAsNumberIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -4192,7 +4191,7 @@ public class BgpConfigurator {
 
         oprot.writeStructBegin(STRUCT_DESC);
         oprot.writeFieldBegin(AS_NUMBER_FIELD_DESC);
-        oprot.writeI32(struct.asNumber);
+        oprot.writeI64(struct.asNumber);
         oprot.writeFieldEnd();
         oprot.writeFieldStop();
         oprot.writeStructEnd();
@@ -4217,7 +4216,7 @@ public class BgpConfigurator {
         }
         oprot.writeBitSet(optionals, 1);
         if (struct.isSetAsNumber()) {
-          oprot.writeI32(struct.asNumber);
+          oprot.writeI64(struct.asNumber);
         }
       }
 
@@ -4226,7 +4225,7 @@ public class BgpConfigurator {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
-          struct.asNumber = iprot.readI32();
+          struct.asNumber = iprot.readI64();
           struct.setAsNumberIsSet(true);
         }
       }
@@ -4239,7 +4238,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new stopBgp_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new stopBgp_resultTupleSchemeFactory());
@@ -4251,7 +4250,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -4310,9 +4309,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(stopBgp_result.class, metaDataMap);
     }
@@ -4321,7 +4320,7 @@ public class BgpConfigurator {
     }
 
     public stopBgp_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -4371,21 +4370,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -4398,8 +4397,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -4465,7 +4464,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -4516,7 +4515,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -4524,7 +4523,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -4592,23 +4591,23 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createPeer_args");
 
     private static final org.apache.thrift.protocol.TField IP_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("ipAddress", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField AS_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("asNumber", org.apache.thrift.protocol.TType.I32, (short)2);
+    private static final org.apache.thrift.protocol.TField AS_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("asNumber", org.apache.thrift.protocol.TType.I64, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new createPeer_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new createPeer_argsTupleSchemeFactory());
     }
 
     public String ipAddress; // required
-    public int asNumber; // required
+    public long asNumber; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       IP_ADDRESS((short)1, "ipAddress"),
       AS_NUMBER((short)2, "asNumber");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -4669,11 +4668,11 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.IP_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("ipAddress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.AS_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("asNumber", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.IP_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("ipAddress", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.AS_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("asNumber", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createPeer_args.class, metaDataMap);
     }
@@ -4682,8 +4681,8 @@ public class BgpConfigurator {
     }
 
     public createPeer_args(
-      String ipAddress,
-      int asNumber)
+            String ipAddress,
+            long asNumber)
     {
       this();
       this.ipAddress = ipAddress;
@@ -4737,11 +4736,11 @@ public class BgpConfigurator {
       }
     }
 
-    public int getAsNumber() {
+    public long getAsNumber() {
       return this.asNumber;
     }
 
-    public createPeer_args setAsNumber(int asNumber) {
+    public createPeer_args setAsNumber(long asNumber) {
       this.asNumber = asNumber;
       setAsNumberIsSet(true);
       return this;
@@ -4762,32 +4761,32 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case IP_ADDRESS:
-        if (value == null) {
-          unsetIpAddress();
-        } else {
-          setIpAddress((String)value);
-        }
-        break;
+        case IP_ADDRESS:
+          if (value == null) {
+            unsetIpAddress();
+          } else {
+            setIpAddress((String)value);
+          }
+          break;
 
-      case AS_NUMBER:
-        if (value == null) {
-          unsetAsNumber();
-        } else {
-          setAsNumber((Integer)value);
-        }
-        break;
+        case AS_NUMBER:
+          if (value == null) {
+            unsetAsNumber();
+          } else {
+            setAsNumber((Long)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case IP_ADDRESS:
-        return getIpAddress();
+        case IP_ADDRESS:
+          return getIpAddress();
 
-      case AS_NUMBER:
-        return Integer.valueOf(getAsNumber());
+        case AS_NUMBER:
+          return Long.valueOf(getAsNumber());
 
       }
       throw new IllegalStateException();
@@ -4800,10 +4799,10 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case IP_ADDRESS:
-        return isSetIpAddress();
-      case AS_NUMBER:
-        return isSetAsNumber();
+        case IP_ADDRESS:
+          return isSetIpAddress();
+        case AS_NUMBER:
+          return isSetAsNumber();
       }
       throw new IllegalStateException();
     }
@@ -4947,7 +4946,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -4955,15 +4954,15 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.ipAddress = iprot.readString();
                 struct.setIpAddressIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
             case 2: // AS_NUMBER
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.asNumber = iprot.readI32();
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.asNumber = iprot.readI64();
                 struct.setAsNumberIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -4988,7 +4987,7 @@ public class BgpConfigurator {
           oprot.writeFieldEnd();
         }
         oprot.writeFieldBegin(AS_NUMBER_FIELD_DESC);
-        oprot.writeI32(struct.asNumber);
+        oprot.writeI64(struct.asNumber);
         oprot.writeFieldEnd();
         oprot.writeFieldStop();
         oprot.writeStructEnd();
@@ -5019,7 +5018,7 @@ public class BgpConfigurator {
           oprot.writeString(struct.ipAddress);
         }
         if (struct.isSetAsNumber()) {
-          oprot.writeI32(struct.asNumber);
+          oprot.writeI64(struct.asNumber);
         }
       }
 
@@ -5032,7 +5031,7 @@ public class BgpConfigurator {
           struct.setIpAddressIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.asNumber = iprot.readI32();
+          struct.asNumber = iprot.readI64();
           struct.setAsNumberIsSet(true);
         }
       }
@@ -5045,7 +5044,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new createPeer_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new createPeer_resultTupleSchemeFactory());
@@ -5057,7 +5056,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -5116,9 +5115,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createPeer_result.class, metaDataMap);
     }
@@ -5127,7 +5126,7 @@ public class BgpConfigurator {
     }
 
     public createPeer_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -5177,21 +5176,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -5204,8 +5203,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -5271,7 +5270,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -5322,7 +5321,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -5330,7 +5329,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -5399,7 +5398,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField IP_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("ipAddress", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new deletePeer_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new deletePeer_argsTupleSchemeFactory());
@@ -5411,7 +5410,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       IP_ADDRESS((short)1, "ipAddress");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -5468,9 +5467,9 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.IP_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("ipAddress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.IP_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("ipAddress", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deletePeer_args.class, metaDataMap);
     }
@@ -5479,7 +5478,7 @@ public class BgpConfigurator {
     }
 
     public deletePeer_args(
-      String ipAddress)
+            String ipAddress)
     {
       this();
       this.ipAddress = ipAddress;
@@ -5529,21 +5528,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case IP_ADDRESS:
-        if (value == null) {
-          unsetIpAddress();
-        } else {
-          setIpAddress((String)value);
-        }
-        break;
+        case IP_ADDRESS:
+          if (value == null) {
+            unsetIpAddress();
+          } else {
+            setIpAddress((String)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case IP_ADDRESS:
-        return getIpAddress();
+        case IP_ADDRESS:
+          return getIpAddress();
 
       }
       throw new IllegalStateException();
@@ -5556,8 +5555,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case IP_ADDRESS:
-        return isSetIpAddress();
+        case IP_ADDRESS:
+          return isSetIpAddress();
       }
       throw new IllegalStateException();
     }
@@ -5676,7 +5675,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -5684,7 +5683,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.ipAddress = iprot.readString();
                 struct.setIpAddressIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -5753,7 +5752,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new deletePeer_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new deletePeer_resultTupleSchemeFactory());
@@ -5765,7 +5764,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -5824,9 +5823,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deletePeer_result.class, metaDataMap);
     }
@@ -5835,7 +5834,7 @@ public class BgpConfigurator {
     }
 
     public deletePeer_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -5885,21 +5884,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -5912,8 +5911,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -5979,7 +5978,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -6030,7 +6029,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -6038,7 +6037,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -6109,7 +6108,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField IRTS_FIELD_DESC = new org.apache.thrift.protocol.TField("irts", org.apache.thrift.protocol.TType.LIST, (short)2);
     private static final org.apache.thrift.protocol.TField ERTS_FIELD_DESC = new org.apache.thrift.protocol.TField("erts", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new addVrf_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new addVrf_argsTupleSchemeFactory());
@@ -6125,7 +6124,7 @@ public class BgpConfigurator {
       IRTS((short)2, "irts"),
       ERTS((short)3, "erts");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -6186,15 +6185,15 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.IRTS, new org.apache.thrift.meta_data.FieldMetaData("irts", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-      tmpMap.put(_Fields.ERTS, new org.apache.thrift.meta_data.FieldMetaData("erts", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.IRTS, new org.apache.thrift.meta_data.FieldMetaData("irts", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+                      new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+      tmpMap.put(_Fields.ERTS, new org.apache.thrift.meta_data.FieldMetaData("erts", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+                      new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addVrf_args.class, metaDataMap);
     }
@@ -6203,9 +6202,9 @@ public class BgpConfigurator {
     }
 
     public addVrf_args(
-      String rd,
-      List<String> irts,
-      List<String> erts)
+            String rd,
+            List<String> irts,
+            List<String> erts)
     {
       this();
       this.rd = rd;
@@ -6221,11 +6220,11 @@ public class BgpConfigurator {
         this.rd = other.rd;
       }
       if (other.isSetIrts()) {
-        List<String> __this__irts = new ArrayList<String>(other.irts);
+        List<String> __this__irts = new ArrayList<>(other.irts);
         this.irts = __this__irts;
       }
       if (other.isSetErts()) {
-        List<String> __this__erts = new ArrayList<String>(other.erts);
+        List<String> __this__erts = new ArrayList<>(other.erts);
         this.erts = __this__erts;
       }
     }
@@ -6275,7 +6274,7 @@ public class BgpConfigurator {
 
     public void addToIrts(String elem) {
       if (this.irts == null) {
-        this.irts = new ArrayList<String>();
+        this.irts = new ArrayList<>();
       }
       this.irts.add(elem);
     }
@@ -6314,7 +6313,7 @@ public class BgpConfigurator {
 
     public void addToErts(String elem) {
       if (this.erts == null) {
-        this.erts = new ArrayList<String>();
+        this.erts = new ArrayList<>();
       }
       this.erts.add(elem);
     }
@@ -6345,43 +6344,43 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case RD:
-        if (value == null) {
-          unsetRd();
-        } else {
-          setRd((String)value);
-        }
-        break;
+        case RD:
+          if (value == null) {
+            unsetRd();
+          } else {
+            setRd((String)value);
+          }
+          break;
 
-      case IRTS:
-        if (value == null) {
-          unsetIrts();
-        } else {
-          setIrts((List<String>)value);
-        }
-        break;
+        case IRTS:
+          if (value == null) {
+            unsetIrts();
+          } else {
+            setIrts((List<String>)value);
+          }
+          break;
 
-      case ERTS:
-        if (value == null) {
-          unsetErts();
-        } else {
-          setErts((List<String>)value);
-        }
-        break;
+        case ERTS:
+          if (value == null) {
+            unsetErts();
+          } else {
+            setErts((List<String>)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case RD:
-        return getRd();
+        case RD:
+          return getRd();
 
-      case IRTS:
-        return getIrts();
+        case IRTS:
+          return getIrts();
 
-      case ERTS:
-        return getErts();
+        case ERTS:
+          return getErts();
 
       }
       throw new IllegalStateException();
@@ -6394,12 +6393,12 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case RD:
-        return isSetRd();
-      case IRTS:
-        return isSetIrts();
-      case ERTS:
-        return isSetErts();
+        case RD:
+          return isSetRd();
+        case IRTS:
+          return isSetIrts();
+        case ERTS:
+          return isSetErts();
       }
       throw new IllegalStateException();
     }
@@ -6572,7 +6571,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -6580,7 +6579,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.rd = iprot.readString();
                 struct.setRdIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -6588,7 +6587,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
                   org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
-                  struct.irts = new ArrayList<String>(_list8.size);
+                  struct.irts = new ArrayList<>(_list8.size);
                   for (int _i9 = 0; _i9 < _list8.size; ++_i9)
                   {
                     String _elem10;
@@ -6598,7 +6597,7 @@ public class BgpConfigurator {
                   iprot.readListEnd();
                 }
                 struct.setIrtsIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -6606,7 +6605,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
                   org.apache.thrift.protocol.TList _list11 = iprot.readListBegin();
-                  struct.erts = new ArrayList<String>(_list11.size);
+                  struct.erts = new ArrayList<>(_list11.size);
                   for (int _i12 = 0; _i12 < _list11.size; ++_i12)
                   {
                     String _elem13;
@@ -6616,7 +6615,7 @@ public class BgpConfigurator {
                   iprot.readListEnd();
                 }
                 struct.setErtsIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -6726,7 +6725,7 @@ public class BgpConfigurator {
         if (incoming.get(1)) {
           {
             org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.irts = new ArrayList<String>(_list18.size);
+            struct.irts = new ArrayList<>(_list18.size);
             for (int _i19 = 0; _i19 < _list18.size; ++_i19)
             {
               String _elem20;
@@ -6739,7 +6738,7 @@ public class BgpConfigurator {
         if (incoming.get(2)) {
           {
             org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.erts = new ArrayList<String>(_list21.size);
+            struct.erts = new ArrayList<>(_list21.size);
             for (int _i22 = 0; _i22 < _list21.size; ++_i22)
             {
               String _elem23;
@@ -6759,7 +6758,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new addVrf_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new addVrf_resultTupleSchemeFactory());
@@ -6771,7 +6770,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -6830,9 +6829,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addVrf_result.class, metaDataMap);
     }
@@ -6841,7 +6840,7 @@ public class BgpConfigurator {
     }
 
     public addVrf_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -6891,21 +6890,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -6918,8 +6917,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -6985,7 +6984,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -7036,7 +7035,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -7044,7 +7043,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -7113,7 +7112,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField RD_FIELD_DESC = new org.apache.thrift.protocol.TField("rd", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new delVrf_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new delVrf_argsTupleSchemeFactory());
@@ -7125,7 +7124,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       RD((short)1, "rd");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -7182,9 +7181,9 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(delVrf_args.class, metaDataMap);
     }
@@ -7193,7 +7192,7 @@ public class BgpConfigurator {
     }
 
     public delVrf_args(
-      String rd)
+            String rd)
     {
       this();
       this.rd = rd;
@@ -7243,21 +7242,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case RD:
-        if (value == null) {
-          unsetRd();
-        } else {
-          setRd((String)value);
-        }
-        break;
+        case RD:
+          if (value == null) {
+            unsetRd();
+          } else {
+            setRd((String)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case RD:
-        return getRd();
+        case RD:
+          return getRd();
 
       }
       throw new IllegalStateException();
@@ -7270,8 +7269,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case RD:
-        return isSetRd();
+        case RD:
+          return isSetRd();
       }
       throw new IllegalStateException();
     }
@@ -7390,7 +7389,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -7398,7 +7397,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.rd = iprot.readString();
                 struct.setRdIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -7467,7 +7466,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new delVrf_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new delVrf_resultTupleSchemeFactory());
@@ -7479,7 +7478,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -7538,9 +7537,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(delVrf_result.class, metaDataMap);
     }
@@ -7549,7 +7548,7 @@ public class BgpConfigurator {
     }
 
     public delVrf_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -7599,21 +7598,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -7626,8 +7625,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -7693,7 +7692,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -7744,7 +7743,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -7752,7 +7751,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -7824,7 +7823,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField RD_FIELD_DESC = new org.apache.thrift.protocol.TField("rd", org.apache.thrift.protocol.TType.STRING, (short)3);
     private static final org.apache.thrift.protocol.TField LABEL_FIELD_DESC = new org.apache.thrift.protocol.TField("label", org.apache.thrift.protocol.TType.I32, (short)4);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new pushRoute_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new pushRoute_argsTupleSchemeFactory());
@@ -7842,7 +7841,7 @@ public class BgpConfigurator {
       RD((short)3, "rd"),
       LABEL((short)4, "label");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -7907,15 +7906,15 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PREFIX, new org.apache.thrift.meta_data.FieldMetaData("prefix", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.NEXTHOP, new org.apache.thrift.meta_data.FieldMetaData("nexthop", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.LABEL, new org.apache.thrift.meta_data.FieldMetaData("label", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PREFIX, new org.apache.thrift.meta_data.FieldMetaData("prefix", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.NEXTHOP, new org.apache.thrift.meta_data.FieldMetaData("nexthop", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.LABEL, new org.apache.thrift.meta_data.FieldMetaData("label", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(pushRoute_args.class, metaDataMap);
     }
@@ -7924,10 +7923,10 @@ public class BgpConfigurator {
     }
 
     public pushRoute_args(
-      String prefix,
-      String nexthop,
-      String rd,
-      int label)
+            String prefix,
+            String nexthop,
+            String rd,
+            int label)
     {
       this();
       this.prefix = prefix;
@@ -8064,54 +8063,54 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PREFIX:
-        if (value == null) {
-          unsetPrefix();
-        } else {
-          setPrefix((String)value);
-        }
-        break;
+        case PREFIX:
+          if (value == null) {
+            unsetPrefix();
+          } else {
+            setPrefix((String)value);
+          }
+          break;
 
-      case NEXTHOP:
-        if (value == null) {
-          unsetNexthop();
-        } else {
-          setNexthop((String)value);
-        }
-        break;
+        case NEXTHOP:
+          if (value == null) {
+            unsetNexthop();
+          } else {
+            setNexthop((String)value);
+          }
+          break;
 
-      case RD:
-        if (value == null) {
-          unsetRd();
-        } else {
-          setRd((String)value);
-        }
-        break;
+        case RD:
+          if (value == null) {
+            unsetRd();
+          } else {
+            setRd((String)value);
+          }
+          break;
 
-      case LABEL:
-        if (value == null) {
-          unsetLabel();
-        } else {
-          setLabel((Integer)value);
-        }
-        break;
+        case LABEL:
+          if (value == null) {
+            unsetLabel();
+          } else {
+            setLabel((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PREFIX:
-        return getPrefix();
+        case PREFIX:
+          return getPrefix();
 
-      case NEXTHOP:
-        return getNexthop();
+        case NEXTHOP:
+          return getNexthop();
 
-      case RD:
-        return getRd();
+        case RD:
+          return getRd();
 
-      case LABEL:
-        return Integer.valueOf(getLabel());
+        case LABEL:
+          return Integer.valueOf(getLabel());
 
       }
       throw new IllegalStateException();
@@ -8124,14 +8123,14 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PREFIX:
-        return isSetPrefix();
-      case NEXTHOP:
-        return isSetNexthop();
-      case RD:
-        return isSetRd();
-      case LABEL:
-        return isSetLabel();
+        case PREFIX:
+          return isSetPrefix();
+        case NEXTHOP:
+          return isSetNexthop();
+        case RD:
+          return isSetRd();
+        case LABEL:
+          return isSetLabel();
       }
       throw new IllegalStateException();
     }
@@ -8329,7 +8328,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -8337,7 +8336,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.prefix = iprot.readString();
                 struct.setPrefixIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -8345,7 +8344,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.nexthop = iprot.readString();
                 struct.setNexthopIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -8353,7 +8352,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.rd = iprot.readString();
                 struct.setRdIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -8361,7 +8360,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.label = iprot.readI32();
                 struct.setLabelIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -8473,7 +8472,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new pushRoute_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new pushRoute_resultTupleSchemeFactory());
@@ -8485,7 +8484,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -8544,9 +8543,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(pushRoute_result.class, metaDataMap);
     }
@@ -8555,7 +8554,7 @@ public class BgpConfigurator {
     }
 
     public pushRoute_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -8605,21 +8604,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -8632,8 +8631,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -8699,7 +8698,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -8750,7 +8749,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -8758,7 +8757,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -8828,7 +8827,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("prefix", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField RD_FIELD_DESC = new org.apache.thrift.protocol.TField("rd", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new withdrawRoute_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new withdrawRoute_argsTupleSchemeFactory());
@@ -8842,7 +8841,7 @@ public class BgpConfigurator {
       PREFIX((short)1, "prefix"),
       RD((short)2, "rd");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -8901,11 +8900,11 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PREFIX, new org.apache.thrift.meta_data.FieldMetaData("prefix", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PREFIX, new org.apache.thrift.meta_data.FieldMetaData("prefix", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.RD, new org.apache.thrift.meta_data.FieldMetaData("rd", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(withdrawRoute_args.class, metaDataMap);
     }
@@ -8914,8 +8913,8 @@ public class BgpConfigurator {
     }
 
     public withdrawRoute_args(
-      String prefix,
-      String rd)
+            String prefix,
+            String rd)
     {
       this();
       this.prefix = prefix;
@@ -8994,32 +8993,32 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PREFIX:
-        if (value == null) {
-          unsetPrefix();
-        } else {
-          setPrefix((String)value);
-        }
-        break;
+        case PREFIX:
+          if (value == null) {
+            unsetPrefix();
+          } else {
+            setPrefix((String)value);
+          }
+          break;
 
-      case RD:
-        if (value == null) {
-          unsetRd();
-        } else {
-          setRd((String)value);
-        }
-        break;
+        case RD:
+          if (value == null) {
+            unsetRd();
+          } else {
+            setRd((String)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PREFIX:
-        return getPrefix();
+        case PREFIX:
+          return getPrefix();
 
-      case RD:
-        return getRd();
+        case RD:
+          return getRd();
 
       }
       throw new IllegalStateException();
@@ -9032,10 +9031,10 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PREFIX:
-        return isSetPrefix();
-      case RD:
-        return isSetRd();
+        case PREFIX:
+          return isSetPrefix();
+        case RD:
+          return isSetRd();
       }
       throw new IllegalStateException();
     }
@@ -9181,7 +9180,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -9189,7 +9188,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.prefix = iprot.readString();
                 struct.setPrefixIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -9197,7 +9196,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.rd = iprot.readString();
                 struct.setRdIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -9281,7 +9280,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new withdrawRoute_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new withdrawRoute_resultTupleSchemeFactory());
@@ -9293,7 +9292,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -9352,9 +9351,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(withdrawRoute_result.class, metaDataMap);
     }
@@ -9363,7 +9362,7 @@ public class BgpConfigurator {
     }
 
     public withdrawRoute_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -9413,21 +9412,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -9440,8 +9439,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -9507,7 +9506,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -9558,7 +9557,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -9566,7 +9565,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -9636,7 +9635,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField PEER_IP_FIELD_DESC = new org.apache.thrift.protocol.TField("peerIp", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField N_HOPS_FIELD_DESC = new org.apache.thrift.protocol.TField("nHops", org.apache.thrift.protocol.TType.I32, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new setEbgpMultihop_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new setEbgpMultihop_argsTupleSchemeFactory());
@@ -9650,7 +9649,7 @@ public class BgpConfigurator {
       PEER_IP((short)1, "peerIp"),
       N_HOPS((short)2, "nHops");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -9711,11 +9710,11 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.N_HOPS, new org.apache.thrift.meta_data.FieldMetaData("nHops", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.N_HOPS, new org.apache.thrift.meta_data.FieldMetaData("nHops", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setEbgpMultihop_args.class, metaDataMap);
     }
@@ -9724,8 +9723,8 @@ public class BgpConfigurator {
     }
 
     public setEbgpMultihop_args(
-      String peerIp,
-      int nHops)
+            String peerIp,
+            int nHops)
     {
       this();
       this.peerIp = peerIp;
@@ -9804,32 +9803,32 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PEER_IP:
-        if (value == null) {
-          unsetPeerIp();
-        } else {
-          setPeerIp((String)value);
-        }
-        break;
+        case PEER_IP:
+          if (value == null) {
+            unsetPeerIp();
+          } else {
+            setPeerIp((String)value);
+          }
+          break;
 
-      case N_HOPS:
-        if (value == null) {
-          unsetNHops();
-        } else {
-          setNHops((Integer)value);
-        }
-        break;
+        case N_HOPS:
+          if (value == null) {
+            unsetNHops();
+          } else {
+            setNHops((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PEER_IP:
-        return getPeerIp();
+        case PEER_IP:
+          return getPeerIp();
 
-      case N_HOPS:
-        return Integer.valueOf(getNHops());
+        case N_HOPS:
+          return Integer.valueOf(getNHops());
 
       }
       throw new IllegalStateException();
@@ -9842,10 +9841,10 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PEER_IP:
-        return isSetPeerIp();
-      case N_HOPS:
-        return isSetNHops();
+        case PEER_IP:
+          return isSetPeerIp();
+        case N_HOPS:
+          return isSetNHops();
       }
       throw new IllegalStateException();
     }
@@ -9989,7 +9988,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -9997,7 +9996,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.peerIp = iprot.readString();
                 struct.setPeerIpIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -10005,7 +10004,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.nHops = iprot.readI32();
                 struct.setNHopsIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -10087,7 +10086,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new setEbgpMultihop_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new setEbgpMultihop_resultTupleSchemeFactory());
@@ -10099,7 +10098,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -10158,9 +10157,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setEbgpMultihop_result.class, metaDataMap);
     }
@@ -10169,7 +10168,7 @@ public class BgpConfigurator {
     }
 
     public setEbgpMultihop_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -10219,21 +10218,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -10246,8 +10245,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -10313,7 +10312,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -10364,7 +10363,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -10372,7 +10371,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -10441,7 +10440,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField PEER_IP_FIELD_DESC = new org.apache.thrift.protocol.TField("peerIp", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new unsetEbgpMultihop_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new unsetEbgpMultihop_argsTupleSchemeFactory());
@@ -10453,7 +10452,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       PEER_IP((short)1, "peerIp");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -10510,9 +10509,9 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unsetEbgpMultihop_args.class, metaDataMap);
     }
@@ -10521,7 +10520,7 @@ public class BgpConfigurator {
     }
 
     public unsetEbgpMultihop_args(
-      String peerIp)
+            String peerIp)
     {
       this();
       this.peerIp = peerIp;
@@ -10571,21 +10570,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PEER_IP:
-        if (value == null) {
-          unsetPeerIp();
-        } else {
-          setPeerIp((String)value);
-        }
-        break;
+        case PEER_IP:
+          if (value == null) {
+            unsetPeerIp();
+          } else {
+            setPeerIp((String)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PEER_IP:
-        return getPeerIp();
+        case PEER_IP:
+          return getPeerIp();
 
       }
       throw new IllegalStateException();
@@ -10598,8 +10597,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PEER_IP:
-        return isSetPeerIp();
+        case PEER_IP:
+          return isSetPeerIp();
       }
       throw new IllegalStateException();
     }
@@ -10718,7 +10717,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -10726,7 +10725,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.peerIp = iprot.readString();
                 struct.setPeerIpIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -10795,7 +10794,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new unsetEbgpMultihop_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new unsetEbgpMultihop_resultTupleSchemeFactory());
@@ -10807,7 +10806,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -10866,9 +10865,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unsetEbgpMultihop_result.class, metaDataMap);
     }
@@ -10877,7 +10876,7 @@ public class BgpConfigurator {
     }
 
     public unsetEbgpMultihop_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -10927,21 +10926,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -10954,8 +10953,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -11021,7 +11020,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -11072,7 +11071,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -11080,7 +11079,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -11150,7 +11149,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField PEER_IP_FIELD_DESC = new org.apache.thrift.protocol.TField("peerIp", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField SRC_IP_FIELD_DESC = new org.apache.thrift.protocol.TField("srcIp", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new setUpdateSource_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new setUpdateSource_argsTupleSchemeFactory());
@@ -11164,7 +11163,7 @@ public class BgpConfigurator {
       PEER_IP((short)1, "peerIp"),
       SRC_IP((short)2, "srcIp");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -11223,11 +11222,11 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.SRC_IP, new org.apache.thrift.meta_data.FieldMetaData("srcIp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.SRC_IP, new org.apache.thrift.meta_data.FieldMetaData("srcIp", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUpdateSource_args.class, metaDataMap);
     }
@@ -11236,8 +11235,8 @@ public class BgpConfigurator {
     }
 
     public setUpdateSource_args(
-      String peerIp,
-      String srcIp)
+            String peerIp,
+            String srcIp)
     {
       this();
       this.peerIp = peerIp;
@@ -11316,32 +11315,32 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PEER_IP:
-        if (value == null) {
-          unsetPeerIp();
-        } else {
-          setPeerIp((String)value);
-        }
-        break;
+        case PEER_IP:
+          if (value == null) {
+            unsetPeerIp();
+          } else {
+            setPeerIp((String)value);
+          }
+          break;
 
-      case SRC_IP:
-        if (value == null) {
-          unsetSrcIp();
-        } else {
-          setSrcIp((String)value);
-        }
-        break;
+        case SRC_IP:
+          if (value == null) {
+            unsetSrcIp();
+          } else {
+            setSrcIp((String)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PEER_IP:
-        return getPeerIp();
+        case PEER_IP:
+          return getPeerIp();
 
-      case SRC_IP:
-        return getSrcIp();
+        case SRC_IP:
+          return getSrcIp();
 
       }
       throw new IllegalStateException();
@@ -11354,10 +11353,10 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PEER_IP:
-        return isSetPeerIp();
-      case SRC_IP:
-        return isSetSrcIp();
+        case PEER_IP:
+          return isSetPeerIp();
+        case SRC_IP:
+          return isSetSrcIp();
       }
       throw new IllegalStateException();
     }
@@ -11503,7 +11502,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -11511,7 +11510,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.peerIp = iprot.readString();
                 struct.setPeerIpIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -11519,7 +11518,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.srcIp = iprot.readString();
                 struct.setSrcIpIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -11603,7 +11602,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new setUpdateSource_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new setUpdateSource_resultTupleSchemeFactory());
@@ -11615,7 +11614,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -11674,9 +11673,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUpdateSource_result.class, metaDataMap);
     }
@@ -11685,7 +11684,7 @@ public class BgpConfigurator {
     }
 
     public setUpdateSource_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -11735,21 +11734,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -11762,8 +11761,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -11829,7 +11828,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -11880,7 +11879,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -11888,7 +11887,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -11957,7 +11956,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField PEER_IP_FIELD_DESC = new org.apache.thrift.protocol.TField("peerIp", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new unsetUpdateSource_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new unsetUpdateSource_argsTupleSchemeFactory());
@@ -11969,7 +11968,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       PEER_IP((short)1, "peerIp");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -12026,9 +12025,9 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unsetUpdateSource_args.class, metaDataMap);
     }
@@ -12037,7 +12036,7 @@ public class BgpConfigurator {
     }
 
     public unsetUpdateSource_args(
-      String peerIp)
+            String peerIp)
     {
       this();
       this.peerIp = peerIp;
@@ -12087,21 +12086,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PEER_IP:
-        if (value == null) {
-          unsetPeerIp();
-        } else {
-          setPeerIp((String)value);
-        }
-        break;
+        case PEER_IP:
+          if (value == null) {
+            unsetPeerIp();
+          } else {
+            setPeerIp((String)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PEER_IP:
-        return getPeerIp();
+        case PEER_IP:
+          return getPeerIp();
 
       }
       throw new IllegalStateException();
@@ -12114,8 +12113,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PEER_IP:
-        return isSetPeerIp();
+        case PEER_IP:
+          return isSetPeerIp();
       }
       throw new IllegalStateException();
     }
@@ -12234,7 +12233,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -12242,7 +12241,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.peerIp = iprot.readString();
                 struct.setPeerIpIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -12311,7 +12310,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new unsetUpdateSource_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new unsetUpdateSource_resultTupleSchemeFactory());
@@ -12323,7 +12322,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -12382,9 +12381,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(unsetUpdateSource_result.class, metaDataMap);
     }
@@ -12393,7 +12392,7 @@ public class BgpConfigurator {
     }
 
     public unsetUpdateSource_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -12443,21 +12442,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -12470,8 +12469,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -12537,7 +12536,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -12588,7 +12587,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -12596,7 +12595,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -12667,7 +12666,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField AFI_FIELD_DESC = new org.apache.thrift.protocol.TField("afi", org.apache.thrift.protocol.TType.I32, (short)2);
     private static final org.apache.thrift.protocol.TField SAFI_FIELD_DESC = new org.apache.thrift.protocol.TField("safi", org.apache.thrift.protocol.TType.I32, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new enableAddressFamily_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new enableAddressFamily_argsTupleSchemeFactory());
@@ -12675,12 +12674,12 @@ public class BgpConfigurator {
 
     public String peerIp; // required
     /**
-     * 
+     *
      * @see af_afi
      */
     public af_afi afi; // required
     /**
-     * 
+     *
      * @see af_safi
      */
     public af_safi safi; // required
@@ -12689,17 +12688,17 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       PEER_IP((short)1, "peerIp"),
       /**
-       * 
+       *
        * @see af_afi
        */
       AFI((short)2, "afi"),
       /**
-       * 
+       *
        * @see af_safi
        */
       SAFI((short)3, "safi");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -12760,13 +12759,13 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.AFI, new org.apache.thrift.meta_data.FieldMetaData("afi", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_afi.class)));
-      tmpMap.put(_Fields.SAFI, new org.apache.thrift.meta_data.FieldMetaData("safi", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_safi.class)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.AFI, new org.apache.thrift.meta_data.FieldMetaData("afi", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_afi.class)));
+      tmpMap.put(_Fields.SAFI, new org.apache.thrift.meta_data.FieldMetaData("safi", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_safi.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(enableAddressFamily_args.class, metaDataMap);
     }
@@ -12775,9 +12774,9 @@ public class BgpConfigurator {
     }
 
     public enableAddressFamily_args(
-      String peerIp,
-      af_afi afi,
-      af_safi safi)
+            String peerIp,
+            af_afi afi,
+            af_safi safi)
     {
       this();
       this.peerIp = peerIp;
@@ -12836,7 +12835,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_afi
      */
     public af_afi getAfi() {
@@ -12844,7 +12843,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_afi
      */
     public enableAddressFamily_args setAfi(af_afi afi) {
@@ -12868,7 +12867,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_safi
      */
     public af_safi getSafi() {
@@ -12876,7 +12875,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_safi
      */
     public enableAddressFamily_args setSafi(af_safi safi) {
@@ -12901,43 +12900,43 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PEER_IP:
-        if (value == null) {
-          unsetPeerIp();
-        } else {
-          setPeerIp((String)value);
-        }
-        break;
+        case PEER_IP:
+          if (value == null) {
+            unsetPeerIp();
+          } else {
+            setPeerIp((String)value);
+          }
+          break;
 
-      case AFI:
-        if (value == null) {
-          unsetAfi();
-        } else {
-          setAfi((af_afi)value);
-        }
-        break;
+        case AFI:
+          if (value == null) {
+            unsetAfi();
+          } else {
+            setAfi((af_afi)value);
+          }
+          break;
 
-      case SAFI:
-        if (value == null) {
-          unsetSafi();
-        } else {
-          setSafi((af_safi)value);
-        }
-        break;
+        case SAFI:
+          if (value == null) {
+            unsetSafi();
+          } else {
+            setSafi((af_safi)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PEER_IP:
-        return getPeerIp();
+        case PEER_IP:
+          return getPeerIp();
 
-      case AFI:
-        return getAfi();
+        case AFI:
+          return getAfi();
 
-      case SAFI:
-        return getSafi();
+        case SAFI:
+          return getSafi();
 
       }
       throw new IllegalStateException();
@@ -12950,12 +12949,12 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PEER_IP:
-        return isSetPeerIp();
-      case AFI:
-        return isSetAfi();
-      case SAFI:
-        return isSetSafi();
+        case PEER_IP:
+          return isSetPeerIp();
+        case AFI:
+          return isSetAfi();
+        case SAFI:
+          return isSetSafi();
       }
       throw new IllegalStateException();
     }
@@ -13128,7 +13127,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -13136,7 +13135,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.peerIp = iprot.readString();
                 struct.setPeerIpIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -13144,7 +13143,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.afi = af_afi.findByValue(iprot.readI32());
                 struct.setAfiIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -13152,7 +13151,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.safi = af_safi.findByValue(iprot.readI32());
                 struct.setSafiIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -13251,7 +13250,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new enableAddressFamily_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new enableAddressFamily_resultTupleSchemeFactory());
@@ -13263,7 +13262,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -13322,9 +13321,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(enableAddressFamily_result.class, metaDataMap);
     }
@@ -13333,7 +13332,7 @@ public class BgpConfigurator {
     }
 
     public enableAddressFamily_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -13383,21 +13382,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -13410,8 +13409,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -13477,7 +13476,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -13528,7 +13527,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -13536,7 +13535,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -13607,7 +13606,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField AFI_FIELD_DESC = new org.apache.thrift.protocol.TField("afi", org.apache.thrift.protocol.TType.I32, (short)2);
     private static final org.apache.thrift.protocol.TField SAFI_FIELD_DESC = new org.apache.thrift.protocol.TField("safi", org.apache.thrift.protocol.TType.I32, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new disableAddressFamily_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new disableAddressFamily_argsTupleSchemeFactory());
@@ -13615,12 +13614,12 @@ public class BgpConfigurator {
 
     public String peerIp; // required
     /**
-     * 
+     *
      * @see af_afi
      */
     public af_afi afi; // required
     /**
-     * 
+     *
      * @see af_safi
      */
     public af_safi safi; // required
@@ -13629,17 +13628,17 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       PEER_IP((short)1, "peerIp"),
       /**
-       * 
+       *
        * @see af_afi
        */
       AFI((short)2, "afi"),
       /**
-       * 
+       *
        * @see af_safi
        */
       SAFI((short)3, "safi");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -13700,13 +13699,13 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.AFI, new org.apache.thrift.meta_data.FieldMetaData("afi", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_afi.class)));
-      tmpMap.put(_Fields.SAFI, new org.apache.thrift.meta_data.FieldMetaData("safi", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_safi.class)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.PEER_IP, new org.apache.thrift.meta_data.FieldMetaData("peerIp", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.AFI, new org.apache.thrift.meta_data.FieldMetaData("afi", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_afi.class)));
+      tmpMap.put(_Fields.SAFI, new org.apache.thrift.meta_data.FieldMetaData("safi", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, af_safi.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(disableAddressFamily_args.class, metaDataMap);
     }
@@ -13715,9 +13714,9 @@ public class BgpConfigurator {
     }
 
     public disableAddressFamily_args(
-      String peerIp,
-      af_afi afi,
-      af_safi safi)
+            String peerIp,
+            af_afi afi,
+            af_safi safi)
     {
       this();
       this.peerIp = peerIp;
@@ -13776,7 +13775,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_afi
      */
     public af_afi getAfi() {
@@ -13784,7 +13783,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_afi
      */
     public disableAddressFamily_args setAfi(af_afi afi) {
@@ -13808,7 +13807,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_safi
      */
     public af_safi getSafi() {
@@ -13816,7 +13815,7 @@ public class BgpConfigurator {
     }
 
     /**
-     * 
+     *
      * @see af_safi
      */
     public disableAddressFamily_args setSafi(af_safi safi) {
@@ -13841,43 +13840,43 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PEER_IP:
-        if (value == null) {
-          unsetPeerIp();
-        } else {
-          setPeerIp((String)value);
-        }
-        break;
+        case PEER_IP:
+          if (value == null) {
+            unsetPeerIp();
+          } else {
+            setPeerIp((String)value);
+          }
+          break;
 
-      case AFI:
-        if (value == null) {
-          unsetAfi();
-        } else {
-          setAfi((af_afi)value);
-        }
-        break;
+        case AFI:
+          if (value == null) {
+            unsetAfi();
+          } else {
+            setAfi((af_afi)value);
+          }
+          break;
 
-      case SAFI:
-        if (value == null) {
-          unsetSafi();
-        } else {
-          setSafi((af_safi)value);
-        }
-        break;
+        case SAFI:
+          if (value == null) {
+            unsetSafi();
+          } else {
+            setSafi((af_safi)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PEER_IP:
-        return getPeerIp();
+        case PEER_IP:
+          return getPeerIp();
 
-      case AFI:
-        return getAfi();
+        case AFI:
+          return getAfi();
 
-      case SAFI:
-        return getSafi();
+        case SAFI:
+          return getSafi();
 
       }
       throw new IllegalStateException();
@@ -13890,12 +13889,12 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case PEER_IP:
-        return isSetPeerIp();
-      case AFI:
-        return isSetAfi();
-      case SAFI:
-        return isSetSafi();
+        case PEER_IP:
+          return isSetPeerIp();
+        case AFI:
+          return isSetAfi();
+        case SAFI:
+          return isSetSafi();
       }
       throw new IllegalStateException();
     }
@@ -14068,7 +14067,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -14076,7 +14075,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.peerIp = iprot.readString();
                 struct.setPeerIpIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -14084,7 +14083,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.afi = af_afi.findByValue(iprot.readI32());
                 struct.setAfiIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -14092,7 +14091,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.safi = af_safi.findByValue(iprot.readI32());
                 struct.setSafiIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -14191,7 +14190,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new disableAddressFamily_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new disableAddressFamily_resultTupleSchemeFactory());
@@ -14203,7 +14202,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -14262,9 +14261,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(disableAddressFamily_result.class, metaDataMap);
     }
@@ -14273,7 +14272,7 @@ public class BgpConfigurator {
     }
 
     public disableAddressFamily_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -14323,21 +14322,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -14350,8 +14349,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -14417,7 +14416,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -14468,7 +14467,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -14476,7 +14475,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -14546,7 +14545,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField LOG_FILE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("logFileName", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField LOG_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("logLevel", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new setLogConfig_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new setLogConfig_argsTupleSchemeFactory());
@@ -14560,7 +14559,7 @@ public class BgpConfigurator {
       LOG_FILE_NAME((short)1, "logFileName"),
       LOG_LEVEL((short)2, "logLevel");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -14619,11 +14618,11 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.LOG_FILE_NAME, new org.apache.thrift.meta_data.FieldMetaData("logFileName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.LOG_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("logLevel", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.LOG_FILE_NAME, new org.apache.thrift.meta_data.FieldMetaData("logFileName", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.LOG_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("logLevel", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setLogConfig_args.class, metaDataMap);
     }
@@ -14632,8 +14631,8 @@ public class BgpConfigurator {
     }
 
     public setLogConfig_args(
-      String logFileName,
-      String logLevel)
+            String logFileName,
+            String logLevel)
     {
       this();
       this.logFileName = logFileName;
@@ -14712,32 +14711,32 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case LOG_FILE_NAME:
-        if (value == null) {
-          unsetLogFileName();
-        } else {
-          setLogFileName((String)value);
-        }
-        break;
+        case LOG_FILE_NAME:
+          if (value == null) {
+            unsetLogFileName();
+          } else {
+            setLogFileName((String)value);
+          }
+          break;
 
-      case LOG_LEVEL:
-        if (value == null) {
-          unsetLogLevel();
-        } else {
-          setLogLevel((String)value);
-        }
-        break;
+        case LOG_LEVEL:
+          if (value == null) {
+            unsetLogLevel();
+          } else {
+            setLogLevel((String)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case LOG_FILE_NAME:
-        return getLogFileName();
+        case LOG_FILE_NAME:
+          return getLogFileName();
 
-      case LOG_LEVEL:
-        return getLogLevel();
+        case LOG_LEVEL:
+          return getLogLevel();
 
       }
       throw new IllegalStateException();
@@ -14750,10 +14749,10 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case LOG_FILE_NAME:
-        return isSetLogFileName();
-      case LOG_LEVEL:
-        return isSetLogLevel();
+        case LOG_FILE_NAME:
+          return isSetLogFileName();
+        case LOG_LEVEL:
+          return isSetLogLevel();
       }
       throw new IllegalStateException();
     }
@@ -14899,7 +14898,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -14907,7 +14906,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.logFileName = iprot.readString();
                 struct.setLogFileNameIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -14915,7 +14914,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.logLevel = iprot.readString();
                 struct.setLogLevelIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -14999,7 +14998,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new setLogConfig_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new setLogConfig_resultTupleSchemeFactory());
@@ -15011,7 +15010,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -15070,9 +15069,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setLogConfig_result.class, metaDataMap);
     }
@@ -15081,7 +15080,7 @@ public class BgpConfigurator {
     }
 
     public setLogConfig_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -15131,21 +15130,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -15158,8 +15157,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -15225,7 +15224,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -15276,7 +15275,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -15284,7 +15283,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -15353,7 +15352,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField STALEPATH_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("stalepathTime", org.apache.thrift.protocol.TType.I32, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new enableGracefulRestart_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new enableGracefulRestart_argsTupleSchemeFactory());
@@ -15365,7 +15364,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       STALEPATH_TIME((short)1, "stalepathTime");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -15424,9 +15423,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.STALEPATH_TIME, new org.apache.thrift.meta_data.FieldMetaData("stalepathTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.STALEPATH_TIME, new org.apache.thrift.meta_data.FieldMetaData("stalepathTime", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(enableGracefulRestart_args.class, metaDataMap);
     }
@@ -15435,7 +15434,7 @@ public class BgpConfigurator {
     }
 
     public enableGracefulRestart_args(
-      int stalepathTime)
+            int stalepathTime)
     {
       this();
       this.stalepathTime = stalepathTime;
@@ -15485,21 +15484,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case STALEPATH_TIME:
-        if (value == null) {
-          unsetStalepathTime();
-        } else {
-          setStalepathTime((Integer)value);
-        }
-        break;
+        case STALEPATH_TIME:
+          if (value == null) {
+            unsetStalepathTime();
+          } else {
+            setStalepathTime((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case STALEPATH_TIME:
-        return Integer.valueOf(getStalepathTime());
+        case STALEPATH_TIME:
+          return Integer.valueOf(getStalepathTime());
 
       }
       throw new IllegalStateException();
@@ -15512,8 +15511,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case STALEPATH_TIME:
-        return isSetStalepathTime();
+        case STALEPATH_TIME:
+          return isSetStalepathTime();
       }
       throw new IllegalStateException();
     }
@@ -15630,7 +15629,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -15638,7 +15637,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.stalepathTime = iprot.readI32();
                 struct.setStalepathTimeIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -15705,7 +15704,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new enableGracefulRestart_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new enableGracefulRestart_resultTupleSchemeFactory());
@@ -15717,7 +15716,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -15776,9 +15775,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(enableGracefulRestart_result.class, metaDataMap);
     }
@@ -15787,7 +15786,7 @@ public class BgpConfigurator {
     }
 
     public enableGracefulRestart_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -15837,21 +15836,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -15864,8 +15863,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -15931,7 +15930,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -15982,7 +15981,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -15990,7 +15989,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -16058,7 +16057,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("disableGracefulRestart_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new disableGracefulRestart_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new disableGracefulRestart_argsTupleSchemeFactory());
@@ -16067,9 +16066,9 @@ public class BgpConfigurator {
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+      ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -16122,7 +16121,7 @@ public class BgpConfigurator {
     }
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(disableGracefulRestart_args.class, metaDataMap);
     }
@@ -16254,7 +16253,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -16305,7 +16304,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new disableGracefulRestart_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new disableGracefulRestart_resultTupleSchemeFactory());
@@ -16317,7 +16316,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -16376,9 +16375,9 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(disableGracefulRestart_result.class, metaDataMap);
     }
@@ -16387,7 +16386,7 @@ public class BgpConfigurator {
     }
 
     public disableGracefulRestart_result(
-      int success)
+            int success)
     {
       this();
       this.success = success;
@@ -16437,21 +16436,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Integer)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        case SUCCESS:
+          return Integer.valueOf(getSuccess());
 
       }
       throw new IllegalStateException();
@@ -16464,8 +16463,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -16531,7 +16530,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -16582,7 +16581,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -16590,7 +16589,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.success = iprot.readI32();
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -16660,7 +16659,7 @@ public class BgpConfigurator {
     private static final org.apache.thrift.protocol.TField OPTYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("optype", org.apache.thrift.protocol.TType.I32, (short)1);
     private static final org.apache.thrift.protocol.TField WIN_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("winSize", org.apache.thrift.protocol.TType.I32, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new getRoutes_argsStandardSchemeFactory());
       schemes.put(TupleScheme.class, new getRoutes_argsTupleSchemeFactory());
@@ -16674,7 +16673,7 @@ public class BgpConfigurator {
       OPTYPE((short)1, "optype"),
       WIN_SIZE((short)2, "winSize");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -16736,11 +16735,11 @@ public class BgpConfigurator {
     private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.OPTYPE, new org.apache.thrift.meta_data.FieldMetaData("optype", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      tmpMap.put(_Fields.WIN_SIZE, new org.apache.thrift.meta_data.FieldMetaData("winSize", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.OPTYPE, new org.apache.thrift.meta_data.FieldMetaData("optype", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      tmpMap.put(_Fields.WIN_SIZE, new org.apache.thrift.meta_data.FieldMetaData("winSize", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRoutes_args.class, metaDataMap);
     }
@@ -16749,8 +16748,8 @@ public class BgpConfigurator {
     }
 
     public getRoutes_args(
-      int optype,
-      int winSize)
+            int optype,
+            int winSize)
     {
       this();
       this.optype = optype;
@@ -16828,32 +16827,32 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case OPTYPE:
-        if (value == null) {
-          unsetOptype();
-        } else {
-          setOptype((Integer)value);
-        }
-        break;
+        case OPTYPE:
+          if (value == null) {
+            unsetOptype();
+          } else {
+            setOptype((Integer)value);
+          }
+          break;
 
-      case WIN_SIZE:
-        if (value == null) {
-          unsetWinSize();
-        } else {
-          setWinSize((Integer)value);
-        }
-        break;
+        case WIN_SIZE:
+          if (value == null) {
+            unsetWinSize();
+          } else {
+            setWinSize((Integer)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case OPTYPE:
-        return Integer.valueOf(getOptype());
+        case OPTYPE:
+          return Integer.valueOf(getOptype());
 
-      case WIN_SIZE:
-        return Integer.valueOf(getWinSize());
+        case WIN_SIZE:
+          return Integer.valueOf(getWinSize());
 
       }
       throw new IllegalStateException();
@@ -16866,10 +16865,10 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case OPTYPE:
-        return isSetOptype();
-      case WIN_SIZE:
-        return isSetWinSize();
+        case OPTYPE:
+          return isSetOptype();
+        case WIN_SIZE:
+          return isSetWinSize();
       }
       throw new IllegalStateException();
     }
@@ -17009,7 +17008,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -17017,7 +17016,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.optype = iprot.readI32();
                 struct.setOptypeIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -17025,7 +17024,7 @@ public class BgpConfigurator {
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.winSize = iprot.readI32();
                 struct.setWinSizeIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -17105,7 +17104,7 @@ public class BgpConfigurator {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<>();
     static {
       schemes.put(StandardScheme.class, new getRoutes_resultStandardSchemeFactory());
       schemes.put(TupleScheme.class, new getRoutes_resultTupleSchemeFactory());
@@ -17117,7 +17116,7 @@ public class BgpConfigurator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final Map<String, _Fields> byName = new HashMap<>();
 
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
@@ -17174,9 +17173,9 @@ public class BgpConfigurator {
     // isset id assignments
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Routes.class)));
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Routes.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRoutes_result.class, metaDataMap);
     }
@@ -17185,7 +17184,7 @@ public class BgpConfigurator {
     }
 
     public getRoutes_result(
-      Routes success)
+            Routes success)
     {
       this();
       this.success = success;
@@ -17235,21 +17234,21 @@ public class BgpConfigurator {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((Routes)value);
-        }
-        break;
+        case SUCCESS:
+          if (value == null) {
+            unsetSuccess();
+          } else {
+            setSuccess((Routes)value);
+          }
+          break;
 
       }
     }
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return getSuccess();
+        case SUCCESS:
+          return getSuccess();
 
       }
       throw new IllegalStateException();
@@ -17262,8 +17261,8 @@ public class BgpConfigurator {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
+        case SUCCESS:
+          return isSetSuccess();
       }
       throw new IllegalStateException();
     }
@@ -17329,7 +17328,7 @@ public class BgpConfigurator {
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-      }
+    }
 
     @Override
     public String toString() {
@@ -17385,7 +17384,7 @@ public class BgpConfigurator {
         while (true)
         {
           schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
             break;
           }
           switch (schemeField.id) {
@@ -17394,7 +17393,7 @@ public class BgpConfigurator {
                 struct.success = new Routes();
                 struct.success.read(iprot);
                 struct.setSuccessIsSet(true);
-              } else { 
+              } else {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
@@ -17459,4 +17458,4 @@ public class BgpConfigurator {
 
   }
 
-}
+}
\ No newline at end of file