丁云鹏 1 gadu atpakaļ
vecāks
revīzija
8ec9645f2b

+ 16 - 97
abtest-client/src/main/java/com/tzld/piaoquan/abtest/client/model/GetGroupResponse.java

@@ -61,12 +61,7 @@ private static final long serialVersionUID = 0L;
 
             break;
           }
-          case 16: {
-
-            date_ = input.readInt64();
-            break;
-          }
-          case 42: {
+          case 18: {
             com.tzld.piaoquan.abtest.client.model.GroupInfoProto.Builder subBuilder = null;
             if (groupInfo_ != null) {
               subBuilder = groupInfo_.toBuilder();
@@ -137,25 +132,10 @@ private static final long serialVersionUID = 0L;
     return getResult();
   }
 
-  public static final int DATE_FIELD_NUMBER = 2;
-  private long date_;
-  /**
-   * <pre>
-   * 分组生成时间
-   * </pre>
-   *
-   * <code>int64 date = 2;</code>
-   * @return The date.
-   */
-  @java.lang.Override
-  public long getDate() {
-    return date_;
-  }
-
-  public static final int GROUP_INFO_FIELD_NUMBER = 5;
+  public static final int GROUP_INFO_FIELD_NUMBER = 2;
   private com.tzld.piaoquan.abtest.client.model.GroupInfoProto groupInfo_;
   /**
-   * <code>.GroupInfoProto group_info = 5;</code>
+   * <code>.GroupInfoProto group_info = 2;</code>
    * @return Whether the groupInfo field is set.
    */
   @java.lang.Override
@@ -163,7 +143,7 @@ private static final long serialVersionUID = 0L;
     return groupInfo_ != null;
   }
   /**
-   * <code>.GroupInfoProto group_info = 5;</code>
+   * <code>.GroupInfoProto group_info = 2;</code>
    * @return The groupInfo.
    */
   @java.lang.Override
@@ -171,7 +151,7 @@ private static final long serialVersionUID = 0L;
     return groupInfo_ == null ? com.tzld.piaoquan.abtest.client.model.GroupInfoProto.getDefaultInstance() : groupInfo_;
   }
   /**
-   * <code>.GroupInfoProto group_info = 5;</code>
+   * <code>.GroupInfoProto group_info = 2;</code>
    */
   @java.lang.Override
   public com.tzld.piaoquan.abtest.client.model.GroupInfoProtoOrBuilder getGroupInfoOrBuilder() {
@@ -195,11 +175,8 @@ private static final long serialVersionUID = 0L;
     if (result_ != null) {
       output.writeMessage(1, getResult());
     }
-    if (date_ != 0L) {
-      output.writeInt64(2, date_);
-    }
     if (groupInfo_ != null) {
-      output.writeMessage(5, getGroupInfo());
+      output.writeMessage(2, getGroupInfo());
     }
     unknownFields.writeTo(output);
   }
@@ -214,13 +191,9 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getResult());
     }
-    if (date_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(2, date_);
-    }
     if (groupInfo_ != null) {
       size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, getGroupInfo());
+        .computeMessageSize(2, getGroupInfo());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -242,8 +215,6 @@ private static final long serialVersionUID = 0L;
       if (!getResult()
           .equals(other.getResult())) return false;
     }
-    if (getDate()
-        != other.getDate()) return false;
     if (hasGroupInfo() != other.hasGroupInfo()) return false;
     if (hasGroupInfo()) {
       if (!getGroupInfo()
@@ -264,9 +235,6 @@ private static final long serialVersionUID = 0L;
       hash = (37 * hash) + RESULT_FIELD_NUMBER;
       hash = (53 * hash) + getResult().hashCode();
     }
-    hash = (37 * hash) + DATE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getDate());
     if (hasGroupInfo()) {
       hash = (37 * hash) + GROUP_INFO_FIELD_NUMBER;
       hash = (53 * hash) + getGroupInfo().hashCode();
@@ -410,8 +378,6 @@ private static final long serialVersionUID = 0L;
         result_ = null;
         resultBuilder_ = null;
       }
-      date_ = 0L;
-
       if (groupInfoBuilder_ == null) {
         groupInfo_ = null;
       } else {
@@ -449,7 +415,6 @@ private static final long serialVersionUID = 0L;
       } else {
         result.result_ = resultBuilder_.build();
       }
-      result.date_ = date_;
       if (groupInfoBuilder_ == null) {
         result.groupInfo_ = groupInfo_;
       } else {
@@ -506,9 +471,6 @@ private static final long serialVersionUID = 0L;
       if (other.hasResult()) {
         mergeResult(other.getResult());
       }
-      if (other.getDate() != 0L) {
-        setDate(other.getDate());
-      }
       if (other.hasGroupInfo()) {
         mergeGroupInfo(other.getGroupInfo());
       }
@@ -660,61 +622,18 @@ private static final long serialVersionUID = 0L;
       return resultBuilder_;
     }
 
-    private long date_ ;
-    /**
-     * <pre>
-     * 分组生成时间
-     * </pre>
-     *
-     * <code>int64 date = 2;</code>
-     * @return The date.
-     */
-    @java.lang.Override
-    public long getDate() {
-      return date_;
-    }
-    /**
-     * <pre>
-     * 分组生成时间
-     * </pre>
-     *
-     * <code>int64 date = 2;</code>
-     * @param value The date to set.
-     * @return This builder for chaining.
-     */
-    public Builder setDate(long value) {
-      
-      date_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * 分组生成时间
-     * </pre>
-     *
-     * <code>int64 date = 2;</code>
-     * @return This builder for chaining.
-     */
-    public Builder clearDate() {
-      
-      date_ = 0L;
-      onChanged();
-      return this;
-    }
-
     private com.tzld.piaoquan.abtest.client.model.GroupInfoProto groupInfo_;
     private com.google.protobuf.SingleFieldBuilderV3<
         com.tzld.piaoquan.abtest.client.model.GroupInfoProto, com.tzld.piaoquan.abtest.client.model.GroupInfoProto.Builder, com.tzld.piaoquan.abtest.client.model.GroupInfoProtoOrBuilder> groupInfoBuilder_;
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      * @return Whether the groupInfo field is set.
      */
     public boolean hasGroupInfo() {
       return groupInfoBuilder_ != null || groupInfo_ != null;
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      * @return The groupInfo.
      */
     public com.tzld.piaoquan.abtest.client.model.GroupInfoProto getGroupInfo() {
@@ -725,7 +644,7 @@ private static final long serialVersionUID = 0L;
       }
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      */
     public Builder setGroupInfo(com.tzld.piaoquan.abtest.client.model.GroupInfoProto value) {
       if (groupInfoBuilder_ == null) {
@@ -741,7 +660,7 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      */
     public Builder setGroupInfo(
         com.tzld.piaoquan.abtest.client.model.GroupInfoProto.Builder builderForValue) {
@@ -755,7 +674,7 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      */
     public Builder mergeGroupInfo(com.tzld.piaoquan.abtest.client.model.GroupInfoProto value) {
       if (groupInfoBuilder_ == null) {
@@ -773,7 +692,7 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      */
     public Builder clearGroupInfo() {
       if (groupInfoBuilder_ == null) {
@@ -787,7 +706,7 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      */
     public com.tzld.piaoquan.abtest.client.model.GroupInfoProto.Builder getGroupInfoBuilder() {
       
@@ -795,7 +714,7 @@ private static final long serialVersionUID = 0L;
       return getGroupInfoFieldBuilder().getBuilder();
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      */
     public com.tzld.piaoquan.abtest.client.model.GroupInfoProtoOrBuilder getGroupInfoOrBuilder() {
       if (groupInfoBuilder_ != null) {
@@ -806,7 +725,7 @@ private static final long serialVersionUID = 0L;
       }
     }
     /**
-     * <code>.GroupInfoProto group_info = 5;</code>
+     * <code>.GroupInfoProto group_info = 2;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         com.tzld.piaoquan.abtest.client.model.GroupInfoProto, com.tzld.piaoquan.abtest.client.model.GroupInfoProto.Builder, com.tzld.piaoquan.abtest.client.model.GroupInfoProtoOrBuilder> 

+ 3 - 13
abtest-client/src/main/java/com/tzld/piaoquan/abtest/client/model/GetGroupResponseOrBuilder.java

@@ -23,27 +23,17 @@ public interface GetGroupResponseOrBuilder extends
   com.tzld.piaoquan.abtest.client.model.ResultOrBuilder getResultOrBuilder();
 
   /**
-   * <pre>
-   * 分组生成时间
-   * </pre>
-   *
-   * <code>int64 date = 2;</code>
-   * @return The date.
-   */
-  long getDate();
-
-  /**
-   * <code>.GroupInfoProto group_info = 5;</code>
+   * <code>.GroupInfoProto group_info = 2;</code>
    * @return Whether the groupInfo field is set.
    */
   boolean hasGroupInfo();
   /**
-   * <code>.GroupInfoProto group_info = 5;</code>
+   * <code>.GroupInfoProto group_info = 2;</code>
    * @return The groupInfo.
    */
   com.tzld.piaoquan.abtest.client.model.GroupInfoProto getGroupInfo();
   /**
-   * <code>.GroupInfoProto group_info = 5;</code>
+   * <code>.GroupInfoProto group_info = 2;</code>
    */
   com.tzld.piaoquan.abtest.client.model.GroupInfoProtoOrBuilder getGroupInfoOrBuilder();
 }

+ 7 - 7
abtest-client/src/main/java/com/tzld/piaoquan/abtest/client/model/Group.java

@@ -51,12 +51,12 @@ public final class Group {
       "\206\001\n\016GroupInfoProto\022\014\n\004date\030\001 \001(\003\022\r\n\005chai" +
       "n\030\002 \001(\t\022)\n\005group\030\003 \003(\0132\032.GroupInfoProto." +
       "GroupEntry\032,\n\nGroupEntry\022\013\n\003key\030\001 \001(\t\022\r\n" +
-      "\005value\030\002 \001(\005:\0028\001\"^\n\020GetGroupResponse\022\027\n\006" +
-      "result\030\001 \001(\0132\007.Result\022\014\n\004date\030\002 \001(\003\022#\n\ng" +
-      "roup_info\030\005 \001(\0132\017.GroupInfoProto2?\n\014Grou" +
-      "pService\022/\n\010getGroup\022\020.GetGroupRequest\032\021" +
-      ".GetGroupResponseB,\n%com.tzld.piaoquan.a" +
-      "btest.client.modelP\001\210\001\001b\006proto3"
+      "\005value\030\002 \001(\005:\0028\001\"P\n\020GetGroupResponse\022\027\n\006" +
+      "result\030\001 \001(\0132\007.Result\022#\n\ngroup_info\030\002 \001(" +
+      "\0132\017.GroupInfoProto2?\n\014GroupService\022/\n\010ge" +
+      "tGroup\022\020.GetGroupRequest\032\021.GetGroupRespo" +
+      "nseB,\n%com.tzld.piaoquan.abtest.client.m" +
+      "odelP\001\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -86,7 +86,7 @@ public final class Group {
     internal_static_GetGroupResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetGroupResponse_descriptor,
-        new java.lang.String[] { "Result", "Date", "GroupInfo", });
+        new java.lang.String[] { "Result", "GroupInfo", });
     com.tzld.piaoquan.abtest.client.model.Common.getDescriptor();
   }
 

+ 1 - 2
abtest-client/src/main/proto/com/tzld/piaoquan/abtest/group.proto

@@ -22,8 +22,7 @@ message GroupInfoProto {
 
 message GetGroupResponse {
   Result result = 1;
-  int64 date = 2; // 分组生成时间
-  GroupInfoProto group_info = 5;
+  GroupInfoProto group_info = 2;
 }
 
 service GroupService {