Skip to content

Commit f277b5a

Browse files
verhasverhas
committed
variables are made to be final
1 parent abc2049 commit f277b5a

131 files changed

Lines changed: 671 additions & 670 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/scriptbasic/Engine.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class Engine implements ScriptBasic {
2828
public Engine() {
2929
}
3030

31-
public void registerFunctions(Class<?> klass) throws ScriptBasicException {
31+
public void registerFunctions(final Class<?> klass) throws ScriptBasicException {
3232
ctx.interpreter.registerFunctions(klass);
3333
}
3434

‎src/main/java/com/scriptbasic/api/ScriptBasicException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ public ScriptBasicException() {
88
super();
99
}
1010

11-
public ScriptBasicException(String message, Throwable cause) {
11+
public ScriptBasicException(final String message, final Throwable cause) {
1212
super(message, cause);
1313
}
1414

15-
public ScriptBasicException(String message) {
15+
public ScriptBasicException(final String message) {
1616
super(message);
1717
}
1818

19-
public ScriptBasicException(Throwable cause) {
19+
public ScriptBasicException(final Throwable cause) {
2020
super(cause);
2121
}
2222

‎src/main/java/com/scriptbasic/api/script/ScriptBasicEngineFactory.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public ScriptBasicEngineFactory() {
3939
* The constructor reads the configuration and fills the constants that are
4040
* requested by the {@link javax.script.ScriptEngineManager}.
4141
*/
42-
public ScriptBasicEngineFactory(Configuration config) {
42+
public ScriptBasicEngineFactory(final Configuration config) {
4343
this.config = config;
4444
engineName = config.getConfigValue("engineName").orElse(engineName);
4545
version = config.getConfigValue("version").orElse(version);
@@ -62,7 +62,7 @@ public Bindings getGlobalScopeBinding() {
6262
/**
6363
* @param globalScopeBinding the globalScopeBinding to set
6464
*/
65-
public void setGlobalScopeBinding(Bindings globalScopeBinding) {
65+
public void setGlobalScopeBinding(final Bindings globalScopeBinding) {
6666
this.globalScopeBinding = globalScopeBinding;
6767
}
6868

@@ -72,9 +72,9 @@ public void setGlobalScopeBinding(Bindings globalScopeBinding) {
7272
* @param key the name of the configuration key.
7373
* @param setter consumer that uses the list of values from the configuration
7474
*/
75-
private void loadKeys(String key, Consumer<List<String>> setter) {
75+
private void loadKeys(final String key, final Consumer<List<String>> setter) {
7676
if (config != null) {
77-
List<String> list = config.getConfigValueList(key);
77+
final List<String> list = config.getConfigValueList(key);
7878
if (!list.isEmpty()) {
7979
setter.accept(list);
8080
}
@@ -157,7 +157,7 @@ public String getLanguageVersion() {
157157
* @see javax.script.ScriptEngineFactory#getParameter(java.lang.String)
158158
*/
159159
@Override
160-
public Object getParameter(String key) {
160+
public Object getParameter(final String key) {
161161
if (key.equals(ScriptEngine.ENGINE))
162162
return getEngineName();
163163
if (key.equals(ScriptEngine.ENGINE_VERSION))
@@ -181,10 +181,10 @@ public Object getParameter(String key) {
181181
* java.lang.String, java.lang.String[])
182182
*/
183183
@Override
184-
public String getMethodCallSyntax(String obj, String m, String... args) {
184+
public String getMethodCallSyntax(final String obj, final String m, final String... args) {
185185
String sep = "";
186186
String argsS = "";
187-
for (String arg : args) {
187+
for (final String arg : args) {
188188
argsS = sep + arg;
189189
sep = ",";
190190
}
@@ -198,7 +198,7 @@ public String getMethodCallSyntax(String obj, String m, String... args) {
198198
* javax.script.ScriptEngineFactory#getOutputStatement(java.lang.String)
199199
*/
200200
@Override
201-
public String getOutputStatement(String toDisplay) {
201+
public String getOutputStatement(final String toDisplay) {
202202
return String.format("print \"%s\"", toDisplay);
203203
}
204204

@@ -208,13 +208,13 @@ public String getOutputStatement(String toDisplay) {
208208
* @see javax.script.ScriptEngineFactory#getProgram(java.lang.String[])
209209
*/
210210
@Override
211-
public String getProgram(String... statements) {
211+
public String getProgram(final String... statements) {
212212
int len = 0;
213-
for (String line : statements) {
213+
for (final String line : statements) {
214214
len += 1 + line.length();
215215
}
216-
StringBuilder sb = new StringBuilder(len);
217-
for (String line : statements) {
216+
final StringBuilder sb = new StringBuilder(len);
217+
for (final String line : statements) {
218218
sb.append(line).append("\n");
219219
}
220220
return sb.toString();

‎src/main/java/com/scriptbasic/api/script/ScriptEngine.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ public class ScriptEngine extends AbstractScriptEngine {
2020
public final ScriptBasicEngineFactory scriptEngineFactory;
2121
public Context ctx;
2222

23-
public ScriptEngine(ScriptBasicEngineFactory scriptEngineFactory) {
23+
public ScriptEngine(final ScriptBasicEngineFactory scriptEngineFactory) {
2424
ctx = ContextBuilder.newContext();
2525
ctx.configuration = scriptEngineFactory.config;
2626
this.scriptEngineFactory = scriptEngineFactory;
2727
}
2828

29-
private static void unmergeBindings(ExtendedInterpreter interpreter,
30-
Bindings bindings) throws ExecutionException {
31-
for (String name : bindings.keySet()) {
29+
private static void unmergeBindings(final ExtendedInterpreter interpreter,
30+
final Bindings bindings) throws ExecutionException {
31+
for (final String name : bindings.keySet()) {
3232
bindings.put(name, interpreter.getVariable(name));
3333
}
3434
}
3535

36-
private static void mergeBinding(ExtendedInterpreter interpreter,
37-
Bindings bindings) throws ExecutionException {
38-
for (String name : bindings.keySet()) {
36+
private static void mergeBinding(final ExtendedInterpreter interpreter,
37+
final Bindings bindings) throws ExecutionException {
38+
for (final String name : bindings.keySet()) {
3939
interpreter.setVariable(name, bindings.get(name));
4040
}
4141
}
@@ -47,7 +47,7 @@ private static void mergeBinding(ExtendedInterpreter interpreter,
4747
* javax.script.ScriptContext)
4848
*/
4949
@Override
50-
public Object eval(String script, ScriptContext context) throws ScriptException {
50+
public Object eval(final String script, final ScriptContext context) throws ScriptException {
5151
return eval(new StringReader(script), context);
5252
}
5353

@@ -58,7 +58,7 @@ public Object eval(String script, ScriptContext context) throws ScriptException
5858
* javax.script.ScriptContext)
5959
*/
6060
@Override
61-
public Object eval(Reader reader, ScriptContext context) throws ScriptException {
61+
public Object eval(final Reader reader, final ScriptContext context) throws ScriptException {
6262
try {
6363
ctx = ContextBuilder.from(ctx, reader, context.getReader(), context.getWriter(), context.getErrorWriter());
6464
mergeBinding(ctx.interpreter, context.getBindings(ScriptContext.GLOBAL_SCOPE));

‎src/main/java/com/scriptbasic/configuration/BasicConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class BasicConfiguration implements Configuration {
2020
public BasicConfiguration() {
2121
try {
2222
loadDefaultConfiguration();
23-
} catch (Exception e) {
23+
} catch (final Exception e) {
2424
LOG.error("Configuration was not loaded", e);
2525
}
2626
}
@@ -60,7 +60,7 @@ public List<String> getConfigValueList(final String key) {
6060
if (lists.containsKey(key)) {
6161
return lists.get(key);
6262
}
63-
List<String> list = new LinkedList<>();
63+
final List<String> list = new LinkedList<>();
6464
for (int i = 0; getConfigValue(key, i).isPresent(); i++) {
6565
list.add(getConfigValue(key, i).get());
6666
}

‎src/main/java/com/scriptbasic/errors/BasicInterpreterInternalError.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public BasicInterpreterInternalError(final String arg0) {
77
super(arg0);
88
}
99

10-
public BasicInterpreterInternalError(final String arg0, Throwable e) {
10+
public BasicInterpreterInternalError(final String arg0, final Throwable e) {
1111
super(arg0, e);
1212
}
1313
}

‎src/main/java/com/scriptbasic/exceptions/CommandFactoryException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public CommandFactoryException() {
1313
super();
1414
}
1515

16-
public CommandFactoryException(String arg0, Throwable arg1) {
16+
public CommandFactoryException(final String arg0, final Throwable arg1) {
1717
super(arg0, arg1);
1818
}
1919

20-
public CommandFactoryException(String arg0) {
20+
public CommandFactoryException(final String arg0) {
2121
super(arg0);
2222
}
2323

24-
public CommandFactoryException(Throwable arg0) {
24+
public CommandFactoryException(final Throwable arg0) {
2525
super(arg0);
2626
}
2727

‎src/main/java/com/scriptbasic/exceptions/GeneralAnalysisException.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public GeneralAnalysisException() {
1818
super();
1919
}
2020

21-
public GeneralAnalysisException(String message, Throwable cause) {
21+
public GeneralAnalysisException(final String message, final Throwable cause) {
2222
super(message, cause);
2323
}
24-
public GeneralAnalysisException(String message) {
24+
public GeneralAnalysisException(final String message) {
2525
super(message);
2626
}
27-
public GeneralAnalysisException(Throwable cause) {
27+
public GeneralAnalysisException(final Throwable cause) {
2828
super(cause);
2929
}
3030

@@ -38,23 +38,23 @@ public String getFileName() {
3838
return this.fileName;
3939
}
4040

41-
public void setFileName(String fileName) {
41+
public void setFileName(final String fileName) {
4242
this.fileName = fileName;
4343
}
4444

4545
public int getLineNumber() {
4646
return this.lineNumber;
4747
}
4848

49-
public void setLineNumber(int lineNumber) {
49+
public void setLineNumber(final int lineNumber) {
5050
this.lineNumber = lineNumber;
5151
}
5252

5353
public int getPosition() {
5454
return this.position;
5555
}
5656

57-
public void setPosition(int position) {
57+
public void setPosition(final int position) {
5858
this.position = position;
5959
}
6060
}

‎src/main/java/com/scriptbasic/executors/BasicExtendedInterpreter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public final class BasicExtendedInterpreter implements ExtendedInterpreter {
3939
private boolean executePreTask = true;
4040
private RightValue returnValue;
4141

42-
public BasicExtendedInterpreter(Context ctx) {
42+
public BasicExtendedInterpreter(final Context ctx) {
4343
this.ctx = ctx;
4444
}
4545

@@ -153,7 +153,7 @@ public CommandSub getSubroutine(final String name) {
153153
public void registerFunctions(final Class<?> klass) {
154154
try {
155155
MethodRegisterUtility.registerFunctions(klass, this);
156-
} catch (BasicRuntimeException e) {
156+
} catch (final BasicRuntimeException e) {
157157
throw new BasicInterpreterInternalError(
158158
"Registering functions from class '"
159159
+ klass

‎src/main/java/com/scriptbasic/executors/BasicMethodRegistry.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class BasicMethodRegistry implements MethodRegistry {
1515
private Map<String, RegistryItem> registry = new HashMap<>();
1616
private Map<String, RegistryItem> globalRegistry = new HashMap<>();
1717

18-
private static String formKey(String alias, Class<?> klass) {
18+
private static String formKey(final String alias, final Class<?> klass) {
1919
return alias + "#" + klass.getName().replaceAll("\\$", ".");
2020
}
2121

@@ -27,17 +27,17 @@ private static String formKey(String alias, Class<?> klass) {
2727
* java.lang.String)
2828
*/
2929
@Override
30-
public Method getJavaMethod(Class<?> klass, String alias)
30+
public Method getJavaMethod(final Class<?> klass, final String alias)
3131
throws ExecutionException {
3232
Method method = null;
3333
if (klass == null) {
3434
method = getJavaMethod(alias);
3535
} else {
36-
RegistryItem item = registry.get(formKey(alias, klass));
36+
final RegistryItem item = registry.get(formKey(alias, klass));
3737
if (item != null) {
3838
try {
3939
method = item.klass.getMethod(item.methodName, item.args);
40-
} catch (Exception e) {
40+
} catch (final Exception e) {
4141
throw new BasicRuntimeException("Method '"
4242
+ item.methodName + "' from class '" + item.klass
4343
+ "' can not be accessed", e);
@@ -47,13 +47,13 @@ public Method getJavaMethod(Class<?> klass, String alias)
4747
return method;
4848
}
4949

50-
private Method getJavaMethod(String alias) throws ExecutionException {
51-
RegistryItem item = globalRegistry.get(alias);
50+
private Method getJavaMethod(final String alias) throws ExecutionException {
51+
final RegistryItem item = globalRegistry.get(alias);
5252
Method method = null;
5353
if (item != null) {
5454
try {
5555
method = item.klass.getMethod(item.methodName, item.args);
56-
} catch (Exception e) {
56+
} catch (final Exception e) {
5757
throw new BasicRuntimeException("Method '" + item.methodName
5858
+ "' from class '" + item.klass
5959
+ "' can not be accessed", e);
@@ -78,7 +78,7 @@ private Method getJavaMethod(String alias) throws ExecutionException {
7878
* @param b the other item to be compared
7979
* @return {@code true} if the two items define the same Java method.
8080
*/
81-
private boolean definitionIsTheSame(RegistryItem a, RegistryItem b) {
81+
private boolean definitionIsTheSame(final RegistryItem a, final RegistryItem b) {
8282
return a.methodName.equals(b.methodName) && a.klass.equals(b.klass)
8383
&& Arrays.equals(a.args, b.args);
8484
}
@@ -106,7 +106,7 @@ private boolean definitionIsTheSame(RegistryItem a, RegistryItem b) {
106106
* @param item
107107
* @throws BasicRuntimeException
108108
*/
109-
private void registerGlobal(String alias, RegistryItem item)
109+
private void registerGlobal(final String alias, final RegistryItem item)
110110
throws BasicRuntimeException {
111111
if (globalRegistry.containsKey(alias)
112112
&& !definitionIsTheSame(globalRegistry.get(alias), item)) {
@@ -128,10 +128,10 @@ private void registerGlobal(String alias, RegistryItem item)
128128
* .String, java.lang.Class, java.lang.String, java.lang.Class)
129129
*/
130130
@Override
131-
public void registerJavaMethod(String alias, Class<?> klass,
132-
String methodName, Class<?>[] argumentTypes)
131+
public void registerJavaMethod(final String alias, final Class<?> klass,
132+
final String methodName, final Class<?>[] argumentTypes)
133133
throws BasicRuntimeException {
134-
RegistryItem item = new RegistryItem();
134+
final RegistryItem item = new RegistryItem();
135135
item.methodName = methodName;
136136
item.klass = klass;
137137
item.args = argumentTypes.clone();

0 commit comments

Comments
 (0)