avoiding more NoSuchMethod exceptions (#6671)

krojew · web-flow · commit 752c7b576d39 · 2021-06-03T14:18:45.000-07:00
refs #6657
diff --git a/grpc/flatbuffers-java-grpc/pom.xml b/grpc/flatbuffers-java-grpc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.google.flatbuffers</groupId>
         <artifactId>flatbuffers-parent</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </parent>
     <artifactId>flatbuffers-java-grpc</artifactId>
     <name>${project.artifactId}</name>
diff --git a/grpc/pom.xml b/grpc/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.google.flatbuffers</groupId>
     <artifactId>flatbuffers-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <name>flatbuffers-parent</name>
     <description>parent pom for flatbuffers java artifacts</description>
     <properties>
diff --git a/grpc/tests/pom.xml b/grpc/tests/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.google.flatbuffers</groupId>
         <artifactId>flatbuffers-parent</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </parent>
     <artifactId>grpc-test</artifactId>
     <description>Example/Test project demonstrating usage of flatbuffers with GRPC-Java instead of protobufs
     </description>
     <properties>
-        <gRPC.version>2.0.1</gRPC.version>
+        <gRPC.version>2.0.2</gRPC.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java b/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java
@@ -15,7 +15,7 @@ public ByteBufferReadWriteBuf(ByteBuffer bb) {
 
   @Override
   public void clear() {
-    buffer.clear();
+    ((Buffer) buffer).clear();
   }
 
   @Override
diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -92,7 +92,7 @@ public FlatBufferBuilder(int initial_size, ByteBufferFactory bb_factory,
         this.bb_factory = bb_factory;
         if (existing_bb != null) {
           bb = existing_bb;
-          bb.clear();
+          ((Buffer) bb).clear();
           bb.order(ByteOrder.LITTLE_ENDIAN);
         } else {
           bb = bb_factory.newByteBuffer(initial_size);
@@ -154,7 +154,7 @@ public FlatBufferBuilder(ByteBuffer existing_bb) {
     public FlatBufferBuilder init(ByteBuffer existing_bb, ByteBufferFactory bb_factory){
         this.bb_factory = bb_factory;
         bb = existing_bb;
-        bb.clear();
+        ((Buffer) bb).clear();
         bb.order(ByteOrder.LITTLE_ENDIAN);
         minalign = 1;
         space = bb.capacity();
@@ -235,7 +235,7 @@ public static boolean isFieldPresent(Table table, int offset) {
      */
     public void clear(){
         space = bb.capacity();
-        bb.clear();
+        ((Buffer) bb).clear();
         minalign = 1;
         while(vtable_in_use > 0) vtable[--vtable_in_use] = 0;
         vtable_in_use = 0;
@@ -275,7 +275,7 @@ static ByteBuffer growByteBuffer(ByteBuffer bb, ByteBufferFactory bb_factory) {
 
         ((Buffer) bb).position(0);
         ByteBuffer nbb = bb_factory.newByteBuffer(new_buf_size);
-        new_buf_size = nbb.clear().capacity(); // Ensure the returned buffer is treated as empty
+        new_buf_size = ((Buffer) nbb).clear().capacity(); // Ensure the returned buffer is treated as empty
         ((Buffer) nbb).position(new_buf_size - old_buf_size);
         nbb.put(bb);
         return nbb;
diff --git a/java/com/google/flatbuffers/Utf8Old.java b/java/com/google/flatbuffers/Utf8Old.java
@@ -56,7 +56,7 @@ public int encodedLength(CharSequence in) {
     if (cache.lastOutput == null || cache.lastOutput.capacity() < estimated) {
       cache.lastOutput = ByteBuffer.allocate(Math.max(128, estimated));
     }
-    cache.lastOutput.clear();
+    ((Buffer) cache.lastOutput).clear();
     cache.lastInput = in;
     CharBuffer wrap = (in instanceof CharBuffer) ?
                           (CharBuffer) in : CharBuffer.wrap(in);
@@ -68,7 +68,7 @@ public int encodedLength(CharSequence in) {
         throw new IllegalArgumentException("bad character encoding", e);
       }
     }
-    cache.lastOutput.flip();
+    ((Buffer) cache.lastOutput).flip();
     return cache.lastOutput.remaining();
   }
 
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.flatbuffers</groupId>
   <artifactId>flatbuffers-java</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <packaging>bundle</packaging>
   <name>FlatBuffers Java API</name>
   <description>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public ByteBufferReadWriteBuf(ByteBuffer bb) {`
`15`	`15`
`16`	`16`	`@Override`
`17`	`17`	`public void clear() {`
`18`		`- buffer.clear();`
	`18`	`+ ((Buffer) buffer).clear();`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public int encodedLength(CharSequence in) {`
`56`	`56`	`if (cache.lastOutput == null \|\| cache.lastOutput.capacity() < estimated) {`
`57`	`57`	`cache.lastOutput = ByteBuffer.allocate(Math.max(128, estimated));`
`58`	`58`	`}`
`59`		`- cache.lastOutput.clear();`
	`59`	`+ ((Buffer) cache.lastOutput).clear();`
`60`	`60`	`cache.lastInput = in;`
`61`	`61`	`CharBuffer wrap = (in instanceof CharBuffer) ?`
`62`	`62`	`(CharBuffer) in : CharBuffer.wrap(in);`
`@@ -68,7 +68,7 @@ public int encodedLength(CharSequence in) {`
`68`	`68`	`throw new IllegalArgumentException("bad character encoding", e);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`		`- cache.lastOutput.flip();`
	`71`	`+ ((Buffer) cache.lastOutput).flip();`
`72`	`72`	`return cache.lastOutput.remaining();`
`73`	`73`	`}`
`74`	`74`