code cleanup suggested by IntelliJ

verhas · verhas · commit 6007835023dc · 2020-01-12T11:02:35.000+01:00
also includes one bug fix for setting a byte value into a byte array for BASIC programs
diff --git a/src/main/java/com/scriptbasic/api/BasicFunction.java b/src/main/java/com/scriptbasic/api/BasicFunction.java
@@ -33,7 +33,7 @@
      * properly function.
      * <p>
      * The different versions of ScriptBasic may provide different
-     * functionalities for the methods registered as functions. When a method
+     * functionality for the methods registered as functions. When a method
      * needs a specific interface version the interpreter may alter its
      * behavior.
      * <p>
diff --git a/src/main/java/com/scriptbasic/api/ScriptBasic.java b/src/main/java/com/scriptbasic/api/ScriptBasic.java
@@ -87,11 +87,9 @@ default FunctionBuilder function(final String methodName) {
      *
      * @param input the input to set
      */
-    @Deprecated()
     void setInput(Reader input);
 
     default ScriptBasic input(final Reader input) {
-        //noinspection deprecation
         setInput(input);
         return this;
     }
@@ -110,11 +108,9 @@ default ScriptBasic input(final Reader input) {
      *
      * @param output parameter
      */
-    @Deprecated()
     void setOutput(Writer output);
 
     default ScriptBasic output(final Writer output) {
-        //noinspection deprecation
         setOutput(output);
         return this;
     }
@@ -133,11 +129,9 @@ default ScriptBasic output(final Writer output) {
      *
      * @param error the error output
      */
-    @Deprecated()
     void setErrorOutput(Writer error);
 
     default ScriptBasic error(final Writer error) {
-        //noinspection deprecation
         setErrorOutput(error);
         return this;
     }
@@ -443,7 +437,6 @@ private VariableBuilder(final String name, final ScriptBasic scriptBasic) {
         }
 
         public ScriptBasic is(final Object value) throws ScriptBasicException {
-            //noinspection deprecation
             scriptBasic.setVariable(name, value);
             return scriptBasic;
         }
diff --git a/src/main/java/com/scriptbasic/context/ContextBuilder.java b/src/main/java/com/scriptbasic/context/ContextBuilder.java
@@ -53,7 +53,7 @@ public static Context from(final Context existing, final Reader reader, final Re
         return ctx;
     }
 
-    public static Context from(final String string) throws AnalysisException {
+    public static Context from(final String string) {
         return from(null, string);
     }
 
@@ -71,7 +71,7 @@ public static Context from(final Context existing, final Reader reader) {
         return from(existing, hReader);
     }
 
-    public static Context from(final SourceReader sourceReader, final Reader input, final Writer output, final Writer error) throws AnalysisException {
+    public static Context from(final SourceReader sourceReader, final Reader input, final Writer output, final Writer error) {
         return from(null, sourceReader, input, output, error);
     }
 
diff --git a/src/main/java/com/scriptbasic/executors/BasicMethodRegistry.java b/src/main/java/com/scriptbasic/executors/BasicMethodRegistry.java
@@ -33,7 +33,7 @@ public Method getJavaMethod(final Class<?> klass, final String alias) {
         final var item = getRegistryItem(klass, alias);
         if (item == null) {
             method = null;
-        } else {//TODO check why ntelliJ analysis says that this is always null
+        } else {//TODO check why IntelliJ analysis says that this is always null
             if (item.method == null) {
                 final Class<?>[] args = new Class[item.args.length + 1];
                 args[0] = Interpreter.class;
diff --git a/src/main/java/com/scriptbasic/executors/commands/CommandCase.java b/src/main/java/com/scriptbasic/executors/commands/CommandCase.java
@@ -83,11 +83,11 @@ public boolean matchCase(Interpreter interpreter, RightValue selectExpressionVal
 	/**
 	 * List of case conditions to be evaluated
 	 */
-	private List<CaseCondition> expressionList = new ArrayList<>();
+	private final List<CaseCondition> expressionList = new ArrayList<>();
 	private CommandEndSelect commandEndSelect;
 
 	@Override
-	public void execute(Interpreter interpreter) throws ScriptBasicException {
+	public void execute(Interpreter interpreter) {
 
 		// Check if other case already applied
 		Boolean caseApplied = (Boolean) interpreter.getMap().get(CommandSelect.CASE_APPLIED);
diff --git a/src/main/java/com/scriptbasic/executors/commands/CommandEndSelect.java b/src/main/java/com/scriptbasic/executors/commands/CommandEndSelect.java
@@ -8,7 +8,7 @@ public class CommandEndSelect
 {
 
 	@Override
-	public void execute(Interpreter interpreter) throws ScriptBasicException {
+	public void execute(Interpreter interpreter) {
 		// do nothing		
 	}
 
diff --git a/src/main/java/com/scriptbasic/executors/commands/CommandSelect.java b/src/main/java/com/scriptbasic/executors/commands/CommandSelect.java
@@ -21,7 +21,7 @@ public class CommandSelect extends AbstractCommandSelectPart {
 	/**
 	 * List of possible cases
 	 */
-	private List<CommandCase> cases = new ArrayList<>();
+	private final List<CommandCase> cases = new ArrayList<>();
 
 	public void setExpression(final Expression expression) {
 		this.expression = expression;		
diff --git a/src/main/java/com/scriptbasic/executors/operators/AbstractBinaryFullCircuitNumericOperator.java b/src/main/java/com/scriptbasic/executors/operators/AbstractBinaryFullCircuitNumericOperator.java
@@ -11,13 +11,13 @@ protected abstract RightValue operateOnDoubleDouble(Double a, Double b)
             ;
 
     protected abstract RightValue operateOnDoubleLong(Double a, Long b)
-            throws BasicRuntimeException;
+        ;
 
     protected abstract RightValue operateOnLongDouble(Long a, Double b)
-            throws BasicRuntimeException;
+        ;
 
     protected abstract RightValue operateOnLongLong(Long a, Long b)
-            throws BasicRuntimeException;
+        ;
 
     protected RightValue operateOnValues(final RightValue leftOperand,
                                          final RightValue rightOperand) throws BasicRuntimeException {
diff --git a/src/main/java/com/scriptbasic/executors/operators/AmpersandOperator.java b/src/main/java/com/scriptbasic/executors/operators/AmpersandOperator.java
@@ -2,7 +2,6 @@
 
 import com.scriptbasic.api.ScriptBasicException;
 import com.scriptbasic.executors.rightvalues.BasicStringValue;
-import com.scriptbasic.interfaces.BasicRuntimeException;
 import com.scriptbasic.spi.RightValue;
 
 /**
@@ -24,8 +23,7 @@ protected RightValue evaluateOn(RightValue leftOperand, RightValue rightOperand)
         addOperand(sb, leftOperand);
         addOperand(sb, rightOperand);
 
-        BasicStringValue result = new BasicStringValue(sb.toString());
-        return result;
+        return new BasicStringValue(sb.toString());
     }
 
     static private void addOperand(StringBuilder stringBuilder, RightValue operand) throws ScriptBasicException {
diff --git a/src/main/java/com/scriptbasic/executors/operators/JavaObjectFieldAccessOperator.java b/src/main/java/com/scriptbasic/executors/operators/JavaObjectFieldAccessOperator.java
@@ -47,7 +47,7 @@ private static Object getArrayElement(final Object[] array, final Integer index)
                     + " < 0 as array index");
         }
         if (index >= array.length) {
-            throw new BasicRuntimeException("Cann not use index" + index
+            throw new BasicRuntimeException("Cannot use index" + index
                     + " > max index" + (array.length - 1) + " ");
         }
         return array[index];
diff --git a/src/main/java/com/scriptbasic/executors/operators/RightSideEqualsOperator.java b/src/main/java/com/scriptbasic/executors/operators/RightSideEqualsOperator.java
@@ -17,7 +17,7 @@ public RightSideEqualsOperator(final RightValue leftOperandEvaluated) {
 	}
 
 	@Override
-	protected RightValue getLeftOperandEvaluated(final Interpreter interpreter) throws ScriptBasicException {
+	protected RightValue getLeftOperandEvaluated(final Interpreter interpreter) {
 		return this.leftOperandEvaluated;
 	}
 
diff --git a/src/main/java/com/scriptbasic/executors/operators/RightSideGreaterOrEqualOperator.java b/src/main/java/com/scriptbasic/executors/operators/RightSideGreaterOrEqualOperator.java
@@ -9,14 +9,14 @@ public class RightSideGreaterOrEqualOperator extends GreaterOrEqualOperator {
     /**
      * Evaluated left operand
      */    
-	private RightValue leftOperandEvaluated;
+	private final RightValue leftOperandEvaluated;
 
 	public RightSideGreaterOrEqualOperator(final RightValue leftOperandEvaluated) {
 		this.leftOperandEvaluated = leftOperandEvaluated;
 	}
 
 	@Override
-	protected RightValue getLeftOperandEvaluated(final Interpreter interpreter) throws ScriptBasicException {
+	protected RightValue getLeftOperandEvaluated(final Interpreter interpreter) {
 		return this.leftOperandEvaluated;
 	}
 }
diff --git a/src/main/java/com/scriptbasic/executors/operators/RightSideLessOrEqualOperator.java b/src/main/java/com/scriptbasic/executors/operators/RightSideLessOrEqualOperator.java
@@ -16,7 +16,7 @@ public RightSideLessOrEqualOperator(final RightValue leftOperandEvaluated) {
 	}
 
 	@Override
-	protected RightValue getLeftOperandEvaluated(final Interpreter interpreter) throws ScriptBasicException {
+	protected RightValue getLeftOperandEvaluated(final Interpreter interpreter) {
 		return this.leftOperandEvaluated;
 	}
 
diff --git a/src/main/java/com/scriptbasic/interfaces/InternalInterpreter.java b/src/main/java/com/scriptbasic/interfaces/InternalInterpreter.java
@@ -114,9 +114,8 @@ public interface InternalInterpreter {
      * @param klass      parameter
      * @param methodName parameter
      * @return return value
-     * @throws ScriptBasicException in case of exception
      */
     Method getJavaMethod(Class<?> klass, String methodName)
-            throws ScriptBasicException;
+    ;
 
 }
diff --git a/src/main/java/com/scriptbasic/interfaces/NestedStructureHouseKeeper.java b/src/main/java/com/scriptbasic/interfaces/NestedStructureHouseKeeper.java
@@ -11,7 +11,7 @@
  */
 public interface NestedStructureHouseKeeper {
     
-    static public enum EndOfStatementResult {
+    enum EndOfStatementResult {
         /**
          * End of statement was consumed. Other processors should not be called.
          */
@@ -23,7 +23,7 @@ static public enum EndOfStatementResult {
         PROCESSED
     }
 
-    static public interface EndOfStatementProcessor {
+    interface EndOfStatementProcessor {
         
         EndOfStatementResult consumeEndOfStatement() throws AnalysisException;
         
diff --git a/src/main/java/com/scriptbasic/syntax/commands/AbstractCommandAnalyzer.java b/src/main/java/com/scriptbasic/syntax/commands/AbstractCommandAnalyzer.java
@@ -8,6 +8,8 @@
 import com.scriptbasic.spi.LeftValueList;
 import com.scriptbasic.syntax.AbstractAnalyzer;
 
+import java.util.Objects;
+
 public abstract class AbstractCommandAnalyzer extends AbstractAnalyzer<Command>
         implements CommandAnalyzer {
     protected final Context ctx;
@@ -26,7 +28,7 @@ protected AbstractCommandAnalyzer(final Context ctx) {
      * has modifiers (array access or field access)
      */
     protected static boolean equal(final LeftValue a, final LeftValue b) {
-        if (a == b || (a != null && a.equals(b))) {
+        if (Objects.equals(a, b)) {
             return true;
         }
         if (a instanceof BasicLeftValue && b instanceof BasicLeftValue) {
diff --git a/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerCase.java b/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerCase.java
@@ -30,7 +30,7 @@ public Command analyze() throws AnalysisException {
         consumeEndOfStatement();
 
         var lastSelectPart = ctx.nestedStructureHouseKeeper.pop(AbstractCommandSelectPart.class);
-        CommandSelect commandSelect = null;
+        final CommandSelect commandSelect;
         if (lastSelectPart instanceof CommandCase) {
             // pop real select
             commandSelect = ctx.nestedStructureHouseKeeper.pop(CommandSelect.class);
@@ -67,12 +67,12 @@ private void analyzeCaseConditions(CommandCase commandCase) throws AnalysisExcep
 
                     commandCase.addCaseFromToCondition(caseCondition, caseCondition2);
                 } else {
-                    // has to be equal condition					
+                    // has to be equal condition
                     commandCase.addCaseEqualCondition(caseCondition);
                 }
             }
 
-            // consume expression separator			
+            // consume expression separator
             elem = ctx.lexicalAnalyzer.peek();
             if (elem.isSymbol(",")) {
                 ctx.lexicalAnalyzer.get();
diff --git a/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerDSL.java b/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerDSL.java
@@ -98,7 +98,7 @@ private void defineDSLRule() throws AnalysisException {
         dslLines.add(new DslLine(functionNameLexicalElement.getLexeme(), syntaxElements));
     }
 
-    private class DslLine {
+    private static class DslLine {
         final String methodName;
         final String[] syntaxElements;
 
diff --git a/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerEnd.java b/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerEnd.java
@@ -30,7 +30,7 @@ public Command analyze() throws AnalysisException {
         var lastSelectPart = ctx.nestedStructureHouseKeeper.pop(AbstractCommandSelectPart.class);
 
         
-        CommandSelect commandSelect = null;                 
+        final CommandSelect commandSelect;
         if(lastSelectPart instanceof CommandCase) {
         	// pop real select
         	commandSelect = ctx.nestedStructureHouseKeeper.pop(CommandSelect.class);
diff --git a/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerIf.java b/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerIf.java
@@ -23,7 +23,7 @@ enum InlineProcessorState {
         EXPECTING_ELSE,
         EXPECTING_ELSE_CLAUSE,
         CLAUSE_DEFINED
-    };
+    }
     
     /**
      * Processor for inline 'if' statement
diff --git a/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerMethod.java b/src/main/java/com/scriptbasic/syntax/commands/CommandAnalyzerMethod.java
@@ -4,7 +4,6 @@
 import com.scriptbasic.executors.commands.CommandMethod;
 import com.scriptbasic.interfaces.AnalysisException;
 import com.scriptbasic.interfaces.Expression;
-import com.scriptbasic.interfaces.ExpressionList;
 import com.scriptbasic.interfaces.ScriptBasicKeyWords;
 import com.scriptbasic.spi.Command;
 import com.scriptbasic.utility.ExpressionUtility;
diff --git a/src/main/java/com/scriptbasic/utility/KlassUtility.java b/src/main/java/com/scriptbasic/utility/KlassUtility.java
@@ -259,10 +259,7 @@ private static Method getGetter(final Field field) {
         if (isGetter != null) {
             return isGetter;
         }
-        if (getGetter != null) {
-            return getGetter;
-        }
-        return null;
+        return getGetter;
     }
 
     private static Method getterPrefixed(final Field field, final String prefix) {
diff --git a/src/main/java/com/scriptbasic/utility/functions/StringFunctions.java b/src/main/java/com/scriptbasic/utility/functions/StringFunctions.java
@@ -129,11 +129,7 @@ static public String right(final String s, final int len) {
     @BasicFunction(classification = {com.scriptbasic.classification.String.class,
             com.scriptbasic.classification.Utility.class})
     static public String space(final int len) {
-        final var sb = new StringBuilder(len);
-        for (int i = 0; i < len; i++) {
-            sb.append(" ");
-        }
-        return sb.toString();
+        return " ".repeat(Math.max(0, len));
     }
 
     /**
diff --git a/src/main/java/com/scriptbasic/utility/functions/UtilityFunctions.java b/src/main/java/com/scriptbasic/utility/functions/UtilityFunctions.java
@@ -57,6 +57,7 @@ public static void logDebug(final String message) {
      *
      * @return the undef value
      */
+    @SuppressWarnings("SameReturnValue")
     @BasicFunction(classification = Constant.class)
     static public Object undef() {
         return null;
@@ -107,7 +108,7 @@ public static void setByte(final byte[] buffer, final Long i, Long v)
         if (v < 0 || v > 255) {
             throw new BasicRuntimeException("Byte value is out of range.");
         }
-        if (i >= 0 || i < buffer.length) {
+        if ( 0 <= i && i < buffer.length) {
             buffer[i.intValue()] = (byte) v.intValue();
         } else {
             throw new BasicRuntimeException(

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,9 @@ default FunctionBuilder function(final String methodName) {`
`87`	`87`	`*`
`88`	`88`	`* @param input the input to set`
`89`	`89`	`*/`
`90`		`- @Deprecated()`
`91`	`90`	`void setInput(Reader input);`
`92`	`91`
`93`	`92`	`default ScriptBasic input(final Reader input) {`
`94`		`- //noinspection deprecation`
`95`	`93`	`setInput(input);`
`96`	`94`	`return this;`
`97`	`95`	`}`
`@@ -110,11 +108,9 @@ default ScriptBasic input(final Reader input) {`
`110`	`108`	`*`
`111`	`109`	`* @param output parameter`
`112`	`110`	`*/`
`113`		`- @Deprecated()`
`114`	`111`	`void setOutput(Writer output);`
`115`	`112`
`116`	`113`	`default ScriptBasic output(final Writer output) {`
`117`		`- //noinspection deprecation`
`118`	`114`	`setOutput(output);`
`119`	`115`	`return this;`
`120`	`116`	`}`
`@@ -133,11 +129,9 @@ default ScriptBasic output(final Writer output) {`
`133`	`129`	`*`
`134`	`130`	`* @param error the error output`
`135`	`131`	`*/`
`136`		`- @Deprecated()`
`137`	`132`	`void setErrorOutput(Writer error);`
`138`	`133`
`139`	`134`	`default ScriptBasic error(final Writer error) {`
`140`		`- //noinspection deprecation`
`141`	`135`	`setErrorOutput(error);`
`142`	`136`	`return this;`
`143`	`137`	`}`
`@@ -443,7 +437,6 @@ private VariableBuilder(final String name, final ScriptBasic scriptBasic) {`
`443`	`437`	`}`
`444`	`438`
`445`	`439`	`public ScriptBasic is(final Object value) throws ScriptBasicException {`
`446`		`- //noinspection deprecation`
`447`	`440`	`scriptBasic.setVariable(name, value);`
`448`	`441`	`return scriptBasic;`
`449`	`442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static Context from(final Context existing, final Reader reader, final Re`
`53`	`53`	`return ctx;`
`54`	`54`	`}`
`55`	`55`
`56`		`- public static Context from(final String string) throws AnalysisException {`
	`56`	`+ public static Context from(final String string) {`
`57`	`57`	`return from(null, string);`
`58`	`58`	`}`
`59`	`59`
`@@ -71,7 +71,7 @@ public static Context from(final Context existing, final Reader reader) {`
`71`	`71`	`return from(existing, hReader);`
`72`	`72`	`}`
`73`	`73`
`74`		`- public static Context from(final SourceReader sourceReader, final Reader input, final Writer output, final Writer error) throws AnalysisException {`
	`74`	`+ public static Context from(final SourceReader sourceReader, final Reader input, final Writer output, final Writer error) {`
`75`	`75`	`return from(null, sourceReader, input, output, error);`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class CommandEndSelect`
`8`	`8`	`{`
`9`	`9`
`10`	`10`	`@Override`
`11`		`- public void execute(Interpreter interpreter) throws ScriptBasicException {`
	`11`	`+ public void execute(Interpreter interpreter) {`
`12`	`12`	`// do nothing`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ private static Object getArrayElement(final Object[] array, final Integer index)`
`47`	`47`	`+ " < 0 as array index");`
`48`	`48`	`}`
`49`	`49`	`if (index >= array.length) {`
`50`		`- throw new BasicRuntimeException("Cann not use index" + index`
	`50`	`+ throw new BasicRuntimeException("Cannot use index" + index`
`51`	`51`	`+ " > max index" + (array.length - 1) + " ");`
`52`	`52`	`}`
`53`	`53`	`return array[index];`