fix: lose common proto for java (#45)

java/src/main/java/io/greptime/v1/Columns.java

@@ -477,8 +477,6 @@ public final class Columns {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -1402,8 +1400,6 @@ public final class Columns {
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
-        } catch (com.google.protobuf.UninitializedMessageException e) {
-          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
           throw new com.google.protobuf.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
@@ -5893,8 +5889,6 @@ public final class Columns {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);

java/src/main/java/io/greptime/v1/Database.java

@@ -220,8 +220,6 @@ public final class Database {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -1082,9 +1080,8 @@ public final class Database {
         } else {
           if (requestCase_ == 2) {
             insertBuilder_.mergeFrom(value);
-          } else {
-            insertBuilder_.setMessage(value);
           }
+          insertBuilder_.setMessage(value);
         }
         requestCase_ = 2;
         return this;
@@ -1224,9 +1221,8 @@ public final class Database {
         } else {
           if (requestCase_ == 3) {
             queryBuilder_.mergeFrom(value);
-          } else {
-            queryBuilder_.setMessage(value);
           }
+          queryBuilder_.setMessage(value);
         }
         requestCase_ = 3;
         return this;
@@ -1366,9 +1362,8 @@ public final class Database {
         } else {
           if (requestCase_ == 4) {
             ddlBuilder_.mergeFrom(value);
-          } else {
-            ddlBuilder_.setMessage(value);
           }
+          ddlBuilder_.setMessage(value);
         }
         requestCase_ = 4;
         return this;
@@ -1508,9 +1503,8 @@ public final class Database {
         } else {
           if (requestCase_ == 5) {
             deleteBuilder_.mergeFrom(value);
-          } else {
-            deleteBuilder_.setMessage(value);
           }
+          deleteBuilder_.setMessage(value);
         }
         requestCase_ = 5;
         return this;
@@ -1747,8 +1741,6 @@ public final class Database {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -2432,9 +2424,8 @@ public final class Database {
         } else {
           if (responseCase_ == 2) {
             affectedRowsBuilder_.mergeFrom(value);
-          } else {
-            affectedRowsBuilder_.setMessage(value);
           }
+          affectedRowsBuilder_.setMessage(value);
         }
         responseCase_ = 2;
         return this;
@@ -2682,8 +2673,6 @@ public final class Database {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -3457,9 +3446,8 @@ public final class Database {
         } else {
           if (queryCase_ == 3) {
             promRangeQueryBuilder_.mergeFrom(value);
-          } else {
-            promRangeQueryBuilder_.setMessage(value);
           }
+          promRangeQueryBuilder_.setMessage(value);
         }
         queryCase_ = 3;
         return this;
@@ -3742,8 +3730,6 @@ public final class Database {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -4993,8 +4979,6 @@ public final class Database {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);

java/src/main/java/io/greptime/v1/Ddl.java

@@ -228,8 +228,6 @@ public final class Ddl {
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -981,9 +979,8 @@ public final class Ddl {
         } else {
           if (exprCase_ == 1) {
             createDatabaseBuilder_.mergeFrom(value);
-          } else {
-            createDatabaseBuilder_.setMessage(value);
           }
+          createDatabaseBuilder_.setMessage(value);
         }
         exprCase_ = 1;
         return this;
@@ -1123,9 +1120,8 @@ public final class Ddl {
         } else {
           if (exprCase_ == 2) {
             createTableBuilder_.mergeFrom(value);
-          } else {
-            createTableBuilder_.setMessage(value);
           }
+          createTableBuilder_.setMessage(value);
         }
         exprCase_ = 2;
         return this;
@@ -1265,9 +1261,8 @@ public final class Ddl {
         } else {
           if (exprCase_ == 3) {
             alterBuilder_.mergeFrom(value);
-          } else {
-            alterBuilder_.setMessage(value);
           }
+          alterBuilder_.setMessage(value);
         }
         exprCase_ = 3;
         return this;
@@ -1407,9 +1402,8 @@ public final class Ddl {
         } else {
           if (exprCase_ == 4) {
             dropTableBuilder_.mergeFrom(value);
-          } else {
-            dropTableBuilder_.setMessage(value);
           }
+          dropTableBuilder_.setMessage(value);
         }
         exprCase_ = 4;
         return this;
@@ -1549,9 +1543,8 @@ public final class Ddl {
         } else {
           if (exprCase_ == 5) {
             flushTableBuilder_.mergeFrom(value);
-          } else {
-            flushTableBuilder_.setMessage(value);
           }
+          flushTableBuilder_.setMessage(value);
         }
         exprCase_ = 5;
         return this;
@@ -1812,11 +1805,9 @@ public final class Ddl {
      * <code>map&lt;string, string&gt; table_options = 9;</code>
      */
 
-    /* nullable */
+    java.lang.String getTableOptionsOrDefault(
-java.lang.String getTableOptionsOrDefault(
         java.lang.String key,
-        /* nullable */
+        java.lang.String defaultValue);
-java.lang.String defaultValue);
     /**
      * <code>map&lt;string, string&gt; table_options = 9;</code>
      */
@@ -2040,8 +2031,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -4577,8 +4566,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -5598,9 +5585,8 @@ java.lang.String defaultValue);
         } else {
           if (kindCase_ == 4) {
             addColumnsBuilder_.mergeFrom(value);
-          } else {
-            addColumnsBuilder_.setMessage(value);
           }
+          addColumnsBuilder_.setMessage(value);
         }
         kindCase_ = 4;
         return this;
@@ -5740,9 +5726,8 @@ java.lang.String defaultValue);
         } else {
           if (kindCase_ == 5) {
             dropColumnsBuilder_.mergeFrom(value);
-          } else {
-            dropColumnsBuilder_.setMessage(value);
           }
+          dropColumnsBuilder_.setMessage(value);
         }
         kindCase_ = 5;
         return this;
@@ -5882,9 +5867,8 @@ java.lang.String defaultValue);
         } else {
           if (kindCase_ == 6) {
             renameTableBuilder_.mergeFrom(value);
-          } else {
-            renameTableBuilder_.setMessage(value);
           }
+          renameTableBuilder_.setMessage(value);
         }
         kindCase_ = 6;
         return this;
@@ -6119,8 +6103,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -7006,8 +6988,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -7945,8 +7925,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -8619,8 +8597,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -9414,8 +9390,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -10193,8 +10167,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -10811,8 +10783,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -10931,8 +10901,6 @@ java.lang.String defaultValue);
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
-        } catch (com.google.protobuf.UninitializedMessageException e) {
-          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
           throw new com.google.protobuf.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
@@ -12445,8 +12413,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
@@ -13007,8 +12973,6 @@ java.lang.String defaultValue);
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
-      } catch (com.google.protobuf.UninitializedMessageException e) {
-        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);

scripts/generate-java.sh

@@ -4,6 +4,7 @@ PROTO_ROOT=./proto
 JAVA_OUTPUT=./java/src/main/java/
 
 protoc -I=${PROTO_ROOT} --java_out=${JAVA_OUTPUT} \
+  ${PROTO_ROOT}/greptime/v1/common.proto \
   ${PROTO_ROOT}/greptime/v1/column.proto \
   ${PROTO_ROOT}/greptime/v1/ddl.proto \
   ${PROTO_ROOT}/greptime/v1/database.proto