diff options
Diffstat (limited to 'velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement')
9 files changed, 28 insertions, 9 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java index 08714561..4bdcff25 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java @@ -41,6 +41,7 @@ public class EscapeHtmlReference extends EscapeReference * @return An escaped String. * @see <a href="http://commons.apache.org/proper/commons-lang/javadocs/api-release/org/apache/commons/lang3/StringEscapeUtils.html#escapeHtml4%28java.lang.String%29">StringEscapeUtils</a> */ + @Override protected String escape(Object text) { return StringEscapeUtils.escapeHtml4(text.toString()); @@ -49,6 +50,7 @@ public class EscapeHtmlReference extends EscapeReference /** * @return attribute "eventhandler.escape.html.match" */ + @Override protected String getMatchAttribute() { return "eventhandler.escape.html.match"; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java index 77e1bbab..f6468743 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java @@ -41,6 +41,7 @@ public class EscapeJavaScriptReference extends EscapeReference * @return An escaped String. * @see <a href="http://commons.apache.org/proper/commons-lang/javadocs/api-release/org/apache/commons/lang3/StringEscapeUtils.html#escapeEcmaScript%28java.lang.String%29">StringEscapeUtils</a> */ + @Override protected String escape(Object text) { return StringEscapeUtils.escapeEcmaScript(text.toString()); @@ -49,6 +50,7 @@ public class EscapeJavaScriptReference extends EscapeReference /** * @return attribute "eventhandler.escape.javascript.match" */ + @Override protected String getMatchAttribute() { return "eventhandler.escape.javascript.match"; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java index 4c8cb9e3..17738a04 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java @@ -90,6 +90,7 @@ public abstract class EscapeReference implements ReferenceInsertionEventHandler, * @param value * @return Escaped text. */ + @Override public Object referenceInsert(Context context, String reference, Object value) { if(value == null) @@ -118,6 +119,7 @@ public abstract class EscapeReference implements ReferenceInsertionEventHandler, * * @param rs instance of RuntimeServices */ + @Override public void setRuntimeServices(RuntimeServices rs) { this.rs = rs; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java index 8f8728e6..46be4c69 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java @@ -34,6 +34,7 @@ public class EscapeSqlReference extends EscapeReference * @param text * @return An escaped string. */ + @Override protected String escape(Object text) { return text.toString().replaceAll("'", "''"); @@ -42,6 +43,7 @@ public class EscapeSqlReference extends EscapeReference /** * @return attribute "eventhandler.escape.sql.match" */ + @Override protected String getMatchAttribute() { return "eventhandler.escape.sql.match"; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java index 48d01db8..0905c513 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java @@ -40,6 +40,7 @@ public class EscapeXmlReference extends EscapeReference * @return An escaped String. * @see <a href="http://commons.apache.org/proper/commons-lang/javadocs/api-release/org/apache/commons/lang3/StringEscapeUtils.html#escapeXml10%28java.lang.String%29">StringEscapeUtils</a> */ + @Override protected String escape(Object text) { return StringEscapeUtils.escapeXml10(text.toString()); @@ -48,6 +49,7 @@ public class EscapeXmlReference extends EscapeReference /** * @return attribute "eventhandler.escape.xml.match" */ + @Override protected String getMatchAttribute() { return "eventhandler.escape.xml.match"; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java index fcc8f663..40fcf5d6 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java @@ -69,6 +69,7 @@ public class IncludeNotFound implements IncludeEventHandler, RuntimeServicesAwar * @param directiveName * @return message. */ + @Override public String includeEvent( Context context, String includeResourcePath, @@ -76,7 +77,7 @@ public class IncludeNotFound implements IncludeEventHandler, RuntimeServicesAwar String directiveName) { - /** + /* * check to see if page exists */ boolean exists = (rs.getLoaderNameForResource(includeResourcePath) != null); @@ -89,7 +90,7 @@ public class IncludeNotFound implements IncludeEventHandler, RuntimeServicesAwar } else { - /** + /* * can't find not found, so display nothing */ log.error("Can't find include not found page: {}", notfound); @@ -104,6 +105,7 @@ public class IncludeNotFound implements IncludeEventHandler, RuntimeServicesAwar /** * @see org.apache.velocity.util.RuntimeServicesAware#setRuntimeServices(org.apache.velocity.runtime.RuntimeServices) */ + @Override public void setRuntimeServices(RuntimeServices rs) { this.rs = rs; @@ -114,6 +116,7 @@ public class IncludeNotFound implements IncludeEventHandler, RuntimeServicesAwar /** * @see org.apache.velocity.util.ContextAware#setContext(org.apache.velocity.context.Context) */ + @Override public void setContext(Context context) { this.context = context; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java index 6010a35a..1c7e0b2d 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java @@ -44,6 +44,7 @@ public class IncludeRelativePath implements IncludeEventHandler { * @return new path relative to the current template's path */ + @Override public String includeEvent( Context context, String includeResourcePath, diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java index d1d7c824..ea88eafe 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java @@ -66,7 +66,8 @@ public class PrintExceptions implements MethodExceptionEventHandler, RuntimeServ * @param info template name and line, column informations * @return an object to insert in the page */ - public Object methodException(Context context, Class claz, String method, Exception e, Info info) + @Override + public Object methodException(Context context, Class<?> claz, String method, Exception e, Info info) { boolean showTemplateInfo = rs.getBoolean(SHOW_TEMPLATE_INFO, false); boolean showStackTrace = rs.getBoolean(SHOW_STACK_TRACE,false); @@ -111,6 +112,7 @@ public class PrintExceptions implements MethodExceptionEventHandler, RuntimeServ /** * @see org.apache.velocity.util.RuntimeServicesAware#setRuntimeServices(org.apache.velocity.runtime.RuntimeServices) */ + @Override public void setRuntimeServices(RuntimeServices rs) { this.rs = rs; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java index c76aa17b..2f9074f7 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/ReportInvalidReferences.java @@ -25,7 +25,6 @@ import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.RuntimeServicesAware; import org.apache.velocity.util.introspection.Info; -import org.slf4j.Logger; import java.util.ArrayList; import java.util.List; @@ -70,7 +69,7 @@ public class ReportInvalidReferences implements /** * List of InvalidReferenceInfo objects */ - List invalidReferences = new ArrayList(); + List<InvalidReferenceInfo> invalidReferences = new ArrayList<>(); /** * If true, stop at the first invalid reference and throw an exception. @@ -89,8 +88,9 @@ public class ReportInvalidReferences implements * @return always returns null * @throws ParseErrorException */ + @Override public Object invalidGetMethod(Context context, String reference, Object object, - String property, Info info) + String property, Info info) { reportInvalidReference(reference, info); return null; @@ -107,8 +107,9 @@ public class ReportInvalidReferences implements * @return always returns null * @throws ParseErrorException */ + @Override public Object invalidMethod(Context context, String reference, Object object, - String method, Info info) + String method, Info info) { if (reference == null) { @@ -130,6 +131,7 @@ public class ReportInvalidReferences implements * @param info contains info on template, line, col * @return loop to end -- always returns false */ + @Override public boolean invalidSetMethod(Context context, String leftreference, String rightreference, Info info) { reportInvalidReference(leftreference, info); @@ -163,7 +165,7 @@ public class ReportInvalidReferences implements * All invalid references during the processing of this page. * @return a List of InvalidReferenceInfo objects */ - public List getInvalidReferences() + public List<InvalidReferenceInfo> getInvalidReferences() { return invalidReferences; } @@ -173,6 +175,7 @@ public class ReportInvalidReferences implements * Called automatically when event cartridge is initialized. * @param rs RuntimeServices object assigned during initialization */ + @Override public void setRuntimeServices(RuntimeServices rs) { Boolean b = rs.getConfiguration().getBoolean(OLD_EVENTHANDLER_INVALIDREFERENCE_EXCEPTION, null); @@ -184,7 +187,7 @@ public class ReportInvalidReferences implements { rs.getLog().warn("configuration key '{}' has been deprecated in favor of '{}'", OLD_EVENTHANDLER_INVALIDREFERENCE_EXCEPTION, EVENTHANDLER_INVALIDREFERENCE_EXCEPTION); } - stopOnFirstInvalidReference = b.booleanValue(); + stopOnFirstInvalidReference = b; } } |