[geode] 15/16: GEODE-6588: Static analyzer cleanup.

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 43c1195df32ac992bf0db32c6710742b9656d93b
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Jan 22 07:52:36 2021 -0800

    GEODE-6588: Static analyzer cleanup.
---
 .../cache/persistence/DiskInitFileParser.java      | 27 +++++++++-------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
index acf89bc..aa06390 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
@@ -51,7 +51,7 @@ public class DiskInitFileParser {
   private static final Logger logger = LogService.getLogger();
 
   private final CountingDataInputStream dis;
-  private DiskInitFileInterpreter interpreter;
+  private final DiskInitFileInterpreter interpreter;
 
   public DiskInitFileParser(CountingDataInputStream dis, DiskInitFileInterpreter interpreter) {
     this.dis = dis;
@@ -68,11 +68,7 @@ public class DiskInitFileParser {
     KnownVersion gfversion = KnownVersion.GFE_6622;
     DiskStoreID result = null;
     boolean endOfFile = false;
-    while (!endOfFile) {
-      if (dis.atEndOfFile()) {
-        endOfFile = true;
-        break;
-      }
+    while (!(endOfFile || dis.atEndOfFile())) {
       byte opCode = dis.readByte();
       if (logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY_VERBOSE)) {
         logger.trace(LogMarker.PERSIST_RECOVERY_VERBOSE, "DiskInitFile opcode={}", opCode);
@@ -217,11 +213,11 @@ public class DiskInitFileParser {
           long drId = readDiskRegionID(dis);
           int size = dis.readInt();
           ConcurrentHashMap<DiskStoreID, RegionVersionHolder<DiskStoreID>> memberToVersion =
-              new ConcurrentHashMap<DiskStoreID, RegionVersionHolder<DiskStoreID>>(size);
+              new ConcurrentHashMap<>(size);
           for (int i = 0; i < size; i++) {
             DiskStoreID id = new DiskStoreID();
             InternalDataSerializer.invokeFromData(id, dis);
-            RegionVersionHolder holder = new RegionVersionHolder(dis);
+            RegionVersionHolder<DiskStoreID> holder = new RegionVersionHolder<>(dis);
             memberToVersion.put(id, holder);
           }
           readEndOfRecord(dis);
@@ -438,7 +434,7 @@ public class DiskInitFileParser {
           if (gfversion == null) {
             throw new DiskAccessException(
                 String.format("Unknown version ordinal %s found when recovering Oplogs", ver),
-                this.interpreter.getNameForError());
+                interpreter.getNameForError());
           }
           interpreter.cmnGemfireVersion(gfversion);
           break;
@@ -469,7 +465,7 @@ public class DiskInitFileParser {
           readEndOfRecord(dis);
           if (logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY_VERBOSE)) {
             logger.trace(LogMarker.PERSIST_RECOVERY_VERBOSE,
-                "IFREC_REVOKE_DISK_STORE_ID id={}" + pattern);
+                "IFREC_REVOKE_DISK_STORE_ID id={}", pattern);
           }
           interpreter.cmnRevokeDiskStoreId(pattern);
         }
@@ -477,7 +473,7 @@ public class DiskInitFileParser {
         default:
           throw new DiskAccessException(
               String.format("Unknown opCode %s found in disk initialization file.", opCode),
-              this.interpreter.getNameForError());
+              interpreter.getNameForError());
       }
       if (interpreter.isClosing()) {
         break;
@@ -502,7 +498,7 @@ public class DiskInitFileParser {
     if (logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY_VERBOSE)) {
       StringBuffer sb = new StringBuffer();
       for (int i = 0; i < OPLOG_TYPE.getLen(); i++) {
-        sb.append(" " + seq[i]);
+        sb.append(" ").append(seq[i]);
       }
       logger.trace(LogMarker.PERSIST_RECOVERY_VERBOSE, "oplog magic code: {}", sb);
     }
@@ -615,10 +611,9 @@ public class DiskInitFileParser {
 
   private static DiskInitFileInterpreter createPrintingInterpreter(
       DiskInitFileInterpreter wrapped) {
-    DiskInitFileInterpreter interpreter = (DiskInitFileInterpreter) Proxy.newProxyInstance(
+    return (DiskInitFileInterpreter) Proxy.newProxyInstance(
         DiskInitFileInterpreter.class.getClassLoader(), new Class[] {DiskInitFileInterpreter.class},
         new PrintingInterpreter(wrapped));
-    return interpreter;
   }
 
 
@@ -627,7 +622,7 @@ public class DiskInitFileParser {
     private final DiskInitFileInterpreter delegate;
 
     public PrintingInterpreter(DiskInitFileInterpreter wrapped) {
-      this.delegate = wrapped;
+      delegate = wrapped;
     }
 
     @Override
@@ -664,6 +659,6 @@ public class DiskInitFileParser {
   }
 
   public boolean gotEOF() {
-    return this.gotEOF;
+    return gotEOF;
   }
 }