extract constant

hwlsniper · Mar 6, 2019 · 368107b · 368107b
1 parent 5649795
commit 368107b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
  <groupId>com.baidu</groupId>
  <artifactId>jprotobuf</artifactId>
- <version>1.11.7</version> 
+ <version>1.11.8-SNAPSHOT</version> 
 
  <name>Jprotobuf</name>
  <description>A very useful utility library for java programmer using google protobuf.</description>

diff --git a/src/main/java/com/baidu/bjf/remoting/protobuf/code/CodedConstant.java b/src/main/java/com/baidu/bjf/remoting/protobuf/code/CodedConstant.java
@@ -67,14 +67,17 @@
  */
 public class CodedConstant {
 
+ /** The Constant FIELD_PREFIX. */
+ private static final String FIELD_PREFIX = "f_";
+
  /**
  * get field name.
  *
  * @param order field order
  * @return field name
  */
  public static String getFieldName(int order) {
- String fieldName = "f_" + order;
+ String fieldName = FIELD_PREFIX + order;
  return fieldName;
  }
 

diff --git a/src/test/java/com/baidu/bjf/remoting/protobuf/enumeration/EnumAttrPOJO.java b/src/test/java/com/baidu/bjf/remoting/protobuf/enumeration/EnumAttrPOJO.java
@@ -15,6 +15,9 @@
  */
 package com.baidu.bjf.remoting.protobuf.enumeration;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.baidu.bjf.remoting.protobuf.EnumReadable;
 
 /**
@@ -60,7 +63,16 @@ public int value() {
  }
 
  public static void main(String[] args) {
- EnumAttrPOJO valueOf = Enum.valueOf(EnumAttrPOJO.class, EnumAttrPOJO.values()[0].name());
- System.out.println(valueOf);
+
+ List<String> list = new ArrayList();
+ list.add("1");
+ list.add("2");
+ list.add("3");
+ list.add("1");
+
+ for (String string : list) {
+ list.remove(string);
+ System.out.println(list);
+ }
  }
 }
diff --git a/v3/pom.xml b/v3/pom.xml
@@ -108,7 +108,7 @@
  <plugin>
  <groupId>com.baidu</groupId>
  <artifactId>jprotobuf-precompile-plugin</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
  <configuration>
  <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
  <filterClassPackage>com.baidu</filterClassPackage>

diff --git a/v3/src/main/java/com/baidu/bjf/remoting/protobuf/code/CodedConstant.java b/v3/src/main/java/com/baidu/bjf/remoting/protobuf/code/CodedConstant.java
@@ -83,6 +83,8 @@
  */
 public class CodedConstant {
 
+ private static final String FIELD_PREFIX = "f_";
+
  /** The Constant MAP_ENTRY_SUFFIX. */
  private static final String MAP_ENTRY_SUFFIX = "Entry";
 
@@ -100,7 +102,7 @@ public class CodedConstant {
  * @return field name
  */
  public static String getFieldName(int order) {
- String fieldName = "f_" + order;
+ String fieldName = FIELD_PREFIX + order;
  return fieldName;
  }
 

diff --git a/v3/src/main/java/com/baidu/bjf/remoting/protobuf/code/TemplateCodeGenerator.java b/v3/src/main/java/com/baidu/bjf/remoting/protobuf/code/TemplateCodeGenerator.java
@@ -97,7 +97,7 @@ public String getCode() {
  if (!StringUtils.isEmpty(pkg)) {
  pkg = "package " + pkg + ";";
  }
- 
+
  // set package
  templator.setVariable("package", pkg);
 
@@ -268,7 +268,7 @@ protected void initDecodeMethodTemplateVariable() {
  } else if (field.isMap()) {
 
  String getMapCommand = getMapCommand(field);
- 
+
  if (field.isEnumValueType()) {
  String enumClassName = field.getGenericeValueType().getCanonicalName();
  code.append("EnumHandler<").append(enumClassName).append("> handler");
@@ -277,13 +277,14 @@ protected void initDecodeMethodTemplateVariable() {
  code.append(ClassCode.LINE_BREAK);
  code.append("public ").append(enumClassName).append(" handle(int value) {");
  code.append(ClassCode.LINE_BREAK);
- code.append("String enumName = CodedConstant.getEnumName(").append(enumClassName).append(".values(), value)");
+ code.append("String enumName = CodedConstant.getEnumName(").append(enumClassName)
+ .append(".values(), value)");
  code.append(ClassCode.JAVA_LINE_BREAK);
  code.append("return ").append(enumClassName).append(".valueOf(enumName)");
  code.append(ClassCode.JAVA_LINE_BREAK);
  code.append("}}");
  code.append(ClassCode.JAVA_LINE_BREAK);
- 
+
  }
  objectDecodeExpress = code.toString();
  code.setLength(0);
@@ -343,27 +344,26 @@ protected void initDecodeMethodTemplateVariable() {
  } else {
  templator.setVariable("deocdeCheckNull", "");
  }
- 
+
  String objectPackedDecodeExpress = "";
  // read packed type
  if (isList) {
  FieldType fieldType = field.getFieldType();
  if (fieldType.isPrimitive() || fieldType.isEnum()) {
- code.append("if (tag == ").append(CodedConstant.makeTag(field.getOrder(),
- WireFormat.WIRETYPE_LENGTH_DELIMITED));
+ code.append("if (tag == ")
+ .append(CodedConstant.makeTag(field.getOrder(), WireFormat.WIRETYPE_LENGTH_DELIMITED));
  code.append(") {").append(ClassCode.LINE_BREAK);
-
-
+
  code.append("int length = input.readRawVarint32()").append(ClassCode.JAVA_LINE_BREAK);
  code.append("int limit = input.pushLimit(length)").append(ClassCode.JAVA_LINE_BREAK);
- 
+
  code.append(getSetToField("ret", field.getField(), cls, express, isList, field.isMap(), true));
- 
+
  code.append("input.popLimit(limit)").append(ClassCode.JAVA_LINE_BREAK);
- 
+
  code.append("continue").append(ClassCode.JAVA_LINE_BREAK);
  code.append("}").append(ClassCode.LINE_BREAK);
- 
+
  objectPackedDecodeExpress = code.toString();
  }
  }
@@ -374,7 +374,7 @@ protected void initDecodeMethodTemplateVariable() {
  templator.addBlock("decodeFields");
  }
  }
- 
+
  /**
  * @param field
  * @return