From 752c7b576d395ffab646aa6878ccf4e17a0a7a2e Mon Sep 17 00:00:00 2001
From: Kamil Rojewski <kamil.rojewski@gmail.com>
Date: Thu, 3 Jun 2021 23:18:45 +0200
Subject: [PATCH] avoiding more NoSuchMethod exceptions (#6671)

refs #6657
---
 grpc/flatbuffers-java-grpc/pom.xml                      | 2 +-
 grpc/pom.xml                                            | 2 +-
 grpc/tests/pom.xml                                      | 4 ++--
 java/com/google/flatbuffers/ByteBufferReadWriteBuf.java | 2 +-
 java/com/google/flatbuffers/FlatBufferBuilder.java      | 8 ++++----
 java/com/google/flatbuffers/Utf8Old.java                | 4 ++--
 pom.xml                                                 | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/grpc/flatbuffers-java-grpc/pom.xml b/grpc/flatbuffers-java-grpc/pom.xml
index 59d8e9c7e..7cd6e563c 100644
--- 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
index e6291d12b..a7584c11e 100644
--- 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
index e889a0c12..835a765ff 100644
--- 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
index cb109f76c..55acdd05a 100644
--- a/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java
+++ b/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java
@@ -15,7 +15,7 @@ public class ByteBufferReadWriteBuf implements ReadWriteBuf {
 
   @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
index 6653f39fd..1e1814889 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -92,7 +92,7 @@ public class FlatBufferBuilder {
         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 class FlatBufferBuilder {
     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 class FlatBufferBuilder {
      */
     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 @@ public class FlatBufferBuilder {
 
         ((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
index ba15031e4..64b0cf02e 100644
--- a/java/com/google/flatbuffers/Utf8Old.java
+++ b/java/com/google/flatbuffers/Utf8Old.java
@@ -56,7 +56,7 @@ public class Utf8Old extends Utf8 {
     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 class Utf8Old extends Utf8 {
         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
index 52782ef6c..fe1cec7e5 100644
--- 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>