From c6c5a0596ffc441e6cd1ad60130cdcdcb2e319e4 Mon Sep 17 00:00:00 2001
From: kpandit <kpandit@pinterest.com>
Date: Thu, 2 Dec 2021 14:15:48 -0800
Subject: THRIFT-5486 : fix issues found by spotbugs

---
 lib/java/src/org/apache/thrift/TDeserializer.java          | 14 --------------
 .../org/apache/thrift/partial/PartialThriftComparer.java   |  6 ++++--
 lib/java/src/org/apache/thrift/partial/ThriftMetadata.java | 11 -----------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/lib/java/src/org/apache/thrift/TDeserializer.java b/lib/java/src/org/apache/thrift/TDeserializer.java
index 1433f6240..dd63996db 100644
--- a/lib/java/src/org/apache/thrift/TDeserializer.java
+++ b/lib/java/src/org/apache/thrift/TDeserializer.java
@@ -680,20 +680,6 @@ public class TDeserializer {
     return this.processor_.prepareEnum(enumClass, ordinal);
   }
 
-  private <T extends TBase> T createNewStruct(ThriftMetadata.ThriftStruct data) {
-    T instance = null;
-
-    try {
-      instance = (T) this.getStructClass(data).newInstance();
-    } catch (InstantiationException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    }
-
-    return instance;
-  }
-
   private <T extends TBase> Class<T> getStructClass(ThriftMetadata.ThriftStruct data) {
     return (Class<T>) ((StructMetaData) data.data.valueMetaData).structClass;
   }
diff --git a/lib/java/src/org/apache/thrift/partial/PartialThriftComparer.java b/lib/java/src/org/apache/thrift/partial/PartialThriftComparer.java
index f0f33eb4f..f636c80d9 100644
--- a/lib/java/src/org/apache/thrift/partial/PartialThriftComparer.java
+++ b/lib/java/src/org/apache/thrift/partial/PartialThriftComparer.java
@@ -267,13 +267,15 @@ public class PartialThriftComparer<T extends TBase> {
       return false;
     }
 
-    for (Object k1 : m1.keySet()) {
+    for (Map.Entry e1 : m1.entrySet()) {
+      Object k1 = e1.getKey();
+
       if (!m2.containsKey(k1)) {
         appendResult(data, sb, "Key %s in m1 not found in m2", k1);
         return false;
       }
 
-      Object v1 = m1.get(k1);
+      Object v1 = e1.getValue();
       Object v2 = m2.get(k1);
       if (!this.areEqual(data.valueData, v1, v2, sb)) {
         return false;
diff --git a/lib/java/src/org/apache/thrift/partial/ThriftMetadata.java b/lib/java/src/org/apache/thrift/partial/ThriftMetadata.java
index 984d97249..1146720c2 100644
--- a/lib/java/src/org/apache/thrift/partial/ThriftMetadata.java
+++ b/lib/java/src/org/apache/thrift/partial/ThriftMetadata.java
@@ -236,17 +236,6 @@ public class ThriftMetadata {
           throw unsupportedFieldTypeException(fieldType);
       }
     }
-
-    private ThriftStruct getParentStruct() {
-      ThriftObject tparent = parent;
-      while (tparent != null) {
-        if (tparent instanceof ThriftStruct) {
-          return (ThriftStruct) tparent;
-        }
-        tparent = tparent.parent;
-      }
-      return null;
-    }
   }
 
   public static class ThriftEnum extends ThriftObject {
-- 
cgit v1.2.1