WebSVN – SmartDukaan – Diff – //trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

     public Map<Long,String> getServiceProviders(RechargeType rechargeType, boolean onlyActive) throws org.apache.thrift.TException;
     public DeviceNumberInfo getServiceProviderForDevice(RechargeType rechargeType, String deviceNumber) throws org.apache.thrift.TException;
-    public String validateRecharge(RechargeType rechargeType, String deviceNumber, String circleCode, long userSelectedProviderId) throws org.apache.thrift.TException;
+    public String validateRecharge(RechargeType rechargeType, String deviceNumber, long userSelectedProviderId) throws org.apache.thrift.TException;
     public List<RechargeOrder> getRechargeOrdersForDevice(String deviceNumber) throws org.apache.thrift.TException;
     public void addAmountToWallet(long userId, long orderId, long amount) throws org.apache.thrift.TException;
     public void getServiceProviders(RechargeType rechargeType, boolean onlyActive, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getServiceProviders_call> resultHandler) throws org.apache.thrift.TException;
     public void getServiceProviderForDevice(RechargeType rechargeType, String deviceNumber, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getServiceProviderForDevice_call> resultHandler) throws org.apache.thrift.TException;
-    public void validateRecharge(RechargeType rechargeType, String deviceNumber, String circleCode, long userSelectedProviderId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.validateRecharge_call> resultHandler) throws org.apache.thrift.TException;
+    public void validateRecharge(RechargeType rechargeType, String deviceNumber, long userSelectedProviderId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.validateRecharge_call> resultHandler) throws org.apache.thrift.TException;
     public void getRechargeOrdersForDevice(String deviceNumber, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getRechargeOrdersForDevice_call> resultHandler) throws org.apache.thrift.TException;
     public void addAmountToWallet(long userId, long orderId, long amount, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.addAmountToWallet_call> resultHandler) throws org.apache.thrift.TException;
         return result.success;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getServiceProviderForDevice failed: unknown result");
+    }
-    public String validateRecharge(RechargeType rechargeType, String deviceNumber, String circleCode, long userSelectedProviderId) throws org.apache.thrift.TException
+    public String validateRecharge(RechargeType rechargeType, String deviceNumber, long userSelectedProviderId) throws org.apache.thrift.TException
+    {
-      send_validateRecharge(rechargeType, deviceNumber, circleCode, userSelectedProviderId);
+      send_validateRecharge(rechargeType, deviceNumber, userSelectedProviderId);
       return recv_validateRecharge();
+    }
-    public void send_validateRecharge(RechargeType rechargeType, String deviceNumber, String circleCode, long userSelectedProviderId) throws org.apache.thrift.TException
+    public void send_validateRecharge(RechargeType rechargeType, String deviceNumber, long userSelectedProviderId) throws org.apache.thrift.TException
+    {
       validateRecharge_args args = new validateRecharge_args();
       args.setRechargeType(rechargeType);
       args.setDeviceNumber(deviceNumber);
-      args.setCircleCode(circleCode);
       args.setUserSelectedProviderId(userSelectedProviderId);
       sendBase("validateRecharge", args);
+    }
     public String recv_validateRecharge() throws org.apache.thrift.TException
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return (new Client(prot)).recv_getServiceProviderForDevice();
+      }
+    }
-    public void validateRecharge(RechargeType rechargeType, String deviceNumber, String circleCode, long userSelectedProviderId, org.apache.thrift.async.AsyncMethodCallback<validateRecharge_call> resultHandler) throws org.apache.thrift.TException {
+    public void validateRecharge(RechargeType rechargeType, String deviceNumber, long userSelectedProviderId, org.apache.thrift.async.AsyncMethodCallback<validateRecharge_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      validateRecharge_call method_call = new validateRecharge_call(rechargeType, deviceNumber, circleCode, userSelectedProviderId, resultHandler, this, ___protocolFactory, ___transport);
+      validateRecharge_call method_call = new validateRecharge_call(rechargeType, deviceNumber, userSelectedProviderId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
+    }
     public static class validateRecharge_call extends org.apache.thrift.async.TAsyncMethodCall {
       private RechargeType rechargeType;
       private String deviceNumber;
-      private String circleCode;
       private long userSelectedProviderId;
-      public validateRecharge_call(RechargeType rechargeType, String deviceNumber, String circleCode, long userSelectedProviderId, org.apache.thrift.async.AsyncMethodCallback<validateRecharge_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public validateRecharge_call(RechargeType rechargeType, String deviceNumber, long userSelectedProviderId, org.apache.thrift.async.AsyncMethodCallback<validateRecharge_call> 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.rechargeType = rechargeType;
         this.deviceNumber = deviceNumber;
-        this.circleCode = circleCode;
         this.userSelectedProviderId = userSelectedProviderId;
+      }
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("validateRecharge", org.apache.thrift.protocol.TMessageType.CALL, 0));
         validateRecharge_args args = new validateRecharge_args();
         args.setRechargeType(rechargeType);
         args.setDeviceNumber(deviceNumber);
-        args.setCircleCode(circleCode);
         args.setUserSelectedProviderId(userSelectedProviderId);
         args.write(prot);
         prot.writeMessageEnd();
+      }
         return new validateRecharge_args();
+      }
       protected validateRecharge_result getResult(I iface, validateRecharge_args args) throws org.apache.thrift.TException {
         validateRecharge_result result = new validateRecharge_result();
-        result.success = iface.validateRecharge(args.rechargeType, args.deviceNumber, args.circleCode, args.userSelectedProviderId);
+        result.success = iface.validateRecharge(args.rechargeType, args.deviceNumber, args.userSelectedProviderId);
         return result;
+      }
+    }
     private static class getRechargeOrdersForDevice<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getRechargeOrdersForDevice_args> {
   public static class validateRecharge_args implements org.apache.thrift.TBase<validateRecharge_args, validateRecharge_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("validateRecharge_args");
     private static final org.apache.thrift.protocol.TField RECHARGE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("rechargeType", org.apache.thrift.protocol.TType.I32, (short)1);
     private static final org.apache.thrift.protocol.TField DEVICE_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("deviceNumber", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField CIRCLE_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("circleCode", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField USER_SELECTED_PROVIDER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userSelectedProviderId", org.apache.thrift.protocol.TType.I64, (short)4);
+    private static final org.apache.thrift.protocol.TField USER_SELECTED_PROVIDER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userSelectedProviderId", org.apache.thrift.protocol.TType.I64, (short)3);
     private RechargeType rechargeType; // required
     private String deviceNumber; // required
-    private String circleCode; // required
     private long userSelectedProviderId; // 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 {
       /**
+       *
        * @see RechargeType
        */
       RECHARGE_TYPE((short)1, "rechargeType"),
       DEVICE_NUMBER((short)2, "deviceNumber"),
-      CIRCLE_CODE((short)3, "circleCode"),
-      USER_SELECTED_PROVIDER_ID((short)4, "userSelectedProviderId");
+      USER_SELECTED_PROVIDER_ID((short)3, "userSelectedProviderId");
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
       static {
         for (_Fields field : EnumSet.allOf(_Fields.class)) {
         switch(fieldId) {
           case 1: // RECHARGE_TYPE
             return RECHARGE_TYPE;
           case 2: // DEVICE_NUMBER
             return DEVICE_NUMBER;
-          case 3: // CIRCLE_CODE
-            return CIRCLE_CODE;
-          case 4: // USER_SELECTED_PROVIDER_ID
+          case 3: // USER_SELECTED_PROVIDER_ID
             return USER_SELECTED_PROVIDER_ID;
           default:
             return null;
+        }
+      }
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.RECHARGE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("rechargeType", org.apache.thrift.TFieldRequirementType.DEFAULT,
           new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, RechargeType.class)));
       tmpMap.put(_Fields.DEVICE_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("deviceNumber", org.apache.thrift.TFieldRequirementType.DEFAULT,
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.CIRCLE_CODE, new org.apache.thrift.meta_data.FieldMetaData("circleCode", org.apache.thrift.TFieldRequirementType.DEFAULT,
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.USER_SELECTED_PROVIDER_ID, new org.apache.thrift.meta_data.FieldMetaData("userSelectedProviderId", 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(validateRecharge_args.class, metaDataMap);
+    }
+    }
     public validateRecharge_args(
       RechargeType rechargeType,
       String deviceNumber,
-      String circleCode,
       long userSelectedProviderId)
+    {
       this();
       this.rechargeType = rechargeType;
       this.deviceNumber = deviceNumber;
-      this.circleCode = circleCode;
       this.userSelectedProviderId = userSelectedProviderId;
       setUserSelectedProviderIdIsSet(true);
+    }
     /**
         this.rechargeType = other.rechargeType;
+      }
       if (other.isSetDeviceNumber()) {
         this.deviceNumber = other.deviceNumber;
+      }
-      if (other.isSetCircleCode()) {
-        this.circleCode = other.circleCode;
-      }
       this.userSelectedProviderId = other.userSelectedProviderId;
+    }
     public validateRecharge_args deepCopy() {
       return new validateRecharge_args(this);
     @Override
     public void clear() {
       this.rechargeType = null;
       this.deviceNumber = null;
-      this.circleCode = null;
       setUserSelectedProviderIdIsSet(false);
       this.userSelectedProviderId = 0;
+    }
     /**
       if (!value) {
         this.deviceNumber = null;
+      }
+    }
-    public String getCircleCode() {
-      return this.circleCode;
-    }
-    public void setCircleCode(String circleCode) {
-      this.circleCode = circleCode;
-    }
-    public void unsetCircleCode() {
-      this.circleCode = null;
-    }
-    /** Returns true if field circleCode is set (has been assigned a value) and false otherwise */
-    public boolean isSetCircleCode() {
-      return this.circleCode != null;
-    }
-    public void setCircleCodeIsSet(boolean value) {
-      if (!value) {
-        this.circleCode = null;
-      }
-    }
     public long getUserSelectedProviderId() {
       return this.userSelectedProviderId;
+    }
     public void setUserSelectedProviderId(long userSelectedProviderId) {
         } else {
           setDeviceNumber((String)value);
+        }
         break;
-      case CIRCLE_CODE:
-        if (value == null) {
-          unsetCircleCode();
-        } else {
-          setCircleCode((String)value);
-        }
-        break;
       case USER_SELECTED_PROVIDER_ID:
         if (value == null) {
           unsetUserSelectedProviderId();
         } else {
           setUserSelectedProviderId((Long)value);
         return getRechargeType();
       case DEVICE_NUMBER:
         return getDeviceNumber();
-      case CIRCLE_CODE:
-        return getCircleCode();
       case USER_SELECTED_PROVIDER_ID:
         return Long.valueOf(getUserSelectedProviderId());
+      }
       throw new IllegalStateException();
       switch (field) {
       case RECHARGE_TYPE:
         return isSetRechargeType();
       case DEVICE_NUMBER:
         return isSetDeviceNumber();
-      case CIRCLE_CODE:
-        return isSetCircleCode();
       case USER_SELECTED_PROVIDER_ID:
         return isSetUserSelectedProviderId();
+      }
       throw new IllegalStateException();
+    }
           return false;
         if (!this.deviceNumber.equals(that.deviceNumber))
           return false;
+      }
-      boolean this_present_circleCode = true && this.isSetCircleCode();
-      boolean that_present_circleCode = true && that.isSetCircleCode();
-      if (this_present_circleCode || that_present_circleCode) {
-        if (!(this_present_circleCode && that_present_circleCode))
-          return false;
-        if (!this.circleCode.equals(that.circleCode))
-          return false;
-      }
       boolean this_present_userSelectedProviderId = true;
       boolean that_present_userSelectedProviderId = true;
       if (this_present_userSelectedProviderId || that_present_userSelectedProviderId) {
         if (!(this_present_userSelectedProviderId && that_present_userSelectedProviderId))
           return false;
         lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deviceNumber, typedOther.deviceNumber);
         if (lastComparison != 0) {
           return lastComparison;
+        }
+      }
-      lastComparison = Boolean.valueOf(isSetCircleCode()).compareTo(typedOther.isSetCircleCode());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetCircleCode()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.circleCode, typedOther.circleCode);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = Boolean.valueOf(isSetUserSelectedProviderId()).compareTo(typedOther.isSetUserSelectedProviderId());
       if (lastComparison != 0) {
         return lastComparison;
+      }
       if (isSetUserSelectedProviderId()) {
               this.deviceNumber = iprot.readString();
             } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
             break;
-          case 3: // CIRCLE_CODE
-            if (field.type == org.apache.thrift.protocol.TType.STRING) {
-              this.circleCode = iprot.readString();
-            } else {
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 4: // USER_SELECTED_PROVIDER_ID
+          case 3: // USER_SELECTED_PROVIDER_ID
             if (field.type == org.apache.thrift.protocol.TType.I64) {
               this.userSelectedProviderId = iprot.readI64();
               setUserSelectedProviderIdIsSet(true);
             } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       if (this.deviceNumber != null) {
         oprot.writeFieldBegin(DEVICE_NUMBER_FIELD_DESC);
         oprot.writeString(this.deviceNumber);
         oprot.writeFieldEnd();
+      }
-      if (this.circleCode != null) {
-        oprot.writeFieldBegin(CIRCLE_CODE_FIELD_DESC);
-        oprot.writeString(this.circleCode);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldBegin(USER_SELECTED_PROVIDER_ID_FIELD_DESC);
       oprot.writeI64(this.userSelectedProviderId);
       oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
       } else {
         sb.append(this.deviceNumber);
+      }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("circleCode:");
-      if (this.circleCode == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.circleCode);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("userSelectedProviderId:");
       sb.append(this.userSelectedProviderId);
       first = false;
       sb.append(")");
       return sb.toString();

Subversion Repositories SmartDukaan

(root)//trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java – Rev 6319 → 6336