[commons-bcel] branch master updated: - Make private elements final where possible. - Remove redundant modifiers. semicolons, type casts. - Simplify ternary expressions. - Normalize type declaration format for arrays.

[gg...@apache.org]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git


The following commit(s) were added to refs/heads/master by this push:
     new 034e537  - Make private elements final where possible. - Remove redundant modifiers. semicolons, type casts. - Simplify ternary expressions. - Normalize type declaration format for arrays.
034e537 is described below

commit 034e5374007593f350a960bc254f3e6881bbbf71
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 17 16:19:08 2021 -0500

    - Make private elements final where possible.
    - Remove redundant modifiers. semicolons, type casts.
    - Simplify ternary expressions.
    - Normalize type declaration format for arrays.
---
 src/main/java/org/apache/bcel/classfile/JavaClass.java           | 2 +-
 src/main/java/org/apache/bcel/classfile/Utility.java             | 4 ++--
 src/main/java/org/apache/bcel/generic/ArrayType.java             | 4 ++--
 src/main/java/org/apache/bcel/generic/ClassElementValueGen.java  | 2 +-
 src/main/java/org/apache/bcel/generic/ElementValuePairGen.java   | 2 +-
 src/main/java/org/apache/bcel/generic/EnumElementValueGen.java   | 4 ++--
 src/main/java/org/apache/bcel/generic/Instruction.java           | 2 +-
 src/main/java/org/apache/bcel/generic/PUSH.java                  | 2 +-
 src/main/java/org/apache/bcel/generic/SWITCH.java                | 4 ++--
 src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java | 2 +-
 src/main/java/org/apache/bcel/util/MethodHTML.java               | 3 +--
 src/test/java/org/apache/bcel/data/CombinedAnnotation.java       | 2 +-
 src/test/java/org/apache/bcel/data/PLSETestClass2.java           | 2 +-
 src/test/java/org/apache/bcel/data/PLSETestEnum.java             | 2 +-
 14 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java b/src/main/java/org/apache/bcel/classfile/JavaClass.java
index 86dab53..de8e260 100644
--- a/src/main/java/org/apache/bcel/classfile/JavaClass.java
+++ b/src/main/java/org/apache/bcel/classfile/JavaClass.java
@@ -50,7 +50,7 @@ import org.apache.commons.lang3.ArrayUtils;
 public class JavaClass extends AccessFlags implements Cloneable, Node, Comparable<JavaClass> {
 
     private String fileName;
-    private String packageName;
+    private final String packageName;
     private String sourceFileName = "<Unknown>";
     private int classNameIndex;
     private int superclassNameIndex;
diff --git a/src/main/java/org/apache/bcel/classfile/Utility.java b/src/main/java/org/apache/bcel/classfile/Utility.java
index 8d3b956..9d3114d 100644
--- a/src/main/java/org/apache/bcel/classfile/Utility.java
+++ b/src/main/java/org/apache/bcel/classfile/Utility.java
@@ -1500,8 +1500,8 @@ public abstract class Utility {
 
     // A-Z, g-z, _, $
     private static final int FREE_CHARS = 48;
-    private static int[] CHAR_MAP = new int[FREE_CHARS];
-    private static int[] MAP_CHAR = new int[256]; // Reverse map
+    private static final int[] CHAR_MAP = new int[FREE_CHARS];
+    private static final int[] MAP_CHAR = new int[256]; // Reverse map
     private static final char ESCAPE_CHAR = '$';
     static {
         int j = 0;
diff --git a/src/main/java/org/apache/bcel/generic/ArrayType.java b/src/main/java/org/apache/bcel/generic/ArrayType.java
index 7c0ea09..ea05fce 100644
--- a/src/main/java/org/apache/bcel/generic/ArrayType.java
+++ b/src/main/java/org/apache/bcel/generic/ArrayType.java
@@ -25,8 +25,8 @@ import org.apache.bcel.Const;
  */
 public final class ArrayType extends ReferenceType {
 
-    private int dimensions;
-    private Type basicType;
+    private final int dimensions;
+    private final Type basicType;
 
 
     /**
diff --git a/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java b/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
index 60f76f6..e705f8d 100644
--- a/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
+++ b/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
@@ -32,7 +32,7 @@ public class ClassElementValueGen extends ElementValueGen
     // For primitive types and string type, this points to the value entry in
     // the cpool
     // For 'class' this points to the class entry in the cpool
-    private int idx;
+    private final int idx;
 
     protected ClassElementValueGen(final int typeIdx, final ConstantPoolGen cpool)
     {
diff --git a/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java b/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
index 3bb047b..5ee1b2b 100644
--- a/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
+++ b/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
@@ -29,7 +29,7 @@ import org.apache.bcel.classfile.ElementValuePair;
  */
 public class ElementValuePairGen
 {
-    private int nameIdx;
+    private final int nameIdx;
 
     private final ElementValueGen value;
 
diff --git a/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java b/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
index 122f437..d96b54d 100644
--- a/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
+++ b/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
@@ -30,9 +30,9 @@ import org.apache.bcel.classfile.EnumElementValue;
 public class EnumElementValueGen extends ElementValueGen
 {
     // For enum types, these two indices point to the type and value
-    private int typeIdx;
+    private final int typeIdx;
 
-    private int valueIdx;
+    private final int valueIdx;
 
     /**
      * This ctor assumes the constant pool already contains the right type and
diff --git a/src/main/java/org/apache/bcel/generic/Instruction.java b/src/main/java/org/apache/bcel/generic/Instruction.java
index 7cdda1e..04f8e32 100644
--- a/src/main/java/org/apache/bcel/generic/Instruction.java
+++ b/src/main/java/org/apache/bcel/generic/Instruction.java
@@ -574,7 +574,7 @@ public abstract class Instruction implements Cloneable {
      */
     @Override
     public boolean equals( final Object that ) {
-        return (that instanceof Instruction) ? cmp.equals(this, (Instruction) that) : false;
+        return that instanceof Instruction && cmp.equals(this, (Instruction) that);
     }
 
     /** calculate the hashCode of this object
diff --git a/src/main/java/org/apache/bcel/generic/PUSH.java b/src/main/java/org/apache/bcel/generic/PUSH.java
index f652da9..e464cd3 100644
--- a/src/main/java/org/apache/bcel/generic/PUSH.java
+++ b/src/main/java/org/apache/bcel/generic/PUSH.java
@@ -26,7 +26,7 @@ import org.apache.bcel.Const;
  */
 public final class PUSH implements CompoundInstruction, VariableLengthInstruction, InstructionConstants {
 
-    private Instruction instruction;
+    private final Instruction instruction;
 
 
     /**
diff --git a/src/main/java/org/apache/bcel/generic/SWITCH.java b/src/main/java/org/apache/bcel/generic/SWITCH.java
index 5172ed1..6f24fbb 100644
--- a/src/main/java/org/apache/bcel/generic/SWITCH.java
+++ b/src/main/java/org/apache/bcel/generic/SWITCH.java
@@ -27,8 +27,8 @@ public final class SWITCH implements CompoundInstruction {
 
     private int[] match;
     private InstructionHandle[] targets;
-    private Select instruction;
-    private int matchLength;
+    private final Select instruction;
+    private final int matchLength;
 
 
     /**
diff --git a/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java b/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java
index 169a3dc..7ad16fc 100644
--- a/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java
+++ b/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java
@@ -36,7 +36,7 @@ public class SimpleElementValueGen extends ElementValueGen
     // For primitive types and string type, this points to the value entry in
     // the cpGen
     // For 'class' this points to the class entry in the cpGen
-    private int idx;
+    private final int idx;
 
     // ctors for each supported type... type could be inferred but for now lets
     // force it to be passed
diff --git a/src/main/java/org/apache/bcel/util/MethodHTML.java b/src/main/java/org/apache/bcel/util/MethodHTML.java
index cff316c..183e896 100644
--- a/src/main/java/org/apache/bcel/util/MethodHTML.java
+++ b/src/main/java/org/apache/bcel/util/MethodHTML.java
@@ -24,7 +24,6 @@ import java.io.PrintWriter;
 import org.apache.bcel.Const;
 import org.apache.bcel.classfile.Attribute;
 import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.ConstantValue;
 import org.apache.bcel.classfile.ExceptionTable;
 import org.apache.bcel.classfile.Field;
 import org.apache.bcel.classfile.Method;
@@ -89,7 +88,7 @@ final class MethodHTML {
         }
         for (int i = 0; i < attributes.length; i++) {
             if (attributes[i].getTag() == Const.ATTR_CONSTANT_VALUE) { // Default value
-                final String str = ((ConstantValue) attributes[i]).toString();
+                final String str = attributes[i].toString();
                 // Reference attribute in _attributes.html
                 file.print("<TD>= <A HREF=\"" + className + "_attributes.html#" + name + "@" + i
                         + "\" TARGET=\"Attributes\">" + str + "</TD>\n");
diff --git a/src/test/java/org/apache/bcel/data/CombinedAnnotation.java b/src/test/java/org/apache/bcel/data/CombinedAnnotation.java
index 54cf354..250e58a 100644
--- a/src/test/java/org/apache/bcel/data/CombinedAnnotation.java
+++ b/src/test/java/org/apache/bcel/data/CombinedAnnotation.java
@@ -24,5 +24,5 @@ import java.lang.annotation.RetentionPolicy;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CombinedAnnotation
 {
-    public SimpleAnnotation[] value();
+    SimpleAnnotation[] value();
 }
diff --git a/src/test/java/org/apache/bcel/data/PLSETestClass2.java b/src/test/java/org/apache/bcel/data/PLSETestClass2.java
index 8cf4c73..a869934 100644
--- a/src/test/java/org/apache/bcel/data/PLSETestClass2.java
+++ b/src/test/java/org/apache/bcel/data/PLSETestClass2.java
@@ -20,7 +20,7 @@ package org.apache.bcel.data;
 
 public class PLSETestClass2
 {
-    public static void main(final String args[]) {
+    public static void main(final String[] args) {
         int t = 0;
 
         for (int i = 0; i < 100; i++) {
diff --git a/src/test/java/org/apache/bcel/data/PLSETestEnum.java b/src/test/java/org/apache/bcel/data/PLSETestEnum.java
index b74fe80..bef8d02 100644
--- a/src/test/java/org/apache/bcel/data/PLSETestEnum.java
+++ b/src/test/java/org/apache/bcel/data/PLSETestEnum.java
@@ -19,5 +19,5 @@
 package org.apache.bcel.data;
 
 public enum PLSETestEnum {
-    TEST_VALUE;
+    TEST_VALUE
 }