You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/09/29 00:04:24 UTC
[1/2] logging-log4j2 git commit: Add final modifier to private fields.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1136 b69cd4d48 -> d805d02e4
Add final modifier to private fields.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/da4d8dbe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/da4d8dbe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/da4d8dbe
Branch: refs/heads/LOG4J2-1136
Commit: da4d8dbe0f127b6edefafb40b84eea6e8a9f4c04
Parents: b69cd4d
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 28 15:02:14 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 28 15:02:14 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/script/ScriptManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da4d8dbe/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
index 9bf868f..8c4ef0d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
@@ -157,7 +157,7 @@ public class ScriptManager {
private class ThreadLocalScriptRunner implements ScriptRunner {
private final Script script;
- private ThreadLocal<MainScriptRunner> runners = new ThreadLocal<MainScriptRunner>() {
+ private final ThreadLocal<MainScriptRunner> runners = new ThreadLocal<MainScriptRunner>() {
@Override protected MainScriptRunner initialValue() {
ScriptEngine engine = manager.getEngineByName(script.getLanguage());
return new MainScriptRunner(engine, script);
[2/2] logging-log4j2 git commit: Add final modifier.
Posted by gg...@apache.org.
Add final modifier.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d805d02e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d805d02e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d805d02e
Branch: refs/heads/LOG4J2-1136
Commit: d805d02e424dbec88c7863ad4c0b8e34ad3ea561
Parents: da4d8db
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 28 15:03:02 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 28 15:03:02 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/script/Script.java | 4 +-
.../log4j/core/script/ScriptManager.java | 42 ++++++++++----------
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d805d02e/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
index 730abcd..03e0c9e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
@@ -20,7 +20,7 @@ public class Script {
private final String scriptText;
private final String name;
- public Script(String name, String language, String body) {
+ public Script(final String name, final String language, final String body) {
this.language = language;
this.scriptText = body;
this.name = name == null ? this.toString() : name;
@@ -40,7 +40,7 @@ public class Script {
@PluginFactory
- public static Script createScript(@PluginAttribute("name") String name,
+ public static Script createScript(@PluginAttribute("name") final String name,
@PluginAttribute("language") String language,
@PluginValue("scriptText") final String scriptText) {
if (language == null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d805d02e/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
index 8c4ef0d..a7b39cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
@@ -42,17 +42,17 @@ public class ScriptManager {
private final String languages;
public ScriptManager() {
- List<ScriptEngineFactory> factories = manager.getEngineFactories();
+ final List<ScriptEngineFactory> factories = manager.getEngineFactories();
if (logger.isDebugEnabled()) {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
logger.debug("Installed script engines");
- for (ScriptEngineFactory factory : factories) {
+ for (final ScriptEngineFactory factory : factories) {
String threading = (String) factory.getParameter(KEY_THREADING);
if (threading == null) {
threading = "Not Thread Safe";
}
- StringBuilder names = new StringBuilder();
- for (String name : factory.getNames()) {
+ final StringBuilder names = new StringBuilder();
+ for (final String name : factory.getNames()) {
if (names.length() > 0) {
names.append(", ");
}
@@ -62,16 +62,16 @@ public class ScriptManager {
sb.append(", ");
}
sb.append(names);
- boolean compiled = factory.getScriptEngine() instanceof Compilable;
+ final boolean compiled = factory.getScriptEngine() instanceof Compilable;
logger.debug(factory.getEngineName() + " Version: " + factory.getEngineVersion() +
", Language: " + factory.getLanguageName() + ", Threading: " + threading +
", Compile: " + compiled + ", Names: {" + names.toString() + "}");
}
languages = sb.toString();
} else {
- StringBuilder names = new StringBuilder();
- for (ScriptEngineFactory factory : factories) {
- for (String name : factory.getNames()) {
+ final StringBuilder names = new StringBuilder();
+ for (final ScriptEngineFactory factory : factories) {
+ for (final String name : factory.getNames()) {
if (names.length() > 0) {
names.append(", ");
}
@@ -82,8 +82,8 @@ public class ScriptManager {
}
}
- public void addScript(Script script) {
- ScriptEngine engine = manager.getEngineByName(script.getLanguage());
+ public void addScript(final Script script) {
+ final ScriptEngine engine = manager.getEngineByName(script.getLanguage());
if (engine == null) {
logger.error("No ScriptEngine found for language " + script.getLanguage() + ". Available languages are: " +
languages);
@@ -96,8 +96,8 @@ public class ScriptManager {
}
}
- public Object execute(String name, Bindings bindings) {
- ScriptRunner scriptRunner = scripts.get(name);
+ public Object execute(final String name, final Bindings bindings) {
+ final ScriptRunner scriptRunner = scripts.get(name);
if (scriptRunner == null) {
logger.warn("No script named {} could be found");
return null;
@@ -116,7 +116,7 @@ public class ScriptManager {
private final ScriptEngine scriptEngine;
- public MainScriptRunner(ScriptEngine scriptEngine, Script script) {
+ public MainScriptRunner(final ScriptEngine scriptEngine, final Script script) {
this.script = script;
this.scriptEngine = scriptEngine;
CompiledScript compiled = null;
@@ -124,7 +124,7 @@ public class ScriptManager {
logger.debug("Script {} is compilable", script.getName());
try {
compiled = ((Compilable) scriptEngine).compile(script.getScriptText());
- } catch (Throwable ex) {
+ } catch (final Throwable ex) {
/* ScriptException is what really should be caught here. However, beanshell's ScriptEngine
* implements Compilable but then throws Error when the compile method is called!
*/
@@ -135,18 +135,18 @@ public class ScriptManager {
}
@Override
- public Object execute(Bindings bindings) {
+ public Object execute(final Bindings bindings) {
if (compiledScript != null) {
try {
return compiledScript.eval(bindings);
- } catch (ScriptException ex) {
+ } catch (final ScriptException ex) {
logger.error("Error running script " + script.getName(), ex);
return null;
}
}
try {
return scriptEngine.eval(script.getScriptText(), bindings);
- } catch (ScriptException ex) {
+ } catch (final ScriptException ex) {
logger.error("Error running script " + script.getName(), ex);
return null;
}
@@ -159,17 +159,17 @@ public class ScriptManager {
private final ThreadLocal<MainScriptRunner> runners = new ThreadLocal<MainScriptRunner>() {
@Override protected MainScriptRunner initialValue() {
- ScriptEngine engine = manager.getEngineByName(script.getLanguage());
+ final ScriptEngine engine = manager.getEngineByName(script.getLanguage());
return new MainScriptRunner(engine, script);
}
};
- public ThreadLocalScriptRunner(Script script) {
+ public ThreadLocalScriptRunner(final Script script) {
this.script = script;
}
@Override
- public Object execute(Bindings bindings) {
+ public Object execute(final Bindings bindings) {
return runners.get().execute(bindings);
}
}